Merge pull request #2110 from yuwenma/stricter-test-final-cleanup

chore: update mockgcp golden object
GoogleCloudPlatform · Jun 22, 2024 · 2bedffd · 2bedffd
2 parents fa14e01 + 39c3391
commit 2bedffd
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/...c/sql/v1beta1/sqlinstance/postgresinstance/_generated_object_postgresinstance.golden.yaml b/...c/sql/v1beta1/sqlinstance/postgresinstance/_generated_object_postgresinstance.golden.yaml
@@ -79,7 +79,7 @@ status:
       -----BEGIN CERTIFICATE-----
       -----END CERTIFICATE-----
     commonName: common-name
-    createTime: "2024-06-19T22:54:48.411842645Z"
-    expirationTime: "2025-06-19T22:54:48.411842645Z"
+    createTime: "1970-01-01T00:00:00Z"
+    expirationTime: "1970-01-01T00:00:00Z"
     sha1Fingerprint: "12345678"
   serviceAccountEmailAddress: p${projectNumber}-abcdef@gcp-sa-cloud-sql.iam.gserviceaccount.com
diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/postgresinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/postgresinstance/_http.log
@@ -661,8 +661,8 @@ Grpc-Metadata-Content-Type: application/grpc
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
     "certSerialNumber": "0",
     "commonName": "common-name",
-    "createTime": "2024-06-19T22:54:48.411842645Z",
-    "expirationTime": "2025-06-19T22:54:48.411842645Z",
+    "createTime": "2024-04-01T12:34:56.123456Z",
+    "expirationTime": "2024-04-01T12:34:56.123456Z",
     "instance": "sqlinstance-${uniqueId}",
     "kind": "sql#sslCert",
     "selfLink": "",
@@ -897,8 +897,8 @@ Grpc-Metadata-Content-Type: application/grpc
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
     "certSerialNumber": "0",
     "commonName": "common-name",
-    "createTime": "2024-06-19T22:54:48.411842645Z",
-    "expirationTime": "2025-06-19T22:54:48.411842645Z",
+    "createTime": "2024-04-01T12:34:56.123456Z",
+    "expirationTime": "2024-04-01T12:34:56.123456Z",
     "instance": "sqlinstance-${uniqueId}",
     "kind": "sql#sslCert",
     "selfLink": "",

diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlserverinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlserverinstance/_http.log
@@ -241,7 +241,7 @@ Grpc-Metadata-Content-Type: application/grpc
       "type": "BUILT_IN"
     },
     {
-      "etag": "xYqLTZMZxPVPE0w1JqoGTA==",
+      "etag": "abcdef0123A=",
       "host": "",
       "instance": "sqlinstance-sample-${uniqueId}",
       "kind": "sql#user",
@@ -265,7 +265,7 @@ Grpc-Metadata-Content-Type: application/grpc
       "type": "BUILT_IN"
     },
     {
-      "etag": "g1dQutqOoBb3fXMbVGXZXA==",
+      "etag": "abcdef0123A=",
       "host": "",
       "instance": "sqlinstance-sample-${uniqueId}",
       "kind": "sql#user",

diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqluser/_http.log b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqluser/_http.log
@@ -440,7 +440,7 @@ Grpc-Metadata-Content-Type: application/grpc
 {
   "items": [
     {
-      "etag": "8bNGhWyyUBi+zWENjU5LMQ==",
+      "etag": "abcdef0123A=",
       "host": "foo",
       "instance": "sqluser-dep-${uniqueId}",
       "kind": "sql#user",
@@ -514,8 +514,8 @@ Grpc-Metadata-Content-Type: application/grpc
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
     "certSerialNumber": "0",
     "commonName": "common-name",
-    "createTime": "2024-06-19T22:55:40.568828479Z",
-    "expirationTime": "2025-06-19T22:55:40.568828479Z",
+    "createTime": "2024-04-01T12:34:56.123456Z",
+    "expirationTime": "2024-04-01T12:34:56.123456Z",
     "instance": "sqluser-dep-${uniqueId}",
     "kind": "sql#sslCert",
     "selfLink": "",
@@ -602,7 +602,7 @@ Grpc-Metadata-Content-Type: application/grpc
 {
   "items": [
     {
-      "etag": "8bNGhWyyUBi+zWENjU5LMQ==",
+      "etag": "abcdef0123A=",
       "host": "foo",
       "instance": "sqluser-dep-${uniqueId}",
       "kind": "sql#user",
@@ -676,8 +676,8 @@ Grpc-Metadata-Content-Type: application/grpc
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
     "certSerialNumber": "0",
     "commonName": "common-name",
-    "createTime": "2024-06-19T22:55:40.568828479Z",
-    "expirationTime": "2025-06-19T22:55:40.568828479Z",
+    "createTime": "2024-04-01T12:34:56.123456Z",
+    "expirationTime": "2024-04-01T12:34:56.123456Z",
     "instance": "sqluser-dep-${uniqueId}",
     "kind": "sql#sslCert",
     "selfLink": "",
@@ -764,7 +764,7 @@ Grpc-Metadata-Content-Type: application/grpc
 {
   "items": [
     {
-      "etag": "8bNGhWyyUBi+zWENjU5LMQ==",
+      "etag": "abcdef0123A=",
       "host": "foo",
       "instance": "sqluser-dep-${uniqueId}",
       "kind": "sql#user",
@@ -838,8 +838,8 @@ Grpc-Metadata-Content-Type: application/grpc
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
     "certSerialNumber": "0",
     "commonName": "common-name",
-    "createTime": "2024-06-19T22:55:40.568828479Z",
-    "expirationTime": "2025-06-19T22:55:40.568828479Z",
+    "createTime": "2024-04-01T12:34:56.123456Z",
+    "expirationTime": "2024-04-01T12:34:56.123456Z",
     "instance": "sqluser-dep-${uniqueId}",
     "kind": "sql#sslCert",
     "selfLink": "",
@@ -993,8 +993,8 @@ Grpc-Metadata-Content-Type: application/grpc
     "cert": "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
     "certSerialNumber": "0",
     "commonName": "common-name",
-    "createTime": "2024-06-19T22:55:40.568828479Z",
-    "expirationTime": "2025-06-19T22:55:40.568828479Z",
+    "createTime": "2024-04-01T12:34:56.123456Z",
+    "expirationTime": "2024-04-01T12:34:56.123456Z",
     "instance": "sqluser-dep-${uniqueId}",
     "kind": "sql#sslCert",
     "selfLink": "",

diff --git a/...urcefixture/testdata/containerannotations/folderid/_generated_object_folderid.golden.yaml b/...urcefixture/testdata/containerannotations/folderid/_generated_object_folderid.golden.yaml
@@ -25,5 +25,5 @@ status:
     reason: UpToDate
     status: "True"
     type: Ready
-  number: "2687044318"
+  number: ${projectNumber}
   observedGeneration: 3
diff --git a/...rvergeneratedid/_generated_object_userspecifiedresourceidandservergeneratedid.golden.yaml b/...rvergeneratedid/_generated_object_userspecifiedresourceidandservergeneratedid.golden.yaml
@@ -25,5 +25,5 @@ status:
     reason: UpToDate
     status: "True"
     type: Ready
-  number: "2588019318"
+  number: ${projectNumber}
   observedGeneration: 2