Allow setting SSL type on connection profiles

owaismawasy · owaismawasy · commit 874c72238d55 · 2025-04-07T10:33:15.000+03:00
diff --git a/mmv1/products/databasemigrationservice/ConnectionProfile.yaml b/mmv1/products/databasemigrationservice/ConnectionProfile.yaml
@@ -232,10 +232,11 @@ properties:
             type: Enum
             description: |
               The current connection profile state.
-            output: true
             enum_values:
               - 'SERVER_ONLY'
               - 'SERVER_CLIENT'
+              - 'REQUIRED'
+              - 'NONE'
           - name: 'clientKey'
             type: String
             description: |
@@ -326,10 +327,11 @@ properties:
             type: Enum
             description: |
               The current connection profile state.
-            output: true
             enum_values:
               - 'SERVER_ONLY'
               - 'SERVER_CLIENT'
+              - 'REQUIRED'
+              - 'NONE'
           - name: 'clientKey'
             type: String
             description: |
diff --git a/mmv1/templates/terraform/examples/database_migration_service_connection_profile_cloudsql.tf.tmpl b/mmv1/templates/terraform/examples/database_migration_service_connection_profile_cloudsql.tf.tmpl
@@ -44,6 +44,7 @@ resource "google_database_migration_service_connection_profile" "{{$.PrimaryReso
       client_key         = google_sql_ssl_cert.sql_client_cert.private_key
       client_certificate = google_sql_ssl_cert.sql_client_cert.cert
       ca_certificate     = google_sql_ssl_cert.sql_client_cert.server_ca_cert
+      type = "SERVER_CLIENT"
     }
     cloud_sql_id = "{{index $.Vars "sqldb"}}"
   }
diff --git a/mmv1/templates/terraform/examples/database_migration_service_connection_profile_postgres.tf.tmpl b/mmv1/templates/terraform/examples/database_migration_service_connection_profile_postgres.tf.tmpl
@@ -39,6 +39,7 @@ resource "google_database_migration_service_connection_profile" "{{$.PrimaryReso
       client_key = google_sql_ssl_cert.sql_client_cert.private_key
       client_certificate = google_sql_ssl_cert.sql_client_cert.cert
       ca_certificate = google_sql_ssl_cert.sql_client_cert.server_ca_cert
+      type = "SERVER_CLIENT"
     }
     cloud_sql_id = "{{index $.Vars "sqldb"}}"
   }
diff --git a/mmv1/templates/terraform/examples/database_migration_service_migration_job_mysql_to_mysql.tf.tmpl b/mmv1/templates/terraform/examples/database_migration_service_migration_job_mysql_to_mysql.tf.tmpl
@@ -42,6 +42,7 @@ resource "google_database_migration_service_connection_profile" "source_cp" {
       client_key         = google_sql_ssl_cert.source_sql_client_cert.private_key
       client_certificate = google_sql_ssl_cert.source_sql_client_cert.cert
       ca_certificate     = google_sql_ssl_cert.source_sql_client_cert.server_ca_cert
+      type = "SERVER_CLIENT"
     }
     cloud_sql_id = "{{index $.Vars "source_csql"}}"
   }
diff --git a/mmv1/templates/terraform/examples/database_migration_service_migration_job_postgres_to_alloydb.tf.tmpl b/mmv1/templates/terraform/examples/database_migration_service_migration_job_postgres_to_alloydb.tf.tmpl
@@ -42,6 +42,7 @@ resource "google_database_migration_service_connection_profile" "source_cp" {
       client_key         = google_sql_ssl_cert.source_sql_client_cert.private_key
       client_certificate = google_sql_ssl_cert.source_sql_client_cert.cert
       ca_certificate     = google_sql_ssl_cert.source_sql_client_cert.server_ca_cert
+      type = "SERVER_CLIENT"
     }
     cloud_sql_id = "{{index $.Vars "source_csql"}}"
   }
diff --git a/mmv1/templates/terraform/examples/database_migration_service_migration_job_postgres_to_postgres.tf.tmpl b/mmv1/templates/terraform/examples/database_migration_service_migration_job_postgres_to_postgres.tf.tmpl
@@ -42,6 +42,7 @@ resource "google_database_migration_service_connection_profile" "source_cp" {
       client_key         = google_sql_ssl_cert.source_sql_client_cert.private_key
       client_certificate = google_sql_ssl_cert.source_sql_client_cert.cert
       ca_certificate     = google_sql_ssl_cert.source_sql_client_cert.server_ca_cert
+      type = "SERVER_CLIENT"
     }
     cloud_sql_id = "{{index $.Vars "source_csql"}}"
   }
