diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingruletcp/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingruletcp/_http.log index fd2639a9b4..b2b788da03 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingruletcp/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingruletcp/_http.log @@ -125,7 +125,6 @@ X-Xss-Protection: 0 "name": "network-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", "routingConfig": { - "bgpBestPathSelectionMode": "LEGACY", "routingMode": "REGIONAL" }, "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/network-${uniqueId}", @@ -197,7 +196,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", @@ -230,7 +229,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 100, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", @@ -257,11 +256,10 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "allowSubnetCidrRoutesOverlap": false, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "enableFlowLogs": false, "fingerprint": "abcdef0123A=", - "gatewayAddress": "10.1.2.1", + "gatewayAddress": "10.2.0.1", "id": "000000000000000000000", "ipCidrRange": "10.1.2.0/24", "kind": "compute#subnetwork", @@ -269,11 +267,11 @@ X-Xss-Protection: 0 "enable": false }, "name": "subnetwork-${uniqueId}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/network-${uniqueId}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/network-${uniqueId}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "PRIVATE", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/subnetwork-${uniqueId}", "stackType": "IPV4_ONLY" } @@ -343,7 +341,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", @@ -376,7 +374,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 100, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", @@ -403,22 +401,22 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "allowSubnetCidrRoutesOverlap": false, "creationTimestamp": "2024-04-01T12:34:56.123456Z", + "enableFlowLogs": false, "fingerprint": "abcdef0123A=", - "gatewayAddress": "10.129.0.1", + "gatewayAddress": "10.2.0.1", "id": "000000000000000000000", "ipCidrRange": "10.129.0.0/23", "kind": "compute#subnetwork", "name": "proxyonlysubnetwork-${uniqueId}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/network-${uniqueId}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/network-${uniqueId}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "REGIONAL_MANAGED_PROXY", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "role": "ACTIVE", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/proxyonlysubnetwork-${uniqueId}", - "state": "READY" + "stackType": "IPV4_ONLY" } --- @@ -489,48 +487,10 @@ X-Xss-Protection: 0 "insertTime": "2024-04-01T12:34:56.123456Z", "kind": "compute#operation", "name": "${operationID}", - "operationType": "insert", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", - "startTime": "2024-04-01T12:34:56.123456Z", - "status": "RUNNING", - "targetId": "843940860366415529", - "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", - "user": "user@example.com" -} - ---- - -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}?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 - -{ - "endTime": "2024-04-01T12:34:56.123456Z", - "id": "000000000000000000000", - "insertTime": "2024-04-01T12:34:56.123456Z", - "kind": "compute#operation", - "name": "${operationID}", - "operationType": "insert", - "progress": 100, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", - "status": "DONE", - "targetId": "843940860366415529", - "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", - "user": "user@example.com" + "status": "DONE" } --- @@ -551,29 +511,22 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "affinityCookieTtlSec": 0, "connectionDraining": { "drainingTimeoutSec": 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "description": "", - "fingerprint": "abcdef0123A=", "iap": { "enabled": false, "oauth2ClientId": "", - "oauth2ClientSecretSha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + "oauth2ClientSecret": "" }, "id": "000000000000000000000", "kind": "compute#backendService", "loadBalancingScheme": "INTERNAL_MANAGED", "name": "computebackendservice-${uniqueId}", - "port": 80, - "portName": "http", "protocol": "TCP", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", - "sessionAffinity": "NONE", - "timeoutSec": 30 + "region": "projects/${projectId}/global/regions/us-central1", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}" } --- @@ -1542,29 +1495,22 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "affinityCookieTtlSec": 0, "connectionDraining": { "drainingTimeoutSec": 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "description": "", - "fingerprint": "abcdef0123A=", "iap": { "enabled": false, "oauth2ClientId": "", - "oauth2ClientSecretSha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + "oauth2ClientSecret": "" }, "id": "000000000000000000000", "kind": "compute#backendService", "loadBalancingScheme": "INTERNAL_MANAGED", "name": "computebackendservice-${uniqueId}", - "port": 80, - "portName": "http", "protocol": "TCP", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", - "sessionAffinity": "NONE", - "timeoutSec": 30 + "region": "projects/${projectId}/global/regions/us-central1", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}" } --- @@ -1589,48 +1535,10 @@ X-Xss-Protection: 0 "insertTime": "2024-04-01T12:34:56.123456Z", "kind": "compute#operation", "name": "${operationID}", - "operationType": "delete", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", - "startTime": "2024-04-01T12:34:56.123456Z", - "status": "RUNNING", - "targetId": "843940860366415529", - "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", - "user": "user@example.com" -} - ---- - -GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}?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 - -{ - "endTime": "2024-04-01T12:34:56.123456Z", - "id": "000000000000000000000", - "insertTime": "2024-04-01T12:34:56.123456Z", - "kind": "compute#operation", - "name": "${operationID}", - "operationType": "delete", - "progress": 100, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", - "status": "DONE", - "targetId": "843940860366415529", - "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", - "user": "user@example.com" + "status": "DONE" } --- @@ -1651,22 +1559,22 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "allowSubnetCidrRoutesOverlap": false, "creationTimestamp": "2024-04-01T12:34:56.123456Z", + "enableFlowLogs": false, "fingerprint": "abcdef0123A=", - "gatewayAddress": "10.129.0.1", + "gatewayAddress": "10.2.0.1", "id": "000000000000000000000", "ipCidrRange": "10.129.0.0/23", "kind": "compute#subnetwork", "name": "proxyonlysubnetwork-${uniqueId}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/network-${uniqueId}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/network-${uniqueId}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "REGIONAL_MANAGED_PROXY", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "role": "ACTIVE", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/proxyonlysubnetwork-${uniqueId}", - "state": "READY" + "stackType": "IPV4_ONLY" } --- @@ -1693,7 +1601,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", @@ -1726,7 +1634,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 100, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", @@ -1753,11 +1661,10 @@ X-Frame-Options: SAMEORIGIN X-Xss-Protection: 0 { - "allowSubnetCidrRoutesOverlap": false, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "enableFlowLogs": false, "fingerprint": "abcdef0123A=", - "gatewayAddress": "10.1.2.1", + "gatewayAddress": "10.2.0.1", "id": "000000000000000000000", "ipCidrRange": "10.1.2.0/24", "kind": "compute#subnetwork", @@ -1765,11 +1672,11 @@ X-Xss-Protection: 0 "enable": false }, "name": "subnetwork-${uniqueId}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/network-${uniqueId}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/network-${uniqueId}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "PRIVATE", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/subnetwork-${uniqueId}", "stackType": "IPV4_ONLY" } @@ -1798,7 +1705,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", @@ -1831,7 +1738,7 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 100, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", + "region": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1", "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE", @@ -1865,7 +1772,6 @@ X-Xss-Protection: 0 "name": "network-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", "routingConfig": { - "bgpBestPathSelectionMode": "LEGACY", "routingMode": "REGIONAL" }, "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/network-${uniqueId}", diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingruletcp/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingruletcp/dependencies.yaml index eb9e419ea0..df3d90ea97 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingruletcp/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingruletcp/dependencies.yaml @@ -59,7 +59,6 @@ kind: ComputeTargetTCPProxy metadata: annotations: cnrm.cloud.google.com/project-id: ${projectId} - alpha.cnrm.cloud.google.com/reconciler: "direct" name: computetargettcpproxy-${uniqueId} spec: description: "test description" @@ -73,7 +72,6 @@ kind: ComputeTargetTCPProxy metadata: annotations: cnrm.cloud.google.com/project-id: ${projectId} - alpha.cnrm.cloud.google.com/reconciler: "direct" name: computetargettcpproxy2-${uniqueId} spec: description: "other test description"