Merge pull request #3438 from maqiuyujoyce/202412-sqlinstance-test

Mark 'spec.deletionPolicy' mutable-but-unreadable in SQLDatabase
GoogleCloudPlatform · Dec 20, 2024 · 7eaca66 · 7eaca66
2 parents 94cd909 + decc085
commit 7eaca66
Show file tree

Hide file tree

Showing 11 changed files with 921 additions and 0 deletions.
diff --git a/config/servicemappings/sql.yaml b/config/servicemappings/sql.yaml
@@ -43,6 +43,8 @@ spec:
       containers:
         - type: project
           tfField: project
+      mutableButUnreadableFields:
+        - deletion_policy
     - name: google_sql_database_instance
       kind: SQLInstance
       metadataMapping:

diff --git a/..._generated_object_sqldatabase.golden.yaml → ...rated_object_sqldatabasebasic.golden.yaml b/..._generated_object_sqldatabase.golden.yaml → ...rated_object_sqldatabasebasic.golden.yaml
@@ -3,6 +3,7 @@ kind: SQLDatabase
 metadata:
   annotations:
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
+    cnrm.cloud.google.com/mutable-but-unreadable-fields: '{}'
     cnrm.cloud.google.com/project-id: ${projectId}
     cnrm.cloud.google.com/state-into-spec: absent
   finalizers:

diff --git a/...a/basic/sql/v1beta1/sqldatabase/_http.log → ...a1/sqldatabase/sqldatabasebasic/_http.log b/...a/basic/sql/v1beta1/sqldatabase/_http.log → ...a1/sqldatabase/sqldatabasebasic/_http.log
diff --git a/...basic/sql/v1beta1/sqldatabase/create.yaml → .../sqldatabase/sqldatabasebasic/create.yaml b/...basic/sql/v1beta1/sqldatabase/create.yaml → .../sqldatabase/sqldatabasebasic/create.yaml
diff --git a/...sql/v1beta1/sqldatabase/dependencies.yaml → ...tabase/sqldatabasebasic/dependencies.yaml b/...sql/v1beta1/sqldatabase/dependencies.yaml → ...tabase/sqldatabasebasic/dependencies.yaml
diff --git a/...basic/sql/v1beta1/sqldatabase/update.yaml → .../sqldatabase/sqldatabasebasic/update.yaml b/...basic/sql/v1beta1/sqldatabase/update.yaml → .../sqldatabase/sqldatabasebasic/update.yaml
diff --git a/...v1beta1/sqldatabase/sqldatabasesismerge/_generated_object_sqldatabasesismerge.golden.yaml b/...v1beta1/sqldatabase/sqldatabasesismerge/_generated_object_sqldatabasesismerge.golden.yaml
@@ -0,0 +1,32 @@
+apiVersion: sql.cnrm.cloud.google.com/v1beta1
+kind: SQLDatabase
+metadata:
+  annotations:
+    cnrm.cloud.google.com/management-conflict-prevention-policy: none
+    cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"deletionPolicy":"DELETE"}}'
+    cnrm.cloud.google.com/project-id: ${projectId}
+    cnrm.cloud.google.com/state-into-spec: merge
+  finalizers:
+  - cnrm.cloud.google.com/finalizer
+  - cnrm.cloud.google.com/deletion-defender
+  generation: 3
+  labels:
+    cnrm-test: "true"
+  name: sqldatabase-${uniqueId}
+  namespace: ${uniqueId}
+spec:
+  charset: utf8mb4
+  collation: utf8mb4_bin
+  deletionPolicy: DELETE
+  instanceRef:
+    name: sqlinstance-${uniqueId}
+  resourceID: sqldatabase-${uniqueId}
+status:
+  conditions:
+  - lastTransitionTime: "1970-01-01T00:00:00Z"
+    message: The resource is up to date
+    reason: UpToDate
+    status: "True"
+    type: Ready
+  observedGeneration: 3
+  selfLink: https://sqladmin.googleapis.com/sql/v1beta4/projects/${projectId}/instances/sqlinstance-${uniqueId}/databases/sqldatabase-${uniqueId}