Bug Fix - Update kmskey and vault id separately.

Author: karthikoracle1993

internal/integrationtest/database_autonomous_database_test.go

@@ -658,7 +658,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
 				//resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.private_endpoint"),
 				//resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.private_endpoint_ip"),
 				resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.state"),
-				resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.supported_regions_to_clone_to.#", "1"),
+				resource.TestCheckResourceAttr(datasourceName, "autonomous_databases.0.supported_regions_to_clone_to.#", "5"),
 				resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.time_created"),
 				resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.time_maintenance_begin"),
 				resource.TestCheckResourceAttrSet(datasourceName, "autonomous_databases.0.time_maintenance_end"),
@@ -718,7 +718,7 @@ func TestDatabaseAutonomousDatabaseResource_basic(t *testing.T) {
 				//resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint"),
 				//resource.TestCheckResourceAttrSet(singularDatasourceName, "private_endpoint_ip"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
-				resource.TestCheckResourceAttr(singularDatasourceName, "supported_regions_to_clone_to.#", "1"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "supported_regions_to_clone_to.#", "5"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_maintenance_begin"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_maintenance_end"),

internal/service/database/database_autonomous_database_resource.go

@@ -1088,11 +1088,11 @@ func (s *DatabaseAutonomousDatabaseResourceCrud) Update() error {
 		}
 	}
 
-	if kmsKeyId, ok := s.D.GetOkExists("kms_key_id"); ok && s.D.HasChange("kms_key_id") {
-		if vaultId, ok := s.D.GetOkExists("vault_id"); ok && s.D.HasChange("vault_id") {
+	if kmsKeyId, ok := s.D.GetOkExists("kms_key_id"); ok {
+		if vaultId, ok := s.D.GetOkExists("vault_id"); ok {
 			oldRaw1, newRaw1 := s.D.GetChange("kms_key_id")
 			oldRaw2, newRaw2 := s.D.GetChange("vault_id")
-			if newRaw1 != "" && oldRaw1 != "" && newRaw2 != "" && oldRaw2 != "" {
+			if newRaw1 != "" && oldRaw1 != "" && newRaw2 != "" && oldRaw2 != "" && (s.D.HasChange("kms_key_id") || s.D.HasChange("vault_id")) {
 				err := s.ConfigureAutonomousDatabaseVaultKey(s.D.Id(), kmsKeyId.(string), vaultId.(string))
 				if err != nil {
 					return err