diff --git a/mmv1/third_party/terraform/services/databasemigrationservice/resource_database_migration_service_migration_job_test.go b/mmv1/third_party/terraform/services/databasemigrationservice/resource_database_migration_service_migration_job_test.go
@@ -88,6 +88,7 @@ resource "google_database_migration_service_connection_profile" "source_cp" {
       client_key         = google_sql_ssl_cert.source_sql_client_cert.private_key
       client_certificate = google_sql_ssl_cert.source_sql_client_cert.cert
       ca_certificate     = google_sql_ssl_cert.source_sql_client_cert.server_ca_cert
+      type = "SERVER_CLIENT"
     }
     cloud_sql_id = "tf-test-source-csql%{random_suffix}"
   }
@@ -195,6 +196,7 @@ resource "google_database_migration_service_connection_profile" "source_cp" {
       client_key         = google_sql_ssl_cert.source_sql_client_cert.private_key
       client_certificate = google_sql_ssl_cert.source_sql_client_cert.cert
       ca_certificate     = google_sql_ssl_cert.source_sql_client_cert.server_ca_cert
+      type = "SERVER_CLIENT"
     }
     cloud_sql_id = "tf-test-source-csql%{random_suffix}"
   }

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ resource "google_database_migration_service_connection_profile" "{{$.PrimaryReso`
`44`	`44`	`client_key = google_sql_ssl_cert.sql_client_cert.private_key`
`45`	`45`	`client_certificate = google_sql_ssl_cert.sql_client_cert.cert`
`46`	`46`	`ca_certificate = google_sql_ssl_cert.sql_client_cert.server_ca_cert`
	`47`	`+ type = "SERVER_CLIENT"`
`47`	`48`	`}`
`48`	`49`	`cloud_sql_id = "{{index $.Vars "sqldb"}}"`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ resource "google_database_migration_service_connection_profile" "{{$.PrimaryReso`
`39`	`39`	`client_key = google_sql_ssl_cert.sql_client_cert.private_key`
`40`	`40`	`client_certificate = google_sql_ssl_cert.sql_client_cert.cert`
`41`	`41`	`ca_certificate = google_sql_ssl_cert.sql_client_cert.server_ca_cert`
	`42`	`+ type = "SERVER_CLIENT"`
`42`	`43`	`}`
`43`	`44`	`cloud_sql_id = "{{index $.Vars "sqldb"}}"`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ resource "google_database_migration_service_connection_profile" "source_cp" {`
`42`	`42`	`client_key = google_sql_ssl_cert.source_sql_client_cert.private_key`
`43`	`43`	`client_certificate = google_sql_ssl_cert.source_sql_client_cert.cert`
`44`	`44`	`ca_certificate = google_sql_ssl_cert.source_sql_client_cert.server_ca_cert`
	`45`	`+ type = "SERVER_CLIENT"`
`45`	`46`	`}`
`46`	`47`	`cloud_sql_id = "{{index $.Vars "source_csql"}}"`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ resource "google_database_migration_service_connection_profile" "source_cp" {`
`88`	`88`	`client_key = google_sql_ssl_cert.source_sql_client_cert.private_key`
`89`	`89`	`client_certificate = google_sql_ssl_cert.source_sql_client_cert.cert`
`90`	`90`	`ca_certificate = google_sql_ssl_cert.source_sql_client_cert.server_ca_cert`
	`91`	`+ type = "SERVER_CLIENT"`
`91`	`92`	`}`
`92`	`93`	`cloud_sql_id = "tf-test-source-csql%{random_suffix}"`
`93`	`94`	`}`
`@@ -195,6 +196,7 @@ resource "google_database_migration_service_connection_profile" "source_cp" {`
`195`	`196`	`client_key = google_sql_ssl_cert.source_sql_client_cert.private_key`
`196`	`197`	`client_certificate = google_sql_ssl_cert.source_sql_client_cert.cert`
`197`	`198`	`ca_certificate = google_sql_ssl_cert.source_sql_client_cert.server_ca_cert`
	`199`	`+ type = "SERVER_CLIENT"`
`198`	`200`	`}`
`199`	`201`	`cloud_sql_id = "tf-test-source-csql%{random_suffix}"`
`200`	`202`	`}`