diff --git a/mockgcp/mockcompute/disksv1.go b/mockgcp/mockcompute/disksv1.go index fa9f5645c3..c41b86f2cf 100644 --- a/mockgcp/mockcompute/disksv1.go +++ b/mockgcp/mockcompute/disksv1.go @@ -61,7 +61,7 @@ func (s *DisksV1) Insert(ctx context.Context, req *pb.InsertDiskRequest) (*pb.Op id := s.generateID() obj := proto.Clone(req.GetDiskResource()).(*pb.Disk) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#disk") diff --git a/mockgcp/mockcompute/globaladdress.go b/mockgcp/mockcompute/globaladdress.go index 4e2a56739a..ecceffa507 100644 --- a/mockgcp/mockcompute/globaladdress.go +++ b/mockgcp/mockcompute/globaladdress.go @@ -60,11 +60,12 @@ func (s *GlobalAddressesV1) Insert(ctx context.Context, req *pb.InsertGlobalAddr id := s.generateID() obj := proto.Clone(req.GetAddressResource()).(*pb.Address) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#address") obj.Address = PtrTo("8.8.8.8") + obj.LabelFingerprint = PtrTo("abcdef0123A=") if err := s.storage.Create(ctx, fqn, obj); err != nil { return nil, err @@ -119,7 +120,7 @@ type globalAddressName struct { } func (n *globalAddressName) String() string { - return "projects/" + n.Project.ID + "/global" + "/networks/" + n.Name + return "projects/" + n.Project.ID + "/global" + "/addresses/" + n.Name } // parseGlobalAddressName parses a string into a globalAddressName. diff --git a/mockgcp/mockcompute/globalbackendservicesv1.go b/mockgcp/mockcompute/globalbackendservicesv1.go index 2b04407e9b..c080ef4aeb 100644 --- a/mockgcp/mockcompute/globalbackendservicesv1.go +++ b/mockgcp/mockcompute/globalbackendservicesv1.go @@ -59,7 +59,7 @@ func (s *GlobalBackendServicesV1) Insert(ctx context.Context, req *pb.InsertBack id := s.generateID() obj := proto.Clone(req.GetBackendServiceResource()).(*pb.BackendService) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#backendService") diff --git a/mockgcp/mockcompute/globalforwardingrulesv1.go b/mockgcp/mockcompute/globalforwardingrulesv1.go index 65ea0067c8..a1f1e9c52e 100644 --- a/mockgcp/mockcompute/globalforwardingrulesv1.go +++ b/mockgcp/mockcompute/globalforwardingrulesv1.go @@ -59,10 +59,11 @@ func (s *GlobalForwardingRulesV1) Insert(ctx context.Context, req *pb.InsertGlob id := s.generateID() obj := proto.Clone(req.GetForwardingRuleResource()).(*pb.ForwardingRule) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#forwardingRule") + obj.LabelFingerprint = PtrTo("abcdef0123A=") if err := s.storage.Create(ctx, fqn, obj); err != nil { return nil, err diff --git a/mockgcp/mockcompute/globalhealthcheckv1.go b/mockgcp/mockcompute/globalhealthcheckv1.go index f19a55db36..4e610aa87e 100644 --- a/mockgcp/mockcompute/globalhealthcheckv1.go +++ b/mockgcp/mockcompute/globalhealthcheckv1.go @@ -55,7 +55,7 @@ func (s *GlobalHealthCheckV1) Insert(ctx context.Context, req *pb.InsertHealthCh id := s.generateID() obj := proto.Clone(req.GetHealthCheckResource()).(*pb.HealthCheck) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#healthCheck") diff --git a/mockgcp/mockcompute/globalsslcertificatesv1.go b/mockgcp/mockcompute/globalsslcertificatesv1.go index 0aa74b8b25..b42bff7103 100644 --- a/mockgcp/mockcompute/globalsslcertificatesv1.go +++ b/mockgcp/mockcompute/globalsslcertificatesv1.go @@ -61,7 +61,7 @@ func (s *GlobalSSLCertificatesV1) Insert(ctx context.Context, req *pb.InsertSslC id := s.generateID() obj := proto.Clone(req.GetSslCertificateResource()).(*pb.SslCertificate) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#sslCertificate") diff --git a/mockgcp/mockcompute/globaltargethttpproxiesv1.go b/mockgcp/mockcompute/globaltargethttpproxiesv1.go index 0f32a5ec50..6ca3120deb 100644 --- a/mockgcp/mockcompute/globaltargethttpproxiesv1.go +++ b/mockgcp/mockcompute/globaltargethttpproxiesv1.go @@ -59,7 +59,7 @@ func (s *GlobalTargetHTTPProxiesV1) Insert(ctx context.Context, req *pb.InsertTa id := s.generateID() obj := proto.Clone(req.GetTargetHttpProxyResource()).(*pb.TargetHttpProxy) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#targetHttpProxy") diff --git a/mockgcp/mockcompute/globalurlmapsv1.go b/mockgcp/mockcompute/globalurlmapsv1.go index b4756db9d6..7df42a873c 100644 --- a/mockgcp/mockcompute/globalurlmapsv1.go +++ b/mockgcp/mockcompute/globalurlmapsv1.go @@ -59,7 +59,7 @@ func (s *GlobalURLMapsV1) Insert(ctx context.Context, req *pb.InsertUrlMapReques id := s.generateID() obj := proto.Clone(req.GetUrlMapResource()).(*pb.UrlMap) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#urlMap") diff --git a/mockgcp/mockcompute/imagesv1.go b/mockgcp/mockcompute/imagesv1.go index f5ac798baf..22a049c8d7 100644 --- a/mockgcp/mockcompute/imagesv1.go +++ b/mockgcp/mockcompute/imagesv1.go @@ -75,7 +75,7 @@ func (s *ImagesV1) Insert(ctx context.Context, req *pb.InsertImageRequest) (*pb. id := s.generateID() obj := proto.Clone(req.GetImageResource()).(*pb.Image) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#image") diff --git a/mockgcp/mockcompute/instancesv1.go b/mockgcp/mockcompute/instancesv1.go index fa773232ea..fdf3608429 100644 --- a/mockgcp/mockcompute/instancesv1.go +++ b/mockgcp/mockcompute/instancesv1.go @@ -60,7 +60,7 @@ func (s *InstancesV1) Insert(ctx context.Context, req *pb.InsertInstanceRequest) id := s.generateID() obj := proto.Clone(req.GetInstanceResource()).(*pb.Instance) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#instance") diff --git a/mockgcp/mockcompute/networksv1.go b/mockgcp/mockcompute/networksv1.go index 890e2e2a8f..cbdbd4f8ef 100644 --- a/mockgcp/mockcompute/networksv1.go +++ b/mockgcp/mockcompute/networksv1.go @@ -65,8 +65,8 @@ func (s *NetworksV1) Insert(ctx context.Context, req *pb.InsertNetworkRequest) ( obj := proto.Clone(req.GetNetworkResource()).(*pb.Network) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id - obj.SelfLink = PtrTo("https://www.googleapis.com/compute/beta/" + name.String()) - obj.SelfLinkWithId = PtrTo(fmt.Sprintf("https://www.googleapis.com/compute/beta/projects/%s/global/networks/%d", name.Project.ID, id)) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) + obj.SelfLinkWithId = PtrTo(fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%d", name.Project.ID, id)) obj.Kind = PtrTo("compute#network") if err := s.storage.Create(ctx, fqn, obj); err != nil { diff --git a/mockgcp/mockcompute/nodegroupsv1.go b/mockgcp/mockcompute/nodegroupsv1.go index e08632b756..2c356f40f8 100644 --- a/mockgcp/mockcompute/nodegroupsv1.go +++ b/mockgcp/mockcompute/nodegroupsv1.go @@ -55,7 +55,7 @@ func (s *NodeGroupsV1) Insert(ctx context.Context, req *pb.InsertNodeGroupReques id := s.generateID() obj := proto.Clone(req.GetNodeGroupResource()).(*pb.NodeGroup) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#nodegroup") diff --git a/mockgcp/mockcompute/nodetemplatesv1.go b/mockgcp/mockcompute/nodetemplatesv1.go index 050ce1ca1c..bd2e94ba29 100644 --- a/mockgcp/mockcompute/nodetemplatesv1.go +++ b/mockgcp/mockcompute/nodetemplatesv1.go @@ -54,7 +54,7 @@ func (s *NodeTemplatesV1) Insert(ctx context.Context, req *pb.InsertNodeTemplate id := s.generateID() obj := proto.Clone(req.GetNodeTemplateResource()).(*pb.NodeTemplate) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#nodetemplate") diff --git a/mockgcp/mockcompute/operations.go b/mockgcp/mockcompute/operations.go index cce3942be9..fd3b1ec4e8 100644 --- a/mockgcp/mockcompute/operations.go +++ b/mockgcp/mockcompute/operations.go @@ -66,7 +66,7 @@ func (s *computeOperations) newLRO(ctx context.Context, projectID string) (*pb.O op.Name = PtrTo(name) op.Kind = PtrTo("compute#operation") fqn := s.globalOperationFQN(projectID, name) - op.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + fqn) + op.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + fqn) op.Status = PtrTo(pb.Operation_DONE) @@ -94,7 +94,7 @@ func (s *computeOperations) startLRO0(ctx context.Context, op *pb.Operation, fqn op.Progress = PtrTo(int32(0)) op.Kind = PtrTo("compute#operation") - op.SelfLink = PtrTo("https://www.googleapis.com/compute/beta/" + fqn) + op.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + fqn) op.Status = PtrTo(pb.Operation_RUNNING) @@ -138,7 +138,7 @@ func (s *computeOperations) startRegionalLRO(ctx context.Context, projectID stri fqn := s.regionalOperationFQN(projectID, region, name) op.Name = PtrTo(name) - op.Region = PtrTo(fmt.Sprintf("https://www.googleapis.com/compute/beta/projects/%s/regions/%s", projectID, region)) + op.Region = PtrTo(fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s", projectID, region)) return s.startLRO0(ctx, op, fqn, callback) } diff --git a/mockgcp/mockcompute/regionaladdress.go b/mockgcp/mockcompute/regionaladdress.go index 0f8f2e4059..367dfb7889 100644 --- a/mockgcp/mockcompute/regionaladdress.go +++ b/mockgcp/mockcompute/regionaladdress.go @@ -60,7 +60,7 @@ func (s *RegionalAddressesV1) Insert(ctx context.Context, req *pb.InsertAddressR id := s.generateID() obj := proto.Clone(req.GetAddressResource()).(*pb.Address) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#address") diff --git a/mockgcp/mockcompute/regionalbackendservicev1.go b/mockgcp/mockcompute/regionalbackendservicev1.go index 435a4b23dc..1f8b48bc89 100644 --- a/mockgcp/mockcompute/regionalbackendservicev1.go +++ b/mockgcp/mockcompute/regionalbackendservicev1.go @@ -59,7 +59,7 @@ func (s *RegionalBackendServicesV1) Insert(ctx context.Context, req *pb.InsertRe id := s.generateID() obj := proto.Clone(req.GetBackendServiceResource()).(*pb.BackendService) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#backendService") diff --git a/mockgcp/mockcompute/regionalforwardingrulev1.go b/mockgcp/mockcompute/regionalforwardingrulev1.go index 116ddf4efe..62bd91ebd8 100644 --- a/mockgcp/mockcompute/regionalforwardingrulev1.go +++ b/mockgcp/mockcompute/regionalforwardingrulev1.go @@ -59,10 +59,11 @@ func (s *RegionalForwardingRulesV1) Insert(ctx context.Context, req *pb.InsertFo id := s.generateID() obj := proto.Clone(req.GetForwardingRuleResource()).(*pb.ForwardingRule) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#forwardingRule") + obj.LabelFingerprint = PtrTo("abcdef0123A=") if err := s.storage.Create(ctx, fqn, obj); err != nil { return nil, err diff --git a/mockgcp/mockcompute/regionalhealthcheckv1.go b/mockgcp/mockcompute/regionalhealthcheckv1.go index a62348e0af..98dd6ed93d 100644 --- a/mockgcp/mockcompute/regionalhealthcheckv1.go +++ b/mockgcp/mockcompute/regionalhealthcheckv1.go @@ -55,7 +55,7 @@ func (s *RegionalHealthCheckV1) Insert(ctx context.Context, req *pb.InsertRegion id := s.generateID() obj := proto.Clone(req.GetHealthCheckResource()).(*pb.HealthCheck) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#healthCheck") diff --git a/mockgcp/mockcompute/regionaltargethttpproxiesv1.go b/mockgcp/mockcompute/regionaltargethttpproxiesv1.go index 4476ad0de0..52a07a90d7 100644 --- a/mockgcp/mockcompute/regionaltargethttpproxiesv1.go +++ b/mockgcp/mockcompute/regionaltargethttpproxiesv1.go @@ -59,7 +59,7 @@ func (s *RegionalTargetHTTPProxiesV1) Insert(ctx context.Context, req *pb.Insert id := s.generateID() obj := proto.Clone(req.GetTargetHttpProxyResource()).(*pb.TargetHttpProxy) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#targetHttpProxy") diff --git a/mockgcp/mockcompute/regionalurlmapsv1.go b/mockgcp/mockcompute/regionalurlmapsv1.go index 96337eae6d..f954be9022 100644 --- a/mockgcp/mockcompute/regionalurlmapsv1.go +++ b/mockgcp/mockcompute/regionalurlmapsv1.go @@ -59,7 +59,7 @@ func (s *RegionalURLMapsV1) Insert(ctx context.Context, req *pb.InsertRegionUrlM id := s.generateID() obj := proto.Clone(req.GetUrlMapResource()).(*pb.UrlMap) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#urlMap") diff --git a/mockgcp/mockcompute/regiondisksv1.go b/mockgcp/mockcompute/regiondisksv1.go index 06b4e038ea..cbf69385f9 100644 --- a/mockgcp/mockcompute/regiondisksv1.go +++ b/mockgcp/mockcompute/regiondisksv1.go @@ -61,7 +61,7 @@ func (s *RegionalDisksV1) Insert(ctx context.Context, req *pb.InsertRegionDiskRe id := s.generateID() obj := proto.Clone(req.GetDiskResource()).(*pb.Disk) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#disk") diff --git a/mockgcp/mockcompute/subnetsv1.go b/mockgcp/mockcompute/subnetsv1.go index e91f849be4..cdc066b143 100644 --- a/mockgcp/mockcompute/subnetsv1.go +++ b/mockgcp/mockcompute/subnetsv1.go @@ -62,7 +62,7 @@ func (s *SubnetsV1) Insert(ctx context.Context, req *pb.InsertSubnetworkRequest) id := s.generateID() obj := proto.Clone(req.GetSubnetworkResource()).(*pb.Subnetwork) - obj.SelfLink = PtrTo("https://www.googleapis.com/compute/beta/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#subnetwork") @@ -78,7 +78,7 @@ func (s *SubnetsV1) Insert(ctx context.Context, req *pb.InsertSubnetworkRequest) if obj.Purpose == nil { obj.Purpose = PtrTo("PRIVATE") } - obj.Region = PtrTo(fmt.Sprintf("https://www.googleapis.com/compute/beta/projects/%s/regions/%s", name.Project.ID, name.Region)) + obj.Region = PtrTo(fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s", name.Project.ID, name.Region)) if obj.StackType == nil { obj.StackType = PtrTo("IPV4_ONLY") } @@ -86,7 +86,7 @@ func (s *SubnetsV1) Insert(ctx context.Context, req *pb.InsertSubnetworkRequest) if err != nil { return nil, status.Errorf(codes.InvalidArgument, "network %q is not valid", obj.GetNetwork()) } - obj.Network = PtrTo(fmt.Sprintf("https://www.googleapis.com/compute/beta/projects/%s/global/networks/%s", networkName.Project.ID, networkName.Name)) + obj.Network = PtrTo(fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", networkName.Project.ID, networkName.Name)) obj.GatewayAddress = PtrTo("10.2.0.1") // obj.AllowSubnetCidrRoutesOverlap = PtrTo(false) diff --git a/mockgcp/mockcompute/targetvpngatewayv1.go b/mockgcp/mockcompute/targetvpngatewayv1.go index c6df0d156d..d4d3d15e6d 100644 --- a/mockgcp/mockcompute/targetvpngatewayv1.go +++ b/mockgcp/mockcompute/targetvpngatewayv1.go @@ -59,7 +59,7 @@ func (s *TargetVpnGatewaysV1) Insert(ctx context.Context, req *pb.InsertTargetVp id := s.generateID() obj := proto.Clone(req.GetTargetVpnGatewayResource()).(*pb.TargetVpnGateway) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#targetVpnGateway") diff --git a/mockgcp/mockcompute/vpngatewayv1.go b/mockgcp/mockcompute/vpngatewayv1.go index 81191523b5..778e9c8b69 100644 --- a/mockgcp/mockcompute/vpngatewayv1.go +++ b/mockgcp/mockcompute/vpngatewayv1.go @@ -59,7 +59,7 @@ func (s *VPNGatewaysV1) Insert(ctx context.Context, req *pb.InsertVpnGatewayRequ id := s.generateID() obj := proto.Clone(req.GetVpnGatewayResource()).(*pb.VpnGateway) - obj.SelfLink = PtrTo("https://compute.googleapis.com/compute/v1/" + name.String()) + obj.SelfLink = PtrTo("https://www.googleapis.com/compute/v1/" + name.String()) obj.CreationTimestamp = PtrTo(s.nowString()) obj.Id = &id obj.Kind = PtrTo("compute#vpnGateway") diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_http.log index f7834f7814..dcdadf1802 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbcluster/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -19,13 +19,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -51,17 +51,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -82,13 +82,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -114,17 +114,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -145,8 +145,8 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_http.log index 1bcdda8aaa..154f6f8751 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/basicalloydbsecondarycluster/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,8 +89,8 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- @@ -188,7 +188,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -209,17 +209,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -252,14 +252,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -280,6 +280,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -288,17 +289,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -322,14 +323,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -350,6 +351,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -358,7 +360,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -958,7 +960,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -983,14 +985,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1011,6 +1013,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1019,12 +1022,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1045,7 +1048,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } @@ -1116,7 +1119,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1138,13 +1141,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1166,10 +1169,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_http.log index a8e69ddff7..2e9e862e43 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbcluster/fullalloydbcluster/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,8 +89,8 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- @@ -874,7 +874,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -896,13 +896,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -924,10 +924,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file 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 30c8532f8c..967ed26ba0 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 @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,8 +89,8 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- @@ -188,7 +188,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -209,17 +209,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -252,14 +252,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -280,6 +280,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -288,17 +289,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -322,14 +323,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -350,6 +351,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -358,7 +360,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -793,7 +795,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -818,14 +820,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -846,6 +848,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -854,12 +857,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -880,7 +883,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } @@ -951,7 +954,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -973,13 +976,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1001,10 +1004,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_http.log index 51c19bb8ff..5f41814143 100644 --- a/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/alloydb/v1beta1/alloydbinstance/basicalloydbsecondaryinstance/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,8 +89,8 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- @@ -188,7 +188,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -209,17 +209,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -252,14 +252,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -280,6 +280,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -288,17 +289,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -322,14 +323,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -350,6 +351,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -358,7 +360,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -1081,7 +1083,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -1106,14 +1108,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1134,6 +1136,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1142,12 +1145,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1168,7 +1171,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } @@ -1239,7 +1242,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1261,13 +1264,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1289,10 +1292,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file 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 0a7bf04b41..89df72722e 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 @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,8 +89,8 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- @@ -183,7 +183,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -204,17 +204,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -247,14 +247,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -275,6 +275,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -283,17 +284,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -317,14 +318,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -345,6 +346,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -353,7 +355,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${uniqueId}" } --- @@ -819,7 +821,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -844,14 +846,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -872,6 +874,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -880,12 +883,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -906,7 +909,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } @@ -974,7 +977,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -996,13 +999,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1024,10 +1027,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file 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 f1f864ece4..65c40af526 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 @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,8 +89,8 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- @@ -183,7 +183,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -204,17 +204,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -247,14 +247,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -275,6 +275,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -283,17 +284,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -317,14 +318,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -345,6 +346,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -353,7 +355,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${uniqueId}" } --- @@ -940,7 +942,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -965,14 +967,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -993,6 +995,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1001,12 +1004,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress${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 @@ -1027,7 +1030,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } @@ -1095,7 +1098,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1117,13 +1120,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1145,10 +1148,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork${uniqueId}", "user": "user@example.com" } \ No newline at end of file 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 8189ae064c..281846845e 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 @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,8 +89,8 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- @@ -188,7 +188,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -209,17 +209,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -252,14 +252,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -280,6 +280,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -288,17 +289,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -322,14 +323,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -350,6 +351,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -358,7 +360,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -716,7 +718,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -741,14 +743,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -769,6 +771,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -777,12 +780,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -803,7 +806,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } @@ -874,7 +877,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -896,13 +899,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -924,10 +927,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildworkerpool/_http.log b/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildworkerpool/_http.log index fddd47c086..385d4ddac9 100644 --- a/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildworkerpool/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildworkerpool/_http.log @@ -51,7 +51,7 @@ Grpc-Metadata-Content-Type: application/grpc --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -82,7 +82,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -110,17 +110,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -142,13 +142,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -169,17 +169,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -212,14 +212,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -240,6 +240,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -248,17 +249,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -282,14 +283,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -310,6 +311,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -318,7 +320,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -876,7 +878,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -901,14 +903,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -929,6 +931,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -937,12 +940,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -963,14 +966,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -992,13 +995,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1020,11 +1023,11 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } diff --git a/pkg/test/resourcefixture/testdata/basic/cloudids/v1beta1/cloudidsendpoint/_http.log b/pkg/test/resourcefixture/testdata/basic/cloudids/v1beta1/cloudidsendpoint/_http.log index 85f9dbfeb2..2980fc40ad 100644 --- a/pkg/test/resourcefixture/testdata/basic/cloudids/v1beta1/cloudidsendpoint/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/cloudids/v1beta1/cloudidsendpoint/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,13 +89,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -116,17 +116,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -159,14 +159,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -187,6 +187,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -195,17 +196,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -229,14 +230,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -257,6 +258,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -265,7 +267,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -650,7 +652,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -675,14 +677,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -703,6 +705,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -711,12 +714,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -737,14 +740,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -766,13 +769,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -794,10 +797,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file 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 a793e90d40..53f1ed0332 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 @@ -46,7 +46,8 @@ status: status: "True" type: Ready creationTimestamp: "1970-01-01T00:00:00Z" + labelFingerprint: abcdef0123A= observedGeneration: 2 observedState: address: 8.8.8.8 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/globalcomputeaddress/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/globalcomputeaddress/_http.log index a37b90444f..009ef81d92 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/globalcomputeaddress/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/globalcomputeaddress/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -19,13 +19,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -51,17 +51,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -82,13 +82,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -114,17 +114,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -145,13 +145,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -172,17 +172,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -216,14 +216,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -245,6 +245,7 @@ X-Xss-Protection: 0 "description": "a test global address", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -253,17 +254,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/${networkID}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -287,14 +288,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -316,6 +317,7 @@ X-Xss-Protection: 0 "description": "a test global address", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -324,12 +326,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/${networkID}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -350,7 +352,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 abaee13d83..1eda63d3cc 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,3 +1,17 @@ +# 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: @@ -32,4 +46,4 @@ status: observedGeneration: 2 observedState: address: 8.8.8.8 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeaddress-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeaddress-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/regionalcomputeaddress/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/regionalcomputeaddress/_http.log index 4f310d8907..3b5c049f42 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/regionalcomputeaddress/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeaddress/regionalcomputeaddress/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -19,13 +19,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${subnetworkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -51,17 +51,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -82,13 +82,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${subnetworkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -114,17 +114,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -145,13 +145,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${subnetworkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -182,7 +182,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks?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 @@ -214,18 +214,18 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/operations/${operationID}", + "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", "targetId": "${subnetworkNumber}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -252,18 +252,18 @@ X-Xss-Protection: 0 "enable": false }, "name": "${subnetworkID}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "PRIVATE", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}", + "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/${subnetworkID}", "stackType": "IPV4_ONLY" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeaddress-${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 @@ -294,7 +294,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses?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 @@ -327,14 +327,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeaddress-${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 @@ -362,13 +362,13 @@ X-Xss-Protection: 0 }, "name": "computeaddress-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeaddress-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeaddress-${uniqueId}", "subnetwork": "projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeaddress-${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 @@ -397,14 +397,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeaddress-${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 @@ -432,13 +432,13 @@ X-Xss-Protection: 0 }, "name": "computeaddress-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeaddress-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeaddress-${uniqueId}", "subnetwork": "projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeaddress-${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 @@ -459,7 +459,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 de8e14e424..5fd2ef1a4c 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 @@ -46,4 +46,4 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-1-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-1-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/computediskfromsourcedisk/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/computediskfromsourcedisk/_http.log index 0585766a5a..d8600d111e 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/computediskfromsourcedisk/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/computediskfromsourcedisk/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks?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 @@ -61,14 +61,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-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 @@ -94,7 +94,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-2-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}", "status": "READY", "type": "projects/${projectId}/zones/us-central1-a/diskTypes/pd-standard", "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a" @@ -102,7 +102,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-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 @@ -133,7 +133,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks?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 @@ -144,7 +144,7 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "managed-by-cnrm": "true" }, "name": "computedisk-1-${uniqueId}", - "sourceDisk": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}", + "sourceDisk": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}", "type": "projects/${projectId}/zones/us-central1-a/diskTypes/pd-standard", "zone": "projects/${projectId}/global/zones/us-central1-a" } @@ -166,14 +166,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-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 @@ -199,8 +199,8 @@ X-Xss-Protection: 0 }, "name": "computedisk-1-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-1-${uniqueId}", - "sourceDisk": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-1-${uniqueId}", + "sourceDisk": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}", "status": "READY", "type": "projects/${projectId}/zones/us-central1-a/diskTypes/pd-standard", "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a" @@ -208,7 +208,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-1-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-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 @@ -229,14 +229,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-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 @@ -262,7 +262,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-2-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}", "status": "READY", "type": "projects/${projectId}/zones/us-central1-a/diskTypes/pd-standard", "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a" @@ -270,7 +270,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-2-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-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 @@ -291,7 +291,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 b97da34fd6..e64b0573db 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 @@ -48,4 +48,4 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/disks/computedisk-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/disks/computedisk-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/regionalcomputedisk/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/regionalcomputedisk/_http.log index edd93698fb..18fb4aafad 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/regionalcomputedisk/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/regionalcomputedisk/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/disks/computedisk-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/disks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/disks?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 @@ -66,14 +66,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/disks/computedisk-${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 @@ -105,14 +105,14 @@ X-Xss-Protection: 0 "projects/${projectId}/global/zones/us-central1-a", "projects/${projectId}/global/zones/us-central1-f" ], - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/disks/computedisk-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/disks/computedisk-${uniqueId}", "status": "READY", "type": "projects/${projectId}/regions/us-central1/diskTypes/pd-standard" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/disks/computedisk-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/disks/computedisk-${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 @@ -133,7 +133,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 f91241f356..d5a5cc463a 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 @@ -45,4 +45,4 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/zonalcomputedisk/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/zonalcomputedisk/_http.log index 0eb41711e5..b032242587 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/zonalcomputedisk/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computedisk/zonalcomputedisk/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks?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 @@ -62,14 +62,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${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 @@ -96,7 +96,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}", "status": "READY", "type": "projects/${projectId}/zones/us-central1-a/diskTypes/pd-standard", "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a" @@ -104,7 +104,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${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 @@ -125,7 +125,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 c312cdb02d..7dbc69d9e4 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,3 +1,17 @@ +# 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: @@ -34,5 +48,6 @@ status: reason: UpToDate status: "True" type: Ready + labelFingerprint: abcdef0123A= observedGeneration: 3 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log index 6d7a37c2b8..d0fdc4741e 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalcomputeforwardingrule/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -19,13 +19,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -51,17 +51,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -82,13 +82,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -114,17 +114,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -145,13 +145,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -182,7 +182,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks?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 @@ -217,14 +217,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -251,7 +251,7 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", "timeoutSec": 5, "type": "HTTP", "unhealthyThreshold": 2 @@ -259,7 +259,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${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 @@ -290,7 +290,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/backendServices?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices?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 @@ -299,7 +299,7 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "drainingTimeoutSec": 300 }, "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -327,14 +327,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${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 @@ -355,7 +355,7 @@ X-Xss-Protection: 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -366,12 +366,12 @@ X-Xss-Protection: 0 "kind": "compute#backendService", "loadBalancingScheme": "INTERNAL_SELF_MANAGED", "name": "computebackendservice-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${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 @@ -402,12 +402,12 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps?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 { - "${networkID}Service": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "${networkID}Service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "name": "computeurlmap-${uniqueId}" } @@ -428,14 +428,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${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 @@ -452,16 +452,16 @@ X-Xss-Protection: 0 { "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "${networkID}Service": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "${networkID}Service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "id": "000000000000000000000", "kind": "compute#urlMap", "name": "computeurlmap-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${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 @@ -492,7 +492,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies?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 @@ -519,14 +519,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${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 @@ -547,13 +547,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#targetHttpProxy", "name": "computetargethttpproxy-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "urlMap": "projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-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 @@ -584,7 +584,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies?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 @@ -611,14 +611,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-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 @@ -639,13 +639,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#targetHttpProxy", "name": "computetargethttpproxy-2-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "urlMap": "projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${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 @@ -676,7 +676,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/forwardingRules?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules?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 @@ -692,7 +692,7 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "name": "computeglobalforwardingrule-${uniqueId}", "network": "projects/${projectId}/global/networks/${networkID}", "portRange": "80", - "target": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" + "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" } 200 OK @@ -712,14 +712,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${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 @@ -740,6 +740,7 @@ X-Xss-Protection: 0 "description": "A global forwarding rule", "id": "000000000000000000000", "kind": "compute#forwardingRule", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "label-one": "value-one", @@ -749,18 +750,18 @@ X-Xss-Protection: 0 "name": "computeglobalforwardingrule-${uniqueId}", "network": "projects/${projectId}/global/networks/${networkID}", "portRange": "80", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", + "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "label-one": "value-one", @@ -785,14 +786,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${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 @@ -813,6 +814,7 @@ X-Xss-Protection: 0 "description": "A global forwarding rule", "id": "000000000000000000000", "kind": "compute#forwardingRule", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "label-one": "value-one", @@ -822,18 +824,18 @@ X-Xss-Protection: 0 "name": "computeglobalforwardingrule-${uniqueId}", "network": "projects/${projectId}/global/networks/${networkID}", "portRange": "80", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", + "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}/setTarget?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}/setTarget?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 { - "target": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" + "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" } 200 OK @@ -853,14 +855,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${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 @@ -881,6 +883,7 @@ X-Xss-Protection: 0 "description": "A global forwarding rule", "id": "000000000000000000000", "kind": "compute#forwardingRule", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "label-one": "value-one", @@ -890,13 +893,13 @@ X-Xss-Protection: 0 "name": "computeglobalforwardingrule-${uniqueId}", "network": "projects/${projectId}/global/networks/${networkID}", "portRange": "80", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", - "target": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}", + "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/forwardingRules/computeglobalforwardingrule-${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 @@ -917,14 +920,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-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 @@ -945,13 +948,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#targetHttpProxy", "name": "computetargethttpproxy-2-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}", "urlMap": "projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-2-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-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 @@ -972,14 +975,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${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 @@ -1000,13 +1003,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#targetHttpProxy", "name": "computetargethttpproxy-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "urlMap": "projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${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 @@ -1027,14 +1030,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${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 @@ -1051,16 +1054,16 @@ X-Xss-Protection: 0 { "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "${networkID}Service": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "${networkID}Service": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "id": "000000000000000000000", "kind": "compute#urlMap", "name": "computeurlmap-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${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 @@ -1081,14 +1084,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${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 @@ -1109,7 +1112,7 @@ X-Xss-Protection: 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -1120,12 +1123,12 @@ X-Xss-Protection: 0 "kind": "compute#backendService", "loadBalancingScheme": "INTERNAL_SELF_MANAGED", "name": "computebackendservice-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${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 @@ -1146,14 +1149,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -1180,7 +1183,7 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", "timeoutSec": 5, "type": "HTTP", "unhealthyThreshold": 2 @@ -1188,7 +1191,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -1209,7 +1212,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 8f9d98efaa..6fcd63673a 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,3 +1,17 @@ +# 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: @@ -34,5 +48,6 @@ status: status: "True" type: Ready creationTimestamp: "1970-01-01T00:00:00Z" + labelFingerprint: abcdef0123A= observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_http.log index 4dc2081a8c..7dfdab677d 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/regionalcomputeforwardingrule/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/addresses/computeraddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeraddress-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses?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 @@ -61,14 +61,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/addresses/computeraddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeraddress-${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 @@ -96,12 +96,12 @@ X-Xss-Protection: 0 }, "name": "computeraddress-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeraddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeraddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/addresses/computeraddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeraddress-${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 @@ -131,14 +131,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/addresses/computeraddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeraddress-${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 @@ -166,12 +166,12 @@ X-Xss-Protection: 0 }, "name": "computeraddress-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeraddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeraddress-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -192,13 +192,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -224,17 +224,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -255,13 +255,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -287,17 +287,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -318,13 +318,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${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 @@ -355,7 +355,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetVpnGateways?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways?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 @@ -383,14 +383,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${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 @@ -413,12 +413,12 @@ X-Xss-Protection: 0 "name": "computetargetvpngateway-${uniqueId}", "network": "projects/${projectId}/global/networks/${networkID}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${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 @@ -449,7 +449,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/forwardingRules?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules?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 @@ -465,7 +465,7 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "loadBalancingScheme": "EXTERNAL", "name": "computeregionalforwardingrule-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "target": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" + "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" } 200 OK @@ -485,14 +485,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${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 @@ -514,6 +514,7 @@ X-Xss-Protection: 0 "description": "A regional forwarding rule", "id": "000000000000000000000", "kind": "compute#forwardingRule", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "label-one": "value-one", @@ -522,18 +523,18 @@ X-Xss-Protection: 0 "loadBalancingScheme": "EXTERNAL", "name": "computeregionalforwardingrule-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}", - "target": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}", + "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "label-one": "value-one", @@ -558,14 +559,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${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 @@ -587,6 +588,7 @@ X-Xss-Protection: 0 "description": "A regional forwarding rule", "id": "000000000000000000000", "kind": "compute#forwardingRule", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "label-one": "value-one", @@ -595,13 +597,13 @@ X-Xss-Protection: 0 "loadBalancingScheme": "EXTERNAL", "name": "computeregionalforwardingrule-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}", - "target": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}", + "target": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/forwardingRules/computeregionalforwardingrule-${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 @@ -622,14 +624,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${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 @@ -652,12 +654,12 @@ X-Xss-Protection: 0 "name": "computetargetvpngateway-${uniqueId}", "network": "projects/${projectId}/global/networks/${networkID}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computetargetvpngateway-${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 @@ -678,14 +680,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/addresses/computeraddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeraddress-${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 @@ -713,12 +715,12 @@ X-Xss-Protection: 0 }, "name": "computeraddress-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeraddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/networks/computeraddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/addresses/computeraddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/addresses/computeraddress-${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 @@ -739,7 +741,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 f13cbd4deb..b1dffb20ba 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 @@ -46,5 +46,5 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 3 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId} type: TCP diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/globalcomputehealthcheck/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/globalcomputehealthcheck/_http.log index 6079d9bb48..5f96c0a07e 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/globalcomputehealthcheck/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/globalcomputehealthcheck/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks?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 @@ -63,14 +63,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -92,7 +92,7 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", "tcpHealthCheck": { "port": 80, "proxyHeader": "NONE" @@ -104,7 +104,7 @@ X-Xss-Protection: 0 --- -PUT https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +PUT https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -140,14 +140,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -171,7 +171,7 @@ X-Xss-Protection: 0 "kind": "compute#healthCheck", "logConfig": {}, "name": "computehealthcheck-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", "tcpHealthCheck": { "port": 88, "proxyHeader": "NONE" @@ -183,7 +183,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -204,7 +204,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 7dabd6181a..d3ea522ee5 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 @@ -46,5 +46,5 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 3 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId} type: TCP diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/regionalcomputehealthcheck/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/regionalcomputehealthcheck/_http.log index fd95e8dbde..c0ae9cd3a1 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/regionalcomputehealthcheck/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computehealthcheck/regionalcomputehealthcheck/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks?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 @@ -64,14 +64,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -94,7 +94,7 @@ X-Xss-Protection: 0 "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", "tcpHealthCheck": { "port": 80, "proxyHeader": "NONE" @@ -106,7 +106,7 @@ X-Xss-Protection: 0 --- -PUT https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +PUT https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -143,14 +143,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -175,7 +175,7 @@ X-Xss-Protection: 0 "logConfig": {}, "name": "computehealthcheck-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", "tcpHealthCheck": { "port": 88, "proxyHeader": "NONE" @@ -187,7 +187,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -208,7 +208,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 ee26f6ee55..8b06d08ae1 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 @@ -1,3 +1,17 @@ +# 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: ComputeImage metadata: @@ -28,4 +42,4 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/global/images/computeimage-test-${uniqueId} + 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 ebe0627165..009cce1a8f 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeimage/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks?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 @@ -60,14 +60,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${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 @@ -92,7 +92,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}", "status": "READY", "type": "projects/${projectId}/zones/us-central1-a/diskTypes/pd-standard", "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a" @@ -100,7 +100,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/images/computeimage-test-${uniqueId}?alt=json +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 @@ -131,7 +131,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/images?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/images?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 @@ -161,14 +161,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/images/computeimage-test-${uniqueId}?alt=json +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 @@ -193,13 +193,13 @@ X-Xss-Protection: 0 "managed-by-cnrm": "true" }, "name": "computeimage-test-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/images/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/beta/projects/${projectId}/global/images/computeimage-test-${uniqueId}?alt=json +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 @@ -220,14 +220,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${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 @@ -252,7 +252,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}", "status": "READY", "type": "projects/${projectId}/zones/us-central1-a/diskTypes/pd-standard", "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a" @@ -260,7 +260,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/disks/computedisk-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/disks/computedisk-${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 @@ -281,7 +281,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 08fa6a8a6e..feb32cbeeb 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,3 +1,17 @@ +# 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: @@ -71,4 +85,4 @@ status: currentStatus: RUNNING instanceId: "1111111111111111" observedGeneration: 4 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId} + 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 80feafb233..ee0491495e 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 @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/debian-cloud/global/images/debian-11?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-11?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 404 Not Found @@ -59,7 +59,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/debian-cloud/global/images/family/debian-11?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/debian-cloud/global/images/family/debian-11?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 @@ -84,7 +84,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks?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 @@ -116,14 +116,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${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 @@ -148,7 +148,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -158,7 +158,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-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 @@ -189,7 +189,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks?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 @@ -221,14 +221,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-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 @@ -254,7 +254,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-1-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}", "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" @@ -262,7 +262,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -283,13 +283,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -315,17 +315,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -346,13 +346,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -378,17 +378,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -409,8 +409,8 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- @@ -502,7 +502,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-${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 @@ -533,7 +533,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-west1/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses?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 @@ -565,14 +565,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-${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 @@ -600,12 +600,12 @@ X-Xss-Protection: 0 "name": "computeaddress-${uniqueId}", "purpose": "GCE_ENDPOINT", "region": "projects/${projectId}/global/regions/us-west1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-${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 @@ -634,14 +634,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-${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 @@ -669,12 +669,12 @@ X-Xss-Protection: 0 "name": "computeaddress-${uniqueId}", "purpose": "GCE_ENDPOINT", "region": "projects/${projectId}/global/regions/us-west1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-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 @@ -705,7 +705,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-west1/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses?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 @@ -736,14 +736,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-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 @@ -770,12 +770,12 @@ X-Xss-Protection: 0 }, "name": "computeaddress-2-${uniqueId}", "region": "projects/${projectId}/global/regions/us-west1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-2-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-2-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-2-${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 @@ -804,14 +804,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-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 @@ -838,12 +838,12 @@ X-Xss-Protection: 0 }, "name": "computeaddress-2-${uniqueId}", "region": "projects/${projectId}/global/regions/us-west1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-2-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 404 Not Found @@ -873,7 +873,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a?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 @@ -897,7 +897,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances?alt=json&prettyPrint=false +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances?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 @@ -990,14 +990,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1072,7 +1072,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "serviceAccounts": [ { "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", @@ -1088,7 +1088,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1112,7 +1112,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -1122,7 +1122,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1197,7 +1197,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "serviceAccounts": [ { "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", @@ -1213,7 +1213,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1237,7 +1237,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -1247,7 +1247,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1322,7 +1322,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "serviceAccounts": [ { "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", @@ -1338,7 +1338,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1362,7 +1362,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -1372,7 +1372,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1447,7 +1447,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "serviceAccounts": [ { "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", @@ -1463,7 +1463,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/setLabels?alt=json&prettyPrint=false +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-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 @@ -1492,14 +1492,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/stop?alt=json&prettyPrint=false +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/stop?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 @@ -1519,14 +1519,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/setMachineType?alt=json&prettyPrint=false +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/setMachineType?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 @@ -1551,14 +1551,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/setServiceAccount?alt=json&prettyPrint=false +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/setServiceAccount?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 @@ -1586,14 +1586,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1668,7 +1668,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "serviceAccounts": [ { "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", @@ -1684,7 +1684,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/start?alt=json&prettyPrint=false +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}/start?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 @@ -1704,14 +1704,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1786,7 +1786,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "serviceAccounts": [ { "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", @@ -1802,7 +1802,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1826,7 +1826,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -1836,7 +1836,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1911,7 +1911,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "serviceAccounts": [ { "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", @@ -1927,7 +1927,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -1951,7 +1951,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -1961,7 +1961,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -2036,7 +2036,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "serviceAccounts": [ { "email": "gsa-${uniqueId}@${projectId}.iam.gserviceaccount.com", @@ -2052,7 +2052,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -2076,7 +2076,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -2086,7 +2086,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 200 OK @@ -2106,14 +2106,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-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 @@ -2140,12 +2140,12 @@ X-Xss-Protection: 0 }, "name": "computeaddress-2-${uniqueId}", "region": "projects/${projectId}/global/regions/us-west1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-2-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-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 @@ -2166,14 +2166,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-${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 @@ -2201,12 +2201,12 @@ X-Xss-Protection: 0 "name": "computeaddress-${uniqueId}", "purpose": "GCE_ENDPOINT", "region": "projects/${projectId}/global/regions/us-west1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/networks/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-west1/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-west1/addresses/computeaddress-${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 @@ -2227,7 +2227,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } @@ -2277,7 +2277,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-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 @@ -2303,7 +2303,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-1-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}", "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" @@ -2311,7 +2311,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-1-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-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 @@ -2332,14 +2332,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${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 @@ -2364,7 +2364,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -2374,7 +2374,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${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 @@ -2395,7 +2395,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 4c175a6fac..e5f6a9c9b3 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,3 +1,17 @@ +# 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: @@ -51,4 +65,4 @@ status: currentStatus: RUNNING instanceId: "1111111111111111" observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId} + 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/computeinstancewithencrypteddisk/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancewithencrypteddisk/_http.log index 8f92747deb..41ab9f4c88 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancewithencrypteddisk/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeinstance/computeinstancewithencrypteddisk/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/debian-cloud/global/images/debian-11?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-11?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 404 Not Found @@ -59,7 +59,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/debian-cloud/global/images/family/debian-11?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/debian-cloud/global/images/family/debian-11?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 @@ -84,7 +84,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks?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 @@ -119,14 +119,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${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 @@ -154,7 +154,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -164,7 +164,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -185,13 +185,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -217,17 +217,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -248,13 +248,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -280,17 +280,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -311,13 +311,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 404 Not Found @@ -347,7 +347,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a?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 @@ -371,7 +371,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances?alt=json&prettyPrint=false +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances?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 @@ -433,14 +433,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -492,7 +492,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "status": "RUNNING", "tags": {}, "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a" @@ -500,7 +500,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -527,7 +527,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -537,7 +537,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -589,7 +589,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "status": "RUNNING", "tags": {}, "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a" @@ -597,7 +597,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -624,7 +624,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -634,7 +634,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -686,7 +686,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "status": "RUNNING", "tags": {}, "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a" @@ -694,7 +694,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -721,7 +721,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -731,7 +731,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -783,7 +783,7 @@ X-Xss-Protection: 0 "preemptible": true, "provisioningModel": "" }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}", "status": "RUNNING", "tags": {}, "zone": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a" @@ -791,7 +791,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json&prettyPrint=false +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 @@ -818,7 +818,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -828,7 +828,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 200 OK @@ -848,14 +848,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${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 @@ -883,7 +883,7 @@ X-Xss-Protection: 0 }, "name": "computedisk-${uniqueId}", "physicalBlockSizeBytes": "4096", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}", + "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", @@ -893,7 +893,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-west1-a/disks/computedisk-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-west1-a/disks/computedisk-${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 @@ -914,7 +914,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computemanagedsslcertificate/_generated_object_computemanagedsslcertificate.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computemanagedsslcertificate/_generated_object_computemanagedsslcertificate.golden.yaml index 2e0ed48726..ba3f9ae790 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computemanagedsslcertificate/_generated_object_computemanagedsslcertificate.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computemanagedsslcertificate/_generated_object_computemanagedsslcertificate.golden.yaml @@ -1,3 +1,17 @@ +# 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: ComputeManagedSSLCertificate metadata: @@ -30,4 +44,4 @@ status: observedState: certificateID: 1111111111111111 creationTimestamp: "1970-01-01T00:00:00Z" - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computemanagedsslcertificate/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computemanagedsslcertificate/_http.log index b898192f60..6493e5ccf9 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computemanagedsslcertificate/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computemanagedsslcertificate/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/sslCertificates?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates?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 @@ -61,17 +61,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${sslCertificatesId}", - "targetLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${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 @@ -96,13 +96,13 @@ X-Xss-Protection: 0 ] }, "name": "computemanagedsslcertificate-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}", "type": "MANAGED" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${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 @@ -124,10 +124,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${sslCertificatesId}", - "targetLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/sslCertificates/computemanagedsslcertificate-${uniqueId}", "user": "user@example.com" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenetwork/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenetwork/_http.log index 7c60bdb0d0..78601a8b6a 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenetwork/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenetwork/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -60,17 +60,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -95,13 +95,13 @@ X-Xss-Protection: 0 "routingConfig": { "routingMode": "REGIONAL" }, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -130,17 +130,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -165,13 +165,13 @@ X-Xss-Protection: 0 "routingConfig": { "routingMode": "GLOBAL" }, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -193,10 +193,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file 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 9b69e135de..44a01fa141 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 @@ -44,4 +44,4 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodegroup/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodegroup/_http.log index 65f153a288..1f37607f73 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodegroup/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodegroup/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/nodeTemplates?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates?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 @@ -64,14 +64,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${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 @@ -101,12 +101,12 @@ X-Xss-Protection: 0 "memory": "any" }, "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${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 @@ -137,7 +137,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-b/nodeGroups?alt=json&initialNodeCount=1 +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-b/nodeGroups?alt=json&initialNodeCount=1 Content-Type: application/json User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager @@ -167,14 +167,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${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 @@ -197,14 +197,14 @@ X-Xss-Protection: 0 "maintenancePolicy": "DEFAULT", "name": "computenodegroup-${uniqueId}", "nodeTemplate": "projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${uniqueId}", "size": 1, "zone": "projects/${projectId}/global/zones/us-central1-b" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-b/nodeGroups/computenodegroup-${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 @@ -225,14 +225,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${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 @@ -262,12 +262,12 @@ X-Xss-Protection: 0 "memory": "any" }, "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${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 @@ -288,7 +288,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 c10ef20ba7..865b6f12b2 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 @@ -46,4 +46,4 @@ status: type: Ready creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodetemplate/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodetemplate/_http.log index ce7745b66a..b0a69a2370 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodetemplate/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computenodetemplate/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/nodeTemplates?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates?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 @@ -66,14 +66,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${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 @@ -105,12 +105,12 @@ X-Xss-Protection: 0 "memory": "any" }, "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/nodeTemplates/computenodetemplate-${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 @@ -131,7 +131,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesubnetwork/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesubnetwork/_http.log index c1543b505c..c2e849c90d 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesubnetwork/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesubnetwork/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -60,17 +60,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -95,13 +95,13 @@ X-Xss-Protection: 0 "routingConfig": { "routingMode": "REGIONAL" }, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -132,7 +132,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks?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 @@ -164,18 +164,18 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/operations/${operationID}", + "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", "targetId": "${subnetworkNumber}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -202,18 +202,18 @@ X-Xss-Protection: 0 "enable": false }, "name": "computesubnetwork-${uniqueId}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "PRIVATE", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "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/computesubnetwork-${uniqueId}", "stackType": "IPV4_ONLY" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}/setPrivateIpGoogleAccess?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}/setPrivateIpGoogleAccess?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 @@ -239,18 +239,18 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "setPrivateIpGoogleAccess", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/operations/${operationID}", + "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", "targetId": "${subnetworkNumber}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -277,18 +277,18 @@ X-Xss-Protection: 0 "enable": false }, "name": "computesubnetwork-${uniqueId}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "privateIpGoogleAccess": true, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "PRIVATE", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "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/computesubnetwork-${uniqueId}", "stackType": "IPV4_ONLY" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -310,18 +310,18 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/operations/${operationID}", + "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", "targetId": "${subnetworkNumber}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -346,13 +346,13 @@ X-Xss-Protection: 0 "routingConfig": { "routingMode": "REGIONAL" }, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -374,10 +374,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file 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 a9e2820962..6ba306188a 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 @@ -1,3 +1,17 @@ +# 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: ComputeTargetHTTPProxy metadata: @@ -29,4 +43,4 @@ status: creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 3 proxyId: 1111111111111111 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_http.log index aa11242756..22c9db2fa4 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/globaltargethttpproxy/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks?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 @@ -64,14 +64,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -98,7 +98,7 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", "timeoutSec": 5, "type": "HTTP", "unhealthyThreshold": 2 @@ -106,7 +106,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${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 @@ -137,7 +137,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/backendServices?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices?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 @@ -146,7 +146,7 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "drainingTimeoutSec": 300 }, "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -174,14 +174,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${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 @@ -202,7 +202,7 @@ X-Xss-Protection: 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -213,12 +213,12 @@ X-Xss-Protection: 0 "kind": "compute#backendService", "loadBalancingScheme": "EXTERNAL", "name": "computebackendservice-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${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 @@ -249,12 +249,12 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps?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 { - "defaultService": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "defaultService": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "name": "computeurlmap-${uniqueId}" } @@ -275,14 +275,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${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 @@ -299,16 +299,16 @@ X-Xss-Protection: 0 { "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "defaultService": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "defaultService": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "id": "000000000000000000000", "kind": "compute#urlMap", "name": "computeurlmap-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-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 @@ -339,12 +339,12 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps?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 { - "defaultService": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "defaultService": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "name": "computeurlmap-2-${uniqueId}" } @@ -365,14 +365,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-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 @@ -389,16 +389,16 @@ X-Xss-Protection: 0 { "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "defaultService": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "defaultService": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "id": "000000000000000000000", "kind": "compute#urlMap", "name": "computeurlmap-2-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${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 @@ -429,7 +429,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies?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 @@ -456,14 +456,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${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 @@ -484,13 +484,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#targetHttpProxy", "name": "computetargethttpproxy-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "urlMap": "projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/targetHttpProxies/computetargethttpproxy-${uniqueId}/setUrlMap?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/targetHttpProxies/computetargethttpproxy-${uniqueId}/setUrlMap?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 @@ -515,14 +515,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${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 @@ -543,13 +543,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#targetHttpProxy", "name": "computetargethttpproxy-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}", "urlMap": "projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/targetHttpProxies/computetargethttpproxy-${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 @@ -570,14 +570,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-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 @@ -594,16 +594,16 @@ X-Xss-Protection: 0 { "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "defaultService": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "defaultService": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "id": "000000000000000000000", "kind": "compute#urlMap", "name": "computeurlmap-2-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps/computeurlmap-2-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-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 @@ -624,14 +624,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${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 @@ -648,16 +648,16 @@ X-Xss-Protection: 0 { "creationTimestamp": "2024-04-01T12:34:56.123456Z", - "defaultService": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", + "defaultService": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}", "id": "000000000000000000000", "kind": "compute#urlMap", "name": "computeurlmap-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/urlMaps/computeurlmap-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/urlMaps/computeurlmap-${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 @@ -678,14 +678,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${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 @@ -706,7 +706,7 @@ X-Xss-Protection: 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -717,12 +717,12 @@ X-Xss-Protection: 0 "kind": "compute#backendService", "loadBalancingScheme": "EXTERNAL", "name": "computebackendservice-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/backendServices/computebackendservice-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/backendServices/computebackendservice-${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 @@ -743,14 +743,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -777,7 +777,7 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}", "timeoutSec": 5, "type": "HTTP", "unhealthyThreshold": 2 @@ -785,7 +785,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/healthChecks/computehealthcheck-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/healthChecks/computehealthcheck-${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 @@ -806,7 +806,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 1cbfd2ea20..eb3911bdf7 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 @@ -1,3 +1,17 @@ +# 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: ComputeTargetHTTPProxy metadata: @@ -29,4 +43,4 @@ status: creationTimestamp: "1970-01-01T00:00:00Z" observedGeneration: 3 proxyId: 1111111111111111 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_http.log index 8821908f22..bda2bc3215 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargethttpproxy/regionaltargethttpproxy/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks?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 @@ -65,14 +65,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -100,7 +100,7 @@ X-Xss-Protection: 0 "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", "timeoutSec": 5, "type": "HTTP", "unhealthyThreshold": 2 @@ -108,7 +108,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${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 @@ -139,7 +139,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/backendServices?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices?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 @@ -149,7 +149,7 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "drainingTimeoutSec": 0 }, "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -179,14 +179,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${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 @@ -207,7 +207,7 @@ X-Xss-Protection: 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -220,12 +220,12 @@ X-Xss-Protection: 0 "name": "computebackendservice-${uniqueId}", "protocol": "HTTP", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -256,7 +256,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps?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 @@ -283,14 +283,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -312,12 +312,12 @@ X-Xss-Protection: 0 "kind": "compute#urlMap", "name": "computeurlmap-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-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 @@ -348,7 +348,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps?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 @@ -375,14 +375,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-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 @@ -404,12 +404,12 @@ X-Xss-Protection: 0 "kind": "compute#urlMap", "name": "computeurlmap-2-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${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 @@ -440,7 +440,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetHttpProxies?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies?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 @@ -468,14 +468,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${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 @@ -497,13 +497,13 @@ X-Xss-Protection: 0 "kind": "compute#targetHttpProxy", "name": "computetargethttpproxy-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}", "urlMap": "projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}/setUrlMap?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}/setUrlMap?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 @@ -528,14 +528,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${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 @@ -557,13 +557,13 @@ X-Xss-Protection: 0 "kind": "compute#targetHttpProxy", "name": "computetargethttpproxy-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}", "urlMap": "projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetHttpProxies/computetargethttpproxy-${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 @@ -584,14 +584,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-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 @@ -613,12 +613,12 @@ X-Xss-Protection: 0 "kind": "compute#urlMap", "name": "computeurlmap-2-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-2-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-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 @@ -639,14 +639,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -668,12 +668,12 @@ X-Xss-Protection: 0 "kind": "compute#urlMap", "name": "computeurlmap-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -694,14 +694,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${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 @@ -722,7 +722,7 @@ X-Xss-Protection: 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -735,12 +735,12 @@ X-Xss-Protection: 0 "name": "computebackendservice-${uniqueId}", "protocol": "HTTP", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${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 @@ -761,14 +761,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -796,7 +796,7 @@ X-Xss-Protection: 0 "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", "timeoutSec": 5, "type": "HTTP", "unhealthyThreshold": 2 @@ -804,7 +804,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -825,7 +825,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 0ca357b0ba..7e64eebc87 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 @@ -1,3 +1,17 @@ +# 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: ComputeTargetVPNGateway metadata: @@ -28,4 +42,4 @@ status: creationTimestamp: "1970-01-01T00:00:00Z" gatewayId: 1111111111111111 observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetvpngateway/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetvpngateway/_http.log index 7a004cdc58..3ce5b24752 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetvpngateway/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computetargetvpngateway/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -19,13 +19,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -51,17 +51,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -82,13 +82,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -114,17 +114,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -145,13 +145,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${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 @@ -182,7 +182,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetVpnGateways?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways?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 @@ -209,14 +209,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${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 @@ -238,12 +238,12 @@ X-Xss-Protection: 0 "name": "computevpngateway-${uniqueId}", "network": "projects/${projectId}/global/networks/${networkID}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/targetVpnGateways/computevpngateway-${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 @@ -264,7 +264,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 3f3a720ce7..bfd75c1840 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,3 +1,17 @@ +# 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: @@ -170,4 +184,4 @@ status: creationTimestamp: "1970-01-01T00:00:00Z" mapId: 1111111111111111 observedGeneration: 4 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId} + 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/computeurlmap/regionalcomputeurlmap/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeurlmap/regionalcomputeurlmap/_http.log index 5490f5651d..409ef0edbb 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeurlmap/regionalcomputeurlmap/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeurlmap/regionalcomputeurlmap/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks?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 @@ -65,14 +65,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -100,7 +100,7 @@ X-Xss-Protection: 0 "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", "timeoutSec": 5, "type": "HTTP", "unhealthyThreshold": 2 @@ -108,7 +108,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${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 @@ -139,7 +139,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/backendServices?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices?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 @@ -148,7 +148,7 @@ User-Agent: Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 t "drainingTimeoutSec": 0 }, "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -179,14 +179,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${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 @@ -207,7 +207,7 @@ X-Xss-Protection: 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -220,13 +220,13 @@ X-Xss-Protection: 0 "name": "computebackendservice-${uniqueId}", "protocol": "HTTP", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", "timeoutSec": 10 } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -257,7 +257,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps?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 @@ -392,14 +392,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -522,7 +522,7 @@ X-Xss-Protection: 0 } ], "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}", "tests": [ { "host": "hi.com", @@ -534,7 +534,7 @@ X-Xss-Protection: 0 --- -PUT https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +PUT https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -669,14 +669,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -895,7 +895,7 @@ X-Xss-Protection: 0 } ], "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}", "tests": [ { "host": "hi.com", @@ -912,7 +912,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/urlMaps/computeurlmap-${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 @@ -933,14 +933,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${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 @@ -961,7 +961,7 @@ X-Xss-Protection: 0 }, "creationTimestamp": "2024-04-01T12:34:56.123456Z", "healthChecks": [ - "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" + "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}" ], "iap": { "enabled": false, @@ -974,13 +974,13 @@ X-Xss-Protection: 0 "name": "computebackendservice-${uniqueId}", "protocol": "HTTP", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}", "timeoutSec": 10 } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/backendServices/computebackendservice-${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 @@ -1001,14 +1001,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -1036,7 +1036,7 @@ X-Xss-Protection: 0 "kind": "compute#healthCheck", "name": "computehealthcheck-${uniqueId}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}", "timeoutSec": 5, "type": "HTTP", "unhealthyThreshold": 2 @@ -1044,7 +1044,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/healthChecks/computehealthcheck-${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 @@ -1065,7 +1065,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 2d1ff335f7..9b53164b07 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,3 +1,17 @@ +# 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: @@ -28,4 +42,4 @@ status: status: "True" type: Ready observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computevpngateway/_http.log b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computevpngateway/_http.log index 01e40eb7d6..fc57bbcbe0 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computevpngateway/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computevpngateway/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -19,13 +19,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -51,17 +51,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -82,13 +82,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -114,17 +114,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -145,13 +145,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${networkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${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 @@ -182,7 +182,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/vpnGateways?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways?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 @@ -210,14 +210,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${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 @@ -239,13 +239,13 @@ X-Xss-Protection: 0 "name": "computevpngateway-${uniqueId}", "network": "projects/${projectId}/global/networks/${networkID}", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}", "stackType": "IPV4_ONLY" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${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 @@ -266,7 +266,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containercluster/_http.log b/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containercluster/_http.log index 7e9c5985d6..e77c74491e 100644 --- a/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containercluster/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/container/v1beta1/containercluster/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -60,17 +60,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -95,13 +95,13 @@ X-Xss-Protection: 0 "routingConfig": { "routingMode": "REGIONAL" }, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -132,7 +132,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks?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 @@ -164,18 +164,18 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/operations/${operationID}", + "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", "targetId": "${subnetworkNumber}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -202,12 +202,12 @@ X-Xss-Protection: 0 "enable": false }, "name": "computesubnetwork-${uniqueId}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "PRIVATE", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "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/computesubnetwork-${uniqueId}", "stackType": "IPV4_ONLY" } @@ -1218,7 +1218,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -1245,18 +1245,18 @@ X-Xss-Protection: 0 "enable": false }, "name": "computesubnetwork-${uniqueId}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "PRIVATE", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "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/computesubnetwork-${uniqueId}", "stackType": "IPV4_ONLY" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -1278,18 +1278,18 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/operations/${operationID}", + "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", "targetId": "${subnetworkNumber}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/computesubnetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1314,13 +1314,13 @@ X-Xss-Protection: 0 "routingConfig": { "routingMode": "REGIONAL" }, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1342,10 +1342,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/servicenetworking/v1beta1/servicenetworkingconnection/_http.log b/pkg/test/resourcefixture/testdata/basic/servicenetworking/v1beta1/servicenetworkingconnection/_http.log index de06994a66..c13440ce9b 100644 --- a/pkg/test/resourcefixture/testdata/basic/servicenetworking/v1beta1/servicenetworkingconnection/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/servicenetworking/v1beta1/servicenetworkingconnection/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,13 +89,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${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 @@ -116,17 +116,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress1-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress1-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress1-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress1-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -159,14 +159,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${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 @@ -187,6 +187,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -195,17 +196,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress1-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -229,14 +230,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${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 @@ -257,6 +258,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -265,12 +267,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress1-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${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 @@ -291,17 +293,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress2-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress2-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress2-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress2-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -334,14 +336,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${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 @@ -362,6 +364,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -370,17 +373,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -404,14 +407,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${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 @@ -432,6 +435,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -440,7 +444,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}" } --- @@ -883,7 +887,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -908,14 +912,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${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 @@ -936,6 +940,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -944,12 +949,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress2-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress2-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress2-${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 @@ -970,14 +975,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${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 @@ -998,6 +1003,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1006,12 +1012,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress1-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress1-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress1-${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 @@ -1032,14 +1038,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1061,13 +1067,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1089,10 +1095,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/postgresinstance/_http.log b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/postgresinstance/_http.log index d858ff08af..74c0e54027 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/postgresinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/postgresinstance/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,13 +89,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -116,17 +116,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -159,14 +159,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -187,6 +187,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -195,17 +196,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -229,14 +230,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -257,6 +258,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -265,7 +267,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -1095,7 +1097,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -1120,14 +1122,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1148,6 +1150,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1156,12 +1159,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1182,14 +1185,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1211,13 +1214,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1239,10 +1242,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstanceencryptionkey/_http.log b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstanceencryptionkey/_http.log index e56336fa30..687f7949ac 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstanceencryptionkey/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstanceencryptionkey/_http.log @@ -446,7 +446,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -477,7 +477,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -506,17 +506,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -539,13 +539,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -566,17 +566,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -609,14 +609,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -637,6 +637,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -645,17 +646,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -679,14 +680,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -707,6 +708,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -715,7 +717,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -1564,7 +1566,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -1589,14 +1591,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1617,6 +1619,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1625,12 +1628,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 16, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1651,14 +1654,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1681,13 +1684,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1709,11 +1712,11 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } diff --git a/pkg/test/resourcefixture/testdata/basic/vertexai/v1beta1/vertexaiendpoint/vertexaiendpointnetwork/_http.log b/pkg/test/resourcefixture/testdata/basic/vertexai/v1beta1/vertexaiendpoint/vertexaiendpointnetwork/_http.log index 7d03f8acf6..c5fb789436 100644 --- a/pkg/test/resourcefixture/testdata/basic/vertexai/v1beta1/vertexaiendpoint/vertexaiendpointnetwork/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/vertexai/v1beta1/vertexaiendpoint/vertexaiendpointnetwork/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks?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 @@ -57,17 +57,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -89,13 +89,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -116,17 +116,17 @@ X-Xss-Protection: 0 "errors": [ { "domain": "global", - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found", + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found", "reason": "notFound" } ], - "message": "address \"projects/${projectId}/global/networks/computeaddress-${uniqueId}\" not found" + "message": "address \"projects/${projectId}/global/addresses/computeaddress-${uniqueId}\" not found" } } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses?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 @@ -159,14 +159,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -187,6 +187,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -195,17 +196,17 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 24, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}/setLabels?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 { - "labelFingerprint": "", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -229,14 +230,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -257,6 +258,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -265,7 +267,7 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 24, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- @@ -1003,7 +1005,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectNumber}/global/networks/${networkID}/removePeering?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectNumber}/global/networks/${networkID}/removePeering?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 @@ -1028,14 +1030,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1056,6 +1058,7 @@ X-Xss-Protection: 0 "creationTimestamp": "2024-04-01T12:34:56.123456Z", "id": "000000000000000000000", "kind": "compute#address", + "labelFingerprint": "abcdef0123A=", "labels": { "cnrm-test": "true", "managed-by-cnrm": "true" @@ -1064,12 +1067,12 @@ X-Xss-Protection: 0 "network": "projects/${projectId}/global/networks/computenetwork-${uniqueId}", "prefixLength": 24, "purpose": "VPC_PEERING", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/computeaddress-${uniqueId}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${uniqueId}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/addresses/computeaddress-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/addresses/computeaddress-${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 @@ -1090,14 +1093,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/global/networks/${networkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1119,13 +1122,13 @@ X-Xss-Protection: 0 "kind": "compute#network", "name": "computenetwork-${uniqueId}", "networkFirewallPolicyEnforcementOrder": "AFTER_CLASSIC_FIREWALL", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}?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 @@ -1147,10 +1150,10 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "delete", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/computenetwork-${uniqueId}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/computenetwork-${uniqueId}", "user": "user@example.com" } \ No newline at end of file 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 46cd023eef..022db91760 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,3 +1,17 @@ +# 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: @@ -27,4 +41,4 @@ status: status: "True" type: Ready observedGeneration: 2 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId} + selfLink: https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId} diff --git a/pkg/test/resourcefixture/testdata/externalref/externalwithpartialuri/_http.log b/pkg/test/resourcefixture/testdata/externalref/externalwithpartialuri/_http.log index 885b56cce0..5740720c9e 100644 --- a/pkg/test/resourcefixture/testdata/externalref/externalwithpartialuri/_http.log +++ b/pkg/test/resourcefixture/testdata/externalref/externalwithpartialuri/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${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 @@ -29,7 +29,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/vpnGateways?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways?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 @@ -57,14 +57,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${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 @@ -86,13 +86,13 @@ X-Xss-Protection: 0 "name": "computevpngateway-${uniqueId}", "network": "projects/${projectId}/global/networks/default", "region": "projects/${projectId}/global/regions/us-central1", - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}", "stackType": "IPV4_ONLY" } --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${uniqueId}?alt=json +DELETE https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/vpnGateways/computevpngateway-${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 @@ -113,7 +113,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file 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 37eeec0b59..c8ba7e6af7 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,3 +1,17 @@ +# 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: @@ -47,4 +61,4 @@ status: currentStatus: RUNNING instanceId: "1111111111111111" observedGeneration: 4 - selfLink: https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId} + 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 95d4904562..de9468937d 100644 --- a/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_http.log +++ b/pkg/test/resourcefixture/testdata/resourceoverrides/computeinstance/networkipcomputeinstance/_http.log @@ -1,4 +1,4 @@ -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -19,13 +19,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${subnetworkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -51,17 +51,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -82,13 +82,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${subnetworkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -PATCH https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +PATCH https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -114,17 +114,17 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "compute.networks.patch", "progress": 0, - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "RUNNING", "targetId": "${networkID}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}?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 @@ -145,13 +145,13 @@ X-Xss-Protection: 0 "id": "000000000000000000000", "kind": "compute#network", "name": "${subnetworkID}", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", - "selfLinkWithId": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${networkID}" + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", + "selfLinkWithId": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${networkID}" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -182,7 +182,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks?alt=json +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks?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 @@ -214,18 +214,18 @@ X-Xss-Protection: 0 "name": "${operationID}", "operationType": "insert", "progress": 0, - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/operations/${operationID}", + "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", "targetId": "${subnetworkNumber}", - "targetLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}", + "targetLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}", "user": "user@example.com" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?alt=json +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}?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 @@ -252,18 +252,18 @@ X-Xss-Protection: 0 "enable": false }, "name": "${subnetworkID}", - "network": "https://www.googleapis.com/compute/beta/projects/${projectId}/global/networks/${subnetworkID}", + "network": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/networks/${subnetworkID}", "privateIpGoogleAccess": false, "privateIpv6GoogleAccess": "DISABLE_GOOGLE_ACCESS", "purpose": "PRIVATE", - "region": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1", - "selfLink": "https://www.googleapis.com/compute/beta/projects/${projectId}/regions/us-central1/subnetworks/${subnetworkID}", + "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/${subnetworkID}", "stackType": "IPV4_ONLY" } --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 404 Not Found @@ -293,7 +293,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a?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 @@ -317,7 +317,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/debian-cloud/global/images/debian-11?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-11?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 404 Not Found @@ -347,7 +347,7 @@ X-Xss-Protection: 0 --- -GET https://compute.googleapis.com/compute/beta/projects/debian-cloud/global/images/family/debian-11?alt=json&prettyPrint=false +GET https://compute.googleapis.com/compute/v1/projects/debian-cloud/global/images/family/debian-11?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 @@ -372,7 +372,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/instances?alt=json&prettyPrint=false +POST https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances?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 @@ -434,14 +434,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -496,7 +496,7 @@ X-Xss-Protection: 0 "scheduling": { "automaticRestart": true }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}", + "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" @@ -504,7 +504,7 @@ X-Xss-Protection: 0 --- -POST https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}/setLabels?alt=json&prettyPrint=false +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 @@ -534,14 +534,14 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "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/beta/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 @@ -596,7 +596,7 @@ X-Xss-Protection: 0 "scheduling": { "automaticRestart": true }, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}", + "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" @@ -604,7 +604,7 @@ X-Xss-Protection: 0 --- -DELETE https://compute.googleapis.com/compute/beta/projects/${projectId}/zones/us-central1-a/instances/computeinstance-${uniqueId}?alt=json&prettyPrint=false +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 200 OK @@ -624,7 +624,7 @@ X-Xss-Protection: 0 "kind": "compute#operation", "name": "${operationID}", "progress": 0, - "selfLink": "https://compute.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", + "selfLink": "https://www.googleapis.com/compute/v1/projects/${projectId}/global/operations/${operationID}", "startTime": "2024-04-01T12:34:56.123456Z", "status": "DONE" } \ No newline at end of file diff --git a/tests/e2e/unified_test.go b/tests/e2e/unified_test.go index c863d2a3c2..64fb0903d1 100644 --- a/tests/e2e/unified_test.go +++ b/tests/e2e/unified_test.go @@ -476,11 +476,20 @@ func runScenario(ctx context.Context, t *testing.T, testPause bool, fixture reso // Replace any dynamic IDs that appear in URLs for _, event := range events { - url := event.Request.URL + u := event.Request.URL for k, v := range pathIDs { - url = strings.ReplaceAll(url, "/"+k, "/"+v) + u = strings.ReplaceAll(u, "/"+k, "/"+v) + } + + // Specific to Compute + // Terraform uses the /beta/ endpoints, but mocks and direct controller should use /v1/ + // This special handling to avoid diffs in http logs. + // This can be removed once all Compute resources are migrated to direct controller. + basePath := "https://compute.googleapis.com/compute" + if strings.HasPrefix(u, basePath+"/beta/") { + u = basePath + "/v1/" + strings.TrimPrefix(u, basePath+"/beta/") } - event.Request.URL = url + event.Request.URL = u } // Remove operation polling requests (ones where the operation is not ready)