Merge pull request #1939 from aiven/byashimov-remove-disaster-recovery

feat: remove disaster recovery integration
aiven · Dec 12, 2024 · 08c8a97 · 08c8a97
2 parents 6d483c1 + fa2ce0d
commit 08c8a97
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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")