Revert "Import a resource provisioned with key_protect_id and key_pro…

…tect_instance attributes set (IBM-Cloud#5798)" This reverts commit 2af014a.
lornakelly · Dec 12, 2024 · c63fa12 · c63fa12
1 parent 4390282
commit c63fa12
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 14 deletions.
diff --git a/ibm/service/database/resource_ibm_database.go b/ibm/service/database/resource_ibm_database.go
@@ -1603,14 +1603,6 @@ func resourceIBMDatabaseInstanceRead(context context.Context, d *schema.Resource
 		if endpoint, ok := instance.Parameters["service-endpoints"]; ok {
 			d.Set("service_endpoints", endpoint)
 		}
-
-		if encryptionInstance, ok := instance.Parameters["disk_encryption_instance_crn"]; ok {
-			d.Set("key_protect_instance", encryptionInstance)
-		}
-
-		if encryptionKey, ok := instance.Parameters["disk_encryption_key_crn"]; ok {
-			d.Set("key_protect_key", encryptionKey)
-		}
 	}
 
 	d.Set(flex.ResourceName, *instance.Name)

diff --git a/ibm/service/database/resource_ibm_database_elasticsearch_platinum_test.go b/ibm/service/database/resource_ibm_database_elasticsearch_platinum_test.go
@@ -276,7 +276,7 @@ func TestAccIBMDatabaseInstanceElasticsearchPlatinumImport(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
-					"wait_time_minutes", "plan_validation", "deletion_protection"},
+					"wait_time_minutes", "plan_validation"},
 			},
 		},
 	})

diff --git a/ibm/service/database/resource_ibm_database_elasticsearch_test.go b/ibm/service/database/resource_ibm_database_elasticsearch_test.go
@@ -271,7 +271,7 @@ func TestAccIBMDatabaseInstanceElasticsearchImport(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
-					"wait_time_minutes", "deletion_protection"},
+					"wait_time_minutes"},
 			},
 		},
 	})

diff --git a/ibm/service/database/resource_ibm_database_etcd_test.go b/ibm/service/database/resource_ibm_database_etcd_test.go
@@ -101,7 +101,7 @@ func TestAccIBMDatabaseInstanceEtcdImport(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
-					"wait_time_minutes", "deletion_protection"},
+					"wait_time_minutes"},
 			},
 		},
 	})

diff --git a/ibm/service/database/resource_ibm_database_postgresql_test.go b/ibm/service/database/resource_ibm_database_postgresql_test.go
@@ -186,7 +186,7 @@ func TestAccIBMDatabaseInstancePostgresImport(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
-					"wait_time_minutes", "deletion_protection"},
+					"wait_time_minutes"},
 			},
 		},
 	})

diff --git a/ibm/service/database/resource_ibm_database_rabbitmq_test.go b/ibm/service/database/resource_ibm_database_rabbitmq_test.go
@@ -108,7 +108,7 @@ func TestAccIBMDatabaseInstanceRabbitmqImport(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
-					"wait_time_minutes", "deletion_protection"},
+					"wait_time_minutes"},
 			},
 		},
 	})

diff --git a/ibm/service/database/resource_ibm_database_redis_test.go b/ibm/service/database/resource_ibm_database_redis_test.go
@@ -113,7 +113,7 @@ func TestAccIBMDatabaseInstanceRedisImport(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{
-					"wait_time_minutes", "deletion_protection"},
+					"wait_time_minutes"},
 			},
 		},
 	})