Remove insightsPostgresOnlyCustomizeDiff function (#6006) (#11699)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/6006.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+sql: removed requirement that Cloud SQL Insight is only allowed for Postgres in `google_sql_database_instance`
+```

google/resource_clouddeploy_delivery_pipeline_generated_test.go

@@ -75,9 +75,9 @@ resource "google_clouddeploy_delivery_pipeline" "primary" {
   description = "basic description"
 
   labels = {
-    my_first_label = "example-label-1"
-
     my_second_label = "example-label-2"
+
+    my_first_label = "example-label-1"
   }
 
   project = "%{project_name}"

google/resource_clouddeploy_target_generated_test.go

@@ -103,9 +103,9 @@ resource "google_clouddeploy_target" "primary" {
   }
 
   labels = {
-    my_second_label = "example-label-2"
-
     my_first_label = "example-label-1"
+
+    my_second_label = "example-label-2"
   }
 
   project          = "%{project_name}"
@@ -175,9 +175,9 @@ resource "google_clouddeploy_target" "primary" {
   }
 
   labels = {
-    my_third_label = "example-label-3"
-
     my_second_label = "updated-example-label-2"
+
+    my_third_label = "example-label-3"
   }
 
   project          = "%{project_name}"
@@ -267,9 +267,9 @@ resource "google_clouddeploy_target" "primary" {
   }
 
   labels = {
-    my_third_label = "example-label-3"
-
     my_second_label = "updated-example-label-2"
+
+    my_third_label = "example-label-3"
   }
 
   project          = "%{project_name}"

google/resource_sql_database_instance.go

@@ -103,7 +103,6 @@ func resourceSqlDatabaseInstance() *schema.Resource {
 			customdiff.ForceNewIfChange("settings.0.disk_size", isDiskShrinkage),
 			privateNetworkCustomizeDiff,
 			pitrPostgresOnlyCustomizeDiff,
-			insightsPostgresOnlyCustomizeDiff,
 		),
 
 		Schema: map[string]*schema.Schema{
@@ -739,15 +738,6 @@ func pitrPostgresOnlyCustomizeDiff(_ context.Context, diff *schema.ResourceDiff,
 	return nil
 }
 
-func insightsPostgresOnlyCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, v interface{}) error {
-	insights := diff.Get("settings.0.insights_config.0.query_insights_enabled").(bool)
-	dbVersion := diff.Get("database_version").(string)
-	if insights && !strings.Contains(dbVersion, "POSTGRES") {
-		return fmt.Errorf("query_insights_enabled is only available for Postgres now.")
-	}
-	return nil
-}
-
 func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 	userAgent, err := generateUserAgentString(d, config.userAgent)

website/docs/r/clouddeploy_delivery_pipeline.html.markdown

@@ -33,17 +33,17 @@ resource "google_clouddeploy_delivery_pipeline" "primary" {
   name     = "pipeline"
 
   annotations = {
-    my_second_annotation = "example-annotation-2"
-
     my_first_annotation = "example-annotation-1"
+
+    my_second_annotation = "example-annotation-2"
   }
 
   description = "basic description"
 
   labels = {
-    my_second_label = "example-label-2"
-
     my_first_label = "example-label-1"
+
+    my_second_label = "example-label-2"
   }
 
   project = "my-project-name"