From 49f628fa3f401a40b3d635a505e550eae7bf20f2 Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Wed, 7 Aug 2024 01:45:35 +0000 Subject: [PATCH 1/4] Use 'Absent' as the default state-into-spec behavior --- pkg/k8s/constants.go | 2 +- pkg/k8s/stateintospecdefaulter_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/k8s/constants.go b/pkg/k8s/constants.go index 38a6bd9869..06a7d8fe28 100644 --- a/pkg/k8s/constants.go +++ b/pkg/k8s/constants.go @@ -80,7 +80,7 @@ const ( // State into spec annotation values StateMergeIntoSpec = "merge" StateAbsentInSpec = "absent" - StateIntoSpecDefaultValueV1Beta1 = StateMergeIntoSpec + StateIntoSpecDefaultValueV1Beta1 = StateAbsentInSpec // Core kubernetes constants LastAppliedConfigurationAnnotation = "kubectl.kubernetes.io/last-applied-configuration" diff --git a/pkg/k8s/stateintospecdefaulter_test.go b/pkg/k8s/stateintospecdefaulter_test.go index 3c72d0b474..3fb581633d 100644 --- a/pkg/k8s/stateintospecdefaulter_test.go +++ b/pkg/k8s/stateintospecdefaulter_test.go @@ -64,7 +64,7 @@ func TestStateIntoSpecDefaulter_ApplyDefaults(t *testing.T) { }, }, expectChanged: true, - expectValue: "merge", + expectValue: "absent", }, { name: "use 'absent' if resource doesn't support 'merge'", From 532ce7bc05104e0cd90e4232a3bb75e1f0668bf1 Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Wed, 7 Aug 2024 20:38:11 +0000 Subject: [PATCH 2/4] Fix powertool test failures --- .../_object00.yaml | 23 ++----------------- .../_object02.yaml | 23 ++----------------- .../script.yaml | 2 ++ 3 files changed, 6 insertions(+), 42 deletions(-) diff --git a/tests/e2e/testdata/scenarios/powertool/powertool_set_bucket_location/_object00.yaml b/tests/e2e/testdata/scenarios/powertool/powertool_set_bucket_location/_object00.yaml index 14d0829292..d9e050abd9 100644 --- a/tests/e2e/testdata/scenarios/powertool/powertool_set_bucket_location/_object00.yaml +++ b/tests/e2e/testdata/scenarios/powertool/powertool_set_bucket_location/_object00.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: storage.cnrm.cloud.google.com/v1beta1 kind: StorageBucket metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -33,13 +19,8 @@ spec: type: Delete condition: age: 7 - withState: ANY location: US - publicAccessPrevention: inherited resourceID: storagebucket-${uniqueId} - softDeletePolicy: - retentionDurationSeconds: 604800 - storageClass: STANDARD versioning: enabled: false status: @@ -55,4 +36,4 @@ status: effectiveTime: "1970-01-01T00:00:00Z" retentionDurationSeconds: 604800 selfLink: https://www.googleapis.com/storage/v1/b/storagebucket-${uniqueId} - url: gs://storagebucket-${uniqueId} \ No newline at end of file + url: gs://storagebucket-${uniqueId} diff --git a/tests/e2e/testdata/scenarios/powertool/powertool_set_bucket_location/_object02.yaml b/tests/e2e/testdata/scenarios/powertool/powertool_set_bucket_location/_object02.yaml index 631d6a03e5..708d206e71 100644 --- a/tests/e2e/testdata/scenarios/powertool/powertool_set_bucket_location/_object02.yaml +++ b/tests/e2e/testdata/scenarios/powertool/powertool_set_bucket_location/_object02.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: storage.cnrm.cloud.google.com/v1beta1 kind: StorageBucket metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -33,13 +19,8 @@ spec: type: Delete condition: age: 7 - withState: ANY location: EU - publicAccessPrevention: inherited resourceID: storagebucket-${uniqueId} - softDeletePolicy: - retentionDurationSeconds: 604800 - storageClass: STANDARD versioning: enabled: false status: @@ -55,4 +36,4 @@ status: effectiveTime: "1970-01-01T00:00:00Z" retentionDurationSeconds: 604800 selfLink: https://www.googleapis.com/storage/v1/b/storagebucket-${uniqueId} - url: gs://storagebucket-${uniqueId} \ No newline at end of file + url: gs://storagebucket-${uniqueId} diff --git a/tests/e2e/testdata/scenarios/powertool/storagebucket_clear_state_into_spec/script.yaml b/tests/e2e/testdata/scenarios/powertool/storagebucket_clear_state_into_spec/script.yaml index a72650c766..6f11ff5197 100644 --- a/tests/e2e/testdata/scenarios/powertool/storagebucket_clear_state_into_spec/script.yaml +++ b/tests/e2e/testdata/scenarios/powertool/storagebucket_clear_state_into_spec/script.yaml @@ -17,6 +17,8 @@ apiVersion: storage.cnrm.cloud.google.com/v1beta1 kind: StorageBucket metadata: + annotations: + cnrm.cloud.google.com/state-into-spec: "merge" labels: label-one: "value-one" name: storagebucket-merge-${uniqueId} From 86e10f16fbe0e630878d94f9a2672773f2a39bfe Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Fri, 30 Aug 2024 00:07:28 +0000 Subject: [PATCH 3/4] Support referencing ComputeAddress by the optional address field --- pkg/controller/direct/compute/refs.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/controller/direct/compute/refs.go b/pkg/controller/direct/compute/refs.go index 6022875ae6..b4ad9d062d 100644 --- a/pkg/controller/direct/compute/refs.go +++ b/pkg/controller/direct/compute/refs.go @@ -154,9 +154,12 @@ func ResolveComputeAddress(ctx context.Context, reader client.Reader, src client // targetField: address // See compute servicemappings for details - address, _, err := unstructured.NestedString(computeAddress.Object, "spec", "address") + // Because `spec.address` field is optional, we can't guarantee it always + // exists in a successfully reconciled ComputeAddress CR, so we should use + // the `status.observedState.address` instead. + address, _, err := unstructured.NestedString(computeAddress.Object, "status", "observedState", "address") if err != nil || address == "" { - return nil, fmt.Errorf("cannot get address for referenced %s %v (spec.address is empty)", computeAddress.GetKind(), computeAddress.GetNamespace()) + return nil, fmt.Errorf("cannot get address for referenced %s %v (status.observedState.address is empty)", computeAddress.GetKind(), computeAddress.GetNamespace()) } return &refs.ComputeAddressRef{ External: address}, nil From 7e4d3c36d18064c1f768509085baf4ef9258d18d Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Wed, 14 Aug 2024 19:23:50 +0000 Subject: [PATCH 4/4] Regenerate golden files and http logs --- ...ted_object_basicalloydbcluster.golden.yaml | 10 +- ...t_basicalloydbsecondarycluster.golden.yaml | 2 +- ...ated_object_fullalloydbcluster.golden.yaml | 6 +- ...ed_object_basicalloydbinstance.golden.yaml | 2 +- ..._basicalloydbsecondaryinstance.golden.yaml | 2 +- ...ted_object_fullalloydbinstance.golden.yaml | 8 +- ...ted_object_readalloydbinstance.golden.yaml | 7 +- ...ed_object_zonalalloydbinstance.golden.yaml | 2 +- ...ect_artifactregistryrepository.golden.yaml | 2 +- ...ed_object_basicbigquerydataset.golden.yaml | 26 +- ...ect_bigquerydatasetaccessblock.golden.yaml | 2 +- ...generated_object_bigquerytable.golden.yaml | 4 +- ...erated_object_bigtableinstance.golden.yaml | 2 +- ...ct_bigtableinstanceautoscaling.golden.yaml | 14 +- .../bigtableinstanceautoscaling/_http.log | 98 -------- ...t_bigtableinstanceautoscaling2.golden.yaml | 10 +- .../bigtableinstanceautoscaling2/_http.log | 234 ------------------ ...d_object_bigtableinstancebasic.golden.yaml | 9 +- .../bigtableinstancebasic/_http.log | 62 ----- ...generated_object_bigtabletable.golden.yaml | 17 +- ...temanagercertificatemanageddns.golden.yaml | 2 +- ...emanagercertificateselfmanaged.golden.yaml | 2 +- ...rtificatemanagercertificatemap.golden.yaml | 2 +- ...catemanagercertificatemapentry.golden.yaml | 2 +- ...temanagerdnsauthorization-full.golden.yaml | 2 +- ...anagerdnsauthorization-minimal.golden.yaml | 2 +- ...ificatemanagerdnsauthorization.golden.yaml | 2 +- ...generated_object_httpsfunction.golden.yaml | 18 +- ...ed_object_globalcomputeaddress.golden.yaml | 17 +- ..._object_regionalcomputeaddress.golden.yaml | 17 +- ...ject_computediskfromsourcedisk.golden.yaml | 18 +- ...ted_object_regionalcomputedisk.golden.yaml | 22 +- ...erated_object_zonalcomputedisk.golden.yaml | 18 +- ...ct_globalcomputeforwardingrule.golden.yaml | 14 -- ..._regionalcomputeforwardingrule.golden.yaml | 14 -- ...bject_globalcomputehealthcheck.golden.yaml | 20 +- ...ect_regionalcomputehealthcheck.golden.yaml | 20 +- ..._generated_object_computeimage.golden.yaml | 6 +- .../compute/v1beta1/computeimage/_http.log | 68 +++++ ...ct_computeinstancebasicexample.golden.yaml | 31 +-- .../computeinstancebasicexample/_http.log | 126 ---------- ...mputeinstancewithencrypteddisk.golden.yaml | 24 +- ...enerated_object_computenetwork.golden.yaml | 3 +- ...erated_object_computenodegroup.golden.yaml | 17 +- ...ted_object_computenodetemplate.golden.yaml | 17 +- ...rated_object_computesubnetwork.golden.yaml | 5 +- ...d_object_globaltargethttpproxy.golden.yaml | 2 +- ...object_regionaltargethttpproxy.golden.yaml | 2 +- ...object_computetargetvpngateway.golden.yaml | 2 +- ...d_object_regionalcomputeurlmap.golden.yaml | 87 +------ ...rated_object_computevpngateway.golden.yaml | 17 +- ...erated_object_containercluster.golden.yaml | 34 +-- ...rated_object_containernodepool.golden.yaml | 30 +-- ...d_object_containeranalysisnote.golden.yaml | 2 +- ...bject_containerattachedcluster.golden.yaml | 2 +- ...t_batchdataflowflextemplatejob.golden.yaml | 13 +- ...reamingdataflowflextemplatejob.golden.yaml | 14 +- ...eamingdataflowflextemplatejob2.golden.yaml | 14 +- ...ed_object_edgecontainercluster.golden.yaml | 3 +- ...d_object_edgecontainernodepool.golden.yaml | 2 +- ...ated_object_edgenetworknetwork.golden.yaml | 2 +- ...rated_object_edgenetworksubnet.golden.yaml | 2 +- .../_generated_object_acmfeature.golden.yaml | 2 +- .../_generated_object_mcifeature.golden.yaml | 2 +- .../_generated_object_mcsdfeature.golden.yaml | 2 +- ...erated_object_gkehubmembership.golden.yaml | 4 +- ...rated_object_iamserviceaccount.golden.yaml | 2 +- ..._generated_object_kmscryptokey.golden.yaml | 3 +- .../_generated_object_kmskeyring.golden.yaml | 2 +- ...erated_object_projectlogbucket.golden.yaml | 2 +- ...d_object_monitoringalertpolicy.golden.yaml | 8 +- ...nerated_object_monitoringgroup.golden.yaml | 2 +- ..._monitoringnotificationchannel.golden.yaml | 3 +- ...d_object_httpuptimecheckconfig.golden.yaml | 2 +- ...ed_object_tcpuptimecheckconfig.golden.yaml | 3 +- ...ted_object_networkservicesmesh.golden.yaml | 2 +- ...ed_object_privatecacapoolbasic.golden.yaml | 2 +- ...ated_object_privatecacapooliam.golden.yaml | 2 +- ..._generated_object_pubsubschema.golden.yaml | 2 +- ...object_basicpubsubsubscription.golden.yaml | 4 +- ...ect_bigquerypubsubsubscription.golden.yaml | 6 +- .../_generated_object_pubsubtopic.golden.yaml | 2 +- ...d_object_pubsublitereservation.golden.yaml | 2 +- ...generated_object_redisinstance.golden.yaml | 15 +- ...nerated_object_projectinfolder.golden.yaml | 2 +- ..._generated_object_projectinorg.golden.yaml | 2 +- ...ect_projectmovedfoldertofolder.golden.yaml | 2 +- ...ted_object_secretmanagersecret.golden.yaml | 2 +- ...ect_secretmanagersecretversion.golden.yaml | 17 +- ...ct_servicenetworkingconnection.golden.yaml | 2 +- .../_generated_object_service.golden.yaml | 2 +- ...nerated_object_serviceidentity.golden.yaml | 2 +- ...nerated_object_spannerdatabase.golden.yaml | 4 +- ...nerated_object_spannerinstance.golden.yaml | 7 +- .../_generated_object_sqluser.golden.yaml | 2 +- ...ated_object_storagebucketbasic.golden.yaml | 10 +- ...object_storagebucketsoftdelete.golden.yaml | 5 +- ...rated_object_storagebucketzero.golden.yaml | 9 +- ...object_storagenotificationbase.golden.yaml | 2 +- ...object_storagenotificationfull.golden.yaml | 2 +- ...enerated_object_tagkeyorgbasic.golden.yaml | 2 +- ...ated_object_tagkeyprojectbasic.golden.yaml | 2 +- ...generated_object_tagvaluebasic.golden.yaml | 2 +- ...nerated_object_tagvalueproject.golden.yaml | 2 +- .../_generated_object_folderid.golden.yaml | 2 +- .../_generated_object_projectid.golden.yaml | 12 +- ..._generated_object_forcedestroy.golden.yaml | 6 +- ...d_object_removedefaultnodepool.golden.yaml | 54 +--- ...erated_object_externalwithname.golden.yaml | 5 +- ..._object_externalwithpartialuri.golden.yaml | 17 +- ...object_externalwithsubresource.golden.yaml | 4 +- ...object_billingaccountiampolicy.golden.yaml | 2 +- ..._billingaccountiampolicymember.golden.yaml | 2 +- ...d_object_organizationiampolicy.golden.yaml | 2 +- ...ct_organizationiampolicymember.golden.yaml | 2 +- ...rated_object_serviceaccountref.golden.yaml | 2 +- ...ated_object_serviceidentityref.golden.yaml | 2 +- ...enerated_object_sqlinstanceref.golden.yaml | 2 +- ...nerated_object_bigquerydataset.golden.yaml | 26 +- ...nerated_object_pubsubschema#01.golden.yaml | 2 +- ...erated_object_storagebucket#01.golden.yaml | 2 +- ...generated_object_storagebucket.golden.yaml | 11 +- ...ncewithuserspecifiedresourceid.golden.yaml | 2 +- ...object_userspecifiedresourceid.golden.yaml | 16 +- ...resourceidandservergeneratedid.golden.yaml | 2 +- ..._userspecifiedresourceidfordcl.golden.yaml | 2 +- ...bject_networkipcomputeinstance.golden.yaml | 25 +- .../networkipcomputeinstance/_http.log | 102 -------- 128 files changed, 240 insertions(+), 1454 deletions(-) diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_generated_object_basicalloydbcluster.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_generated_object_basicalloydbcluster.golden.yaml index 377422a163..84598f317a 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_generated_object_basicalloydbcluster.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_generated_object_basicalloydbcluster.golden.yaml @@ -3,13 +3,13 @@ kind: AlloyDBCluster metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"deletionPolicy":"DEFAULT","initialUser":{"password":{"value":"postgres"},"user":"postgres"}}}' + cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"initialUser":{"password":{"value":"postgres"},"user":"postgres"}}}' cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 3 + generation: 2 labels: cnrm-test: "true" name: alloydbcluster-${uniqueId} @@ -18,8 +18,6 @@ spec: automatedBackupPolicy: labels: source: kcc-test - clusterType: PRIMARY - deletionPolicy: DEFAULT initialUser: password: value: postgres @@ -40,6 +38,6 @@ status: type: Ready databaseVersion: DATABASE_VERSION_UNSPECIFIED name: projects/${projectId}/locations/southamerica-east1/clusters/alloydbcluster${uniqueId} - observedGeneration: 3 + observedGeneration: 2 observedState: clusterType: PRIMARY diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_generated_object_basicalloydbsecondarycluster.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_generated_object_basicalloydbsecondarycluster.golden.yaml index e173b36582..229ab750e8 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_generated_object_basicalloydbsecondarycluster.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_generated_object_basicalloydbsecondarycluster.golden.yaml @@ -5,7 +5,7 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"deletionPolicy":"FORCE"}}' cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_generated_object_fullalloydbcluster.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_generated_object_fullalloydbcluster.golden.yaml index a26c840cf3..c5d2b33d4b 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_generated_object_fullalloydbcluster.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_generated_object_fullalloydbcluster.golden.yaml @@ -3,9 +3,9 @@ kind: AlloyDBCluster metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"deletionPolicy":"DEFAULT","initialUser":{"password":{"value":"Postgres123"},"user":"postgres"}}}' + cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"initialUser":{"password":{"value":"Postgres123"},"user":"postgres"}}}' cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -38,10 +38,8 @@ spec: minutes: 0 nanos: 0 seconds: 0 - clusterType: PRIMARY continuousBackupConfig: enabled: false - deletionPolicy: DEFAULT encryptionConfig: kmsKeyNameRef: name: kmscryptokey-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_generated_object_basicalloydbinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_generated_object_basicalloydbinstance.golden.yaml index 7fdbb18683..ab788333ae 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_generated_object_basicalloydbinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_generated_object_basicalloydbinstance.golden.yaml @@ -3,7 +3,7 @@ kind: AlloyDBInstance metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_generated_object_basicalloydbsecondaryinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_generated_object_basicalloydbsecondaryinstance.golden.yaml index 0770d96fc2..c3068cf596 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_generated_object_basicalloydbsecondaryinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_generated_object_basicalloydbsecondaryinstance.golden.yaml @@ -3,7 +3,7 @@ kind: AlloyDBInstance metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_generated_object_fullalloydbinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_generated_object_fullalloydbinstance.golden.yaml index 440d891b0f..8a5807bdcb 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_generated_object_fullalloydbinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_generated_object_fullalloydbinstance.golden.yaml @@ -3,17 +3,16 @@ kind: AlloyDBInstance metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 2 labels: cnrm-test: "true" name: alloydbinstance-${uniqueId} namespace: ${uniqueId} spec: - availabilityType: AVAILABILITY_TYPE_UNSPECIFIED clusterRef: name: alloydbcluster-${uniqueId} databaseFlags: @@ -24,6 +23,7 @@ spec: machineConfig: cpuCount: 4 networkConfig: + authorizedExternalNetworks: [] enablePublicIp: false resourceID: alloydbinstance${uniqueId} status: @@ -35,5 +35,5 @@ status: type: Ready createTime: "1970-01-01T00:00:00Z" name: projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId} - observedGeneration: 4 + observedGeneration: 2 state: STATE_UNSPECIFIED diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_generated_object_readalloydbinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_generated_object_readalloydbinstance.golden.yaml index 6928ccb304..f593a9f8d9 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_generated_object_readalloydbinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_generated_object_readalloydbinstance.golden.yaml @@ -3,17 +3,16 @@ kind: AlloyDBInstance metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 3 + generation: 2 labels: cnrm-test: "true" name: alloydbreadinstance-${uniqueId} namespace: ${uniqueId} spec: - availabilityType: AVAILABILITY_TYPE_UNSPECIFIED clusterRef: name: alloydbcluster-${uniqueId} instanceTypeRef: @@ -32,5 +31,5 @@ status: type: Ready createTime: "1970-01-01T00:00:00Z" name: projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId} - observedGeneration: 3 + observedGeneration: 2 state: STATE_UNSPECIFIED diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/_generated_object_zonalalloydbinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/_generated_object_zonalalloydbinstance.golden.yaml index e7ba2fa5a7..0d95aa4dcd 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/_generated_object_zonalalloydbinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/_generated_object_zonalalloydbinstance.golden.yaml @@ -3,7 +3,7 @@ kind: AlloyDBInstance metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/artifactregistry/v1beta1/artifactregistryrepository/_generated_object_artifactregistryrepository.golden.yaml b/pkg/test/resourcefixture/testdata/basic/artifactregistry/v1beta1/artifactregistryrepository/_generated_object_artifactregistryrepository.golden.yaml index 8562a65ef6..ef6c187811 100644 --- a/pkg/test/resourcefixture/testdata/basic/artifactregistry/v1beta1/artifactregistryrepository/_generated_object_artifactregistryrepository.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/artifactregistry/v1beta1/artifactregistryrepository/_generated_object_artifactregistryrepository.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerydataset/basicbigquerydataset/_generated_object_basicbigquerydataset.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerydataset/basicbigquerydataset/_generated_object_basicbigquerydataset.golden.yaml index 2a34d5fb0c..9ca8d07847 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerydataset/basicbigquerydataset/_generated_object_basicbigquerydataset.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerydataset/basicbigquerydataset/_generated_object_basicbigquerydataset.golden.yaml @@ -1,23 +1,9 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: bigquery.cnrm.cloud.google.com/v1beta1 kind: BigQueryDataset metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -27,17 +13,7 @@ metadata: name: bigquerydatasetsample${uniqueId} namespace: ${uniqueId} spec: - access: - - role: OWNER - specialGroup: projectOwners - - role: OWNER - userByEmail: user@google.com - - role: READER - specialGroup: projectReaders - - role: WRITER - specialGroup: projectWriters friendlyName: bigquerydataset-sample-updated - location: US projectRef: external: ${projectId} resourceID: bigquerydatasetsample${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerydataset/bigquerydatasetaccessblock/_generated_object_bigquerydatasetaccessblock.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerydataset/bigquerydatasetaccessblock/_generated_object_bigquerydatasetaccessblock.golden.yaml index 36ab1d7544..4496ca473c 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerydataset/bigquerydatasetaccessblock/_generated_object_bigquerydatasetaccessblock.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerydataset/bigquerydatasetaccessblock/_generated_object_bigquerydatasetaccessblock.golden.yaml @@ -17,7 +17,7 @@ kind: BigQueryDataset metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerytable/_generated_object_bigquerytable.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerytable/_generated_object_bigquerytable.golden.yaml index 1802ae229b..476149b0f6 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerytable/_generated_object_bigquerytable.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigquery/v1beta1/bigquerytable/_generated_object_bigquerytable.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -18,14 +18,12 @@ spec: name: bigquerydatasetsample${uniqueId} externalDataConfiguration: autodetect: true - compression: NONE sourceFormat: CSV sourceUris: - gs://gcp-public-data-landsat/LC08/01/044/034/LC08_L1GT_044034_20130330_20170310_01_T2/LC08_L1GT_044034_20130330_20170310_01_T2_ANG.txt friendlyName: bigquerytable-sample-updated requirePartitionFilter: false resourceID: bigquerytablesample${uniqueId} - schema: '[{"mode":"NULLABLE","name":"string_field_0","type":"STRING"},{"mode":"NULLABLE","name":"string_field_1","type":"STRING"},{"mode":"NULLABLE","name":"string_field_2","type":"STRING"},{"mode":"NULLABLE","name":"string_field_3","type":"STRING"},{"mode":"NULLABLE","name":"string_field_4","type":"STRING"},{"mode":"NULLABLE","name":"string_field_5","type":"STRING"},{"mode":"NULLABLE","name":"int64_field_6","type":"INTEGER"},{"mode":"NULLABLE","name":"int64_field_7","type":"INTEGER"},{"mode":"NULLABLE","name":"int64_field_8","type":"INTEGER"},{"mode":"NULLABLE","name":"int64_field_9","type":"INTEGER"},{"mode":"NULLABLE","name":"string_field_10","type":"STRING"},{"mode":"NULLABLE","name":"int64_field_11","type":"INTEGER"},{"mode":"NULLABLE","name":"int64_field_12","type":"INTEGER"},{"mode":"NULLABLE","name":"string_field_13","type":"STRING"}]' status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/_generated_object_bigtableinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/_generated_object_bigtableinstance.golden.yaml index d88fd6304d..91fc890d2c 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/_generated_object_bigtableinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/_generated_object_bigtableinstance.golden.yaml @@ -5,7 +5,7 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"instanceType":"PRODUCTION"}}' cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling/_generated_object_bigtableinstanceautoscaling.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling/_generated_object_bigtableinstanceautoscaling.golden.yaml index 237e70bc53..09aa8fc214 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling/_generated_object_bigtableinstanceautoscaling.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling/_generated_object_bigtableinstanceautoscaling.golden.yaml @@ -5,11 +5,11 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"instanceType":"PRODUCTION"}}' cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" name: btinstance-${uniqueId} @@ -20,27 +20,19 @@ spec: cpuTarget: 70 maxNodes: 5 minNodes: 2 - storageTarget: 2560 clusterId: cluster-1-${uniqueId} - numNodes: 2 - storageType: SSD zone: us-central1-a - autoscalingConfig: cpuTarget: 70 maxNodes: 5 minNodes: 2 - storageTarget: 2560 clusterId: cluster-2-${uniqueId} - numNodes: 2 - storageType: SSD zone: us-central1-b - autoscalingConfig: cpuTarget: 70 maxNodes: 5 minNodes: 2 clusterId: cluster-3-${uniqueId} - numNodes: 2 - storageType: SSD zone: us-central1-c displayName: BigtableSample instanceType: PRODUCTION @@ -52,4 +44,4 @@ status: reason: UpToDate status: "True" type: Ready - observedGeneration: 4 + observedGeneration: 3 diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling/_http.log b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling/_http.log index 879da8809e..d54883b5c4 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling/_http.log @@ -991,104 +991,6 @@ OK --- -GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListInstances - -{ - "parent": "projects/${projectId}" -} - -OK - -{ - "instances": [ - { - "createTime": "2024-04-01T12:34:56.123456Z", - "displayName": "BigtableSample", - "labels": { - "cnrm-test": "true", - "managed-by-cnrm": "true" - }, - "name": "projects/${projectId}/instances/btinstance-${uniqueId}", - "state": "READY", - "type": "PRODUCTION" - } - ] -} - ---- - -GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListClusters - -{ - "parent": "projects/${projectId}/instances/btinstance-${uniqueId}" -} - -OK - -{ - "clusters": [ - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 5, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 70, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-a", - "name": "projects/${projectId}/instances/btinstance-${uniqueId}/clusters/cluster-1-${uniqueId}", - "serveNodes": 2, - "state": "READY" - }, - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 5, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 70, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "encryptionConfig": {}, - "location": "projects/${projectId}/locations/us-central1-b", - "name": "projects/${projectId}/instances/btinstance-${uniqueId}/clusters/cluster-2-${uniqueId}", - "serveNodes": 2, - "state": "READY" - }, - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 5, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 70 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-c", - "name": "projects/${projectId}/instances/btinstance-${uniqueId}/clusters/cluster-3-${uniqueId}", - "serveNodes": 2, - "state": "READY" - } - ] -} - ---- - GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteInstance { diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling2/_generated_object_bigtableinstanceautoscaling2.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling2/_generated_object_bigtableinstanceautoscaling2.golden.yaml index 56bf7529ba..d780644c96 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling2/_generated_object_bigtableinstanceautoscaling2.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling2/_generated_object_bigtableinstanceautoscaling2.golden.yaml @@ -5,11 +5,11 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"instanceType":"PRODUCTION"}}' cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 2 labels: cnrm-test: "true" name: bigtableinstance @@ -22,7 +22,6 @@ spec: minNodes: 3 storageTarget: 2560 clusterId: cluster-1-${uniqueId} - numNodes: 3 storageType: SSD zone: us-central1-a - autoscalingConfig: @@ -31,7 +30,6 @@ spec: minNodes: 2 storageTarget: 2560 clusterId: cluster-2-${uniqueId} - numNodes: 2 storageType: SSD zone: us-central1-b - autoscalingConfig: @@ -40,7 +38,6 @@ spec: minNodes: 2 storageTarget: 2560 clusterId: cluster-3-${uniqueId} - numNodes: 2 storageType: SSD zone: us-central1-c - autoscalingConfig: @@ -49,7 +46,6 @@ spec: minNodes: 2 storageTarget: 2560 clusterId: cluster-4-${uniqueId} - numNodes: 2 storageType: SSD zone: us-central1-f displayName: bigtableinstance @@ -62,4 +58,4 @@ status: reason: UpToDate status: "True" type: Ready - observedGeneration: 4 + observedGeneration: 2 diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling2/_http.log b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling2/_http.log index 4c6669d6b0..f87c8f2066 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling2/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstanceautoscaling2/_http.log @@ -432,123 +432,6 @@ OK --- -GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListInstances - -{ - "parent": "projects/${projectId}" -} - -OK - -{ - "instances": [ - { - "createTime": "2024-04-01T12:34:56.123456Z", - "displayName": "bigtableinstance", - "labels": { - "cnrm-test": "true", - "managed-by-cnrm": "true" - }, - "name": "projects/${projectId}/instances/bt-${uniqueId}", - "state": "READY", - "type": "PRODUCTION" - } - ] -} - ---- - -GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListClusters - -{ - "parent": "projects/${projectId}/instances/bt-${uniqueId}" -} - -OK - -{ - "clusters": [ - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 5, - "minServeNodes": 3 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 70, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-a", - "name": "projects/${projectId}/instances/bt-${uniqueId}/clusters/cluster-1-${uniqueId}", - "serveNodes": 3, - "state": "READY" - }, - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 4, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 80, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-b", - "name": "projects/${projectId}/instances/bt-${uniqueId}/clusters/cluster-2-${uniqueId}", - "serveNodes": 2, - "state": "READY" - }, - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 4, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 80, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-c", - "name": "projects/${projectId}/instances/bt-${uniqueId}/clusters/cluster-3-${uniqueId}", - "serveNodes": 2, - "state": "READY" - }, - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 3, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 80, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-f", - "name": "projects/${projectId}/instances/bt-${uniqueId}/clusters/cluster-4-${uniqueId}", - "serveNodes": 2, - "state": "READY" - } - ] -} - ---- - GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListClusters { @@ -1381,123 +1264,6 @@ OK --- -GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListInstances - -{ - "parent": "projects/${projectId}" -} - -OK - -{ - "instances": [ - { - "createTime": "2024-04-01T12:34:56.123456Z", - "displayName": "bigtableinstance", - "labels": { - "cnrm-test": "true", - "managed-by-cnrm": "true" - }, - "name": "projects/${projectId}/instances/bt-${uniqueId}", - "state": "READY", - "type": "PRODUCTION" - } - ] -} - ---- - -GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListClusters - -{ - "parent": "projects/${projectId}/instances/bt-${uniqueId}" -} - -OK - -{ - "clusters": [ - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 5, - "minServeNodes": 3 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 70, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-a", - "name": "projects/${projectId}/instances/bt-${uniqueId}/clusters/cluster-1-${uniqueId}", - "serveNodes": 3, - "state": "READY" - }, - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 4, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 80, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-b", - "name": "projects/${projectId}/instances/bt-${uniqueId}/clusters/cluster-2-${uniqueId}", - "serveNodes": 2, - "state": "READY" - }, - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 4, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 80, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-c", - "name": "projects/${projectId}/instances/bt-${uniqueId}/clusters/cluster-3-${uniqueId}", - "serveNodes": 2, - "state": "READY" - }, - { - "clusterConfig": { - "clusterAutoscalingConfig": { - "autoscalingLimits": { - "maxServeNodes": 4, - "minServeNodes": 2 - }, - "autoscalingTargets": { - "cpuUtilizationPercent": 80, - "storageUtilizationGibPerNode": 2560 - } - } - }, - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-f", - "name": "projects/${projectId}/instances/bt-${uniqueId}/clusters/cluster-4-${uniqueId}", - "serveNodes": 2, - "state": "READY" - } - ] -} - ---- - GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteInstance { diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstancebasic/_generated_object_bigtableinstancebasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstancebasic/_generated_object_bigtableinstancebasic.golden.yaml index d88fd6304d..75151f77f3 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstancebasic/_generated_object_bigtableinstancebasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstancebasic/_generated_object_bigtableinstancebasic.golden.yaml @@ -5,11 +5,11 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"instanceType":"PRODUCTION"}}' cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" name: btinstance-${uniqueId} @@ -18,15 +18,12 @@ spec: cluster: - clusterId: cluster-1-${uniqueId} numNodes: 3 - storageType: SSD zone: us-central1-a - clusterId: cluster-2-${uniqueId} numNodes: 1 - storageType: SSD zone: us-west1-b - clusterId: cluster-3-${uniqueId} numNodes: 1 - storageType: SSD zone: us-east1-d displayName: BigtableSample instanceType: PRODUCTION @@ -38,4 +35,4 @@ status: reason: UpToDate status: "True" type: Ready - observedGeneration: 4 + observedGeneration: 3 diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstancebasic/_http.log b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstancebasic/_http.log index 230f4f845e..aaa2338640 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstancebasic/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtableinstance/bigtableinstancebasic/_http.log @@ -755,68 +755,6 @@ OK --- -GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListInstances - -{ - "parent": "projects/${projectId}" -} - -OK - -{ - "instances": [ - { - "createTime": "2024-04-01T12:34:56.123456Z", - "displayName": "BigtableSample", - "labels": { - "cnrm-test": "true", - "managed-by-cnrm": "true" - }, - "name": "projects/${projectId}/instances/btinstance-${uniqueId}", - "state": "READY", - "type": "PRODUCTION" - } - ] -} - ---- - -GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/ListClusters - -{ - "parent": "projects/${projectId}/instances/btinstance-${uniqueId}" -} - -OK - -{ - "clusters": [ - { - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-central1-a", - "name": "projects/${projectId}/instances/btinstance-${uniqueId}/clusters/cluster-1-${uniqueId}", - "serveNodes": 3, - "state": "READY" - }, - { - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-west1-b", - "name": "projects/${projectId}/instances/btinstance-${uniqueId}/clusters/cluster-2-${uniqueId}", - "serveNodes": 1, - "state": "READY" - }, - { - "defaultStorageType": "SSD", - "location": "projects/${projectId}/locations/us-east1-d", - "name": "projects/${projectId}/instances/btinstance-${uniqueId}/clusters/cluster-3-${uniqueId}", - "serveNodes": 1, - "state": "READY" - } - ] -} - ---- - GRPC /google.bigtable.admin.v2.BigtableInstanceAdmin/DeleteInstance { diff --git a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtabletable/_generated_object_bigtabletable.golden.yaml b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtabletable/_generated_object_bigtabletable.golden.yaml index 6edde25012..b89531158e 100644 --- a/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtabletable/_generated_object_bigtabletable.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/bigtable/v1beta1/bigtabletable/_generated_object_bigtabletable.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: bigtable.cnrm.cloud.google.com/v1beta1 kind: BigtableTable metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -31,7 +17,6 @@ spec: columnFamily: - family: family3 - family: family2 - deletionProtection: UNPROTECTED instanceRef: name: bigtable-dep-${uniqueId} resourceID: bigtabletable-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificate/certificatemanagercertificatemanageddns/_generated_object_certificatemanagercertificatemanageddns.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificate/certificatemanagercertificatemanageddns/_generated_object_certificatemanagercertificatemanageddns.golden.yaml index d62f91dc5f..5642d38844 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificate/certificatemanagercertificatemanageddns/_generated_object_certificatemanagercertificatemanageddns.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificate/certificatemanagercertificatemanageddns/_generated_object_certificatemanagercertificatemanageddns.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificate/certificatemanagercertificateselfmanaged/_generated_object_certificatemanagercertificateselfmanaged.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificate/certificatemanagercertificateselfmanaged/_generated_object_certificatemanagercertificateselfmanaged.golden.yaml index e16fef9d04..b6edac17d6 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificate/certificatemanagercertificateselfmanaged/_generated_object_certificatemanagercertificateselfmanaged.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificate/certificatemanagercertificateselfmanaged/_generated_object_certificatemanagercertificateselfmanaged.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificatemap/_generated_object_certificatemanagercertificatemap.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificatemap/_generated_object_certificatemanagercertificatemap.golden.yaml index 6354c35dee..791d0a130a 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificatemap/_generated_object_certificatemanagercertificatemap.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificatemap/_generated_object_certificatemanagercertificatemap.golden.yaml @@ -3,7 +3,7 @@ kind: CertificateManagerCertificateMap metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificatemapentry/_generated_object_certificatemanagercertificatemapentry.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificatemapentry/_generated_object_certificatemanagercertificatemapentry.golden.yaml index 1828aed64d..d4d0c74cf3 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificatemapentry/_generated_object_certificatemanagercertificatemapentry.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagercertificatemapentry/_generated_object_certificatemanagercertificatemapentry.golden.yaml @@ -3,7 +3,7 @@ kind: CertificateManagerCertificateMapEntry metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml index 5200b2f1b6..c85de4a8a7 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-full/_generated_object_certificatemanagerdnsauthorization-full.golden.yaml @@ -3,7 +3,7 @@ kind: CertificateManagerDNSAuthorization metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml index d1fd9b783a..210c9be51b 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization-minimal/_generated_object_certificatemanagerdnsauthorization-minimal.golden.yaml @@ -3,7 +3,7 @@ kind: CertificateManagerDNSAuthorization metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml index 177e830fa0..5f273957bb 100644 --- a/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/certificatemanager/v1beta1/certificatemanagerdnsauthorization/_generated_object_certificatemanagerdnsauthorization.golden.yaml @@ -3,7 +3,7 @@ kind: CertificateManagerDNSAuthorization metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/cloudfunctions/v1beta1/cloudfunctionsfunction/httpsfunction/_generated_object_httpsfunction.golden.yaml b/pkg/test/resourcefixture/testdata/basic/cloudfunctions/v1beta1/cloudfunctionsfunction/httpsfunction/_generated_object_httpsfunction.golden.yaml index 4e63a26479..9ce6cd5e00 100644 --- a/pkg/test/resourcefixture/testdata/basic/cloudfunctions/v1beta1/cloudfunctionsfunction/httpsfunction/_generated_object_httpsfunction.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/cloudfunctions/v1beta1/cloudfunctionsfunction/httpsfunction/_generated_object_httpsfunction.golden.yaml @@ -1,23 +1,9 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: cloudfunctions.cnrm.cloud.google.com/v1beta1 kind: CloudFunctionsFunction metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -30,7 +16,6 @@ spec: entryPoint: helloGET httpsTrigger: securityLevel: SECURE_OPTIONAL - ingressSettings: INGRESS_SETTINGS_UNSPECIFIED projectRef: external: projects/${projectId} region: us-west2 @@ -38,7 +23,6 @@ spec: runtime: nodejs10 sourceArchiveUrl: gs://config-connector-samples/cloudfunctionsfunction/http_trigger.zip timeout: 120s - vpcConnectorEgressSettings: VPC_CONNECTOR_EGRESS_SETTINGS_UNSPECIFIED status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/globalcomputeaddress/_generated_object_globalcomputeaddress.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/globalcomputeaddress/_generated_object_globalcomputeaddress.golden.yaml index 53f1ed0332..c0813597e8 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/globalcomputeaddress/_generated_object_globalcomputeaddress.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/globalcomputeaddress/_generated_object_globalcomputeaddress.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeAddress metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -28,7 +14,6 @@ metadata: name: computeaddress-${uniqueId} namespace: ${uniqueId} spec: - address: 8.8.8.8 addressType: INTERNAL description: a test global address ipVersion: IPV4 diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/regionalcomputeaddress/_generated_object_regionalcomputeaddress.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/regionalcomputeaddress/_generated_object_regionalcomputeaddress.golden.yaml index 1eda63d3cc..e23753d743 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/regionalcomputeaddress/_generated_object_regionalcomputeaddress.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/regionalcomputeaddress/_generated_object_regionalcomputeaddress.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeAddress metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -28,7 +14,6 @@ metadata: name: computeaddress-${uniqueId} namespace: ${uniqueId} spec: - address: 8.8.8.8 addressType: INTERNAL description: a test address location: us-central1 diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/computediskfromsourcedisk/_generated_object_computediskfromsourcedisk.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/computediskfromsourcedisk/_generated_object_computediskfromsourcedisk.golden.yaml index 5fd2ef1a4c..853aa01aa6 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/computediskfromsourcedisk/_generated_object_computediskfromsourcedisk.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/computediskfromsourcedisk/_generated_object_computediskfromsourcedisk.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeDisk metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -30,13 +16,11 @@ metadata: spec: description: an example disk from source disk location: us-central1-a - physicalBlockSizeBytes: 4096 projectRef: external: ${projectId} resourceID: computedisk-1-${uniqueId} sourceDiskRef: name: computedisk-2-${uniqueId} - type: pd-standard status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/regionalcomputedisk/_generated_object_regionalcomputedisk.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/regionalcomputedisk/_generated_object_regionalcomputedisk.golden.yaml index e64b0573db..57fc9eafb5 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/regionalcomputedisk/_generated_object_regionalcomputedisk.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/regionalcomputedisk/_generated_object_regionalcomputedisk.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeDisk metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -31,14 +17,12 @@ metadata: spec: description: a sample regional disk location: us-central1 - physicalBlockSizeBytes: 4096 projectRef: external: ${projectId} replicaZones: - - projects/${projectId}/global/zones/us-central1-a - - projects/${projectId}/global/zones/us-central1-f + - us-central1-a + - us-central1-f resourceID: computedisk-${uniqueId} - type: pd-standard status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/zonalcomputedisk/_generated_object_zonalcomputedisk.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/zonalcomputedisk/_generated_object_zonalcomputedisk.golden.yaml index d5a5cc463a..63e32308e3 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/zonalcomputedisk/_generated_object_zonalcomputedisk.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/zonalcomputedisk/_generated_object_zonalcomputedisk.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeDisk metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -31,11 +17,9 @@ metadata: spec: description: an example disk without reference location: us-central1-a - physicalBlockSizeBytes: 4096 projectRef: external: ${projectId} resourceID: computedisk-${uniqueId} - type: pd-standard status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_generated_object_globalcomputeforwardingrule.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_generated_object_globalcomputeforwardingrule.golden.yaml index 27ea9518fd..8a8f698648 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_generated_object_globalcomputeforwardingrule.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_generated_object_globalcomputeforwardingrule.golden.yaml @@ -1,17 +1,3 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeForwardingRule metadata: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_generated_object_regionalcomputeforwardingrule.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_generated_object_regionalcomputeforwardingrule.golden.yaml index 3d255f75d5..0e214b39c9 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_generated_object_regionalcomputeforwardingrule.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_generated_object_regionalcomputeforwardingrule.golden.yaml @@ -1,17 +1,3 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeForwardingRule metadata: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/globalcomputehealthcheck/_generated_object_globalcomputehealthcheck.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/globalcomputehealthcheck/_generated_object_globalcomputehealthcheck.golden.yaml index b1dffb20ba..9c025e92eb 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/globalcomputehealthcheck/_generated_object_globalcomputehealthcheck.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/globalcomputehealthcheck/_generated_object_globalcomputehealthcheck.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeHealthCheck metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -29,14 +15,10 @@ metadata: namespace: ${uniqueId} spec: checkIntervalSec: 15 - healthyThreshold: 2 location: global resourceID: computehealthcheck-${uniqueId} tcpHealthCheck: port: 88 - proxyHeader: NONE - timeoutSec: 5 - unhealthyThreshold: 2 status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/regionalcomputehealthcheck/_generated_object_regionalcomputehealthcheck.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/regionalcomputehealthcheck/_generated_object_regionalcomputehealthcheck.golden.yaml index d3ea522ee5..136499c7f4 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/regionalcomputehealthcheck/_generated_object_regionalcomputehealthcheck.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/regionalcomputehealthcheck/_generated_object_regionalcomputehealthcheck.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeHealthCheck metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -29,14 +15,10 @@ metadata: namespace: ${uniqueId} spec: checkIntervalSec: 15 - healthyThreshold: 2 location: us-central1 resourceID: computehealthcheck-${uniqueId} tcpHealthCheck: port: 88 - proxyHeader: NONE - timeoutSec: 5 - unhealthyThreshold: 2 status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_generated_object_computeimage.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_generated_object_computeimage.golden.yaml index 05726da0e0..37309cf857 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_generated_object_computeimage.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_generated_object_computeimage.golden.yaml @@ -4,11 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 2 + generation: 3 labels: cnrm-test: "true" label-one: value-one @@ -27,5 +27,5 @@ status: status: "True" type: Ready creationTimestamp: "1970-01-01T00:00:00Z" - observedGeneration: 2 + observedGeneration: 3 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/images/computeimage-test-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_http.log index 009cce1a8f..c4a78c4b7e 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_http.log @@ -199,6 +199,74 @@ X-Xss-Protection: 0 --- +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/images/computeimage-test-${uniqueId}/setLabels?alt=json +Content-Type: application/json +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager + +{ + "labels": { + "cnrm-test": "true", + "label-one": "value-one", + "managed-by-cnrm": "true" + } +} + +200 OK +Cache-Control: private +Content-Type: application/json; charset=UTF-8 +Server: ESF +Vary: Origin +Vary: X-Origin +Vary: Referer +X-Content-Type-Options: nosniff +X-Frame-Options: SAMEORIGIN +X-Xss-Protection: 0 + +{ + "id": "000000000000000000000", + "insertTime": "2024-04-01T12:34:56.123456Z", + "kind": "compute#operation", + "name": "${operationID}", + "progress": 0, + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "startTime": "2024-04-01T12:34:56.123456Z", + "status": "DONE" +} + +--- + +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/images/computeimage-test-${uniqueId}?alt=json +Content-Type: application/json +User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager + +200 OK +Cache-Control: private +Content-Type: application/json; charset=UTF-8 +Server: ESF +Vary: Origin +Vary: X-Origin +Vary: Referer +X-Content-Type-Options: nosniff +X-Frame-Options: SAMEORIGIN +X-Xss-Protection: 0 + +{ + "creationTimestamp": "2024-04-01T12:34:56.123456Z", + "diskSizeGb": "500", + "id": "000000000000000000000", + "kind": "compute#image", + "labels": { + "cnrm-test": "true", + "label-one": "value-one", + "managed-by-cnrm": "true" + }, + "name": "computeimage-test-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/images/computeimage-test-${uniqueId}", + "sourceDisk": "projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}" +} + +--- + DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/images/computeimage-test-${uniqueId}?alt=json Content-Type: application/json User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancebasicexample/_generated_object_computeinstancebasicexample.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancebasicexample/_generated_object_computeinstancebasicexample.golden.yaml index a07410e9e0..d9a0d0c9e0 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancebasicexample/_generated_object_computeinstancebasicexample.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancebasicexample/_generated_object_computeinstancebasicexample.golden.yaml @@ -1,17 +1,3 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeInstance metadata: @@ -20,11 +6,11 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" label-one: value-two @@ -32,19 +18,10 @@ metadata: namespace: ${uniqueId} spec: attachedDisk: - - mode: READ_WRITE - sourceDiskRef: + - sourceDiskRef: name: computedisk-1-${uniqueId} bootDisk: autoDelete: false - initializeParams: - labels: - cnrm-test: "true" - managed-by-cnrm: "true" - sourceImageRef: - external: https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-11-bullseye-v20231010 - type: pd-standard - mode: READ_WRITE sourceDiskRef: name: computedisk-${uniqueId} description: an basic instance example @@ -85,5 +62,5 @@ status: currentStatus: RUNNING instanceId: "1111111111111111" labelFingerprint: abcdef0123A= - observedGeneration: 4 + observedGeneration: 3 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancebasicexample/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancebasicexample/_http.log index e8a82dde91..fea7f818c4 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancebasicexample/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancebasicexample/_http.log @@ -2033,132 +2033,6 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false -User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager - -200 OK -Cache-Control: private -Content-Type: application/json; charset=UTF-8 -Server: ESF -Vary: Origin -Vary: X-Origin -Vary: Referer -X-Content-Type-Options: nosniff -X-Frame-Options: SAMEORIGIN -X-Xss-Protection: 0 - -{ - "canIpForward": false, - "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "deletionProtection": false, - "description": "an basic instance example", - "disks": [ - { - "boot": true, - "mode": "READ_WRITE", - "source": "projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}" - }, - { - "mode": "READ_WRITE", - "source": "projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}" - } - ], - "id": "000000000000000000000", - "kind": "compute#instance", - "labelFingerprint": "abcdef0123A=", - "labels": { - "cnrm-test": "true", - "label-one": "value-two", - "managed-by-cnrm": "true" - }, - "machineType": "projects/${projectId}/zones/us-west1-a/machineTypes/n1-standard-2", - "metadata": { - "items": [ - { - "key": "bar", - "value": "baz" - }, - { - "key": "foo", - "value": "bar" - }, - { - "key": "startup-script", - "value": "echo hi \u003e /test.txt" - } - ] - }, - "name": "computeinstance-${uniqueId}", - "networkInterfaces": [ - { - "accessConfigs": [ - { - "natIP": "8.8.8.8", - "type": "ONE_TO_ONE_NAT" - } - ], - "network": "projects/${projectId}/global/networks/${networkID}", - "networkIP": "8.8.8.8" - } - ], - "params": {}, - "scheduling": { - "automaticRestart": false, - "instanceTerminationAction": "", - "onHostMaintenance": "TERMINATE", - "preemptible": true, - "provisioningModel": "" - }, - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", - "serviceAccounts": [ - { - "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", - "scopes": [ - "https://www.googleapis.com/auth/compute.readonly" - ] - } - ], - "status": "RUNNING", - "tags": {}, - "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a" -} - ---- - -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false -User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager - -200 OK -Cache-Control: private -Content-Type: application/json; charset=UTF-8 -Server: ESF -Vary: Origin -Vary: X-Origin -Vary: Referer -X-Content-Type-Options: nosniff -X-Frame-Options: SAMEORIGIN -X-Xss-Protection: 0 - -{ - "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "id": "000000000000000000000", - "kind": "compute#disk", - "labels": { - "cnrm-test": "true", - "managed-by-cnrm": "true" - }, - "name": "computedisk-${uniqueId}", - "physicalBlockSizeBytes": "4096", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", - "sourceImage": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-11-bullseye-v20231010", - "sourceImageId": "2443108620951880213", - "status": "READY", - "type": "projects/${projectId}/zones/us-west1-a/diskTypes/pd-standard", - "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a" -} - ---- - DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancewithencrypteddisk/_generated_object_computeinstancewithencrypteddisk.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancewithencrypteddisk/_generated_object_computeinstancewithencrypteddisk.golden.yaml index 4481e3f32a..39b440021b 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancewithencrypteddisk/_generated_object_computeinstancewithencrypteddisk.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancewithencrypteddisk/_generated_object_computeinstancewithencrypteddisk.golden.yaml @@ -1,17 +1,3 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeInstance metadata: @@ -19,7 +5,7 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -34,14 +20,6 @@ spec: autoDelete: false diskEncryptionKeyRaw: value: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0= - initializeParams: - labels: - cnrm-test: "true" - managed-by-cnrm: "true" - sourceImageRef: - external: https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-11-bullseye-v20231010 - type: pd-standard - mode: READ_WRITE sourceDiskRef: name: computedisk-${uniqueId} description: an basic instance example diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenetwork/_generated_object_computenetwork.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenetwork/_generated_object_computenetwork.golden.yaml index 556ff435dc..c096a64d8b 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenetwork/_generated_object_computenetwork.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenetwork/_generated_object_computenetwork.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -17,7 +17,6 @@ metadata: spec: autoCreateSubnetworks: false enableUlaInternalIpv6: true - networkFirewallPolicyEnforcementOrder: AFTER_CLASSIC_FIREWALL resourceID: computenetwork-${uniqueId} routingMode: GLOBAL status: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodegroup/_generated_object_computenodegroup.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodegroup/_generated_object_computenodegroup.golden.yaml index 44a01fa141..e8ef29210d 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodegroup/_generated_object_computenodegroup.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodegroup/_generated_object_computenodegroup.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeNodeGroup metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -29,7 +15,6 @@ metadata: namespace: ${uniqueId} spec: description: A single sole-tenant node in the us-central1-b zone. - maintenancePolicy: DEFAULT nodeTemplateRef: name: computenodetemplate-${uniqueId} resourceID: computenodegroup-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodetemplate/_generated_object_computenodetemplate.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodetemplate/_generated_object_computenodetemplate.golden.yaml index 865b6f12b2..f3c296e231 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodetemplate/_generated_object_computenodetemplate.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodetemplate/_generated_object_computenodetemplate.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeNodeTemplate metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -29,7 +15,6 @@ metadata: name: computenodetemplate-${uniqueId} namespace: ${uniqueId} spec: - cpuOvercommitType: NONE description: Node template for sole tenant nodes running in us-central1, with 96vCPUs and any amount of memory on any machine type. nodeTypeFlexibility: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesubnetwork/_generated_object_computesubnetwork.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesubnetwork/_generated_object_computesubnetwork.golden.yaml index ad82272bbd..ada97466bf 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesubnetwork/_generated_object_computesubnetwork.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesubnetwork/_generated_object_computesubnetwork.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -19,11 +19,8 @@ spec: networkRef: name: computenetwork-${uniqueId} privateIpGoogleAccess: true - privateIpv6GoogleAccess: DISABLE_GOOGLE_ACCESS - purpose: PRIVATE region: us-central1 resourceID: computesubnetwork-${uniqueId} - stackType: IPV4_ONLY status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_generated_object_globaltargethttpproxy.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_generated_object_globaltargethttpproxy.golden.yaml index 6ba306188a..b6e40208e5 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_generated_object_globaltargethttpproxy.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_generated_object_globaltargethttpproxy.golden.yaml @@ -18,7 +18,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_generated_object_regionaltargethttpproxy.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_generated_object_regionaltargethttpproxy.golden.yaml index eb3911bdf7..8f8688fd0b 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_generated_object_regionaltargethttpproxy.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_generated_object_regionaltargethttpproxy.golden.yaml @@ -18,7 +18,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetvpngateway/_generated_object_computetargetvpngateway.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetvpngateway/_generated_object_computetargetvpngateway.golden.yaml index 7e64eebc87..c46141d023 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetvpngateway/_generated_object_computetargetvpngateway.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetvpngateway/_generated_object_computetargetvpngateway.golden.yaml @@ -18,7 +18,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeurlmap/regionalcomputeurlmap/_generated_object_regionalcomputeurlmap.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeurlmap/regionalcomputeurlmap/_generated_object_regionalcomputeurlmap.golden.yaml index bfd75c1840..94ca375700 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeurlmap/regionalcomputeurlmap/_generated_object_regionalcomputeurlmap.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeurlmap/regionalcomputeurlmap/_generated_object_regionalcomputeurlmap.golden.yaml @@ -1,28 +1,14 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeURLMap metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" name: computeurlmap-${uniqueId} @@ -100,68 +86,6 @@ spec: responseHeadersToRemove: - RemoveMe weight: 400 - - defaultService: - backendServiceRef: - external: projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId} - name: allpaths - pathRule: - - paths: - - /home - routeAction: - corsPolicy: - allowCredentials: true - allowHeaders: - - Allowed content - allowMethods: - - GET - allowOrigins: - - Allowed origin - disabled: false - exposeHeaders: - - Exposed header - maxAge: 30 - faultInjectionPolicy: - abort: - httpStatus: 234 - percentage: 5.6 - delay: - fixedDelay: - nanos: 50000 - seconds: "0" - percentage: 7.8 - requestMirrorPolicy: - backendServiceRef: - external: projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId} - retryPolicy: - numRetries: 4 - perTryTimeout: - seconds: "30" - retryConditions: - - 5xx - - deadline-exceeded - timeout: - nanos: 750000000 - seconds: "20" - urlRewrite: - hostRewrite: A replacement header - pathPrefixRewrite: A replacement path - weightedBackendServices: - - backendServiceRef: - external: projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId} - headerAction: - requestHeadersToAdd: - - headerName: AddMe - headerValue: MyValue - replace: true - requestHeadersToRemove: - - RemoveMe - responseHeadersToAdd: - - headerName: AddMe - headerValue: MyValue - replace: false - responseHeadersToRemove: - - RemoveMe - weight: 400 resourceID: computeurlmap-${uniqueId} test: - host: hi.com @@ -169,11 +93,6 @@ spec: service: backendServiceRef: name: computebackendservice-${uniqueId} - - host: hi.com - path: /home - service: - backendServiceRef: - external: projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId} status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" @@ -183,5 +102,5 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" mapId: 1111111111111111 - observedGeneration: 4 + observedGeneration: 3 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computevpngateway/_generated_object_computevpngateway.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computevpngateway/_generated_object_computevpngateway.golden.yaml index 9b53164b07..418be259fa 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computevpngateway/_generated_object_computevpngateway.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computevpngateway/_generated_object_computevpngateway.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeVPNGateway metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -33,7 +19,6 @@ spec: name: default region: us-central1 resourceID: computevpngateway-${uniqueId} - stackType: IPV4_ONLY status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containercluster/_generated_object_containercluster.golden.yaml b/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containercluster/_generated_object_containercluster.golden.yaml index 82dc85babb..5496c92b4d 100644 --- a/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containercluster/_generated_object_containercluster.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containercluster/_generated_object_containercluster.golden.yaml @@ -6,7 +6,7 @@ metadata: cnrm.cloud.google.com/mutable-but-unreadable-fields: '{}' cnrm.cloud.google.com/observed-secret-versions: (removed) cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -17,20 +17,10 @@ metadata: name: cluster-sample-${uniqueId} namespace: ${uniqueId} spec: - addonsConfig: - gcePersistentDiskCsiDriverConfig: - enabled: true - networkPolicyConfig: - disabled: true clusterAutoscaling: autoProvisioningDefaults: bootDiskKMSKeyRef: name: kmscryptokey-${uniqueId} - diskSize: 100 - imageType: COS_CONTAINERD - minCpuPlatform: automatic - serviceAccountRef: - external: default autoscalingProfile: BALANCED enabled: true resourceLimits: @@ -40,16 +30,10 @@ spec: - maximum: 1000 minimum: 100 resourceType: memory - clusterTelemetry: - type: ENABLED - databaseEncryption: - state: DECRYPTED - enableShieldedNodes: true initialNodeCount: 1 ipAllocationPolicy: clusterIpv4CidrBlock: /20 servicesIpv4CidrBlock: /20 - stackType: IPV4 location: us-central1-a loggingConfig: enableComponents: @@ -57,41 +41,25 @@ spec: - WORKLOADS loggingService: none monitoringConfig: - advancedDatapathObservabilityConfig: - - enableMetrics: false enableComponents: - SYSTEM_COMPONENTS - APISERVER managedPrometheus: enabled: true monitoringService: none - networkPolicy: - enabled: false networkRef: name: computenetwork-${uniqueId} - networkingMode: VPC_NATIVE nodeConfig: linuxNodeConfig: cgroupMode: CGROUP_MODE_UNSPECIFIED sysctls: net.core.somaxconn: "4096" - loggingVariant: DEFAULT - nodeLocations: - - us-central1-a - nodeVersion: "" notificationConfig: pubsub: enabled: true topicRef: name: pubsubtopic-${uniqueId} - podSecurityPolicyConfig: - enabled: false - releaseChannel: - channel: REGULAR resourceID: cluster-sample-${uniqueId} - securityPostureConfig: - mode: BASIC - vulnerabilityMode: VULNERABILITY_MODE_UNSPECIFIED subnetworkRef: name: computesubnetwork-${uniqueId} status: diff --git a/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containernodepool/_generated_object_containernodepool.golden.yaml b/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containernodepool/_generated_object_containernodepool.golden.yaml index 28a47d86c8..a0592e975e 100644 --- a/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containernodepool/_generated_object_containernodepool.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containernodepool/_generated_object_containernodepool.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -20,41 +20,13 @@ spec: minNodeCount: 1 clusterRef: name: cluster-sample-${uniqueId} - initialNodeCount: 1 location: us-central1-a - management: - autoRepair: true - autoUpgrade: true - maxPodsPerNode: 110 nodeConfig: - diskSizeGb: 100 - diskType: pd-balanced - imageType: COS_CONTAINERD - loggingVariant: DEFAULT - machineType: e2-standard-4 - metadata: - disable-legacy-endpoints: "true" - oauthScopes: - - https://www.googleapis.com/auth/devstorage.read_only - - https://www.googleapis.com/auth/logging.write - - https://www.googleapis.com/auth/monitoring - - https://www.googleapis.com/auth/service.management.readonly - - https://www.googleapis.com/auth/servicecontrol - - https://www.googleapis.com/auth/trace.append - serviceAccountRef: - external: default - shieldedInstanceConfig: - enableIntegrityMonitoring: true taint: - effect: NO_SCHEDULE key: newKey value: newValue - nodeCount: 0 resourceID: nodepool-sample-${uniqueId} - upgradeSettings: - maxSurge: 1 - strategy: SURGE - version: "" status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/containeranalysis/v1beta1/containeranalysisnote/_generated_object_containeranalysisnote.golden.yaml b/pkg/test/resourcefixture/testdata/basic/containeranalysis/v1beta1/containeranalysisnote/_generated_object_containeranalysisnote.golden.yaml index 201b4aaa56..b434cba59a 100644 --- a/pkg/test/resourcefixture/testdata/basic/containeranalysis/v1beta1/containeranalysisnote/_generated_object_containeranalysisnote.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/containeranalysis/v1beta1/containeranalysisnote/_generated_object_containeranalysisnote.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/containerattached/v1beta1/containerattachedcluster/_generated_object_containerattachedcluster.golden.yaml b/pkg/test/resourcefixture/testdata/basic/containerattached/v1beta1/containerattachedcluster/_generated_object_containerattachedcluster.golden.yaml index 11c15931ab..965f5c725a 100644 --- a/pkg/test/resourcefixture/testdata/basic/containerattached/v1beta1/containerattachedcluster/_generated_object_containerattachedcluster.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/containerattached/v1beta1/containerattachedcluster/_generated_object_containerattachedcluster.golden.yaml @@ -18,7 +18,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"deletionPolicy":"DELETE_IGNORE_ERRORS"}}' - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/batchdataflowflextemplatejob/_generated_object_batchdataflowflextemplatejob.golden.yaml b/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/batchdataflowflextemplatejob/_generated_object_batchdataflowflextemplatejob.golden.yaml index ede4fa1ccc..9c21a68e89 100644 --- a/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/batchdataflowflextemplatejob/_generated_object_batchdataflowflextemplatejob.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/batchdataflowflextemplatejob/_generated_object_batchdataflowflextemplatejob.golden.yaml @@ -6,19 +6,16 @@ metadata: cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"containerSpecGcsPath":"gs://dataflow-templates/2022-10-03-00_RC00/flex/File_Format_Conversion","parameters":{"inputFileFormat":"csv","inputFileSpec":"gs://config-connector-samples/dataflowflextemplate/numbertest.csv","outputBucket":"gs://storagebucket-${uniqueId}","outputFileFormat":"avro","schema":"gs://config-connector-samples/dataflowflextemplate/numbers.avsc"}}}' cnrm.cloud.google.com/on-delete: cancel cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 2 + generation: 1 labels: cnrm-test: "true" name: dataflowflextemplatejob-${uniqueId} namespace: ${uniqueId} spec: - additionalExperiments: - - disable_runner_v2_reason=java_job_google_template - - enable_always_on_exception_sampling containerSpecGcsPath: gs://dataflow-templates/2022-10-03-00_RC00/flex/File_Format_Conversion parameters: inputFileFormat: csv @@ -27,10 +24,6 @@ spec: outputFileFormat: avro schema: gs://config-connector-samples/dataflowflextemplate/numbers.avsc region: us-central1 - serviceAccountEmailRef: - external: ${projectNumber}-compute@developer.gserviceaccount.com - stagingLocation: gs://dataflow-staging-us-central1-${projectNumber}/staging - tempLocation: gs://dataflow-staging-us-central1-${projectNumber}/tmp status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" @@ -39,6 +32,6 @@ status: status: "True" type: Ready jobId: ${jobID} - observedGeneration: 2 + observedGeneration: 1 state: JOB_STATE_RUNNING type: JOB_TYPE_BATCH diff --git a/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob/_generated_object_streamingdataflowflextemplatejob.golden.yaml b/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob/_generated_object_streamingdataflowflextemplatejob.golden.yaml index 2aa5276131..85567f5f16 100644 --- a/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob/_generated_object_streamingdataflowflextemplatejob.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob/_generated_object_streamingdataflowflextemplatejob.golden.yaml @@ -6,21 +6,17 @@ metadata: cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"containerSpecGcsPath":"gs://dataflow-templates/2020-08-31-00_RC00/flex/PubSub_Avro_to_BigQuery","parameters":{"createDisposition":"CREATE_NEVER","inputSubscription":"projects/${projectId}/subscriptions/pubsubsubscription-${uniqueId}","outputTableSpec":"${projectId}:bigquerydataset${uniqueId}.bigquerytable${uniqueId}","outputTopic":"projects/${projectId}/topics/pubsubtopic1-${uniqueId}","schemaPath":"gs://config-connector-samples/dataflowflextemplate/numbers.avsc"}}}' cnrm.cloud.google.com/on-delete: cancel cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 2 + generation: 1 labels: cnrm-test: "true" label-one: value-one name: dataflowflextemplatejob-${uniqueId} namespace: ${uniqueId} spec: - additionalExperiments: - - disable_runner_v2_reason=java_job_google_template - - enable_always_on_exception_sampling - - enable_streaming_java_vmr containerSpecGcsPath: gs://dataflow-templates/2020-08-31-00_RC00/flex/PubSub_Avro_to_BigQuery parameters: createDisposition: CREATE_NEVER @@ -29,10 +25,6 @@ spec: outputTopic: projects/${projectId}/topics/pubsubtopic1-${uniqueId} schemaPath: gs://config-connector-samples/dataflowflextemplate/numbers.avsc region: us-central1 - serviceAccountEmailRef: - external: ${projectNumber}-compute@developer.gserviceaccount.com - stagingLocation: gs://dataflow-staging-us-central1-${projectNumber}/staging - tempLocation: gs://dataflow-staging-us-central1-${projectNumber}/tmp status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" @@ -41,6 +33,6 @@ status: status: "True" type: Ready jobId: ${jobID} - observedGeneration: 2 + observedGeneration: 1 state: JOB_STATE_RUNNING type: JOB_TYPE_STREAMING diff --git a/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob2/_generated_object_streamingdataflowflextemplatejob2.golden.yaml b/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob2/_generated_object_streamingdataflowflextemplatejob2.golden.yaml index 8d481d44d7..3838cec306 100644 --- a/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob2/_generated_object_streamingdataflowflextemplatejob2.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dataflow/v1beta1/dataflowflextemplatejob/streamingdataflowflextemplatejob2/_generated_object_streamingdataflowflextemplatejob2.golden.yaml @@ -6,30 +6,22 @@ metadata: cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"containerSpecGcsPath":"gs://dataflow-templates-us-central1/2024-08-06-00_RC00/flex/Cloud_PubSub_to_GCS_Text_Flex","parameters":{"inputSubscription":"projects/${projectId}/subscriptions/pubsubsubscription-${uniqueId}","outputDirectory":"gs://bucket-dataflow-output-${uniqueId}/path2"}}}' cnrm.cloud.google.com/on-delete: cancel cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 3 + generation: 2 labels: cnrm-test: "true" label-one: value-two name: streamingdataflowflextemplatejob2-${uniqueId} namespace: ${uniqueId} spec: - additionalExperiments: - - disable_runner_v2_reason=java_job_google_template - - enable_always_on_exception_sampling - - enable_streaming_java_vmr containerSpecGcsPath: gs://dataflow-templates-us-central1/2024-08-06-00_RC00/flex/Cloud_PubSub_to_GCS_Text_Flex parameters: inputSubscription: projects/${projectId}/subscriptions/pubsubsubscription-${uniqueId} outputDirectory: gs://bucket-dataflow-output-${uniqueId}/path2 region: us-central1 - serviceAccountEmailRef: - external: ${projectNumber}-compute@developer.gserviceaccount.com - stagingLocation: gs://dataflow-staging-us-central1-${projectNumber}/staging - tempLocation: gs://dataflow-staging-us-central1-${projectNumber}/tmp status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" @@ -38,6 +30,6 @@ status: status: "True" type: Ready jobId: ${jobID} - observedGeneration: 3 + observedGeneration: 2 state: JOB_STATE_RUNNING type: JOB_TYPE_STREAMING diff --git a/pkg/test/resourcefixture/testdata/basic/edgecontainer/v1beta1/edgecontainercluster/_generated_object_edgecontainercluster.golden.yaml b/pkg/test/resourcefixture/testdata/basic/edgecontainer/v1beta1/edgecontainercluster/_generated_object_edgecontainercluster.golden.yaml index 5e160313c7..9809cd415e 100644 --- a/pkg/test/resourcefixture/testdata/basic/edgecontainer/v1beta1/edgecontainercluster/_generated_object_edgecontainercluster.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/edgecontainer/v1beta1/edgecontainercluster/_generated_object_edgecontainercluster.golden.yaml @@ -3,7 +3,7 @@ kind: EdgeContainerCluster metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -30,7 +30,6 @@ spec: - 10.1.0.0/16 projectRef: external: ${projectId} - releaseChannel: RELEASE_CHANNEL_UNSPECIFIED resourceID: edgecontainercluster-${uniqueId} status: conditions: diff --git a/pkg/test/resourcefixture/testdata/basic/edgecontainer/v1beta1/edgecontainernodepool/_generated_object_edgecontainernodepool.golden.yaml b/pkg/test/resourcefixture/testdata/basic/edgecontainer/v1beta1/edgecontainernodepool/_generated_object_edgecontainernodepool.golden.yaml index 896ada2aed..9ae13e546a 100644 --- a/pkg/test/resourcefixture/testdata/basic/edgecontainer/v1beta1/edgecontainernodepool/_generated_object_edgecontainernodepool.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/edgecontainer/v1beta1/edgecontainernodepool/_generated_object_edgecontainernodepool.golden.yaml @@ -17,7 +17,7 @@ kind: EdgeContainerNodePool metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/edgenetwork/v1beta1/edgenetworknetwork/_generated_object_edgenetworknetwork.golden.yaml b/pkg/test/resourcefixture/testdata/basic/edgenetwork/v1beta1/edgenetworknetwork/_generated_object_edgenetworknetwork.golden.yaml index e130bdbaa1..575a573c6a 100644 --- a/pkg/test/resourcefixture/testdata/basic/edgenetwork/v1beta1/edgenetworknetwork/_generated_object_edgenetworknetwork.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/edgenetwork/v1beta1/edgenetworknetwork/_generated_object_edgenetworknetwork.golden.yaml @@ -17,7 +17,7 @@ kind: EdgeNetworkNetwork metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/edgenetwork/v1beta1/edgenetworksubnet/_generated_object_edgenetworksubnet.golden.yaml b/pkg/test/resourcefixture/testdata/basic/edgenetwork/v1beta1/edgenetworksubnet/_generated_object_edgenetworksubnet.golden.yaml index 3e98f25681..fd32455d9b 100644 --- a/pkg/test/resourcefixture/testdata/basic/edgenetwork/v1beta1/edgenetworksubnet/_generated_object_edgenetworksubnet.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/edgenetwork/v1beta1/edgenetworksubnet/_generated_object_edgenetworksubnet.golden.yaml @@ -17,7 +17,7 @@ kind: EdgeNetworkSubnet metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/_generated_object_acmfeature.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/_generated_object_acmfeature.golden.yaml index ae57b8a85f..75c17107b5 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/_generated_object_acmfeature.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/_generated_object_acmfeature.golden.yaml @@ -3,7 +3,7 @@ kind: GKEHubFeature metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcifeature/_generated_object_mcifeature.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcifeature/_generated_object_mcifeature.golden.yaml index f585f38b9c..235d2b26fe 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcifeature/_generated_object_mcifeature.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcifeature/_generated_object_mcifeature.golden.yaml @@ -3,7 +3,7 @@ kind: GKEHubFeature metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/_generated_object_mcsdfeature.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/_generated_object_mcsdfeature.golden.yaml index b162146ff5..562b5510a3 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/_generated_object_mcsdfeature.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/_generated_object_mcsdfeature.golden.yaml @@ -3,7 +3,7 @@ kind: GKEHubFeature metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubmembership/_generated_object_gkehubmembership.golden.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubmembership/_generated_object_gkehubmembership.golden.yaml index 3fdc5c5ba1..3477c71d20 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubmembership/_generated_object_gkehubmembership.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubmembership/_generated_object_gkehubmembership.golden.yaml @@ -5,7 +5,7 @@ metadata: 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: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -22,8 +22,6 @@ spec: gkeCluster: resourceRef: name: containercluster-${uniqueId} - externalId: c772f869-1d6c-4d50-a92e-816c48322246 - infrastructureType: MULTI_CLOUD location: global resourceID: gkehubmembership-${uniqueId} status: diff --git a/pkg/test/resourcefixture/testdata/basic/iam/v1beta1/iamserviceaccount/_generated_object_iamserviceaccount.golden.yaml b/pkg/test/resourcefixture/testdata/basic/iam/v1beta1/iamserviceaccount/_generated_object_iamserviceaccount.golden.yaml index 8e7ea44937..6864cfa8cf 100644 --- a/pkg/test/resourcefixture/testdata/basic/iam/v1beta1/iamserviceaccount/_generated_object_iamserviceaccount.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/iam/v1beta1/iamserviceaccount/_generated_object_iamserviceaccount.golden.yaml @@ -18,7 +18,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmscryptokey/_generated_object_kmscryptokey.golden.yaml b/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmscryptokey/_generated_object_kmscryptokey.golden.yaml index 92188d7891..5865917621 100644 --- a/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmscryptokey/_generated_object_kmscryptokey.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmscryptokey/_generated_object_kmscryptokey.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -15,7 +15,6 @@ metadata: name: kmscryptokey-${uniqueId} namespace: ${uniqueId} spec: - destroyScheduledDuration: 2592000s importOnly: false keyRingRef: name: kmscryptokey-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmskeyring/_generated_object_kmskeyring.golden.yaml b/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmskeyring/_generated_object_kmskeyring.golden.yaml index 1962d4ae9d..fa77033ad9 100644 --- a/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmskeyring/_generated_object_kmskeyring.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/kms/v1beta1/kmskeyring/_generated_object_kmskeyring.golden.yaml @@ -18,7 +18,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/projectlogbucket/_generated_object_projectlogbucket.golden.yaml b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/projectlogbucket/_generated_object_projectlogbucket.golden.yaml index 53ab47097d..4bdbd39798 100644 --- a/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/projectlogbucket/_generated_object_projectlogbucket.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/projectlogbucket/_generated_object_projectlogbucket.golden.yaml @@ -17,7 +17,7 @@ kind: LoggingLogBucket metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringalertpolicy/_generated_object_monitoringalertpolicy.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringalertpolicy/_generated_object_monitoringalertpolicy.golden.yaml index abfb6c9fa3..5feb86c3cc 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringalertpolicy/_generated_object_monitoringalertpolicy.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringalertpolicy/_generated_object_monitoringalertpolicy.golden.yaml @@ -4,11 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" name: monitoringalertpolicy-${uniqueId} @@ -32,7 +32,6 @@ spec: trigger: count: 3 displayName: Very low CPU usage - name: projects/${projectId}/alertPolicies/${alertPolicyId}/conditions/${conditionId} displayName: Updated Test Alert Policy documentation: content: |- @@ -45,7 +44,6 @@ spec: That alone should discourage the crew. Just the place for a Snark! I have measured it thrice: What I measure three times is true.” - mimeType: text/markdown enabled: false notificationChannels: - name: monitoringnotificationchannel3-${uniqueId} @@ -63,4 +61,4 @@ status: - mutateTime: "1970-01-01T00:00:00Z" mutatedBy: user@google.com name: projects/${projectId}/alertPolicies/${alertPolicyId} - observedGeneration: 4 + observedGeneration: 3 diff --git a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringgroup/_generated_object_monitoringgroup.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringgroup/_generated_object_monitoringgroup.golden.yaml index b979eeff17..91fdd4a4c5 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringgroup/_generated_object_monitoringgroup.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringgroup/_generated_object_monitoringgroup.golden.yaml @@ -3,7 +3,7 @@ kind: MonitoringGroup metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringnotificationchannel/_generated_object_monitoringnotificationchannel.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringnotificationchannel/_generated_object_monitoringnotificationchannel.golden.yaml index a222cd1b8d..a3d478f221 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringnotificationchannel/_generated_object_monitoringnotificationchannel.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringnotificationchannel/_generated_object_monitoringnotificationchannel.golden.yaml @@ -6,7 +6,7 @@ metadata: cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"sensitiveLabels":{"password":{"valueFrom":{"secretKeyRef":{"key":"password","name":"secret-${uniqueId}"}}}}}}' cnrm.cloud.google.com/observed-secret-versions: (removed) cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -22,7 +22,6 @@ spec: description: Sends notifications to newly indicated webhook URL using HTTP-standard basic authentication. Should be used in conjunction with SSL/TLS to reduce the risk of attackers snooping the credentials. - enabled: true labels: url: http://hooks.example.com/notification username: user diff --git a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringuptimecheckconfig/httpuptimecheckconfig/_generated_object_httpuptimecheckconfig.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringuptimecheckconfig/httpuptimecheckconfig/_generated_object_httpuptimecheckconfig.golden.yaml index 7442d3ba93..99bffd723f 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringuptimecheckconfig/httpuptimecheckconfig/_generated_object_httpuptimecheckconfig.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringuptimecheckconfig/httpuptimecheckconfig/_generated_object_httpuptimecheckconfig.golden.yaml @@ -5,7 +5,7 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"httpCheck":{"authInfo":{"password":{"valueFrom":{"secretKeyRef":{"key":"password","name":"secret-2-${uniqueId}"}}}},"headers":{"header-one":"value-one","header-two":"value-two"}}}}' cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringuptimecheckconfig/tcpuptimecheckconfig/_generated_object_tcpuptimecheckconfig.golden.yaml b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringuptimecheckconfig/tcpuptimecheckconfig/_generated_object_tcpuptimecheckconfig.golden.yaml index 29d90180ab..9e375bc1b4 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringuptimecheckconfig/tcpuptimecheckconfig/_generated_object_tcpuptimecheckconfig.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringuptimecheckconfig/tcpuptimecheckconfig/_generated_object_tcpuptimecheckconfig.golden.yaml @@ -5,7 +5,7 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/mutable-but-unreadable-fields: '{}' cnrm.cloud.google.com/observed-secret-versions: (removed) - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -16,7 +16,6 @@ metadata: namespace: ${uniqueId} spec: displayName: updated-tcp-uptime-check - period: 60s projectRef: external: projects/${projectId} resourceGroup: diff --git a/pkg/test/resourcefixture/testdata/basic/networkservices/v1beta1/networkservicesmesh/_generated_object_networkservicesmesh.golden.yaml b/pkg/test/resourcefixture/testdata/basic/networkservices/v1beta1/networkservicesmesh/_generated_object_networkservicesmesh.golden.yaml index b486036e03..7ff00ad9b9 100644 --- a/pkg/test/resourcefixture/testdata/basic/networkservices/v1beta1/networkservicesmesh/_generated_object_networkservicesmesh.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/networkservices/v1beta1/networkservicesmesh/_generated_object_networkservicesmesh.golden.yaml @@ -17,7 +17,7 @@ kind: NetworkServicesMesh metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/privateca/v1beta1/privatecacapool/privatecacapoolbasic/_generated_object_privatecacapoolbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/privateca/v1beta1/privatecacapool/privatecacapoolbasic/_generated_object_privatecacapoolbasic.golden.yaml index d81c3f4af0..08e48509f5 100644 --- a/pkg/test/resourcefixture/testdata/basic/privateca/v1beta1/privatecacapool/privatecacapoolbasic/_generated_object_privatecacapoolbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/privateca/v1beta1/privatecacapool/privatecacapoolbasic/_generated_object_privatecacapoolbasic.golden.yaml @@ -17,7 +17,7 @@ kind: PrivateCACAPool metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/privateca/v1beta1/privatecacapool/privatecacapooliam/_generated_object_privatecacapooliam.golden.yaml b/pkg/test/resourcefixture/testdata/basic/privateca/v1beta1/privatecacapool/privatecacapooliam/_generated_object_privatecacapooliam.golden.yaml index c9a58a241e..2d57cfa703 100644 --- a/pkg/test/resourcefixture/testdata/basic/privateca/v1beta1/privatecacapool/privatecacapooliam/_generated_object_privatecacapooliam.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/privateca/v1beta1/privatecacapool/privatecacapooliam/_generated_object_privatecacapooliam.golden.yaml @@ -2,7 +2,7 @@ apiVersion: iam.cnrm.cloud.google.com/v1beta1 kind: IAMPolicyMember metadata: annotations: - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubschema/_generated_object_pubsubschema.golden.yaml b/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubschema/_generated_object_pubsubschema.golden.yaml index 47efd15914..37e64300b6 100644 --- a/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubschema/_generated_object_pubsubschema.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubschema/_generated_object_pubsubschema.golden.yaml @@ -3,7 +3,7 @@ kind: PubSubSchema metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubsubscription/basicpubsubsubscription/_generated_object_basicpubsubsubscription.golden.yaml b/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubsubscription/basicpubsubsubscription/_generated_object_basicpubsubsubscription.golden.yaml index 1fad843da0..f7f0cbb77d 100644 --- a/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubsubscription/basicpubsubsubscription/_generated_object_basicpubsubsubscription.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubsubscription/basicpubsubsubscription/_generated_object_basicpubsubsubscription.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -18,8 +18,6 @@ metadata: spec: ackDeadlineSeconds: 20 enableExactlyOnceDelivery: true - expirationPolicy: - ttl: 2678400s messageRetentionDuration: 86400s resourceID: pubsubsubscription-sample-${uniqueId} retainAckedMessages: false diff --git a/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubsubscription/bigquerypubsubsubscription/_generated_object_bigquerypubsubsubscription.golden.yaml b/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubsubscription/bigquerypubsubsubscription/_generated_object_bigquerypubsubsubscription.golden.yaml index 1830a2200c..5a8caaee69 100644 --- a/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubsubscription/bigquerypubsubsubscription/_generated_object_bigquerypubsubsubscription.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubsubscription/bigquerypubsubsubscription/_generated_object_bigquerypubsubsubscription.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -15,13 +15,9 @@ metadata: name: pubsubsubscription-${uniqueId} namespace: ${uniqueId} spec: - ackDeadlineSeconds: 10 bigqueryConfig: tableRef: name: bigquerytable-2-${uniqueId} - expirationPolicy: - ttl: 2678400s - messageRetentionDuration: 604800s resourceID: pubsubsubscription-${uniqueId} topicRef: name: pubsubtopic-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubtopic/_generated_object_pubsubtopic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubtopic/_generated_object_pubsubtopic.golden.yaml index 8334e0f7b9..4313afb2ff 100644 --- a/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubtopic/_generated_object_pubsubtopic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/pubsub/v1beta1/pubsubtopic/_generated_object_pubsubtopic.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/pubsublite/v1beta1/pubsublitereservation/_generated_object_pubsublitereservation.golden.yaml b/pkg/test/resourcefixture/testdata/basic/pubsublite/v1beta1/pubsublitereservation/_generated_object_pubsublitereservation.golden.yaml index 0403323503..bf5317f9e9 100644 --- a/pkg/test/resourcefixture/testdata/basic/pubsublite/v1beta1/pubsublitereservation/_generated_object_pubsublitereservation.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/pubsublite/v1beta1/pubsublitereservation/_generated_object_pubsublitereservation.golden.yaml @@ -3,7 +3,7 @@ kind: PubSubLiteReservation metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/redisinstance/_generated_object_redisinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/redisinstance/_generated_object_redisinstance.golden.yaml index 271de67148..9bf4dc294e 100644 --- a/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/redisinstance/_generated_object_redisinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/redis/v1beta1/redisinstance/_generated_object_redisinstance.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -16,20 +16,15 @@ metadata: name: redisinstances-${uniqueId} namespace: ${uniqueId} spec: - authorizedNetworkRef: - external: projects/${projectId}/global/networks/default - connectMode: DIRECT_PEERING displayName: newDisplayName - locationId: us-central1-a + maintenanceSchedule: + - endTime: "2023-08-01T16:29:22.045123456Z" + scheduleDeadlineTime: "2023-08-01T17:29:22.045123456Z" + startTime: "2023-08-01T15:29:22.045123456Z" memorySizeGb: 20 - persistenceConfig: - persistenceMode: DISABLED - readReplicasMode: READ_REPLICAS_DISABLED - redisVersion: REDIS_7_0 region: us-central1 resourceID: redisinstances-${uniqueId} tier: BASIC - transitEncryptionMode: DISABLED status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/_generated_object_projectinfolder.golden.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/_generated_object_projectinfolder.golden.yaml index e9eddcccd5..ed50a9789d 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/_generated_object_projectinfolder.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/_generated_object_projectinfolder.golden.yaml @@ -3,7 +3,7 @@ kind: Project metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/_generated_object_projectinorg.golden.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/_generated_object_projectinorg.golden.yaml index df4b4d130a..0fdf86108f 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/_generated_object_projectinorg.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/_generated_object_projectinorg.golden.yaml @@ -3,7 +3,7 @@ kind: Project metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/_generated_object_projectmovedfoldertofolder.golden.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/_generated_object_projectmovedfoldertofolder.golden.yaml index 37b0a9eea4..478471c443 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/_generated_object_projectmovedfoldertofolder.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/_generated_object_projectmovedfoldertofolder.golden.yaml @@ -3,7 +3,7 @@ kind: Project metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/secretmanager/v1beta1/secretmanagersecret/_generated_object_secretmanagersecret.golden.yaml b/pkg/test/resourcefixture/testdata/basic/secretmanager/v1beta1/secretmanagersecret/_generated_object_secretmanagersecret.golden.yaml index 6cf2b7d133..29895678a1 100644 --- a/pkg/test/resourcefixture/testdata/basic/secretmanager/v1beta1/secretmanagersecret/_generated_object_secretmanagersecret.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/secretmanager/v1beta1/secretmanagersecret/_generated_object_secretmanagersecret.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/secretmanager/v1beta1/secretmanagersecretversion/_generated_object_secretmanagersecretversion.golden.yaml b/pkg/test/resourcefixture/testdata/basic/secretmanager/v1beta1/secretmanagersecretversion/_generated_object_secretmanagersecretversion.golden.yaml index 42be976044..dae9a9399b 100644 --- a/pkg/test/resourcefixture/testdata/basic/secretmanager/v1beta1/secretmanagersecretversion/_generated_object_secretmanagersecretversion.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/secretmanager/v1beta1/secretmanagersecretversion/_generated_object_secretmanagersecretversion.golden.yaml @@ -1,17 +1,3 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: secretmanager.cnrm.cloud.google.com/v1beta1 kind: SecretManagerSecretVersion metadata: @@ -19,7 +5,7 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -29,7 +15,6 @@ metadata: name: secretmanagersecretversion-${uniqueId} namespace: ${uniqueId} spec: - deletionPolicy: DELETE enabled: false resourceID: "1" secretData: diff --git a/pkg/test/resourcefixture/testdata/basic/servicenetworking/v1beta1/servicenetworkingconnection/_generated_object_servicenetworkingconnection.golden.yaml b/pkg/test/resourcefixture/testdata/basic/servicenetworking/v1beta1/servicenetworkingconnection/_generated_object_servicenetworkingconnection.golden.yaml index a26ff2531e..310f06fee2 100644 --- a/pkg/test/resourcefixture/testdata/basic/servicenetworking/v1beta1/servicenetworkingconnection/_generated_object_servicenetworkingconnection.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/servicenetworking/v1beta1/servicenetworkingconnection/_generated_object_servicenetworkingconnection.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/serviceusage/v1beta1/service/_generated_object_service.golden.yaml b/pkg/test/resourcefixture/testdata/basic/serviceusage/v1beta1/service/_generated_object_service.golden.yaml index e459b79626..34241abc01 100644 --- a/pkg/test/resourcefixture/testdata/basic/serviceusage/v1beta1/service/_generated_object_service.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/serviceusage/v1beta1/service/_generated_object_service.golden.yaml @@ -18,7 +18,7 @@ metadata: annotations: cnrm.cloud.google.com/disable-dependent-services: "false" cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/serviceusage/v1beta1/serviceidentity/_generated_object_serviceidentity.golden.yaml b/pkg/test/resourcefixture/testdata/basic/serviceusage/v1beta1/serviceidentity/_generated_object_serviceidentity.golden.yaml index e070190e14..02058631ed 100644 --- a/pkg/test/resourcefixture/testdata/basic/serviceusage/v1beta1/serviceidentity/_generated_object_serviceidentity.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/serviceusage/v1beta1/serviceidentity/_generated_object_serviceidentity.golden.yaml @@ -17,7 +17,7 @@ kind: ServiceIdentity metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/spanner/v1beta1/spannerdatabase/_generated_object_spannerdatabase.golden.yaml b/pkg/test/resourcefixture/testdata/basic/spanner/v1beta1/spannerdatabase/_generated_object_spannerdatabase.golden.yaml index eb3ea94c52..ee30273e97 100644 --- a/pkg/test/resourcefixture/testdata/basic/spanner/v1beta1/spannerdatabase/_generated_object_spannerdatabase.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/spanner/v1beta1/spannerdatabase/_generated_object_spannerdatabase.golden.yaml @@ -6,7 +6,7 @@ metadata: cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"ddl":["CREATE TABLE t1 (t1 INT64 NOT NULL,) PRIMARY KEY(t1)"]}}' cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -16,13 +16,11 @@ metadata: name: spannerdb-${uniqueId} namespace: ${uniqueId} spec: - databaseDialect: GOOGLE_STANDARD_SQL ddl: - CREATE TABLE t1 (t1 INT64 NOT NULL,) PRIMARY KEY(t1) instanceRef: name: spannerinstance-${uniqueId} resourceID: spannerdb-${uniqueId} - versionRetentionPeriod: 1h status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/spanner/v1beta1/spannerinstance/_generated_object_spannerinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/spanner/v1beta1/spannerinstance/_generated_object_spannerinstance.golden.yaml index eb7dbcb14c..556ad3e9a2 100644 --- a/pkg/test/resourcefixture/testdata/basic/spanner/v1beta1/spannerinstance/_generated_object_spannerinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/spanner/v1beta1/spannerinstance/_generated_object_spannerinstance.golden.yaml @@ -4,11 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" label-one: value-one @@ -18,7 +18,6 @@ spec: config: regional-us-west1 displayName: Spanner Instance Sample numNodes: 3 - processingUnits: 3000 resourceID: spannerinstance-sample-${uniqueId} status: conditions: @@ -27,5 +26,5 @@ status: reason: UpToDate status: "True" type: Ready - observedGeneration: 4 + observedGeneration: 3 state: READY diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqluser/_generated_object_sqluser.golden.yaml b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqluser/_generated_object_sqluser.golden.yaml index d13687e3d9..c172d27220 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqluser/_generated_object_sqluser.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqluser/_generated_object_sqluser.golden.yaml @@ -6,7 +6,7 @@ metadata: cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"password":{"valueFrom":{"secretKeyRef":{"key":"password","name":"sqluser-dep-${uniqueId}"}}}}}' cnrm.cloud.google.com/observed-secret-versions: (removed) cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketbasic/_generated_object_storagebucketbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketbasic/_generated_object_storagebucketbasic.golden.yaml index b1ee58c04c..cb54fea869 100644 --- a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketbasic/_generated_object_storagebucketbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketbasic/_generated_object_storagebucketbasic.golden.yaml @@ -4,11 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" label-one: value-one @@ -16,12 +16,11 @@ metadata: name: storagebucket-sample-${uniqueId} namespace: ${uniqueId} spec: + lifecycleRule: [] location: US - publicAccessPrevention: inherited resourceID: storagebucket-sample-${uniqueId} softDeletePolicy: retentionDurationSeconds: 0 - storageClass: STANDARD versioning: enabled: true status: @@ -31,9 +30,10 @@ status: reason: UpToDate status: "True" type: Ready - observedGeneration: 4 + observedGeneration: 3 observedState: softDeletePolicy: + effectiveTime: "1970-01-01T00:00:00Z" retentionDurationSeconds: 0 selfLink: https://www.googleapis.com/storage/v1/b/storagebucket-sample-${uniqueId} url: gs://storagebucket-sample-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketsoftdelete/_generated_object_storagebucketsoftdelete.golden.yaml b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketsoftdelete/_generated_object_storagebucketsoftdelete.golden.yaml index e284a25973..e2001d26f6 100644 --- a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketsoftdelete/_generated_object_storagebucketsoftdelete.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketsoftdelete/_generated_object_storagebucketsoftdelete.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -21,13 +21,10 @@ spec: type: Delete condition: age: 7 - withState: ANY location: US - publicAccessPrevention: inherited resourceID: storagebucket-sample-${uniqueId} softDeletePolicy: retentionDurationSeconds: 604800 - storageClass: STANDARD versioning: enabled: false status: diff --git a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketzero/_generated_object_storagebucketzero.golden.yaml b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketzero/_generated_object_storagebucketzero.golden.yaml index d4b7e391a7..1aa09a2be3 100644 --- a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketzero/_generated_object_storagebucketzero.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/storagebucketzero/_generated_object_storagebucketzero.golden.yaml @@ -4,11 +4,11 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" label-one: value-one @@ -16,12 +16,11 @@ metadata: name: storagebucket-sample-${uniqueId} namespace: ${uniqueId} spec: + lifecycleRule: [] location: US - publicAccessPrevention: inherited resourceID: storagebucket-sample-${uniqueId} softDeletePolicy: retentionDurationSeconds: 604800 - storageClass: STANDARD versioning: enabled: false status: @@ -31,7 +30,7 @@ status: reason: UpToDate status: "True" type: Ready - observedGeneration: 4 + observedGeneration: 3 observedState: softDeletePolicy: effectiveTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagenotification/storagenotificationbase/_generated_object_storagenotificationbase.golden.yaml b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagenotification/storagenotificationbase/_generated_object_storagenotificationbase.golden.yaml index 43667cdec0..6b2b1a5e41 100644 --- a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagenotification/storagenotificationbase/_generated_object_storagenotificationbase.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagenotification/storagenotificationbase/_generated_object_storagenotificationbase.golden.yaml @@ -3,7 +3,7 @@ kind: StorageNotification metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagenotification/storagenotificationfull/_generated_object_storagenotificationfull.golden.yaml b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagenotification/storagenotificationfull/_generated_object_storagenotificationfull.golden.yaml index b0e02f49cd..dc07abffae 100644 --- a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagenotification/storagenotificationfull/_generated_object_storagenotificationfull.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagenotification/storagenotificationfull/_generated_object_storagenotificationfull.golden.yaml @@ -3,7 +3,7 @@ kind: StorageNotification metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagkey/tagkeyorgbasic/_generated_object_tagkeyorgbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagkey/tagkeyorgbasic/_generated_object_tagkeyorgbasic.golden.yaml index 445b8e4fe9..907f8944ef 100644 --- a/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagkey/tagkeyorgbasic/_generated_object_tagkeyorgbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagkey/tagkeyorgbasic/_generated_object_tagkeyorgbasic.golden.yaml @@ -3,7 +3,7 @@ kind: TagsTagKey metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagkey/tagkeyprojectbasic/_generated_object_tagkeyprojectbasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagkey/tagkeyprojectbasic/_generated_object_tagkeyprojectbasic.golden.yaml index 57f18444eb..5e9b7a79e9 100644 --- a/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagkey/tagkeyprojectbasic/_generated_object_tagkeyprojectbasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagkey/tagkeyprojectbasic/_generated_object_tagkeyprojectbasic.golden.yaml @@ -3,7 +3,7 @@ kind: TagsTagKey metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagvalue/tagvaluebasic/_generated_object_tagvaluebasic.golden.yaml b/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagvalue/tagvaluebasic/_generated_object_tagvaluebasic.golden.yaml index 83908d9200..53143caa77 100644 --- a/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagvalue/tagvaluebasic/_generated_object_tagvaluebasic.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagvalue/tagvaluebasic/_generated_object_tagvaluebasic.golden.yaml @@ -3,7 +3,7 @@ kind: TagsTagValue metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagvalue/tagvalueproject/_generated_object_tagvalueproject.golden.yaml b/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagvalue/tagvalueproject/_generated_object_tagvalueproject.golden.yaml index 0a69a9db47..17fe1dc0d6 100644 --- a/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagvalue/tagvalueproject/_generated_object_tagvalueproject.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/tags/v1beta1/tagstagvalue/tagvalueproject/_generated_object_tagvalueproject.golden.yaml @@ -3,7 +3,7 @@ kind: TagsTagValue metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/containerannotations/folderid/_generated_object_folderid.golden.yaml b/pkg/test/resourcefixture/testdata/containerannotations/folderid/_generated_object_folderid.golden.yaml index bdfdd9ae6d..4b2e985712 100644 --- a/pkg/test/resourcefixture/testdata/containerannotations/folderid/_generated_object_folderid.golden.yaml +++ b/pkg/test/resourcefixture/testdata/containerannotations/folderid/_generated_object_folderid.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/folder-id: "123451001" cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/containerannotations/projectid/_generated_object_projectid.golden.yaml b/pkg/test/resourcefixture/testdata/containerannotations/projectid/_generated_object_projectid.golden.yaml index 7a71a22283..002fd319cd 100644 --- a/pkg/test/resourcefixture/testdata/containerannotations/projectid/_generated_object_projectid.golden.yaml +++ b/pkg/test/resourcefixture/testdata/containerannotations/projectid/_generated_object_projectid.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -14,17 +14,7 @@ metadata: name: bigquerydatasetsample${uniqueId} namespace: ${uniqueId} spec: - access: - - role: OWNER - specialGroup: projectOwners - - role: OWNER - userByEmail: user@google.com - - role: READER - specialGroup: projectReaders - - role: WRITER - specialGroup: projectWriters friendlyName: bigquerydataset-sample-updated - location: US projectRef: external: ${projectId} resourceID: bigquerydatasetsample${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/directives/forcedestroy/_generated_object_forcedestroy.golden.yaml b/pkg/test/resourcefixture/testdata/directives/forcedestroy/_generated_object_forcedestroy.golden.yaml index 00584f17df..9fc79e776d 100644 --- a/pkg/test/resourcefixture/testdata/directives/forcedestroy/_generated_object_forcedestroy.golden.yaml +++ b/pkg/test/resourcefixture/testdata/directives/forcedestroy/_generated_object_forcedestroy.golden.yaml @@ -5,7 +5,7 @@ metadata: cnrm.cloud.google.com/force-destroy: "true" cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -18,11 +18,7 @@ metadata: namespace: ${uniqueId} spec: location: US - publicAccessPrevention: inherited resourceID: storagebucket-sample-${uniqueId} - softDeletePolicy: - retentionDurationSeconds: 604800 - storageClass: STANDARD versioning: enabled: true status: diff --git a/pkg/test/resourcefixture/testdata/directives/removedefaultnodepool/_generated_object_removedefaultnodepool.golden.yaml b/pkg/test/resourcefixture/testdata/directives/removedefaultnodepool/_generated_object_removedefaultnodepool.golden.yaml index fca26a4ddd..2d17ddb266 100644 --- a/pkg/test/resourcefixture/testdata/directives/removedefaultnodepool/_generated_object_removedefaultnodepool.golden.yaml +++ b/pkg/test/resourcefixture/testdata/directives/removedefaultnodepool/_generated_object_removedefaultnodepool.golden.yaml @@ -7,7 +7,7 @@ metadata: cnrm.cloud.google.com/observed-secret-versions: (removed) cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/remove-default-node-pool: "true" - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -18,63 +18,11 @@ metadata: name: cluster-sample-${uniqueId} namespace: ${uniqueId} spec: - addonsConfig: - gcePersistentDiskCsiDriverConfig: - enabled: true - networkPolicyConfig: - disabled: true - clusterAutoscaling: - autoscalingProfile: BALANCED - clusterTelemetry: - type: ENABLED - databaseEncryption: - state: DECRYPTED - enableShieldedNodes: true initialNodeCount: 1 location: us-central1-a - loggingConfig: - enableComponents: - - SYSTEM_COMPONENTS - - WORKLOADS loggingService: none - monitoringConfig: - advancedDatapathObservabilityConfig: - - enableMetrics: false - enableComponents: - - SYSTEM_COMPONENTS - managedPrometheus: - enabled: true monitoringService: none - networkPolicy: - enabled: false - networkRef: - external: projects/${projectId}/global/networks/default - networkingMode: ROUTES - nodeConfig: - loggingVariant: DEFAULT - oauthScopes: - - https://www.googleapis.com/auth/devstorage.read_only - - https://www.googleapis.com/auth/logging.write - - https://www.googleapis.com/auth/monitoring - - https://www.googleapis.com/auth/service.management.readonly - - https://www.googleapis.com/auth/servicecontrol - - https://www.googleapis.com/auth/trace.append - nodeLocations: - - us-central1-a - nodeVersion: "" - notificationConfig: - pubsub: - enabled: false - podSecurityPolicyConfig: - enabled: false - releaseChannel: - channel: REGULAR resourceID: cluster-sample-${uniqueId} - securityPostureConfig: - mode: BASIC - vulnerabilityMode: VULNERABILITY_MODE_UNSPECIFIED - subnetworkRef: - external: projects/${projectId}/regions/us-central1-a/subnetworks/default status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/externalref/externalwithname/_generated_object_externalwithname.golden.yaml b/pkg/test/resourcefixture/testdata/externalref/externalwithname/_generated_object_externalwithname.golden.yaml index 2d4807897f..8d93b4a83d 100644 --- a/pkg/test/resourcefixture/testdata/externalref/externalwithname/_generated_object_externalwithname.golden.yaml +++ b/pkg/test/resourcefixture/testdata/externalref/externalwithname/_generated_object_externalwithname.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -15,9 +15,6 @@ metadata: namespace: ${uniqueId} spec: ackDeadlineSeconds: 20 - expirationPolicy: - ttl: 2678400s - messageRetentionDuration: 604800s resourceID: pubsubsubscription-${uniqueId} topicRef: external: pubsubtopic-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/externalref/externalwithpartialuri/_generated_object_externalwithpartialuri.golden.yaml b/pkg/test/resourcefixture/testdata/externalref/externalwithpartialuri/_generated_object_externalwithpartialuri.golden.yaml index 022db91760..7fa744cf2d 100644 --- a/pkg/test/resourcefixture/testdata/externalref/externalwithpartialuri/_generated_object_externalwithpartialuri.golden.yaml +++ b/pkg/test/resourcefixture/testdata/externalref/externalwithpartialuri/_generated_object_externalwithpartialuri.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeVPNGateway metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -32,7 +18,6 @@ spec: external: projects/${projectId}/global/networks/default region: us-central1 resourceID: computevpngateway-${uniqueId} - stackType: IPV4_ONLY status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/externalref/externalwithsubresource/_generated_object_externalwithsubresource.golden.yaml b/pkg/test/resourcefixture/testdata/externalref/externalwithsubresource/_generated_object_externalwithsubresource.golden.yaml index a7fd8e22e7..654ee87aae 100644 --- a/pkg/test/resourcefixture/testdata/externalref/externalwithsubresource/_generated_object_externalwithsubresource.golden.yaml +++ b/pkg/test/resourcefixture/testdata/externalref/externalwithsubresource/_generated_object_externalwithsubresource.golden.yaml @@ -6,7 +6,7 @@ metadata: cnrm.cloud.google.com/mutable-but-unreadable-fields: '{"spec":{"ddl":["CREATE TABLE t1 (t1 INT64 NOT NULL,) PRIMARY KEY(t1)"]}}' cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -16,13 +16,11 @@ metadata: name: spannerdatabase-test namespace: ${uniqueId} spec: - databaseDialect: GOOGLE_STANDARD_SQL ddl: - CREATE TABLE t1 (t1 INT64 NOT NULL,) PRIMARY KEY(t1) instanceRef: external: spannerinstance-${uniqueId} resourceID: spannerdatabase-test - versionRetentionPeriod: 1h status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/iamexternalonlyref/billingaccountiampolicy/_generated_object_billingaccountiampolicy.golden.yaml b/pkg/test/resourcefixture/testdata/iamexternalonlyref/billingaccountiampolicy/_generated_object_billingaccountiampolicy.golden.yaml index 2d55719a67..b771cecdfb 100644 --- a/pkg/test/resourcefixture/testdata/iamexternalonlyref/billingaccountiampolicy/_generated_object_billingaccountiampolicy.golden.yaml +++ b/pkg/test/resourcefixture/testdata/iamexternalonlyref/billingaccountiampolicy/_generated_object_billingaccountiampolicy.golden.yaml @@ -17,7 +17,7 @@ kind: IAMPolicy metadata: annotations: cnrm.cloud.google.com/deletion-policy: abandon - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/iamexternalonlyref/billingaccountiampolicymember/_generated_object_billingaccountiampolicymember.golden.yaml b/pkg/test/resourcefixture/testdata/iamexternalonlyref/billingaccountiampolicymember/_generated_object_billingaccountiampolicymember.golden.yaml index 9f80cfd988..2f1a78233b 100644 --- a/pkg/test/resourcefixture/testdata/iamexternalonlyref/billingaccountiampolicymember/_generated_object_billingaccountiampolicymember.golden.yaml +++ b/pkg/test/resourcefixture/testdata/iamexternalonlyref/billingaccountiampolicymember/_generated_object_billingaccountiampolicymember.golden.yaml @@ -16,7 +16,7 @@ apiVersion: iam.cnrm.cloud.google.com/v1beta1 kind: IAMPolicyMember metadata: annotations: - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/iamexternalonlyref/organizationiampolicy/_generated_object_organizationiampolicy.golden.yaml b/pkg/test/resourcefixture/testdata/iamexternalonlyref/organizationiampolicy/_generated_object_organizationiampolicy.golden.yaml index df263ffac5..ddc949d009 100644 --- a/pkg/test/resourcefixture/testdata/iamexternalonlyref/organizationiampolicy/_generated_object_organizationiampolicy.golden.yaml +++ b/pkg/test/resourcefixture/testdata/iamexternalonlyref/organizationiampolicy/_generated_object_organizationiampolicy.golden.yaml @@ -17,7 +17,7 @@ kind: IAMPolicy metadata: annotations: cnrm.cloud.google.com/deletion-policy: abandon - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/iamexternalonlyref/organizationiampolicymember/_generated_object_organizationiampolicymember.golden.yaml b/pkg/test/resourcefixture/testdata/iamexternalonlyref/organizationiampolicymember/_generated_object_organizationiampolicymember.golden.yaml index b3850fda03..c05325f99d 100644 --- a/pkg/test/resourcefixture/testdata/iamexternalonlyref/organizationiampolicymember/_generated_object_organizationiampolicymember.golden.yaml +++ b/pkg/test/resourcefixture/testdata/iamexternalonlyref/organizationiampolicymember/_generated_object_organizationiampolicymember.golden.yaml @@ -16,7 +16,7 @@ apiVersion: iam.cnrm.cloud.google.com/v1beta1 kind: IAMPolicyMember metadata: annotations: - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/iammemberreferences/serviceaccountref/_generated_object_serviceaccountref.golden.yaml b/pkg/test/resourcefixture/testdata/iammemberreferences/serviceaccountref/_generated_object_serviceaccountref.golden.yaml index 72e358401e..33e85801a6 100644 --- a/pkg/test/resourcefixture/testdata/iammemberreferences/serviceaccountref/_generated_object_serviceaccountref.golden.yaml +++ b/pkg/test/resourcefixture/testdata/iammemberreferences/serviceaccountref/_generated_object_serviceaccountref.golden.yaml @@ -2,7 +2,7 @@ apiVersion: iam.cnrm.cloud.google.com/v1beta1 kind: IAMPolicyMember metadata: annotations: - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/iammemberreferences/serviceidentityref/_generated_object_serviceidentityref.golden.yaml b/pkg/test/resourcefixture/testdata/iammemberreferences/serviceidentityref/_generated_object_serviceidentityref.golden.yaml index c6506cc3f0..fdedd385f9 100644 --- a/pkg/test/resourcefixture/testdata/iammemberreferences/serviceidentityref/_generated_object_serviceidentityref.golden.yaml +++ b/pkg/test/resourcefixture/testdata/iammemberreferences/serviceidentityref/_generated_object_serviceidentityref.golden.yaml @@ -2,7 +2,7 @@ apiVersion: iam.cnrm.cloud.google.com/v1beta1 kind: IAMPolicyMember metadata: annotations: - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/iammemberreferences/sqlinstanceref/_generated_object_sqlinstanceref.golden.yaml b/pkg/test/resourcefixture/testdata/iammemberreferences/sqlinstanceref/_generated_object_sqlinstanceref.golden.yaml index 1cbc186da2..4cda840d67 100644 --- a/pkg/test/resourcefixture/testdata/iammemberreferences/sqlinstanceref/_generated_object_sqlinstanceref.golden.yaml +++ b/pkg/test/resourcefixture/testdata/iammemberreferences/sqlinstanceref/_generated_object_sqlinstanceref.golden.yaml @@ -2,7 +2,7 @@ apiVersion: iam.cnrm.cloud.google.com/v1beta1 kind: IAMPolicyMember metadata: annotations: - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/reconcileintervalannotations/bigquerydataset/_generated_object_bigquerydataset.golden.yaml b/pkg/test/resourcefixture/testdata/reconcileintervalannotations/bigquerydataset/_generated_object_bigquerydataset.golden.yaml index f7edb08c3a..e51bf29cb4 100644 --- a/pkg/test/resourcefixture/testdata/reconcileintervalannotations/bigquerydataset/_generated_object_bigquerydataset.golden.yaml +++ b/pkg/test/resourcefixture/testdata/reconcileintervalannotations/bigquerydataset/_generated_object_bigquerydataset.golden.yaml @@ -1,24 +1,10 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: bigquery.cnrm.cloud.google.com/v1beta1 kind: BigQueryDataset metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/reconcile-interval-in-seconds: "10" - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -28,17 +14,7 @@ metadata: name: bigquerydatasetsample${uniqueId} namespace: ${uniqueId} spec: - access: - - role: OWNER - specialGroup: projectOwners - - role: OWNER - userByEmail: user@google.com - - role: READER - specialGroup: projectReaders - - role: WRITER - specialGroup: projectWriters friendlyName: bigquerydataset-sample-updated - location: US projectRef: external: ${projectId} resourceID: bigquerydatasetsample${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/reconcileintervalannotations/pubsubschema/_generated_object_pubsubschema#01.golden.yaml b/pkg/test/resourcefixture/testdata/reconcileintervalannotations/pubsubschema/_generated_object_pubsubschema#01.golden.yaml index 395c2b1dcd..3539668469 100644 --- a/pkg/test/resourcefixture/testdata/reconcileintervalannotations/pubsubschema/_generated_object_pubsubschema#01.golden.yaml +++ b/pkg/test/resourcefixture/testdata/reconcileintervalannotations/pubsubschema/_generated_object_pubsubschema#01.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/reconcile-interval-in-seconds: "0" - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/reconcileintervalannotations/storagebucket/_generated_object_storagebucket#01.golden.yaml b/pkg/test/resourcefixture/testdata/reconcileintervalannotations/storagebucket/_generated_object_storagebucket#01.golden.yaml index afb60eec51..f10b18caad 100644 --- a/pkg/test/resourcefixture/testdata/reconcileintervalannotations/storagebucket/_generated_object_storagebucket#01.golden.yaml +++ b/pkg/test/resourcefixture/testdata/reconcileintervalannotations/storagebucket/_generated_object_storagebucket#01.golden.yaml @@ -5,7 +5,7 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/reconcile-interval-in-seconds: "10" - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/reconcileintervalannotations/storagebucket/_generated_object_storagebucket.golden.yaml b/pkg/test/resourcefixture/testdata/reconcileintervalannotations/storagebucket/_generated_object_storagebucket.golden.yaml index afb60eec51..82128f0790 100644 --- a/pkg/test/resourcefixture/testdata/reconcileintervalannotations/storagebucket/_generated_object_storagebucket.golden.yaml +++ b/pkg/test/resourcefixture/testdata/reconcileintervalannotations/storagebucket/_generated_object_storagebucket.golden.yaml @@ -5,22 +5,19 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} cnrm.cloud.google.com/reconcile-interval-in-seconds: "10" - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 3 labels: cnrm-test: "true" name: storagebucket-sample-${uniqueId} namespace: ${uniqueId} spec: + lifecycleRule: [] location: US - publicAccessPrevention: inherited resourceID: storagebucket-sample-${uniqueId} - softDeletePolicy: - retentionDurationSeconds: 604800 - storageClass: STANDARD versioning: enabled: true status: @@ -30,7 +27,7 @@ status: reason: UpToDate status: "True" type: Ready - observedGeneration: 4 + observedGeneration: 3 observedState: softDeletePolicy: effectiveTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/resourceid/referencewithuserspecifiedresourceid/_generated_object_referencewithuserspecifiedresourceid.golden.yaml b/pkg/test/resourcefixture/testdata/resourceid/referencewithuserspecifiedresourceid/_generated_object_referencewithuserspecifiedresourceid.golden.yaml index 8c86e519dc..0f09b7870c 100644 --- a/pkg/test/resourcefixture/testdata/resourceid/referencewithuserspecifiedresourceid/_generated_object_referencewithuserspecifiedresourceid.golden.yaml +++ b/pkg/test/resourcefixture/testdata/resourceid/referencewithuserspecifiedresourceid/_generated_object_referencewithuserspecifiedresourceid.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceid/_generated_object_userspecifiedresourceid.golden.yaml b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceid/_generated_object_userspecifiedresourceid.golden.yaml index 4107dad945..78a3f1328d 100644 --- a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceid/_generated_object_userspecifiedresourceid.golden.yaml +++ b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceid/_generated_object_userspecifiedresourceid.golden.yaml @@ -3,27 +3,17 @@ kind: BigQueryDataset metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 3 + generation: 2 labels: cnrm-test: "true" name: bigquerydataset-resourceid-${uniqueId} namespace: ${uniqueId} spec: - access: - - role: OWNER - specialGroup: projectOwners - - role: OWNER - userByEmail: user@google.com - - role: READER - specialGroup: projectReaders - - role: WRITER - specialGroup: projectWriters friendlyName: bigquerydataset-sample-updated - location: US projectRef: external: ${projectId} resourceID: bigquerydataset_${uniqueId} @@ -37,5 +27,5 @@ status: creationTime: "1970-01-01T00:00:00Z" etag: abcdef123456 lastModifiedTime: "1970-01-01T00:00:00Z" - observedGeneration: 3 + observedGeneration: 2 selfLink: https://bigquery.googleapis.com/bigquery/v2/projects/${projectId}/datasets/bigquerydataset_${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/_generated_object_userspecifiedresourceidandservergeneratedid.golden.yaml b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/_generated_object_userspecifiedresourceidandservergeneratedid.golden.yaml index 81ffc13f5b..dfe9405f99 100644 --- a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/_generated_object_userspecifiedresourceidandservergeneratedid.golden.yaml +++ b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/_generated_object_userspecifiedresourceidandservergeneratedid.golden.yaml @@ -3,7 +3,7 @@ kind: Project metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidfordcl/_generated_object_userspecifiedresourceidfordcl.golden.yaml b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidfordcl/_generated_object_userspecifiedresourceidfordcl.golden.yaml index 201b4aaa56..b434cba59a 100644 --- a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidfordcl/_generated_object_userspecifiedresourceidfordcl.golden.yaml +++ b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidfordcl/_generated_object_userspecifiedresourceidfordcl.golden.yaml @@ -4,7 +4,7 @@ metadata: annotations: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender diff --git a/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_generated_object_networkipcomputeinstance.golden.yaml b/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_generated_object_networkipcomputeinstance.golden.yaml index b980db6484..f941d5b78c 100644 --- a/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_generated_object_networkipcomputeinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_generated_object_networkipcomputeinstance.golden.yaml @@ -1,17 +1,3 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeInstance metadata: @@ -20,11 +6,11 @@ metadata: cnrm.cloud.google.com/management-conflict-prevention-policy: none cnrm.cloud.google.com/observed-secret-versions: (removed) cnrm.cloud.google.com/project-id: ${projectId} - cnrm.cloud.google.com/state-into-spec: merge + cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender - generation: 4 + generation: 2 labels: cnrm-test: "true" created-from: image-2 @@ -33,23 +19,18 @@ metadata: namespace: ${uniqueId} spec: bootDisk: - autoDelete: true initializeParams: sourceImageRef: external: debian-cloud/debian-11 - mode: READ_WRITE canIpForward: true machineType: n1-standard-1 networkInterface: - accessConfig: - networkTier: PREMIUM networkIp: 10.128.0.9 - subnetworkProject: ${projectId} subnetworkRef: name: default resourceID: computeinstance-${uniqueId} - scheduling: - automaticRestart: true zone: us-central1-a status: conditions: @@ -61,5 +42,5 @@ status: currentStatus: RUNNING instanceId: "1111111111111111" labelFingerprint: abcdef0123A= - observedGeneration: 4 + observedGeneration: 2 selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_http.log b/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_http.log index ab7b4ad260..2b7408f7c7 100644 --- a/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_http.log @@ -602,108 +602,6 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}/setLabels?alt=json&prettyPrint=false -Content-Type: application/json -User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager - -{ - "labelFingerprint": "abcdef0123A=", - "labels": { - "cnrm-test": "true", - "created-from": "image-2", - "managed-by-cnrm": "true", - "network-type": "subnetwork-2" - } -} - -200 OK -Cache-Control: private -Content-Type: application/json; charset=UTF-8 -Server: ESF -Vary: Origin -Vary: X-Origin -Vary: Referer -X-Content-Type-Options: nosniff -X-Frame-Options: SAMEORIGIN -X-Xss-Protection: 0 - -{ - "id": "000000000000000000000", - "insertTime": "2024-04-01T12:34:56.123456Z", - "kind": "compute#operation", - "name": "${operationID}", - "progress": 0, - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", - "startTime": "2024-04-01T12:34:56.123456Z", - "status": "DONE" -} - ---- - -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false -User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager - -200 OK -Cache-Control: private -Content-Type: application/json; charset=UTF-8 -Server: ESF -Vary: Origin -Vary: X-Origin -Vary: Referer -X-Content-Type-Options: nosniff -X-Frame-Options: SAMEORIGIN -X-Xss-Protection: 0 - -{ - "canIpForward": true, - "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "deletionProtection": false, - "disks": [ - { - "autoDelete": true, - "boot": true, - "initializeParams": { - "sourceImage": "projects/debian-cloud/global/images/family/debian-11" - }, - "mode": "READ_WRITE" - } - ], - "id": "000000000000000000000", - "kind": "compute#instance", - "labelFingerprint": "abcdef0123A=", - "labels": { - "cnrm-test": "true", - "created-from": "image-2", - "managed-by-cnrm": "true", - "network-type": "subnetwork-2" - }, - "machineType": "projects/${projectId}/zones/us-central1-a/machineTypes/n1-standard-1", - "metadata": {}, - "name": "computeinstance-${uniqueId}", - "networkInterfaces": [ - { - "accessConfigs": [ - { - "networkTier": "PREMIUM", - "type": "ONE_TO_ONE_NAT" - } - ], - "networkIP": "10.128.0.9", - "subnetwork": "projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}" - } - ], - "params": {}, - "scheduling": { - "automaticRestart": true - }, - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}", - "status": "RUNNING", - "tags": {}, - "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a" -} - ---- - DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager