From fa2ce0dad304b61ac252e6e5170290334d88cf60 Mon Sep 17 00:00:00 2001 From: Murad Biashimov Date: Thu, 12 Dec 2024 11:56:52 +0100 Subject: [PATCH] feat: remove disaster recovery integration --- CHANGELOG.md | 1 - docs/resources/pg.md | 2 +- internal/schemautil/service.go | 4 ---- internal/schemautil/wait.go | 4 +--- internal/sdkprovider/service/pg/pg_test.go | 1 + 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0a9a1a9c..50018cda8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ nav_order: 1 ## [MAJOR.MINOR.PATCH] - YYYY-MM-DD -- Add `disaster_recovery` service integration type support - Add `alloydbomni` BETA resource and datasource - Add `aiven_alloydbomni_user` BETA resource and datasource - Add `aiven_alloydbomni_database` BETA resource and datasource diff --git a/docs/resources/pg.md b/docs/resources/pg.md index e65936267..545d92de2 100644 --- a/docs/resources/pg.md +++ b/docs/resources/pg.md @@ -355,7 +355,7 @@ Optional: Required: -- `integration_type` (String) Type of the service integration. The possible values are `read_replica` and `disaster_recovery`. +- `integration_type` (String) Type of the service integration. The possible value is `read_replica`. - `source_service_name` (String) Name of the source service diff --git a/internal/schemautil/service.go b/internal/schemautil/service.go index 337f827bd..95dc5de30 100644 --- a/internal/schemautil/service.go +++ b/internal/schemautil/service.go @@ -100,10 +100,6 @@ func getBootstrapIntegrationTypes(kind string) []service.IntegrationType { list = append(list, service.IntegrationTypeReadReplica) } - if kind == ServiceTypePG { - list = append(list, service.IntegrationTypeDisasterRecovery) - } - return list } diff --git a/internal/schemautil/wait.go b/internal/schemautil/wait.go index 408192c30..4378d54cf 100644 --- a/internal/schemautil/wait.go +++ b/internal/schemautil/wait.go @@ -260,9 +260,7 @@ func backupsReady(s *service.ServiceGetOut) bool { // See https://github.com/aiven/terraform-provider-aiven/pull/172 for _, i := range s.ServiceIntegrations { switch i.IntegrationType { - case service.IntegrationTypeReadReplica, service.IntegrationTypeDisasterRecovery: - // fixme: disaster recovery will have a backup eventually, - // remove this when BE is ready + case service.IntegrationTypeReadReplica: if lo.FromPtr(i.DestService) == s.ServiceName { return true } diff --git a/internal/sdkprovider/service/pg/pg_test.go b/internal/sdkprovider/service/pg/pg_test.go index 782f80dd5..a1f1405c0 100644 --- a/internal/sdkprovider/service/pg/pg_test.go +++ b/internal/sdkprovider/service/pg/pg_test.go @@ -1090,6 +1090,7 @@ func testAccCheckAivenServicePGAttributes(n string) resource.TestCheckFunc { } func TestAccAivenServicePG_disaster_recovery(t *testing.T) { + t.Skip("the feature is disabled") primaryName := "aiven_pg.primary" secondaryName := "aiven_pg.secondary" projectName := os.Getenv("AIVEN_PROJECT_NAME")