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 65a23831fd..2be4d71488 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 @@ -2,12 +2,12 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: annotations: + alpha.cnrm.cloud.google.com/reconciler: direct cnrm.cloud.google.com/management-conflict-prevention-policy: none - 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: alloydbinstance-${uniqueId} @@ -22,7 +22,6 @@ spec: name: alloydbcluster-${uniqueId} machineConfig: cpuCount: 2 - resourceID: alloydbinstance-${uniqueId} status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" @@ -31,9 +30,10 @@ status: status: "True" type: Ready createTime: "1970-01-01T00:00:00Z" + externalRef: //alloydb.googleapis.com/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId} ipAddress: 10.1.2.3 name: projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId} - observedGeneration: 3 + observedGeneration: 2 state: READY uid: "12345678" updateTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_http.log index b9512c4b94..e93ba4ee4c 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/_http.log @@ -765,9 +765,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-${uniqueId}%2Finstances%2Falloydbinstance-${uniqueId} 404 Not Found Cache-Control: private @@ -790,13 +791,14 @@ X-Xss-Protection: 0 --- -POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances?alt=json&instanceId=alloydbinstance-${uniqueId} +POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances?%24alt=json%3Benum-encoding%3Dint&instanceId=alloydbinstance-${uniqueId} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: parent=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-${uniqueId} { - "availabilityType": "REGIONAL", - "instanceType": "PRIMARY", + "availabilityType": 2, + "instanceType": 1, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -832,9 +834,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -913,9 +916,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-${uniqueId}%2Finstances%2Falloydbinstance-${uniqueId} 200 OK Cache-Control: private @@ -929,15 +933,15 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "REGIONAL", + "availabilityType": 2, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", "geminiConfig": {}, - "instanceType": "PRIMARY", + "instanceType": 1, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -970,7 +974,7 @@ X-Xss-Protection: 0 "recordClientAddress": false }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -980,22 +984,26 @@ X-Xss-Protection: 0 --- -PATCH https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?alt=json&updateMask=databaseFlags +PATCH https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?%24alt=json%3Benum-encoding%3Dint&updateMask=databaseFlags Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: instance.name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-${uniqueId}%2Finstances%2Falloydbinstance-${uniqueId} { - "availabilityType": "REGIONAL", + "availabilityType": 2, "databaseFlags": { "enable_google_adaptive_autovacuum": "off" }, + "instanceType": 1, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" }, "machineConfig": { "cpuCount": 2 - } + }, + "name": "projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}", + "reconciling": false } 200 OK @@ -1024,9 +1032,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -1108,9 +1117,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-${uniqueId}%2Finstances%2Falloydbinstance-${uniqueId} 200 OK Cache-Control: private @@ -1124,10 +1134,10 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "REGIONAL", + "availabilityType": 2, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", @@ -1135,7 +1145,7 @@ X-Xss-Protection: 0 "enable_google_adaptive_autovacuum": "off" }, "geminiConfig": {}, - "instanceType": "PRIMARY", + "instanceType": 1, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1168,7 +1178,7 @@ X-Xss-Protection: 0 "recordClientAddress": false }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -1178,9 +1188,10 @@ X-Xss-Protection: 0 --- -DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?alt=json +DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-${uniqueId}%2Finstances%2Falloydbinstance-${uniqueId} 200 OK Cache-Control: private @@ -1208,9 +1219,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Foperations%2F${operationID} 200 OK Cache-Control: private diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/create.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/create.yaml index 58ac921991..1cf1fb431b 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/create.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-${uniqueId} spec: clusterRef: diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/update.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/update.yaml index b10deea72c..86c1db0d97 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbinstance/update.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-${uniqueId} spec: clusterRef: diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/_generated_object_basicsecondaryalloydbinstance.golden.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/_generated_object_basicsecondaryalloydbinstance.golden.yaml index a10071e611..76483d572d 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/_generated_object_basicsecondaryalloydbinstance.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/_generated_object_basicsecondaryalloydbinstance.golden.yaml @@ -2,12 +2,12 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: annotations: + alpha.cnrm.cloud.google.com/reconciler: direct cnrm.cloud.google.com/management-conflict-prevention-policy: none - 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: alloydbinstance-2-${uniqueId} @@ -22,7 +22,6 @@ spec: name: alloydbcluster-2-${uniqueId} machineConfig: cpuCount: 2 - resourceID: alloydbinstance-2-${uniqueId} status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" @@ -31,9 +30,10 @@ status: status: "True" type: Ready createTime: "1970-01-01T00:00:00Z" + externalRef: //alloydb.googleapis.com/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId} ipAddress: 10.1.2.3 name: projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId} - observedGeneration: 3 + observedGeneration: 2 state: READY uid: "12345678" updateTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/_http.log index 8d4ee52c5e..72c0ce0b95 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/_http.log @@ -765,9 +765,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances/alloydbinstance-1-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances/alloydbinstance-1-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-1-${uniqueId}%2Finstances%2Falloydbinstance-1-${uniqueId} 404 Not Found Cache-Control: private @@ -790,13 +791,14 @@ X-Xss-Protection: 0 --- -POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances?alt=json&instanceId=alloydbinstance-1-${uniqueId} +POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances?%24alt=json%3Benum-encoding%3Dint&instanceId=alloydbinstance-1-${uniqueId} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: parent=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-1-${uniqueId} { - "availabilityType": "REGIONAL", - "instanceType": "PRIMARY", + "availabilityType": 2, + "instanceType": 1, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -832,9 +834,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -913,73 +916,6 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances/alloydbinstance-1-${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 - -{ - "availabilityType": "REGIONAL", - "clientConnectionConfig": { - "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" - } - }, - "createTime": "2024-04-01T12:34:56.123456Z", - "geminiConfig": {}, - "instanceType": "PRIMARY", - "ipAddress": "10.1.2.3", - "labels": { - "cnrm-test": "true", - "managed-by-cnrm": "true" - }, - "machineConfig": { - "cpuCount": 2 - }, - "name": "projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances/alloydbinstance-1-${uniqueId}", - "nodes": [ - { - "zoneId": "europe-west1-c" - } - ], - "observabilityConfig": { - "enabled": false, - "maxQueryStringLength": 10240, - "preserveComments": false, - "queryPlansPerMinute": 20, - "recordApplicationTags": false, - "trackActiveQueries": false, - "trackClientAddress": false, - "trackWaitEventTypes": true, - "trackWaitEvents": true - }, - "queryInsightsConfig": { - "queryPlansPerMinute": 5, - "queryStringLength": 1024, - "recordApplicationTags": false, - "recordClientAddress": false - }, - "reconciling": false, - "state": "READY", - "uid": "111111111111111111111", - "updateTime": "2024-04-01T12:34:56.123456Z", - "writableNode": { - "zoneId": "europe-west1-b" - } -} - ---- - GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${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 @@ -1237,9 +1173,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west2%2Fclusters%2Falloydbcluster-2-${uniqueId}%2Finstances%2Falloydbinstance-2-${uniqueId} 404 Not Found Cache-Control: private @@ -1262,13 +1199,14 @@ X-Xss-Protection: 0 --- -POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances:createsecondary?alt=json&instanceId=alloydbinstance-2-${uniqueId} +POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances:createsecondary?%24alt=json%3Benum-encoding%3Dint&instanceId=alloydbinstance-2-${uniqueId} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: parent=projects%2F${projectId}%2Flocations%2Feurope-west2%2Fclusters%2Falloydbcluster-2-${uniqueId} { - "availabilityType": "REGIONAL", - "instanceType": "SECONDARY", + "availabilityType": 2, + "instanceType": 3, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1304,9 +1242,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west2%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -1385,9 +1324,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west2%2Fclusters%2Falloydbcluster-2-${uniqueId}%2Finstances%2Falloydbinstance-2-${uniqueId} 200 OK Cache-Control: private @@ -1401,15 +1341,15 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "REGIONAL", + "availabilityType": 2, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", "geminiConfig": {}, - "instanceType": "SECONDARY", + "instanceType": 3, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1442,7 +1382,7 @@ X-Xss-Protection: 0 "recordClientAddress": true }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -1452,22 +1392,26 @@ X-Xss-Protection: 0 --- -PATCH https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}?alt=json&updateMask=databaseFlags +PATCH https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}?%24alt=json%3Benum-encoding%3Dint&updateMask=databaseFlags Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: instance.name=projects%2F${projectId}%2Flocations%2Feurope-west2%2Fclusters%2Falloydbcluster-2-${uniqueId}%2Finstances%2Falloydbinstance-2-${uniqueId} { - "availabilityType": "REGIONAL", + "availabilityType": 2, "databaseFlags": { "enable_google_adaptive_autovacuum": "off" }, + "instanceType": 3, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" }, "machineConfig": { "cpuCount": 2 - } + }, + "name": "projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}", + "reconciling": false } 200 OK @@ -1496,9 +1440,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west2%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -1580,9 +1525,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west2/clusters/alloydbcluster-2-${uniqueId}/instances/alloydbinstance-2-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west2%2Fclusters%2Falloydbcluster-2-${uniqueId}%2Finstances%2Falloydbinstance-2-${uniqueId} 200 OK Cache-Control: private @@ -1596,10 +1542,10 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "REGIONAL", + "availabilityType": 2, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", @@ -1607,7 +1553,7 @@ X-Xss-Protection: 0 "enable_google_adaptive_autovacuum": "off" }, "geminiConfig": {}, - "instanceType": "SECONDARY", + "instanceType": 3, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1640,7 +1586,7 @@ X-Xss-Protection: 0 "recordClientAddress": true }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -1801,9 +1747,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances/alloydbinstance-1-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances/alloydbinstance-1-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-1-${uniqueId}%2Finstances%2Falloydbinstance-1-${uniqueId} 200 OK Cache-Control: private @@ -1817,15 +1764,15 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "REGIONAL", + "availabilityType": 2, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", "geminiConfig": {}, - "instanceType": "PRIMARY", + "instanceType": 1, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1858,7 +1805,7 @@ X-Xss-Protection: 0 "recordClientAddress": false }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -1868,9 +1815,10 @@ X-Xss-Protection: 0 --- -DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances/alloydbinstance-1-${uniqueId}?alt=json +DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/clusters/alloydbcluster-1-${uniqueId}/instances/alloydbinstance-1-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Fclusters%2Falloydbcluster-1-${uniqueId}%2Finstances%2Falloydbinstance-1-${uniqueId} 200 OK Cache-Control: private @@ -1898,9 +1846,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-west1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-west1%2Foperations%2F${operationID} 200 OK Cache-Control: private diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/create.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/create.yaml index 990e2d6ccc..1a262980f2 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/create.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-2-${uniqueId} spec: clusterRef: diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/dependencies.yaml index 443264d684..fd380fbf78 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/dependencies.yaml @@ -60,6 +60,8 @@ spec: apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-1-${uniqueId} spec: clusterRef: diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/update.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/update.yaml index 8770370057..04fa87f64c 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicsecondaryalloydbinstance/update.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-2-${uniqueId} spec: clusterRef: 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 4c5f65c319..9f324e9ede 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 @@ -2,8 +2,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: annotations: + alpha.cnrm.cloud.google.com/reconciler: direct cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -35,6 +35,7 @@ status: status: "True" type: Ready createTime: "1970-01-01T00:00:00Z" + externalRef: //alloydb.googleapis.com/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId} ipAddress: 10.1.2.3 name: projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId} observedGeneration: 2 diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_http.log index 6283f9e279..f3c04a6cb7 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/_http.log @@ -763,9 +763,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-north1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbinstance${uniqueId} 404 Not Found Cache-Control: private @@ -788,15 +789,16 @@ X-Xss-Protection: 0 --- -POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances?alt=json&instanceId=alloydbinstance${uniqueId} +POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances?%24alt=json%3Benum-encoding%3Dint&instanceId=alloydbinstance${uniqueId} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: parent=projects%2F${projectId}%2Flocations%2Feurope-north1%2Fclusters%2Falloydbcluster${uniqueId} { "databaseFlags": { "password.enforce_complexity": "on" }, - "instanceType": "PRIMARY", + "instanceType": 1, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -844,9 +846,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-north1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -945,9 +948,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-north1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbinstance${uniqueId} 200 OK Cache-Control: private @@ -961,10 +965,10 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "REGIONAL", + "availabilityType": 2, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", @@ -972,7 +976,7 @@ X-Xss-Protection: 0 "password.enforce_complexity": "on" }, "geminiConfig": {}, - "instanceType": "PRIMARY", + "instanceType": 1, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1022,7 +1026,7 @@ X-Xss-Protection: 0 "recordClientAddress": false }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -1032,16 +1036,17 @@ X-Xss-Protection: 0 --- -PATCH https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json&updateMask=databaseFlags%2CmachineConfig%2CnetworkConfig +PATCH https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint&updateMask=databaseFlags%2CmachineConfig.cpuCount%2CnetworkConfig.enablePublicIp%2CnetworkConfig.enableOutboundPublicIp%2CnetworkConfig.authorizedExternalNetworks Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: instance.name=projects%2F${projectId}%2Flocations%2Feurope-north1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbinstance${uniqueId} { - "availabilityType": "REGIONAL", "databaseFlags": { "enable_google_adaptive_autovacuum": "off", "password.enforce_complexity": "on" }, + "instanceType": 1, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1049,7 +1054,9 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "machineConfig": { "cpuCount": 4 }, - "networkConfig": {} + "name": "projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}", + "networkConfig": {}, + "reconciling": false } 200 OK @@ -1078,9 +1085,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-north1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -1169,9 +1177,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-north1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbinstance${uniqueId} 200 OK Cache-Control: private @@ -1185,10 +1194,10 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "REGIONAL", + "availabilityType": 2, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", @@ -1197,7 +1206,7 @@ X-Xss-Protection: 0 "password.enforce_complexity": "on" }, "geminiConfig": {}, - "instanceType": "PRIMARY", + "instanceType": 1, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1236,7 +1245,7 @@ X-Xss-Protection: 0 "recordClientAddress": false }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -1246,9 +1255,10 @@ X-Xss-Protection: 0 --- -DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json +DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-north1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbinstance${uniqueId} 200 OK Cache-Control: private @@ -1276,9 +1286,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-north1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-north1%2Foperations%2F${operationID} 200 OK Cache-Control: private diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/create.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/create.yaml index eb81f02bb2..72126db5f7 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/create.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-${uniqueId} spec: clusterRef: diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/update.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/update.yaml index d03d6b7633..5dc20ba559 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/fullalloydbinstance/update.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-${uniqueId} spec: clusterRef: 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 f6fb733209..66b3dd5bc2 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 @@ -2,8 +2,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: annotations: + alpha.cnrm.cloud.google.com/reconciler: direct cnrm.cloud.google.com/management-conflict-prevention-policy: none - cnrm.cloud.google.com/state-into-spec: absent finalizers: - cnrm.cloud.google.com/finalizer - cnrm.cloud.google.com/deletion-defender @@ -30,6 +30,7 @@ status: status: "True" type: Ready createTime: "1970-01-01T00:00:00Z" + externalRef: //alloydb.googleapis.com/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId} ipAddress: 10.1.2.3 name: projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId} observedGeneration: 2 diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_http.log index 274b115aa7..8950ae6347 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/_http.log @@ -805,9 +805,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbinstance${uniqueId} 404 Not Found Cache-Control: private @@ -830,12 +831,13 @@ X-Xss-Protection: 0 --- -POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances?alt=json&instanceId=alloydbinstance${uniqueId} +POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances?%24alt=json%3Benum-encoding%3Dint&instanceId=alloydbinstance${uniqueId} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: parent=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId} { - "instanceType": "PRIMARY", + "instanceType": 1, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -871,9 +873,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -952,76 +955,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint 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 - -{ - "availabilityType": "REGIONAL", - "clientConnectionConfig": { - "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" - } - }, - "createTime": "2024-04-01T12:34:56.123456Z", - "geminiConfig": {}, - "instanceType": "PRIMARY", - "ipAddress": "10.1.2.3", - "labels": { - "cnrm-test": "true", - "managed-by-cnrm": "true" - }, - "machineConfig": { - "cpuCount": 2 - }, - "name": "projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}", - "nodes": [ - { - "zoneId": "europe-southwest1-c" - } - ], - "observabilityConfig": { - "enabled": false, - "maxQueryStringLength": 10240, - "preserveComments": false, - "queryPlansPerMinute": 20, - "recordApplicationTags": false, - "trackActiveQueries": false, - "trackClientAddress": false, - "trackWaitEventTypes": true, - "trackWaitEvents": true - }, - "queryInsightsConfig": { - "queryPlansPerMinute": 5, - "queryStringLength": 1024, - "recordApplicationTags": false, - "recordClientAddress": false - }, - "reconciling": false, - "state": "READY", - "uid": "111111111111111111111", - "updateTime": "2024-04-01T12:34:56.123456Z", - "writableNode": { - "zoneId": "europe-southwest1-b" - } -} - ---- - -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${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 +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbreadinstance${uniqueId} 404 Not Found Cache-Control: private @@ -1044,12 +981,13 @@ X-Xss-Protection: 0 --- -POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances?alt=json&instanceId=alloydbreadinstance${uniqueId} +POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances?%24alt=json%3Benum-encoding%3Dint&instanceId=alloydbreadinstance${uniqueId} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: parent=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId} { - "instanceType": "READ_POOL", + "instanceType": 2, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1088,9 +1026,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -1163,9 +1102,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbreadinstance${uniqueId} 200 OK Cache-Control: private @@ -1181,12 +1121,12 @@ X-Xss-Protection: 0 { "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", "geminiConfig": {}, - "instanceType": "READ_POOL", + "instanceType": 2, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1217,18 +1157,20 @@ X-Xss-Protection: 0 "nodeCount": 1 }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z" } --- -PATCH https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?alt=json&updateMask=readPoolConfig +PATCH https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint&updateMask=readPoolConfig.nodeCount Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: instance.name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbreadinstance${uniqueId} { + "instanceType": 2, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1236,9 +1178,11 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "machineConfig": { "cpuCount": 2 }, + "name": "projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}", "readPoolConfig": { "nodeCount": 3 - } + }, + "reconciling": false } 200 OK @@ -1267,9 +1211,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -1342,9 +1287,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbreadinstance${uniqueId} 200 OK Cache-Control: private @@ -1360,12 +1306,12 @@ X-Xss-Protection: 0 { "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", "geminiConfig": {}, - "instanceType": "READ_POOL", + "instanceType": 2, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1396,16 +1342,17 @@ X-Xss-Protection: 0 "nodeCount": 3 }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z" } --- -DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?alt=json +DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbreadinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbreadinstance${uniqueId} 200 OK Cache-Control: private @@ -1433,9 +1380,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -1467,9 +1415,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbinstance${uniqueId} 200 OK Cache-Control: private @@ -1483,15 +1432,15 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "REGIONAL", + "availabilityType": 2, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", "geminiConfig": {}, - "instanceType": "PRIMARY", + "instanceType": 1, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -1524,7 +1473,7 @@ X-Xss-Protection: 0 "recordClientAddress": false }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -1534,9 +1483,10 @@ X-Xss-Protection: 0 --- -DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?alt=json +DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/clusters/alloydbcluster${uniqueId}/instances/alloydbinstance${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Fclusters%2Falloydbcluster${uniqueId}%2Finstances%2Falloydbinstance${uniqueId} 200 OK Cache-Control: private @@ -1564,9 +1514,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-southwest1/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-southwest1%2Foperations%2F${operationID} 200 OK Cache-Control: private diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/create.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/create.yaml index 5a2d0b84c9..19f42508ad 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/create.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbreadinstance-${uniqueId} spec: clusterRef: diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/dependencies.yaml index f2fb81f7cb..f1497fe34b 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/dependencies.yaml @@ -70,6 +70,8 @@ spec: apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-${uniqueId} spec: clusterRef: diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/update.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/update.yaml index 4b1d5e48d2..0e8c60e320 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/readalloydbinstance/update.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbreadinstance-${uniqueId} spec: clusterRef: 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 07bcb87c5a..7e77bd8fe7 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 @@ -2,12 +2,12 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: annotations: + alpha.cnrm.cloud.google.com/reconciler: direct cnrm.cloud.google.com/management-conflict-prevention-policy: none - 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: alloydbinstance-${uniqueId} @@ -20,7 +20,6 @@ spec: name: alloydbcluster-${uniqueId} machineConfig: cpuCount: 2 - resourceID: alloydbinstance-${uniqueId} status: conditions: - lastTransitionTime: "1970-01-01T00:00:00Z" @@ -29,9 +28,10 @@ status: status: "True" type: Ready createTime: "1970-01-01T00:00:00Z" + externalRef: //alloydb.googleapis.com/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId} ipAddress: 10.1.2.3 name: projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId} - observedGeneration: 2 + observedGeneration: 1 state: READY uid: "12345678" updateTime: "1970-01-01T00:00:00Z" diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/_http.log index 8e1e853d39..306587c0c2 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/_http.log @@ -765,9 +765,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-central2%2Fclusters%2Falloydbcluster-${uniqueId}%2Finstances%2Falloydbinstance-${uniqueId} 404 Not Found Cache-Control: private @@ -790,13 +791,14 @@ X-Xss-Protection: 0 --- -POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances?alt=json&instanceId=alloydbinstance-${uniqueId} +POST https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances?%24alt=json%3Benum-encoding%3Dint&instanceId=alloydbinstance-${uniqueId} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: parent=projects%2F${projectId}%2Flocations%2Feurope-central2%2Fclusters%2Falloydbcluster-${uniqueId} { - "availabilityType": "ZONAL", - "instanceType": "PRIMARY", + "availabilityType": 1, + "instanceType": 1, "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -832,9 +834,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-central2%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -908,9 +911,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-central2%2Fclusters%2Falloydbcluster-${uniqueId}%2Finstances%2Falloydbinstance-${uniqueId} 200 OK Cache-Control: private @@ -924,15 +928,15 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "availabilityType": "ZONAL", + "availabilityType": 1, "clientConnectionConfig": { "sslConfig": { - "sslMode": "ENCRYPTED_ONLY" + "sslMode": 5 } }, "createTime": "2024-04-01T12:34:56.123456Z", "geminiConfig": {}, - "instanceType": "PRIMARY", + "instanceType": 1, "ipAddress": "10.1.2.3", "labels": { "cnrm-test": "true", @@ -960,7 +964,7 @@ X-Xss-Protection: 0 "recordClientAddress": false }, "reconciling": false, - "state": "READY", + "state": 1, "uid": "111111111111111111111", "updateTime": "2024-04-01T12:34:56.123456Z", "writableNode": { @@ -970,9 +974,10 @@ X-Xss-Protection: 0 --- -DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?alt=json +DELETE https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/clusters/alloydbcluster-${uniqueId}/instances/alloydbinstance-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-central2%2Fclusters%2Falloydbcluster-${uniqueId}%2Finstances%2Falloydbinstance-${uniqueId} 200 OK Cache-Control: private @@ -1000,9 +1005,10 @@ X-Xss-Protection: 0 --- -GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/operations/${operationID}?alt=json +GET https://alloydb.googleapis.com/v1beta/projects/${projectId}/locations/europe-central2/operations/${operationID} Content-Type: application/json -User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager +User-Agent: kcc/controller-manager +x-goog-request-params: name=projects%2F${projectId}%2Flocations%2Feurope-central2%2Foperations%2F${operationID} 200 OK Cache-Control: private diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/create.yaml b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/create.yaml index 0289df586d..a2d7a6d379 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/zonalalloydbinstance/create.yaml @@ -15,6 +15,8 @@ apiVersion: alloydb.cnrm.cloud.google.com/v1beta1 kind: AlloyDBInstance metadata: + annotations: + alpha.cnrm.cloud.google.com/reconciler: "direct" name: alloydbinstance-${uniqueId} spec: clusterRef: