diff --git a/go.mod b/go.mod index daca22fa1..89c8890f3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( cloud.google.com/go/cloudbuild v1.2.0 - cloud.google.com/go/compute v1.6.0 + cloud.google.com/go/compute v1.6.1 cloud.google.com/go/storage v1.22.0 github.com/Azure/azure-pipeline-go v0.2.3 github.com/Azure/azure-sdk-for-go v63.1.0+incompatible @@ -47,6 +47,6 @@ require ( golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20220412211240-33da011f77ad google.golang.org/api v0.75.0 - google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 + google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 gopkg.in/ini.v1 v1.66.4 ) diff --git a/go.sum b/go.sum index 77f472f1e..755dd4b71 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,9 @@ cloud.google.com/go/cloudbuild v1.2.0/go.mod h1:RraRjYXsYxOVnaZuOETdc3boabBTy2CB cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute v1.6.0 h1:XdQIN5mdPTSBVwSIVDuY5e8ZzVAccsHvD3qTEz4zIps= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc= +cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= @@ -1158,8 +1159,9 @@ google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2I google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 h1:myaecH64R0bIEDjNORIel4iXubqzaHU1K2z8ajBwWcM= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 h1:SeX3QUcBj3fciwnfPT9kt5gBhFy/FCZtYZ+I/RB8agc= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= diff --git a/vendor/cloud.google.com/go/compute/apiv1/accelerator_types_client.go b/vendor/cloud.google.com/go/compute/apiv1/accelerator_types_client.go index be1a5d3bc..c4140ef94 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/accelerator_types_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/accelerator_types_client.go @@ -189,7 +189,10 @@ func (c *acceleratorTypesRESTClient) AggregatedList(ctx context.Context, req *co } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/acceleratorTypes", req.GetProject()) params := url.Values{} @@ -217,6 +220,9 @@ func (c *acceleratorTypesRESTClient) AggregatedList(ctx context.Context, req *co // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -276,14 +282,22 @@ func (c *acceleratorTypesRESTClient) AggregatedList(ctx context.Context, req *co // Get returns the specified accelerator type. func (c *acceleratorTypesRESTClient) Get(ctx context.Context, req *computepb.GetAcceleratorTypeRequest, opts ...gax.CallOption) (*computepb.AcceleratorType, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/acceleratorTypes/%v", req.GetProject(), req.GetZone(), req.GetAcceleratorType()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "accelerator_type", url.QueryEscape(req.GetAcceleratorType()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.AcceleratorType{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -333,7 +347,10 @@ func (c *acceleratorTypesRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/acceleratorTypes", req.GetProject(), req.GetZone()) params := url.Values{} @@ -358,6 +375,9 @@ func (c *acceleratorTypesRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/addresses_client.go b/vendor/cloud.google.com/go/compute/apiv1/addresses_client.go index bf89a63b0..aa5113e51 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/addresses_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/addresses_client.go @@ -216,7 +216,10 @@ func (c *addressesRESTClient) AggregatedList(ctx context.Context, req *computepb } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/addresses", req.GetProject()) params := url.Values{} @@ -244,6 +247,9 @@ func (c *addressesRESTClient) AggregatedList(ctx context.Context, req *computepb // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -303,7 +309,10 @@ func (c *addressesRESTClient) AggregatedList(ctx context.Context, req *computepb // Delete deletes the specified address resource. func (c *addressesRESTClient) Delete(ctx context.Context, req *computepb.DeleteAddressRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/addresses/%v", req.GetProject(), req.GetRegion(), req.GetAddress()) params := url.Values{} @@ -314,10 +323,15 @@ func (c *addressesRESTClient) Delete(ctx context.Context, req *computepb.DeleteA baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "address", url.QueryEscape(req.GetAddress()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -362,14 +376,22 @@ func (c *addressesRESTClient) Delete(ctx context.Context, req *computepb.DeleteA // Get returns the specified address resource. func (c *addressesRESTClient) Get(ctx context.Context, req *computepb.GetAddressRequest, opts ...gax.CallOption) (*computepb.Address, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/addresses/%v", req.GetProject(), req.GetRegion(), req.GetAddress()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "address", url.QueryEscape(req.GetAddress()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Address{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -413,7 +435,10 @@ func (c *addressesRESTClient) Insert(ctx context.Context, req *computepb.InsertA return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/addresses", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -424,10 +449,15 @@ func (c *addressesRESTClient) Insert(ctx context.Context, req *computepb.InsertA baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -485,7 +515,10 @@ func (c *addressesRESTClient) List(ctx context.Context, req *computepb.ListAddre } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/addresses", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -510,6 +543,9 @@ func (c *addressesRESTClient) List(ctx context.Context, req *computepb.ListAddre // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/autoscalers_client.go b/vendor/cloud.google.com/go/compute/apiv1/autoscalers_client.go index f71225494..f696bac1c 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/autoscalers_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/autoscalers_client.go @@ -230,7 +230,10 @@ func (c *autoscalersRESTClient) AggregatedList(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/autoscalers", req.GetProject()) params := url.Values{} @@ -258,6 +261,9 @@ func (c *autoscalersRESTClient) AggregatedList(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -317,7 +323,10 @@ func (c *autoscalersRESTClient) AggregatedList(ctx context.Context, req *compute // Delete deletes the specified autoscaler. func (c *autoscalersRESTClient) Delete(ctx context.Context, req *computepb.DeleteAutoscalerRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/autoscalers/%v", req.GetProject(), req.GetZone(), req.GetAutoscaler()) params := url.Values{} @@ -328,10 +337,15 @@ func (c *autoscalersRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "autoscaler", url.QueryEscape(req.GetAutoscaler()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -376,14 +390,22 @@ func (c *autoscalersRESTClient) Delete(ctx context.Context, req *computepb.Delet // Get returns the specified autoscaler resource. Gets a list of available autoscalers by making a list() request. func (c *autoscalersRESTClient) Get(ctx context.Context, req *computepb.GetAutoscalerRequest, opts ...gax.CallOption) (*computepb.Autoscaler, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/autoscalers/%v", req.GetProject(), req.GetZone(), req.GetAutoscaler()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "autoscaler", url.QueryEscape(req.GetAutoscaler()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Autoscaler{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -427,7 +449,10 @@ func (c *autoscalersRESTClient) Insert(ctx context.Context, req *computepb.Inser return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/autoscalers", req.GetProject(), req.GetZone()) params := url.Values{} @@ -438,10 +463,15 @@ func (c *autoscalersRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -499,7 +529,10 @@ func (c *autoscalersRESTClient) List(ctx context.Context, req *computepb.ListAut } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/autoscalers", req.GetProject(), req.GetZone()) params := url.Values{} @@ -524,6 +557,9 @@ func (c *autoscalersRESTClient) List(ctx context.Context, req *computepb.ListAut // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -583,7 +619,10 @@ func (c *autoscalersRESTClient) Patch(ctx context.Context, req *computepb.PatchA return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/autoscalers", req.GetProject(), req.GetZone()) params := url.Values{} @@ -597,10 +636,15 @@ func (c *autoscalersRESTClient) Patch(ctx context.Context, req *computepb.PatchA baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -652,7 +696,10 @@ func (c *autoscalersRESTClient) Update(ctx context.Context, req *computepb.Updat return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/autoscalers", req.GetProject(), req.GetZone()) params := url.Values{} @@ -666,10 +713,15 @@ func (c *autoscalersRESTClient) Update(ctx context.Context, req *computepb.Updat baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/backend_buckets_client.go b/vendor/cloud.google.com/go/compute/apiv1/backend_buckets_client.go index 803feda5f..0e86a1f3d 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/backend_buckets_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/backend_buckets_client.go @@ -237,7 +237,10 @@ func (c *backendBucketsRESTClient) AddSignedUrlKey(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets/%v/addSignedUrlKey", req.GetProject(), req.GetBackendBucket()) params := url.Values{} @@ -248,10 +251,15 @@ func (c *backendBucketsRESTClient) AddSignedUrlKey(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_bucket", url.QueryEscape(req.GetBackendBucket()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -295,7 +303,10 @@ func (c *backendBucketsRESTClient) AddSignedUrlKey(ctx context.Context, req *com // Delete deletes the specified BackendBucket resource. func (c *backendBucketsRESTClient) Delete(ctx context.Context, req *computepb.DeleteBackendBucketRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets/%v", req.GetProject(), req.GetBackendBucket()) params := url.Values{} @@ -306,10 +317,15 @@ func (c *backendBucketsRESTClient) Delete(ctx context.Context, req *computepb.De baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_bucket", url.QueryEscape(req.GetBackendBucket()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -353,7 +369,10 @@ func (c *backendBucketsRESTClient) Delete(ctx context.Context, req *computepb.De // DeleteSignedUrlKey deletes a key for validating requests with signed URLs for this backend bucket. func (c *backendBucketsRESTClient) DeleteSignedUrlKey(ctx context.Context, req *computepb.DeleteSignedUrlKeyBackendBucketRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets/%v/deleteSignedUrlKey", req.GetProject(), req.GetBackendBucket()) params := url.Values{} @@ -365,10 +384,15 @@ func (c *backendBucketsRESTClient) DeleteSignedUrlKey(ctx context.Context, req * baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_bucket", url.QueryEscape(req.GetBackendBucket()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -412,14 +436,22 @@ func (c *backendBucketsRESTClient) DeleteSignedUrlKey(ctx context.Context, req * // Get returns the specified BackendBucket resource. Gets a list of available backend buckets by making a list() request. func (c *backendBucketsRESTClient) Get(ctx context.Context, req *computepb.GetBackendBucketRequest, opts ...gax.CallOption) (*computepb.BackendBucket, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets/%v", req.GetProject(), req.GetBackendBucket()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_bucket", url.QueryEscape(req.GetBackendBucket()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.BackendBucket{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -463,7 +495,10 @@ func (c *backendBucketsRESTClient) Insert(ctx context.Context, req *computepb.In return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets", req.GetProject()) params := url.Values{} @@ -474,10 +509,15 @@ func (c *backendBucketsRESTClient) Insert(ctx context.Context, req *computepb.In baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -534,7 +574,10 @@ func (c *backendBucketsRESTClient) List(ctx context.Context, req *computepb.List } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets", req.GetProject()) params := url.Values{} @@ -559,6 +602,9 @@ func (c *backendBucketsRESTClient) List(ctx context.Context, req *computepb.List // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -618,7 +664,10 @@ func (c *backendBucketsRESTClient) Patch(ctx context.Context, req *computepb.Pat return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets/%v", req.GetProject(), req.GetBackendBucket()) params := url.Values{} @@ -629,10 +678,15 @@ func (c *backendBucketsRESTClient) Patch(ctx context.Context, req *computepb.Pat baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_bucket", url.QueryEscape(req.GetBackendBucket()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -683,7 +737,10 @@ func (c *backendBucketsRESTClient) SetEdgeSecurityPolicy(ctx context.Context, re return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets/%v/setEdgeSecurityPolicy", req.GetProject(), req.GetBackendBucket()) params := url.Values{} @@ -694,10 +751,15 @@ func (c *backendBucketsRESTClient) SetEdgeSecurityPolicy(ctx context.Context, re baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_bucket", url.QueryEscape(req.GetBackendBucket()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -748,7 +810,10 @@ func (c *backendBucketsRESTClient) Update(ctx context.Context, req *computepb.Up return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets/%v", req.GetProject(), req.GetBackendBucket()) params := url.Values{} @@ -759,10 +824,15 @@ func (c *backendBucketsRESTClient) Update(ctx context.Context, req *computepb.Up baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_bucket", url.QueryEscape(req.GetBackendBucket()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/backend_services_client.go b/vendor/cloud.google.com/go/compute/apiv1/backend_services_client.go index 9fe61ff99..79b63a7ee 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/backend_services_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/backend_services_client.go @@ -259,7 +259,10 @@ func (c *backendServicesRESTClient) AddSignedUrlKey(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v/addSignedUrlKey", req.GetProject(), req.GetBackendService()) params := url.Values{} @@ -270,10 +273,15 @@ func (c *backendServicesRESTClient) AddSignedUrlKey(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -330,7 +338,10 @@ func (c *backendServicesRESTClient) AggregatedList(ctx context.Context, req *com } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/backendServices", req.GetProject()) params := url.Values{} @@ -358,6 +369,9 @@ func (c *backendServicesRESTClient) AggregatedList(ctx context.Context, req *com // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -417,7 +431,10 @@ func (c *backendServicesRESTClient) AggregatedList(ctx context.Context, req *com // Delete deletes the specified BackendService resource. func (c *backendServicesRESTClient) Delete(ctx context.Context, req *computepb.DeleteBackendServiceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v", req.GetProject(), req.GetBackendService()) params := url.Values{} @@ -428,10 +445,15 @@ func (c *backendServicesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -475,7 +497,10 @@ func (c *backendServicesRESTClient) Delete(ctx context.Context, req *computepb.D // DeleteSignedUrlKey deletes a key for validating requests with signed URLs for this backend service. func (c *backendServicesRESTClient) DeleteSignedUrlKey(ctx context.Context, req *computepb.DeleteSignedUrlKeyBackendServiceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v/deleteSignedUrlKey", req.GetProject(), req.GetBackendService()) params := url.Values{} @@ -487,10 +512,15 @@ func (c *backendServicesRESTClient) DeleteSignedUrlKey(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -534,14 +564,22 @@ func (c *backendServicesRESTClient) DeleteSignedUrlKey(ctx context.Context, req // Get returns the specified BackendService resource. Gets a list of available backend services. func (c *backendServicesRESTClient) Get(ctx context.Context, req *computepb.GetBackendServiceRequest, opts ...gax.CallOption) (*computepb.BackendService, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v", req.GetProject(), req.GetBackendService()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.BackendService{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -585,14 +623,22 @@ func (c *backendServicesRESTClient) GetHealth(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v/getHealth", req.GetProject(), req.GetBackendService()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.BackendServiceGroupHealth{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -636,7 +682,10 @@ func (c *backendServicesRESTClient) Insert(ctx context.Context, req *computepb.I return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices", req.GetProject()) params := url.Values{} @@ -647,10 +696,15 @@ func (c *backendServicesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -707,7 +761,10 @@ func (c *backendServicesRESTClient) List(ctx context.Context, req *computepb.Lis } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices", req.GetProject()) params := url.Values{} @@ -732,6 +789,9 @@ func (c *backendServicesRESTClient) List(ctx context.Context, req *computepb.Lis // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -791,7 +851,10 @@ func (c *backendServicesRESTClient) Patch(ctx context.Context, req *computepb.Pa return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v", req.GetProject(), req.GetBackendService()) params := url.Values{} @@ -802,10 +865,15 @@ func (c *backendServicesRESTClient) Patch(ctx context.Context, req *computepb.Pa baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -856,7 +924,10 @@ func (c *backendServicesRESTClient) SetEdgeSecurityPolicy(ctx context.Context, r return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v/setEdgeSecurityPolicy", req.GetProject(), req.GetBackendService()) params := url.Values{} @@ -867,10 +938,15 @@ func (c *backendServicesRESTClient) SetEdgeSecurityPolicy(ctx context.Context, r baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -921,7 +997,10 @@ func (c *backendServicesRESTClient) SetSecurityPolicy(ctx context.Context, req * return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v/setSecurityPolicy", req.GetProject(), req.GetBackendService()) params := url.Values{} @@ -932,10 +1011,15 @@ func (c *backendServicesRESTClient) SetSecurityPolicy(ctx context.Context, req * baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -986,7 +1070,10 @@ func (c *backendServicesRESTClient) Update(ctx context.Context, req *computepb.U return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v", req.GetProject(), req.GetBackendService()) params := url.Values{} @@ -997,10 +1084,15 @@ func (c *backendServicesRESTClient) Update(ctx context.Context, req *computepb.U baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/disk_types_client.go b/vendor/cloud.google.com/go/compute/apiv1/disk_types_client.go index 08e8194e0..e1dc0554d 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/disk_types_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/disk_types_client.go @@ -185,7 +185,10 @@ func (c *diskTypesRESTClient) AggregatedList(ctx context.Context, req *computepb } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/diskTypes", req.GetProject()) params := url.Values{} @@ -213,6 +216,9 @@ func (c *diskTypesRESTClient) AggregatedList(ctx context.Context, req *computepb // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -272,14 +278,22 @@ func (c *diskTypesRESTClient) AggregatedList(ctx context.Context, req *computepb // Get returns the specified disk type. Gets a list of available disk types by making a list() request. func (c *diskTypesRESTClient) Get(ctx context.Context, req *computepb.GetDiskTypeRequest, opts ...gax.CallOption) (*computepb.DiskType, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/diskTypes/%v", req.GetProject(), req.GetZone(), req.GetDiskType()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "disk_type", url.QueryEscape(req.GetDiskType()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.DiskType{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -329,7 +343,10 @@ func (c *diskTypesRESTClient) List(ctx context.Context, req *computepb.ListDiskT } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/diskTypes", req.GetProject(), req.GetZone()) params := url.Values{} @@ -354,6 +371,9 @@ func (c *diskTypesRESTClient) List(ctx context.Context, req *computepb.ListDiskT // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/disks_client.go b/vendor/cloud.google.com/go/compute/apiv1/disks_client.go index 63ac3f37d..ea69846a8 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/disks_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/disks_client.go @@ -266,7 +266,10 @@ func (c *disksRESTClient) AddResourcePolicies(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/addResourcePolicies", req.GetProject(), req.GetZone(), req.GetDisk()) params := url.Values{} @@ -277,10 +280,15 @@ func (c *disksRESTClient) AddResourcePolicies(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -338,7 +346,10 @@ func (c *disksRESTClient) AggregatedList(ctx context.Context, req *computepb.Agg } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/disks", req.GetProject()) params := url.Values{} @@ -366,6 +377,9 @@ func (c *disksRESTClient) AggregatedList(ctx context.Context, req *computepb.Agg // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -432,7 +446,10 @@ func (c *disksRESTClient) CreateSnapshot(ctx context.Context, req *computepb.Cre return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/createSnapshot", req.GetProject(), req.GetZone(), req.GetDisk()) params := url.Values{} @@ -446,10 +463,15 @@ func (c *disksRESTClient) CreateSnapshot(ctx context.Context, req *computepb.Cre baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -494,7 +516,10 @@ func (c *disksRESTClient) CreateSnapshot(ctx context.Context, req *computepb.Cre // Delete deletes the specified persistent disk. Deleting a disk removes its data permanently and is irreversible. However, deleting a disk does not delete any snapshots previously made from the disk. You must separately delete snapshots. func (c *disksRESTClient) Delete(ctx context.Context, req *computepb.DeleteDiskRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v", req.GetProject(), req.GetZone(), req.GetDisk()) params := url.Values{} @@ -505,10 +530,15 @@ func (c *disksRESTClient) Delete(ctx context.Context, req *computepb.DeleteDiskR baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -553,14 +583,22 @@ func (c *disksRESTClient) Delete(ctx context.Context, req *computepb.DeleteDiskR // Get returns a specified persistent disk. Gets a list of available persistent disks by making a list() request. func (c *disksRESTClient) Get(ctx context.Context, req *computepb.GetDiskRequest, opts ...gax.CallOption) (*computepb.Disk, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v", req.GetProject(), req.GetZone(), req.GetDisk()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Disk{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -597,7 +635,10 @@ func (c *disksRESTClient) Get(ctx context.Context, req *computepb.GetDiskRequest // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *disksRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyDiskRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/getIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) params := url.Values{} @@ -608,10 +649,15 @@ func (c *disksRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIa baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -655,7 +701,10 @@ func (c *disksRESTClient) Insert(ctx context.Context, req *computepb.InsertDiskR return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks", req.GetProject(), req.GetZone()) params := url.Values{} @@ -669,10 +718,15 @@ func (c *disksRESTClient) Insert(ctx context.Context, req *computepb.InsertDiskR baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -730,7 +784,10 @@ func (c *disksRESTClient) List(ctx context.Context, req *computepb.ListDisksRequ } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks", req.GetProject(), req.GetZone()) params := url.Values{} @@ -755,6 +812,9 @@ func (c *disksRESTClient) List(ctx context.Context, req *computepb.ListDisksRequ // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -814,7 +874,10 @@ func (c *disksRESTClient) RemoveResourcePolicies(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/removeResourcePolicies", req.GetProject(), req.GetZone(), req.GetDisk()) params := url.Values{} @@ -825,10 +888,15 @@ func (c *disksRESTClient) RemoveResourcePolicies(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -880,7 +948,10 @@ func (c *disksRESTClient) Resize(ctx context.Context, req *computepb.ResizeDiskR return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/resize", req.GetProject(), req.GetZone(), req.GetDisk()) params := url.Values{} @@ -891,10 +962,15 @@ func (c *disksRESTClient) Resize(ctx context.Context, req *computepb.ResizeDiskR baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -946,14 +1022,22 @@ func (c *disksRESTClient) SetIamPolicy(ctx context.Context, req *computepb.SetIa return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/setIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -997,7 +1081,10 @@ func (c *disksRESTClient) SetLabels(ctx context.Context, req *computepb.SetLabel return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/setLabels", req.GetProject(), req.GetZone(), req.GetResource()) params := url.Values{} @@ -1008,10 +1095,15 @@ func (c *disksRESTClient) SetLabels(ctx context.Context, req *computepb.SetLabel baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1063,14 +1155,22 @@ func (c *disksRESTClient) TestIamPermissions(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/external_vpn_gateways_client.go b/vendor/cloud.google.com/go/compute/apiv1/external_vpn_gateways_client.go index b44ae3585..9b27d6657 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/external_vpn_gateways_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/external_vpn_gateways_client.go @@ -209,7 +209,10 @@ func (c *externalVpnGatewaysRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified externalVpnGateway. func (c *externalVpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb.DeleteExternalVpnGatewayRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways/%v", req.GetProject(), req.GetExternalVpnGateway()) params := url.Values{} @@ -220,10 +223,15 @@ func (c *externalVpnGatewaysRESTClient) Delete(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "external_vpn_gateway", url.QueryEscape(req.GetExternalVpnGateway()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -267,14 +275,22 @@ func (c *externalVpnGatewaysRESTClient) Delete(ctx context.Context, req *compute // Get returns the specified externalVpnGateway. Get a list of available externalVpnGateways by making a list() request. func (c *externalVpnGatewaysRESTClient) Get(ctx context.Context, req *computepb.GetExternalVpnGatewayRequest, opts ...gax.CallOption) (*computepb.ExternalVpnGateway, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways/%v", req.GetProject(), req.GetExternalVpnGateway()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "external_vpn_gateway", url.QueryEscape(req.GetExternalVpnGateway()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.ExternalVpnGateway{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -318,7 +334,10 @@ func (c *externalVpnGatewaysRESTClient) Insert(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways", req.GetProject()) params := url.Values{} @@ -329,10 +348,15 @@ func (c *externalVpnGatewaysRESTClient) Insert(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -389,7 +413,10 @@ func (c *externalVpnGatewaysRESTClient) List(ctx context.Context, req *computepb } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways", req.GetProject()) params := url.Values{} @@ -414,6 +441,9 @@ func (c *externalVpnGatewaysRESTClient) List(ctx context.Context, req *computepb // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -473,14 +503,22 @@ func (c *externalVpnGatewaysRESTClient) SetLabels(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways/%v/setLabels", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -531,14 +569,22 @@ func (c *externalVpnGatewaysRESTClient) TestIamPermissions(ctx context.Context, return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways/%v/testIamPermissions", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/firewall_policies_client.go b/vendor/cloud.google.com/go/compute/apiv1/firewall_policies_client.go index 63b6d7f74..acc09ffa7 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/firewall_policies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/firewall_policies_client.go @@ -300,7 +300,10 @@ func (c *firewallPoliciesRESTClient) AddAssociation(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/addAssociation", req.GetFirewallPolicy()) params := url.Values{} @@ -314,10 +317,15 @@ func (c *firewallPoliciesRESTClient) AddAssociation(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -367,7 +375,10 @@ func (c *firewallPoliciesRESTClient) AddRule(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/addRule", req.GetFirewallPolicy()) params := url.Values{} @@ -378,10 +389,15 @@ func (c *firewallPoliciesRESTClient) AddRule(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -424,7 +440,10 @@ func (c *firewallPoliciesRESTClient) AddRule(ctx context.Context, req *computepb // CloneRules copies rules to the specified firewall policy. func (c *firewallPoliciesRESTClient) CloneRules(ctx context.Context, req *computepb.CloneRulesFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/cloneRules", req.GetFirewallPolicy()) params := url.Values{} @@ -438,10 +457,15 @@ func (c *firewallPoliciesRESTClient) CloneRules(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -484,7 +508,10 @@ func (c *firewallPoliciesRESTClient) CloneRules(ctx context.Context, req *comput // Delete deletes the specified policy. func (c *firewallPoliciesRESTClient) Delete(ctx context.Context, req *computepb.DeleteFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v", req.GetFirewallPolicy()) params := url.Values{} @@ -495,10 +522,15 @@ func (c *firewallPoliciesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -541,14 +573,22 @@ func (c *firewallPoliciesRESTClient) Delete(ctx context.Context, req *computepb. // Get returns the specified firewall policy. func (c *firewallPoliciesRESTClient) Get(ctx context.Context, req *computepb.GetFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v", req.GetFirewallPolicy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -585,7 +625,10 @@ func (c *firewallPoliciesRESTClient) Get(ctx context.Context, req *computepb.Get // GetAssociation gets an association with the specified name. func (c *firewallPoliciesRESTClient) GetAssociation(ctx context.Context, req *computepb.GetAssociationFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicyAssociation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/getAssociation", req.GetFirewallPolicy()) params := url.Values{} @@ -596,10 +639,15 @@ func (c *firewallPoliciesRESTClient) GetAssociation(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicyAssociation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -636,7 +684,10 @@ func (c *firewallPoliciesRESTClient) GetAssociation(ctx context.Context, req *co // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *firewallPoliciesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/getIamPolicy", req.GetResource()) params := url.Values{} @@ -647,10 +698,15 @@ func (c *firewallPoliciesRESTClient) GetIamPolicy(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -687,7 +743,10 @@ func (c *firewallPoliciesRESTClient) GetIamPolicy(ctx context.Context, req *comp // GetRule gets a rule of the specified priority. func (c *firewallPoliciesRESTClient) GetRule(ctx context.Context, req *computepb.GetRuleFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicyRule, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/getRule", req.GetFirewallPolicy()) params := url.Values{} @@ -698,10 +757,15 @@ func (c *firewallPoliciesRESTClient) GetRule(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicyRule{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -745,7 +809,10 @@ func (c *firewallPoliciesRESTClient) Insert(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies") params := url.Values{} @@ -761,6 +828,9 @@ func (c *firewallPoliciesRESTClient) Insert(ctx context.Context, req *computepb. unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -816,7 +886,10 @@ func (c *firewallPoliciesRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies") params := url.Values{} @@ -844,6 +917,9 @@ func (c *firewallPoliciesRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -896,7 +972,10 @@ func (c *firewallPoliciesRESTClient) List(ctx context.Context, req *computepb.Li // ListAssociations lists associations of a specified target, i.e., organization or folder. func (c *firewallPoliciesRESTClient) ListAssociations(ctx context.Context, req *computepb.ListAssociationsFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPoliciesListAssociationsResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/listAssociations") params := url.Values{} @@ -911,6 +990,9 @@ func (c *firewallPoliciesRESTClient) ListAssociations(ctx context.Context, req * unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPoliciesListAssociationsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -947,13 +1029,14 @@ func (c *firewallPoliciesRESTClient) ListAssociations(ctx context.Context, req * // Move moves the specified firewall policy. func (c *firewallPoliciesRESTClient) Move(ctx context.Context, req *computepb.MoveFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/move", req.GetFirewallPolicy()) params := url.Values{} - if req != nil && req.ParentId != nil { - params.Add("parentId", fmt.Sprintf("%v", req.GetParentId())) - } + params.Add("parentId", fmt.Sprintf("%v", req.GetParentId())) if req != nil && req.RequestId != nil { params.Add("requestId", fmt.Sprintf("%v", req.GetRequestId())) } @@ -961,10 +1044,15 @@ func (c *firewallPoliciesRESTClient) Move(ctx context.Context, req *computepb.Mo baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1014,7 +1102,10 @@ func (c *firewallPoliciesRESTClient) Patch(ctx context.Context, req *computepb.P return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v", req.GetFirewallPolicy()) params := url.Values{} @@ -1025,10 +1116,15 @@ func (c *firewallPoliciesRESTClient) Patch(ctx context.Context, req *computepb.P baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1078,7 +1174,10 @@ func (c *firewallPoliciesRESTClient) PatchRule(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/patchRule", req.GetFirewallPolicy()) params := url.Values{} @@ -1092,10 +1191,15 @@ func (c *firewallPoliciesRESTClient) PatchRule(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1138,7 +1242,10 @@ func (c *firewallPoliciesRESTClient) PatchRule(ctx context.Context, req *compute // RemoveAssociation removes an association for the specified firewall policy. func (c *firewallPoliciesRESTClient) RemoveAssociation(ctx context.Context, req *computepb.RemoveAssociationFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/removeAssociation", req.GetFirewallPolicy()) params := url.Values{} @@ -1152,10 +1259,15 @@ func (c *firewallPoliciesRESTClient) RemoveAssociation(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1198,7 +1310,10 @@ func (c *firewallPoliciesRESTClient) RemoveAssociation(ctx context.Context, req // RemoveRule deletes a rule of the specified priority. func (c *firewallPoliciesRESTClient) RemoveRule(ctx context.Context, req *computepb.RemoveRuleFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/removeRule", req.GetFirewallPolicy()) params := url.Values{} @@ -1212,10 +1327,15 @@ func (c *firewallPoliciesRESTClient) RemoveRule(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1265,14 +1385,22 @@ func (c *firewallPoliciesRESTClient) SetIamPolicy(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/setIamPolicy", req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1316,14 +1444,22 @@ func (c *firewallPoliciesRESTClient) TestIamPermissions(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/testIamPermissions", req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/firewalls_client.go b/vendor/cloud.google.com/go/compute/apiv1/firewalls_client.go index a3f358eca..0e123d260 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/firewalls_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/firewalls_client.go @@ -209,7 +209,10 @@ func (c *firewallsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified firewall. func (c *firewallsRESTClient) Delete(ctx context.Context, req *computepb.DeleteFirewallRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewalls/%v", req.GetProject(), req.GetFirewall()) params := url.Values{} @@ -220,10 +223,15 @@ func (c *firewallsRESTClient) Delete(ctx context.Context, req *computepb.DeleteF baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall", url.QueryEscape(req.GetFirewall()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -267,14 +275,22 @@ func (c *firewallsRESTClient) Delete(ctx context.Context, req *computepb.DeleteF // Get returns the specified firewall. func (c *firewallsRESTClient) Get(ctx context.Context, req *computepb.GetFirewallRequest, opts ...gax.CallOption) (*computepb.Firewall, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewalls/%v", req.GetProject(), req.GetFirewall()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall", url.QueryEscape(req.GetFirewall()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Firewall{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -318,7 +334,10 @@ func (c *firewallsRESTClient) Insert(ctx context.Context, req *computepb.InsertF return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewalls", req.GetProject()) params := url.Values{} @@ -329,10 +348,15 @@ func (c *firewallsRESTClient) Insert(ctx context.Context, req *computepb.InsertF baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -389,7 +413,10 @@ func (c *firewallsRESTClient) List(ctx context.Context, req *computepb.ListFirew } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewalls", req.GetProject()) params := url.Values{} @@ -414,6 +441,9 @@ func (c *firewallsRESTClient) List(ctx context.Context, req *computepb.ListFirew // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -473,7 +503,10 @@ func (c *firewallsRESTClient) Patch(ctx context.Context, req *computepb.PatchFir return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewalls/%v", req.GetProject(), req.GetFirewall()) params := url.Values{} @@ -484,10 +517,15 @@ func (c *firewallsRESTClient) Patch(ctx context.Context, req *computepb.PatchFir baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall", url.QueryEscape(req.GetFirewall()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -538,7 +576,10 @@ func (c *firewallsRESTClient) Update(ctx context.Context, req *computepb.UpdateF return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewalls/%v", req.GetProject(), req.GetFirewall()) params := url.Values{} @@ -549,10 +590,15 @@ func (c *firewallsRESTClient) Update(ctx context.Context, req *computepb.UpdateF baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall", url.QueryEscape(req.GetFirewall()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/forwarding_rules_client.go b/vendor/cloud.google.com/go/compute/apiv1/forwarding_rules_client.go index 967779e73..c28e64706 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/forwarding_rules_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/forwarding_rules_client.go @@ -237,7 +237,10 @@ func (c *forwardingRulesRESTClient) AggregatedList(ctx context.Context, req *com } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/forwardingRules", req.GetProject()) params := url.Values{} @@ -265,6 +268,9 @@ func (c *forwardingRulesRESTClient) AggregatedList(ctx context.Context, req *com // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -324,7 +330,10 @@ func (c *forwardingRulesRESTClient) AggregatedList(ctx context.Context, req *com // Delete deletes the specified ForwardingRule resource. func (c *forwardingRulesRESTClient) Delete(ctx context.Context, req *computepb.DeleteForwardingRuleRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/forwardingRules/%v", req.GetProject(), req.GetRegion(), req.GetForwardingRule()) params := url.Values{} @@ -335,10 +344,15 @@ func (c *forwardingRulesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "forwarding_rule", url.QueryEscape(req.GetForwardingRule()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -383,14 +397,22 @@ func (c *forwardingRulesRESTClient) Delete(ctx context.Context, req *computepb.D // Get returns the specified ForwardingRule resource. func (c *forwardingRulesRESTClient) Get(ctx context.Context, req *computepb.GetForwardingRuleRequest, opts ...gax.CallOption) (*computepb.ForwardingRule, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/forwardingRules/%v", req.GetProject(), req.GetRegion(), req.GetForwardingRule()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "forwarding_rule", url.QueryEscape(req.GetForwardingRule()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.ForwardingRule{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -434,7 +456,10 @@ func (c *forwardingRulesRESTClient) Insert(ctx context.Context, req *computepb.I return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/forwardingRules", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -445,10 +470,15 @@ func (c *forwardingRulesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -506,7 +536,10 @@ func (c *forwardingRulesRESTClient) List(ctx context.Context, req *computepb.Lis } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/forwardingRules", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -531,6 +564,9 @@ func (c *forwardingRulesRESTClient) List(ctx context.Context, req *computepb.Lis // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -590,7 +626,10 @@ func (c *forwardingRulesRESTClient) Patch(ctx context.Context, req *computepb.Pa return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/forwardingRules/%v", req.GetProject(), req.GetRegion(), req.GetForwardingRule()) params := url.Values{} @@ -601,10 +640,15 @@ func (c *forwardingRulesRESTClient) Patch(ctx context.Context, req *computepb.Pa baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "forwarding_rule", url.QueryEscape(req.GetForwardingRule()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -656,7 +700,10 @@ func (c *forwardingRulesRESTClient) SetLabels(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/forwardingRules/%v/setLabels", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -667,10 +714,15 @@ func (c *forwardingRulesRESTClient) SetLabels(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -722,7 +774,10 @@ func (c *forwardingRulesRESTClient) SetTarget(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/forwardingRules/%v/setTarget", req.GetProject(), req.GetRegion(), req.GetForwardingRule()) params := url.Values{} @@ -733,10 +788,15 @@ func (c *forwardingRulesRESTClient) SetTarget(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "forwarding_rule", url.QueryEscape(req.GetForwardingRule()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/global_addresses_client.go b/vendor/cloud.google.com/go/compute/apiv1/global_addresses_client.go index 5ce280f84..02b6ea9a9 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/global_addresses_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/global_addresses_client.go @@ -195,7 +195,10 @@ func (c *globalAddressesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified address resource. func (c *globalAddressesRESTClient) Delete(ctx context.Context, req *computepb.DeleteGlobalAddressRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/addresses/%v", req.GetProject(), req.GetAddress()) params := url.Values{} @@ -206,10 +209,15 @@ func (c *globalAddressesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "address", url.QueryEscape(req.GetAddress()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -253,14 +261,22 @@ func (c *globalAddressesRESTClient) Delete(ctx context.Context, req *computepb.D // Get returns the specified address resource. Gets a list of available addresses by making a list() request. func (c *globalAddressesRESTClient) Get(ctx context.Context, req *computepb.GetGlobalAddressRequest, opts ...gax.CallOption) (*computepb.Address, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/addresses/%v", req.GetProject(), req.GetAddress()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "address", url.QueryEscape(req.GetAddress()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Address{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -304,7 +320,10 @@ func (c *globalAddressesRESTClient) Insert(ctx context.Context, req *computepb.I return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/addresses", req.GetProject()) params := url.Values{} @@ -315,10 +334,15 @@ func (c *globalAddressesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -375,7 +399,10 @@ func (c *globalAddressesRESTClient) List(ctx context.Context, req *computepb.Lis } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/addresses", req.GetProject()) params := url.Values{} @@ -400,6 +427,9 @@ func (c *globalAddressesRESTClient) List(ctx context.Context, req *computepb.Lis // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/global_forwarding_rules_client.go b/vendor/cloud.google.com/go/compute/apiv1/global_forwarding_rules_client.go index 00dd51853..c4f60bee7 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/global_forwarding_rules_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/global_forwarding_rules_client.go @@ -216,7 +216,10 @@ func (c *globalForwardingRulesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified GlobalForwardingRule resource. func (c *globalForwardingRulesRESTClient) Delete(ctx context.Context, req *computepb.DeleteGlobalForwardingRuleRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules/%v", req.GetProject(), req.GetForwardingRule()) params := url.Values{} @@ -227,10 +230,15 @@ func (c *globalForwardingRulesRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "forwarding_rule", url.QueryEscape(req.GetForwardingRule()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -274,14 +282,22 @@ func (c *globalForwardingRulesRESTClient) Delete(ctx context.Context, req *compu // Get returns the specified GlobalForwardingRule resource. Gets a list of available forwarding rules by making a list() request. func (c *globalForwardingRulesRESTClient) Get(ctx context.Context, req *computepb.GetGlobalForwardingRuleRequest, opts ...gax.CallOption) (*computepb.ForwardingRule, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules/%v", req.GetProject(), req.GetForwardingRule()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "forwarding_rule", url.QueryEscape(req.GetForwardingRule()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.ForwardingRule{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -325,7 +341,10 @@ func (c *globalForwardingRulesRESTClient) Insert(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules", req.GetProject()) params := url.Values{} @@ -336,10 +355,15 @@ func (c *globalForwardingRulesRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -396,7 +420,10 @@ func (c *globalForwardingRulesRESTClient) List(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules", req.GetProject()) params := url.Values{} @@ -421,6 +448,9 @@ func (c *globalForwardingRulesRESTClient) List(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -480,7 +510,10 @@ func (c *globalForwardingRulesRESTClient) Patch(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules/%v", req.GetProject(), req.GetForwardingRule()) params := url.Values{} @@ -491,10 +524,15 @@ func (c *globalForwardingRulesRESTClient) Patch(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "forwarding_rule", url.QueryEscape(req.GetForwardingRule()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -545,14 +583,22 @@ func (c *globalForwardingRulesRESTClient) SetLabels(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules/%v/setLabels", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -603,7 +649,10 @@ func (c *globalForwardingRulesRESTClient) SetTarget(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules/%v/setTarget", req.GetProject(), req.GetForwardingRule()) params := url.Values{} @@ -614,10 +663,15 @@ func (c *globalForwardingRulesRESTClient) SetTarget(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "forwarding_rule", url.QueryEscape(req.GetForwardingRule()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/global_network_endpoint_groups_client.go b/vendor/cloud.google.com/go/compute/apiv1/global_network_endpoint_groups_client.go index b6e089253..1f1d5e4b1 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/global_network_endpoint_groups_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/global_network_endpoint_groups_client.go @@ -223,7 +223,10 @@ func (c *globalNetworkEndpointGroupsRESTClient) AttachNetworkEndpoints(ctx conte return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networkEndpointGroups/%v/attachNetworkEndpoints", req.GetProject(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -234,10 +237,15 @@ func (c *globalNetworkEndpointGroupsRESTClient) AttachNetworkEndpoints(ctx conte baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -281,7 +289,10 @@ func (c *globalNetworkEndpointGroupsRESTClient) AttachNetworkEndpoints(ctx conte // Delete deletes the specified network endpoint group.Note that the NEG cannot be deleted if there are backend services referencing it. func (c *globalNetworkEndpointGroupsRESTClient) Delete(ctx context.Context, req *computepb.DeleteGlobalNetworkEndpointGroupRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networkEndpointGroups/%v", req.GetProject(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -292,10 +303,15 @@ func (c *globalNetworkEndpointGroupsRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -346,7 +362,10 @@ func (c *globalNetworkEndpointGroupsRESTClient) DetachNetworkEndpoints(ctx conte return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networkEndpointGroups/%v/detachNetworkEndpoints", req.GetProject(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -357,10 +376,15 @@ func (c *globalNetworkEndpointGroupsRESTClient) DetachNetworkEndpoints(ctx conte baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -404,14 +428,22 @@ func (c *globalNetworkEndpointGroupsRESTClient) DetachNetworkEndpoints(ctx conte // Get returns the specified network endpoint group. Gets a list of available network endpoint groups by making a list() request. func (c *globalNetworkEndpointGroupsRESTClient) Get(ctx context.Context, req *computepb.GetGlobalNetworkEndpointGroupRequest, opts ...gax.CallOption) (*computepb.NetworkEndpointGroup, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networkEndpointGroups/%v", req.GetProject(), req.GetNetworkEndpointGroup()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NetworkEndpointGroup{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -455,7 +487,10 @@ func (c *globalNetworkEndpointGroupsRESTClient) Insert(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networkEndpointGroups", req.GetProject()) params := url.Values{} @@ -466,10 +501,15 @@ func (c *globalNetworkEndpointGroupsRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -526,7 +566,10 @@ func (c *globalNetworkEndpointGroupsRESTClient) List(ctx context.Context, req *c } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networkEndpointGroups", req.GetProject()) params := url.Values{} @@ -551,6 +594,9 @@ func (c *globalNetworkEndpointGroupsRESTClient) List(ctx context.Context, req *c // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -616,7 +662,10 @@ func (c *globalNetworkEndpointGroupsRESTClient) ListNetworkEndpoints(ctx context } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networkEndpointGroups/%v/listNetworkEndpoints", req.GetProject(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -641,6 +690,9 @@ func (c *globalNetworkEndpointGroupsRESTClient) ListNetworkEndpoints(ctx context // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/global_operations_client.go b/vendor/cloud.google.com/go/compute/apiv1/global_operations_client.go index 0d227456e..83ad02468 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/global_operations_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/global_operations_client.go @@ -199,7 +199,10 @@ func (c *globalOperationsRESTClient) AggregatedList(ctx context.Context, req *co } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/operations", req.GetProject()) params := url.Values{} @@ -227,6 +230,9 @@ func (c *globalOperationsRESTClient) AggregatedList(ctx context.Context, req *co // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -286,14 +292,22 @@ func (c *globalOperationsRESTClient) AggregatedList(ctx context.Context, req *co // Delete deletes the specified Operations resource. func (c *globalOperationsRESTClient) Delete(ctx context.Context, req *computepb.DeleteGlobalOperationRequest, opts ...gax.CallOption) (*computepb.DeleteGlobalOperationResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/operations/%v", req.GetProject(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.DeleteGlobalOperationResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -330,14 +344,22 @@ func (c *globalOperationsRESTClient) Delete(ctx context.Context, req *computepb. // Get retrieves the specified Operations resource. func (c *globalOperationsRESTClient) Get(ctx context.Context, req *computepb.GetGlobalOperationRequest, opts ...gax.CallOption) (*computepb.Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/operations/%v", req.GetProject(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -387,7 +409,10 @@ func (c *globalOperationsRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/operations", req.GetProject()) params := url.Values{} @@ -412,6 +437,9 @@ func (c *globalOperationsRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -464,14 +492,22 @@ func (c *globalOperationsRESTClient) List(ctx context.Context, req *computepb.Li // Wait waits for the specified Operation resource to return as DONE or for the request to approach the 2 minute deadline, and retrieves the specified Operation resource. This method differs from the GET method in that it waits for no more than the default deadline (2 minutes) and then returns the current state of the operation, which might be DONE or still in progress. This method is called on a best-effort basis. Specifically: - In uncommon cases, when the server is overloaded, the request might return before the default deadline is reached, or might return after zero seconds. - If the default deadline is reached, there is no guarantee that the operation is actually done when the method returns. Be prepared to retry if the operation is not DONE. func (c *globalOperationsRESTClient) Wait(ctx context.Context, req *computepb.WaitGlobalOperationRequest, opts ...gax.CallOption) (*computepb.Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/operations/%v/wait", req.GetProject(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/global_organization_operations_client.go b/vendor/cloud.google.com/go/compute/apiv1/global_organization_operations_client.go index fb9caf888..7e322ade3 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/global_organization_operations_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/global_organization_operations_client.go @@ -171,7 +171,10 @@ func (c *globalOrganizationOperationsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified Operations resource. func (c *globalOrganizationOperationsRESTClient) Delete(ctx context.Context, req *computepb.DeleteGlobalOrganizationOperationRequest, opts ...gax.CallOption) (*computepb.DeleteGlobalOrganizationOperationResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/operations/%v", req.GetOperation()) params := url.Values{} @@ -182,10 +185,15 @@ func (c *globalOrganizationOperationsRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.DeleteGlobalOrganizationOperationResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -222,7 +230,10 @@ func (c *globalOrganizationOperationsRESTClient) Delete(ctx context.Context, req // Get retrieves the specified Operations resource. Gets a list of operations by making a list() request. func (c *globalOrganizationOperationsRESTClient) Get(ctx context.Context, req *computepb.GetGlobalOrganizationOperationRequest, opts ...gax.CallOption) (*computepb.Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/operations/%v", req.GetOperation()) params := url.Values{} @@ -233,10 +244,15 @@ func (c *globalOrganizationOperationsRESTClient) Get(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -286,7 +302,10 @@ func (c *globalOrganizationOperationsRESTClient) List(ctx context.Context, req * } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/operations") params := url.Values{} @@ -314,6 +333,9 @@ func (c *globalOrganizationOperationsRESTClient) List(ctx context.Context, req * // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/global_public_delegated_prefixes_client.go b/vendor/cloud.google.com/go/compute/apiv1/global_public_delegated_prefixes_client.go index d1886ca99..7dea7aca1 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/global_public_delegated_prefixes_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/global_public_delegated_prefixes_client.go @@ -202,7 +202,10 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Connection() *grpc.ClientConn // Delete deletes the specified global PublicDelegatedPrefix. func (c *globalPublicDelegatedPrefixesRESTClient) Delete(ctx context.Context, req *computepb.DeleteGlobalPublicDelegatedPrefixeRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicDelegatedPrefixes/%v", req.GetProject(), req.GetPublicDelegatedPrefix()) params := url.Values{} @@ -213,10 +216,15 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Delete(ctx context.Context, re baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "public_delegated_prefix", url.QueryEscape(req.GetPublicDelegatedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -260,14 +268,22 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Delete(ctx context.Context, re // Get returns the specified global PublicDelegatedPrefix resource. func (c *globalPublicDelegatedPrefixesRESTClient) Get(ctx context.Context, req *computepb.GetGlobalPublicDelegatedPrefixeRequest, opts ...gax.CallOption) (*computepb.PublicDelegatedPrefix, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicDelegatedPrefixes/%v", req.GetProject(), req.GetPublicDelegatedPrefix()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "public_delegated_prefix", url.QueryEscape(req.GetPublicDelegatedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.PublicDelegatedPrefix{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -311,7 +327,10 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Insert(ctx context.Context, re return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicDelegatedPrefixes", req.GetProject()) params := url.Values{} @@ -322,10 +341,15 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Insert(ctx context.Context, re baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -382,7 +406,10 @@ func (c *globalPublicDelegatedPrefixesRESTClient) List(ctx context.Context, req } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicDelegatedPrefixes", req.GetProject()) params := url.Values{} @@ -407,6 +434,9 @@ func (c *globalPublicDelegatedPrefixesRESTClient) List(ctx context.Context, req // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -466,7 +496,10 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Patch(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicDelegatedPrefixes/%v", req.GetProject(), req.GetPublicDelegatedPrefix()) params := url.Values{} @@ -477,10 +510,15 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Patch(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "public_delegated_prefix", url.QueryEscape(req.GetPublicDelegatedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/health_checks_client.go b/vendor/cloud.google.com/go/compute/apiv1/health_checks_client.go index 28011337f..664e88aae 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/health_checks_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/health_checks_client.go @@ -230,7 +230,10 @@ func (c *healthChecksRESTClient) AggregatedList(ctx context.Context, req *comput } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/healthChecks", req.GetProject()) params := url.Values{} @@ -258,6 +261,9 @@ func (c *healthChecksRESTClient) AggregatedList(ctx context.Context, req *comput // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -317,7 +323,10 @@ func (c *healthChecksRESTClient) AggregatedList(ctx context.Context, req *comput // Delete deletes the specified HealthCheck resource. func (c *healthChecksRESTClient) Delete(ctx context.Context, req *computepb.DeleteHealthCheckRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/healthChecks/%v", req.GetProject(), req.GetHealthCheck()) params := url.Values{} @@ -328,10 +337,15 @@ func (c *healthChecksRESTClient) Delete(ctx context.Context, req *computepb.Dele baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "health_check", url.QueryEscape(req.GetHealthCheck()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -375,14 +389,22 @@ func (c *healthChecksRESTClient) Delete(ctx context.Context, req *computepb.Dele // Get returns the specified HealthCheck resource. Gets a list of available health checks by making a list() request. func (c *healthChecksRESTClient) Get(ctx context.Context, req *computepb.GetHealthCheckRequest, opts ...gax.CallOption) (*computepb.HealthCheck, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/healthChecks/%v", req.GetProject(), req.GetHealthCheck()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "health_check", url.QueryEscape(req.GetHealthCheck()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.HealthCheck{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -426,7 +448,10 @@ func (c *healthChecksRESTClient) Insert(ctx context.Context, req *computepb.Inse return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/healthChecks", req.GetProject()) params := url.Values{} @@ -437,10 +462,15 @@ func (c *healthChecksRESTClient) Insert(ctx context.Context, req *computepb.Inse baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -497,7 +527,10 @@ func (c *healthChecksRESTClient) List(ctx context.Context, req *computepb.ListHe } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/healthChecks", req.GetProject()) params := url.Values{} @@ -522,6 +555,9 @@ func (c *healthChecksRESTClient) List(ctx context.Context, req *computepb.ListHe // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -581,7 +617,10 @@ func (c *healthChecksRESTClient) Patch(ctx context.Context, req *computepb.Patch return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/healthChecks/%v", req.GetProject(), req.GetHealthCheck()) params := url.Values{} @@ -592,10 +631,15 @@ func (c *healthChecksRESTClient) Patch(ctx context.Context, req *computepb.Patch baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "health_check", url.QueryEscape(req.GetHealthCheck()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -646,7 +690,10 @@ func (c *healthChecksRESTClient) Update(ctx context.Context, req *computepb.Upda return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/healthChecks/%v", req.GetProject(), req.GetHealthCheck()) params := url.Values{} @@ -657,10 +704,15 @@ func (c *healthChecksRESTClient) Update(ctx context.Context, req *computepb.Upda baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "health_check", url.QueryEscape(req.GetHealthCheck()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/image_family_views_client.go b/vendor/cloud.google.com/go/compute/apiv1/image_family_views_client.go index 4afa4959f..59eac966c 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/image_family_views_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/image_family_views_client.go @@ -154,14 +154,22 @@ func (c *imageFamilyViewsRESTClient) Connection() *grpc.ClientConn { // Get returns the latest image that is part of an image family, is not deprecated and is rolled out in the specified zone. func (c *imageFamilyViewsRESTClient) Get(ctx context.Context, req *computepb.GetImageFamilyViewRequest, opts ...gax.CallOption) (*computepb.ImageFamilyView, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/imageFamilyViews/%v", req.GetProject(), req.GetZone(), req.GetFamily()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "family", url.QueryEscape(req.GetFamily()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.ImageFamilyView{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/images_client.go b/vendor/cloud.google.com/go/compute/apiv1/images_client.go index d58fffd55..d96d8de47 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/images_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/images_client.go @@ -244,7 +244,10 @@ func (c *imagesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified image. func (c *imagesRESTClient) Delete(ctx context.Context, req *computepb.DeleteImageRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v", req.GetProject(), req.GetImage()) params := url.Values{} @@ -255,10 +258,15 @@ func (c *imagesRESTClient) Delete(ctx context.Context, req *computepb.DeleteImag baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "image", url.QueryEscape(req.GetImage()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -309,7 +317,10 @@ func (c *imagesRESTClient) Deprecate(ctx context.Context, req *computepb.Depreca return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v/deprecate", req.GetProject(), req.GetImage()) params := url.Values{} @@ -320,10 +331,15 @@ func (c *imagesRESTClient) Deprecate(ctx context.Context, req *computepb.Depreca baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "image", url.QueryEscape(req.GetImage()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -367,14 +383,22 @@ func (c *imagesRESTClient) Deprecate(ctx context.Context, req *computepb.Depreca // Get returns the specified image. Gets a list of available images by making a list() request. func (c *imagesRESTClient) Get(ctx context.Context, req *computepb.GetImageRequest, opts ...gax.CallOption) (*computepb.Image, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v", req.GetProject(), req.GetImage()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "image", url.QueryEscape(req.GetImage()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Image{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -411,14 +435,22 @@ func (c *imagesRESTClient) Get(ctx context.Context, req *computepb.GetImageReque // GetFromFamily returns the latest image that is part of an image family and is not deprecated. func (c *imagesRESTClient) GetFromFamily(ctx context.Context, req *computepb.GetFromFamilyImageRequest, opts ...gax.CallOption) (*computepb.Image, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/family/%v", req.GetProject(), req.GetFamily()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "family", url.QueryEscape(req.GetFamily()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Image{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -455,7 +487,10 @@ func (c *imagesRESTClient) GetFromFamily(ctx context.Context, req *computepb.Get // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *imagesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyImageRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v/getIamPolicy", req.GetProject(), req.GetResource()) params := url.Values{} @@ -466,10 +501,15 @@ func (c *imagesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetI baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -513,7 +553,10 @@ func (c *imagesRESTClient) Insert(ctx context.Context, req *computepb.InsertImag return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images", req.GetProject()) params := url.Values{} @@ -527,10 +570,15 @@ func (c *imagesRESTClient) Insert(ctx context.Context, req *computepb.InsertImag baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -587,7 +635,10 @@ func (c *imagesRESTClient) List(ctx context.Context, req *computepb.ListImagesRe } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images", req.GetProject()) params := url.Values{} @@ -612,6 +663,9 @@ func (c *imagesRESTClient) List(ctx context.Context, req *computepb.ListImagesRe // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -671,7 +725,10 @@ func (c *imagesRESTClient) Patch(ctx context.Context, req *computepb.PatchImageR return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v", req.GetProject(), req.GetImage()) params := url.Values{} @@ -682,10 +739,15 @@ func (c *imagesRESTClient) Patch(ctx context.Context, req *computepb.PatchImageR baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "image", url.QueryEscape(req.GetImage()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -736,14 +798,22 @@ func (c *imagesRESTClient) SetIamPolicy(ctx context.Context, req *computepb.SetI return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v/setIamPolicy", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -787,14 +857,22 @@ func (c *imagesRESTClient) SetLabels(ctx context.Context, req *computepb.SetLabe return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v/setLabels", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -845,14 +923,22 @@ func (c *imagesRESTClient) TestIamPermissions(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v/testIamPermissions", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/instance_group_managers_client.go b/vendor/cloud.google.com/go/compute/apiv1/instance_group_managers_client.go index caa4c112e..436562a03 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/instance_group_managers_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/instance_group_managers_client.go @@ -315,7 +315,10 @@ func (c *instanceGroupManagersRESTClient) AbandonInstances(ctx context.Context, return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/abandonInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -326,10 +329,15 @@ func (c *instanceGroupManagersRESTClient) AbandonInstances(ctx context.Context, baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -387,7 +395,10 @@ func (c *instanceGroupManagersRESTClient) AggregatedList(ctx context.Context, re } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/instanceGroupManagers", req.GetProject()) params := url.Values{} @@ -415,6 +426,9 @@ func (c *instanceGroupManagersRESTClient) AggregatedList(ctx context.Context, re // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -481,14 +495,22 @@ func (c *instanceGroupManagersRESTClient) ApplyUpdatesToInstances(ctx context.Co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/applyUpdatesToInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -540,7 +562,10 @@ func (c *instanceGroupManagersRESTClient) CreateInstances(ctx context.Context, r return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/createInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -551,10 +576,15 @@ func (c *instanceGroupManagersRESTClient) CreateInstances(ctx context.Context, r baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -599,7 +629,10 @@ func (c *instanceGroupManagersRESTClient) CreateInstances(ctx context.Context, r // Delete deletes the specified managed instance group and all of the instances in that group. Note that the instance group must not belong to a backend service. Read Deleting an instance group for more information. func (c *instanceGroupManagersRESTClient) Delete(ctx context.Context, req *computepb.DeleteInstanceGroupManagerRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -610,10 +643,15 @@ func (c *instanceGroupManagersRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -665,7 +703,10 @@ func (c *instanceGroupManagersRESTClient) DeleteInstances(ctx context.Context, r return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/deleteInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -676,10 +717,15 @@ func (c *instanceGroupManagersRESTClient) DeleteInstances(ctx context.Context, r baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -731,14 +777,22 @@ func (c *instanceGroupManagersRESTClient) DeletePerInstanceConfigs(ctx context.C return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/deletePerInstanceConfigs", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -783,14 +837,22 @@ func (c *instanceGroupManagersRESTClient) DeletePerInstanceConfigs(ctx context.C // Get returns all of the details about the specified managed instance group. Gets a list of available managed instance groups by making a list() request. func (c *instanceGroupManagersRESTClient) Get(ctx context.Context, req *computepb.GetInstanceGroupManagerRequest, opts ...gax.CallOption) (*computepb.InstanceGroupManager, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InstanceGroupManager{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -834,7 +896,10 @@ func (c *instanceGroupManagersRESTClient) Insert(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers", req.GetProject(), req.GetZone()) params := url.Values{} @@ -845,10 +910,15 @@ func (c *instanceGroupManagersRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -906,7 +976,10 @@ func (c *instanceGroupManagersRESTClient) List(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers", req.GetProject(), req.GetZone()) params := url.Values{} @@ -931,6 +1004,9 @@ func (c *instanceGroupManagersRESTClient) List(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -996,7 +1072,10 @@ func (c *instanceGroupManagersRESTClient) ListErrors(ctx context.Context, req *c } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/listErrors", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1021,6 +1100,9 @@ func (c *instanceGroupManagersRESTClient) ListErrors(ctx context.Context, req *c // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1086,7 +1168,10 @@ func (c *instanceGroupManagersRESTClient) ListManagedInstances(ctx context.Conte } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/listManagedInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1111,6 +1196,9 @@ func (c *instanceGroupManagersRESTClient) ListManagedInstances(ctx context.Conte // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1176,7 +1264,10 @@ func (c *instanceGroupManagersRESTClient) ListPerInstanceConfigs(ctx context.Con } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/listPerInstanceConfigs", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1201,6 +1292,9 @@ func (c *instanceGroupManagersRESTClient) ListPerInstanceConfigs(ctx context.Con // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1260,7 +1354,10 @@ func (c *instanceGroupManagersRESTClient) Patch(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1271,10 +1368,15 @@ func (c *instanceGroupManagersRESTClient) Patch(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1326,7 +1428,10 @@ func (c *instanceGroupManagersRESTClient) PatchPerInstanceConfigs(ctx context.Co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/patchPerInstanceConfigs", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1337,10 +1442,15 @@ func (c *instanceGroupManagersRESTClient) PatchPerInstanceConfigs(ctx context.Co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1392,7 +1502,10 @@ func (c *instanceGroupManagersRESTClient) RecreateInstances(ctx context.Context, return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/recreateInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1403,10 +1516,15 @@ func (c *instanceGroupManagersRESTClient) RecreateInstances(ctx context.Context, baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1451,7 +1569,10 @@ func (c *instanceGroupManagersRESTClient) RecreateInstances(ctx context.Context, // Resize resizes the managed instance group. If you increase the size, the group creates new instances using the current instance template. If you decrease the size, the group deletes instances. The resize operation is marked DONE when the resize actions are scheduled even if the group has not yet added or deleted any instances. You must separately verify the status of the creating or deleting actions with the listmanagedinstances method. When resizing down, the instance group arbitrarily chooses the order in which VMs are deleted. The group takes into account some VM attributes when making the selection including: + The status of the VM instance. + The health of the VM instance. + The instance template version the VM is based on. + For regional managed instance groups, the location of the VM instance. This list is subject to change. If the group is part of a backend service that has enabled connection draining, it can take up to 60 seconds after the connection draining duration has elapsed before the VM instance is removed or deleted. func (c *instanceGroupManagersRESTClient) Resize(ctx context.Context, req *computepb.ResizeInstanceGroupManagerRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/resize", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1463,10 +1584,15 @@ func (c *instanceGroupManagersRESTClient) Resize(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1518,7 +1644,10 @@ func (c *instanceGroupManagersRESTClient) SetInstanceTemplate(ctx context.Contex return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/setInstanceTemplate", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1529,10 +1658,15 @@ func (c *instanceGroupManagersRESTClient) SetInstanceTemplate(ctx context.Contex baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1584,7 +1718,10 @@ func (c *instanceGroupManagersRESTClient) SetTargetPools(ctx context.Context, re return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/setTargetPools", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1595,10 +1732,15 @@ func (c *instanceGroupManagersRESTClient) SetTargetPools(ctx context.Context, re baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1650,7 +1792,10 @@ func (c *instanceGroupManagersRESTClient) UpdatePerInstanceConfigs(ctx context.C return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/updatePerInstanceConfigs", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1661,10 +1806,15 @@ func (c *instanceGroupManagersRESTClient) UpdatePerInstanceConfigs(ctx context.C baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/instance_groups_client.go b/vendor/cloud.google.com/go/compute/apiv1/instance_groups_client.go index b8d797cf6..add6dcd16 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/instance_groups_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/instance_groups_client.go @@ -238,7 +238,10 @@ func (c *instanceGroupsRESTClient) AddInstances(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups/%v/addInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroup()) params := url.Values{} @@ -249,10 +252,15 @@ func (c *instanceGroupsRESTClient) AddInstances(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group", url.QueryEscape(req.GetInstanceGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -310,7 +318,10 @@ func (c *instanceGroupsRESTClient) AggregatedList(ctx context.Context, req *comp } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/instanceGroups", req.GetProject()) params := url.Values{} @@ -338,6 +349,9 @@ func (c *instanceGroupsRESTClient) AggregatedList(ctx context.Context, req *comp // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -397,7 +411,10 @@ func (c *instanceGroupsRESTClient) AggregatedList(ctx context.Context, req *comp // Delete deletes the specified instance group. The instances in the group are not deleted. Note that instance group must not belong to a backend service. Read Deleting an instance group for more information. func (c *instanceGroupsRESTClient) Delete(ctx context.Context, req *computepb.DeleteInstanceGroupRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups/%v", req.GetProject(), req.GetZone(), req.GetInstanceGroup()) params := url.Values{} @@ -408,10 +425,15 @@ func (c *instanceGroupsRESTClient) Delete(ctx context.Context, req *computepb.De baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group", url.QueryEscape(req.GetInstanceGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -456,14 +478,22 @@ func (c *instanceGroupsRESTClient) Delete(ctx context.Context, req *computepb.De // Get returns the specified zonal instance group. Get a list of available zonal instance groups by making a list() request. For managed instance groups, use the instanceGroupManagers or regionInstanceGroupManagers methods instead. func (c *instanceGroupsRESTClient) Get(ctx context.Context, req *computepb.GetInstanceGroupRequest, opts ...gax.CallOption) (*computepb.InstanceGroup, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups/%v", req.GetProject(), req.GetZone(), req.GetInstanceGroup()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group", url.QueryEscape(req.GetInstanceGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InstanceGroup{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -507,7 +537,10 @@ func (c *instanceGroupsRESTClient) Insert(ctx context.Context, req *computepb.In return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups", req.GetProject(), req.GetZone()) params := url.Values{} @@ -518,10 +551,15 @@ func (c *instanceGroupsRESTClient) Insert(ctx context.Context, req *computepb.In baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -579,7 +617,10 @@ func (c *instanceGroupsRESTClient) List(ctx context.Context, req *computepb.List } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups", req.GetProject(), req.GetZone()) params := url.Values{} @@ -604,6 +645,9 @@ func (c *instanceGroupsRESTClient) List(ctx context.Context, req *computepb.List // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -675,7 +719,10 @@ func (c *instanceGroupsRESTClient) ListInstances(ctx context.Context, req *compu return nil, "", err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups/%v/listInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroup()) params := url.Values{} @@ -700,6 +747,9 @@ func (c *instanceGroupsRESTClient) ListInstances(ctx context.Context, req *compu // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -759,7 +809,10 @@ func (c *instanceGroupsRESTClient) RemoveInstances(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups/%v/removeInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroup()) params := url.Values{} @@ -770,10 +823,15 @@ func (c *instanceGroupsRESTClient) RemoveInstances(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group", url.QueryEscape(req.GetInstanceGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -825,7 +883,10 @@ func (c *instanceGroupsRESTClient) SetNamedPorts(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups/%v/setNamedPorts", req.GetProject(), req.GetZone(), req.GetInstanceGroup()) params := url.Values{} @@ -836,10 +897,15 @@ func (c *instanceGroupsRESTClient) SetNamedPorts(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance_group", url.QueryEscape(req.GetInstanceGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/instance_templates_client.go b/vendor/cloud.google.com/go/compute/apiv1/instance_templates_client.go index 06b17da14..f09cc765a 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/instance_templates_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/instance_templates_client.go @@ -216,7 +216,10 @@ func (c *instanceTemplatesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified instance template. Deleting an instance template is permanent and cannot be undone. It is not possible to delete templates that are already in use by a managed instance group. func (c *instanceTemplatesRESTClient) Delete(ctx context.Context, req *computepb.DeleteInstanceTemplateRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates/%v", req.GetProject(), req.GetInstanceTemplate()) params := url.Values{} @@ -227,10 +230,15 @@ func (c *instanceTemplatesRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "instance_template", url.QueryEscape(req.GetInstanceTemplate()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -274,14 +282,22 @@ func (c *instanceTemplatesRESTClient) Delete(ctx context.Context, req *computepb // Get returns the specified instance template. Gets a list of available instance templates by making a list() request. func (c *instanceTemplatesRESTClient) Get(ctx context.Context, req *computepb.GetInstanceTemplateRequest, opts ...gax.CallOption) (*computepb.InstanceTemplate, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates/%v", req.GetProject(), req.GetInstanceTemplate()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "instance_template", url.QueryEscape(req.GetInstanceTemplate()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InstanceTemplate{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -318,7 +334,10 @@ func (c *instanceTemplatesRESTClient) Get(ctx context.Context, req *computepb.Ge // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *instanceTemplatesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyInstanceTemplateRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates/%v/getIamPolicy", req.GetProject(), req.GetResource()) params := url.Values{} @@ -329,10 +348,15 @@ func (c *instanceTemplatesRESTClient) GetIamPolicy(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -376,7 +400,10 @@ func (c *instanceTemplatesRESTClient) Insert(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates", req.GetProject()) params := url.Values{} @@ -387,10 +414,15 @@ func (c *instanceTemplatesRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -447,7 +479,10 @@ func (c *instanceTemplatesRESTClient) List(ctx context.Context, req *computepb.L } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates", req.GetProject()) params := url.Values{} @@ -472,6 +507,9 @@ func (c *instanceTemplatesRESTClient) List(ctx context.Context, req *computepb.L // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -531,14 +569,22 @@ func (c *instanceTemplatesRESTClient) SetIamPolicy(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates/%v/setIamPolicy", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -582,14 +628,22 @@ func (c *instanceTemplatesRESTClient) TestIamPermissions(ctx context.Context, re return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates/%v/testIamPermissions", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/instances_client.go b/vendor/cloud.google.com/go/compute/apiv1/instances_client.go index 15cc0500f..5025c33f2 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/instances_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/instances_client.go @@ -490,7 +490,10 @@ func (c *instancesRESTClient) AddAccessConfig(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/addAccessConfig", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -502,10 +505,15 @@ func (c *instancesRESTClient) AddAccessConfig(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -557,7 +565,10 @@ func (c *instancesRESTClient) AddResourcePolicies(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/addResourcePolicies", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -568,10 +579,15 @@ func (c *instancesRESTClient) AddResourcePolicies(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -629,7 +645,10 @@ func (c *instancesRESTClient) AggregatedList(ctx context.Context, req *computepb } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/instances", req.GetProject()) params := url.Values{} @@ -657,6 +676,9 @@ func (c *instancesRESTClient) AggregatedList(ctx context.Context, req *computepb // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -723,7 +745,10 @@ func (c *instancesRESTClient) AttachDisk(ctx context.Context, req *computepb.Att return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/attachDisk", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -737,10 +762,15 @@ func (c *instancesRESTClient) AttachDisk(ctx context.Context, req *computepb.Att baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -792,7 +822,10 @@ func (c *instancesRESTClient) BulkInsert(ctx context.Context, req *computepb.Bul return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/bulkInsert", req.GetProject(), req.GetZone()) params := url.Values{} @@ -803,10 +836,15 @@ func (c *instancesRESTClient) BulkInsert(ctx context.Context, req *computepb.Bul baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -851,7 +889,10 @@ func (c *instancesRESTClient) BulkInsert(ctx context.Context, req *computepb.Bul // Delete deletes the specified Instance resource. For more information, see Deleting an instance. func (c *instancesRESTClient) Delete(ctx context.Context, req *computepb.DeleteInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -862,10 +903,15 @@ func (c *instancesRESTClient) Delete(ctx context.Context, req *computepb.DeleteI baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -910,7 +956,10 @@ func (c *instancesRESTClient) Delete(ctx context.Context, req *computepb.DeleteI // DeleteAccessConfig deletes an access config from an instance’s network interface. func (c *instancesRESTClient) DeleteAccessConfig(ctx context.Context, req *computepb.DeleteAccessConfigInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/deleteAccessConfig", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -923,10 +972,15 @@ func (c *instancesRESTClient) DeleteAccessConfig(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -971,7 +1025,10 @@ func (c *instancesRESTClient) DeleteAccessConfig(ctx context.Context, req *compu // DetachDisk detaches a disk from an instance. func (c *instancesRESTClient) DetachDisk(ctx context.Context, req *computepb.DetachDiskInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/detachDisk", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -983,10 +1040,15 @@ func (c *instancesRESTClient) DetachDisk(ctx context.Context, req *computepb.Det baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1031,14 +1093,22 @@ func (c *instancesRESTClient) DetachDisk(ctx context.Context, req *computepb.Det // Get returns the specified Instance resource. Gets a list of available instances by making a list() request. func (c *instancesRESTClient) Get(ctx context.Context, req *computepb.GetInstanceRequest, opts ...gax.CallOption) (*computepb.Instance, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v", req.GetProject(), req.GetZone(), req.GetInstance()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Instance{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1075,7 +1145,10 @@ func (c *instancesRESTClient) Get(ctx context.Context, req *computepb.GetInstanc // GetEffectiveFirewalls returns effective firewalls applied to an interface of the instance. func (c *instancesRESTClient) GetEffectiveFirewalls(ctx context.Context, req *computepb.GetEffectiveFirewallsInstanceRequest, opts ...gax.CallOption) (*computepb.InstancesGetEffectiveFirewallsResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/getEffectiveFirewalls", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -1084,10 +1157,15 @@ func (c *instancesRESTClient) GetEffectiveFirewalls(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InstancesGetEffectiveFirewallsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1124,7 +1202,10 @@ func (c *instancesRESTClient) GetEffectiveFirewalls(ctx context.Context, req *co // GetGuestAttributes returns the specified guest attributes entry. func (c *instancesRESTClient) GetGuestAttributes(ctx context.Context, req *computepb.GetGuestAttributesInstanceRequest, opts ...gax.CallOption) (*computepb.GuestAttributes, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/getGuestAttributes", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -1138,10 +1219,15 @@ func (c *instancesRESTClient) GetGuestAttributes(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.GuestAttributes{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1178,7 +1264,10 @@ func (c *instancesRESTClient) GetGuestAttributes(ctx context.Context, req *compu // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *instancesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyInstanceRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/getIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) params := url.Values{} @@ -1189,10 +1278,15 @@ func (c *instancesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.G baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1229,14 +1323,22 @@ func (c *instancesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.G // GetScreenshot returns the screenshot from the specified instance. func (c *instancesRESTClient) GetScreenshot(ctx context.Context, req *computepb.GetScreenshotInstanceRequest, opts ...gax.CallOption) (*computepb.Screenshot, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/screenshot", req.GetProject(), req.GetZone(), req.GetInstance()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Screenshot{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1273,7 +1375,10 @@ func (c *instancesRESTClient) GetScreenshot(ctx context.Context, req *computepb. // GetSerialPortOutput returns the last 1 MB of serial port output from the specified instance. func (c *instancesRESTClient) GetSerialPortOutput(ctx context.Context, req *computepb.GetSerialPortOutputInstanceRequest, opts ...gax.CallOption) (*computepb.SerialPortOutput, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/serialPort", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -1287,10 +1392,15 @@ func (c *instancesRESTClient) GetSerialPortOutput(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SerialPortOutput{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1327,14 +1437,22 @@ func (c *instancesRESTClient) GetSerialPortOutput(ctx context.Context, req *comp // GetShieldedInstanceIdentity returns the Shielded Instance Identity of an instance func (c *instancesRESTClient) GetShieldedInstanceIdentity(ctx context.Context, req *computepb.GetShieldedInstanceIdentityInstanceRequest, opts ...gax.CallOption) (*computepb.ShieldedInstanceIdentity, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/getShieldedInstanceIdentity", req.GetProject(), req.GetZone(), req.GetInstance()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.ShieldedInstanceIdentity{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1378,7 +1496,10 @@ func (c *instancesRESTClient) Insert(ctx context.Context, req *computepb.InsertI return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances", req.GetProject(), req.GetZone()) params := url.Values{} @@ -1395,10 +1516,15 @@ func (c *instancesRESTClient) Insert(ctx context.Context, req *computepb.InsertI baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1456,7 +1582,10 @@ func (c *instancesRESTClient) List(ctx context.Context, req *computepb.ListInsta } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances", req.GetProject(), req.GetZone()) params := url.Values{} @@ -1481,6 +1610,9 @@ func (c *instancesRESTClient) List(ctx context.Context, req *computepb.ListInsta // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1546,7 +1678,10 @@ func (c *instancesRESTClient) ListReferrers(ctx context.Context, req *computepb. } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/referrers", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -1571,6 +1706,9 @@ func (c *instancesRESTClient) ListReferrers(ctx context.Context, req *computepb. // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -1630,7 +1768,10 @@ func (c *instancesRESTClient) RemoveResourcePolicies(ctx context.Context, req *c return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/removeResourcePolicies", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -1641,10 +1782,15 @@ func (c *instancesRESTClient) RemoveResourcePolicies(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1689,7 +1835,10 @@ func (c *instancesRESTClient) RemoveResourcePolicies(ctx context.Context, req *c // Reset performs a reset on the instance. This is a hard reset. The VM does not do a graceful shutdown. For more information, see Resetting an instance. func (c *instancesRESTClient) Reset(ctx context.Context, req *computepb.ResetInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/reset", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -1700,10 +1849,15 @@ func (c *instancesRESTClient) Reset(ctx context.Context, req *computepb.ResetIns baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1748,7 +1902,10 @@ func (c *instancesRESTClient) Reset(ctx context.Context, req *computepb.ResetIns // Resume resumes an instance that was suspended using the instances().suspend method. func (c *instancesRESTClient) Resume(ctx context.Context, req *computepb.ResumeInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/resume", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -1759,10 +1916,15 @@ func (c *instancesRESTClient) Resume(ctx context.Context, req *computepb.ResumeI baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1807,14 +1969,22 @@ func (c *instancesRESTClient) Resume(ctx context.Context, req *computepb.ResumeI // SendDiagnosticInterrupt sends diagnostic interrupt to the instance. func (c *instancesRESTClient) SendDiagnosticInterrupt(ctx context.Context, req *computepb.SendDiagnosticInterruptInstanceRequest, opts ...gax.CallOption) (*computepb.SendDiagnosticInterruptInstanceResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/sendDiagnosticInterrupt", req.GetProject(), req.GetZone(), req.GetInstance()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SendDiagnosticInterruptInstanceResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1851,7 +2021,10 @@ func (c *instancesRESTClient) SendDiagnosticInterrupt(ctx context.Context, req * // SetDeletionProtection sets deletion protection on the instance. func (c *instancesRESTClient) SetDeletionProtection(ctx context.Context, req *computepb.SetDeletionProtectionInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setDeletionProtection", req.GetProject(), req.GetZone(), req.GetResource()) params := url.Values{} @@ -1865,10 +2038,15 @@ func (c *instancesRESTClient) SetDeletionProtection(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1913,7 +2091,10 @@ func (c *instancesRESTClient) SetDeletionProtection(ctx context.Context, req *co // SetDiskAutoDelete sets the auto-delete flag for a disk attached to an instance. func (c *instancesRESTClient) SetDiskAutoDelete(ctx context.Context, req *computepb.SetDiskAutoDeleteInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setDiskAutoDelete", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -1926,10 +2107,15 @@ func (c *instancesRESTClient) SetDiskAutoDelete(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1981,14 +2167,22 @@ func (c *instancesRESTClient) SetIamPolicy(ctx context.Context, req *computepb.S return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2032,7 +2226,10 @@ func (c *instancesRESTClient) SetLabels(ctx context.Context, req *computepb.SetL return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setLabels", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2043,10 +2240,15 @@ func (c *instancesRESTClient) SetLabels(ctx context.Context, req *computepb.SetL baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2098,7 +2300,10 @@ func (c *instancesRESTClient) SetMachineResources(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setMachineResources", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2109,10 +2314,15 @@ func (c *instancesRESTClient) SetMachineResources(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2164,7 +2374,10 @@ func (c *instancesRESTClient) SetMachineType(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setMachineType", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2175,10 +2388,15 @@ func (c *instancesRESTClient) SetMachineType(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2230,7 +2448,10 @@ func (c *instancesRESTClient) SetMetadata(ctx context.Context, req *computepb.Se return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setMetadata", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2241,10 +2462,15 @@ func (c *instancesRESTClient) SetMetadata(ctx context.Context, req *computepb.Se baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2296,7 +2522,10 @@ func (c *instancesRESTClient) SetMinCpuPlatform(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setMinCpuPlatform", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2307,10 +2536,15 @@ func (c *instancesRESTClient) SetMinCpuPlatform(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2362,7 +2596,10 @@ func (c *instancesRESTClient) SetScheduling(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setScheduling", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2373,10 +2610,15 @@ func (c *instancesRESTClient) SetScheduling(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2428,7 +2670,10 @@ func (c *instancesRESTClient) SetServiceAccount(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setServiceAccount", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2439,10 +2684,15 @@ func (c *instancesRESTClient) SetServiceAccount(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2494,7 +2744,10 @@ func (c *instancesRESTClient) SetShieldedInstanceIntegrityPolicy(ctx context.Con return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setShieldedInstanceIntegrityPolicy", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2505,10 +2758,15 @@ func (c *instancesRESTClient) SetShieldedInstanceIntegrityPolicy(ctx context.Con baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2560,7 +2818,10 @@ func (c *instancesRESTClient) SetTags(ctx context.Context, req *computepb.SetTag return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setTags", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2571,10 +2832,15 @@ func (c *instancesRESTClient) SetTags(ctx context.Context, req *computepb.SetTag baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2619,14 +2885,22 @@ func (c *instancesRESTClient) SetTags(ctx context.Context, req *computepb.SetTag // SimulateMaintenanceEvent simulates a host maintenance event on a VM. For more information, see Simulate a host maintenance event. func (c *instancesRESTClient) SimulateMaintenanceEvent(ctx context.Context, req *computepb.SimulateMaintenanceEventInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/simulateMaintenanceEvent", req.GetProject(), req.GetZone(), req.GetInstance()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -2671,7 +2945,10 @@ func (c *instancesRESTClient) SimulateMaintenanceEvent(ctx context.Context, req // Start starts an instance that was stopped using the instances().stop method. For more information, see Restart an instance. func (c *instancesRESTClient) Start(ctx context.Context, req *computepb.StartInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/start", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2682,10 +2959,15 @@ func (c *instancesRESTClient) Start(ctx context.Context, req *computepb.StartIns baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -2737,7 +3019,10 @@ func (c *instancesRESTClient) StartWithEncryptionKey(ctx context.Context, req *c return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/startWithEncryptionKey", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2748,10 +3033,15 @@ func (c *instancesRESTClient) StartWithEncryptionKey(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2796,7 +3086,10 @@ func (c *instancesRESTClient) StartWithEncryptionKey(ctx context.Context, req *c // Stop stops a running instance, shutting it down cleanly, and allows you to restart the instance at a later time. Stopped instances do not incur VM usage charges while they are stopped. However, resources that the VM is using, such as persistent disks and static IP addresses, will continue to be charged until they are deleted. For more information, see Stopping an instance. func (c *instancesRESTClient) Stop(ctx context.Context, req *computepb.StopInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/stop", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2807,10 +3100,15 @@ func (c *instancesRESTClient) Stop(ctx context.Context, req *computepb.StopInsta baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -2855,7 +3153,10 @@ func (c *instancesRESTClient) Stop(ctx context.Context, req *computepb.StopInsta // Suspend this method suspends a running instance, saving its state to persistent storage, and allows you to resume the instance at a later time. Suspended instances have no compute costs (cores or RAM), and incur only storage charges for the saved VM memory and localSSD data. Any charged resources the virtual machine was using, such as persistent disks and static IP addresses, will continue to be charged while the instance is suspended. For more information, see Suspending and resuming an instance. func (c *instancesRESTClient) Suspend(ctx context.Context, req *computepb.SuspendInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/suspend", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2866,10 +3167,15 @@ func (c *instancesRESTClient) Suspend(ctx context.Context, req *computepb.Suspen baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -2921,14 +3227,22 @@ func (c *instancesRESTClient) TestIamPermissions(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -2972,7 +3286,10 @@ func (c *instancesRESTClient) Update(ctx context.Context, req *computepb.UpdateI return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -2989,10 +3306,15 @@ func (c *instancesRESTClient) Update(ctx context.Context, req *computepb.UpdateI baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -3044,7 +3366,10 @@ func (c *instancesRESTClient) UpdateAccessConfig(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/updateAccessConfig", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -3056,10 +3381,15 @@ func (c *instancesRESTClient) UpdateAccessConfig(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -3111,7 +3441,10 @@ func (c *instancesRESTClient) UpdateDisplayDevice(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/updateDisplayDevice", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -3122,10 +3455,15 @@ func (c *instancesRESTClient) UpdateDisplayDevice(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -3177,7 +3515,10 @@ func (c *instancesRESTClient) UpdateNetworkInterface(ctx context.Context, req *c return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/updateNetworkInterface", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -3189,10 +3530,15 @@ func (c *instancesRESTClient) UpdateNetworkInterface(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -3244,7 +3590,10 @@ func (c *instancesRESTClient) UpdateShieldedInstanceConfig(ctx context.Context, return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/updateShieldedInstanceConfig", req.GetProject(), req.GetZone(), req.GetInstance()) params := url.Values{} @@ -3255,10 +3604,15 @@ func (c *instancesRESTClient) UpdateShieldedInstanceConfig(ctx context.Context, baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "instance", url.QueryEscape(req.GetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/interconnect_attachments_client.go b/vendor/cloud.google.com/go/compute/apiv1/interconnect_attachments_client.go index 5fb1852e4..b88580718 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/interconnect_attachments_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/interconnect_attachments_client.go @@ -223,7 +223,10 @@ func (c *interconnectAttachmentsRESTClient) AggregatedList(ctx context.Context, } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/interconnectAttachments", req.GetProject()) params := url.Values{} @@ -251,6 +254,9 @@ func (c *interconnectAttachmentsRESTClient) AggregatedList(ctx context.Context, // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -310,7 +316,10 @@ func (c *interconnectAttachmentsRESTClient) AggregatedList(ctx context.Context, // Delete deletes the specified interconnect attachment. func (c *interconnectAttachmentsRESTClient) Delete(ctx context.Context, req *computepb.DeleteInterconnectAttachmentRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/interconnectAttachments/%v", req.GetProject(), req.GetRegion(), req.GetInterconnectAttachment()) params := url.Values{} @@ -321,10 +330,15 @@ func (c *interconnectAttachmentsRESTClient) Delete(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "interconnect_attachment", url.QueryEscape(req.GetInterconnectAttachment()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -369,14 +383,22 @@ func (c *interconnectAttachmentsRESTClient) Delete(ctx context.Context, req *com // Get returns the specified interconnect attachment. func (c *interconnectAttachmentsRESTClient) Get(ctx context.Context, req *computepb.GetInterconnectAttachmentRequest, opts ...gax.CallOption) (*computepb.InterconnectAttachment, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/interconnectAttachments/%v", req.GetProject(), req.GetRegion(), req.GetInterconnectAttachment()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "interconnect_attachment", url.QueryEscape(req.GetInterconnectAttachment()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InterconnectAttachment{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -420,7 +442,10 @@ func (c *interconnectAttachmentsRESTClient) Insert(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/interconnectAttachments", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -434,10 +459,15 @@ func (c *interconnectAttachmentsRESTClient) Insert(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -495,7 +525,10 @@ func (c *interconnectAttachmentsRESTClient) List(ctx context.Context, req *compu } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/interconnectAttachments", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -520,6 +553,9 @@ func (c *interconnectAttachmentsRESTClient) List(ctx context.Context, req *compu // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -579,7 +615,10 @@ func (c *interconnectAttachmentsRESTClient) Patch(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/interconnectAttachments/%v", req.GetProject(), req.GetRegion(), req.GetInterconnectAttachment()) params := url.Values{} @@ -590,10 +629,15 @@ func (c *interconnectAttachmentsRESTClient) Patch(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "interconnect_attachment", url.QueryEscape(req.GetInterconnectAttachment()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/interconnect_locations_client.go b/vendor/cloud.google.com/go/compute/apiv1/interconnect_locations_client.go index c2ed8a2d1..44dca972f 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/interconnect_locations_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/interconnect_locations_client.go @@ -164,14 +164,22 @@ func (c *interconnectLocationsRESTClient) Connection() *grpc.ClientConn { // Get returns the details for the specified interconnect location. Gets a list of available interconnect locations by making a list() request. func (c *interconnectLocationsRESTClient) Get(ctx context.Context, req *computepb.GetInterconnectLocationRequest, opts ...gax.CallOption) (*computepb.InterconnectLocation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnectLocations/%v", req.GetProject(), req.GetInterconnectLocation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "interconnect_location", url.QueryEscape(req.GetInterconnectLocation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InterconnectLocation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -221,7 +229,10 @@ func (c *interconnectLocationsRESTClient) List(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnectLocations", req.GetProject()) params := url.Values{} @@ -246,6 +257,9 @@ func (c *interconnectLocationsRESTClient) List(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/interconnects_client.go b/vendor/cloud.google.com/go/compute/apiv1/interconnects_client.go index 8a3bc48db..7a764b41a 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/interconnects_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/interconnects_client.go @@ -209,7 +209,10 @@ func (c *interconnectsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified interconnect. func (c *interconnectsRESTClient) Delete(ctx context.Context, req *computepb.DeleteInterconnectRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnects/%v", req.GetProject(), req.GetInterconnect()) params := url.Values{} @@ -220,10 +223,15 @@ func (c *interconnectsRESTClient) Delete(ctx context.Context, req *computepb.Del baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "interconnect", url.QueryEscape(req.GetInterconnect()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -267,14 +275,22 @@ func (c *interconnectsRESTClient) Delete(ctx context.Context, req *computepb.Del // Get returns the specified interconnect. Get a list of available interconnects by making a list() request. func (c *interconnectsRESTClient) Get(ctx context.Context, req *computepb.GetInterconnectRequest, opts ...gax.CallOption) (*computepb.Interconnect, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnects/%v", req.GetProject(), req.GetInterconnect()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "interconnect", url.QueryEscape(req.GetInterconnect()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Interconnect{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -311,14 +327,22 @@ func (c *interconnectsRESTClient) Get(ctx context.Context, req *computepb.GetInt // GetDiagnostics returns the interconnectDiagnostics for the specified interconnect. func (c *interconnectsRESTClient) GetDiagnostics(ctx context.Context, req *computepb.GetDiagnosticsInterconnectRequest, opts ...gax.CallOption) (*computepb.InterconnectsGetDiagnosticsResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnects/%v/getDiagnostics", req.GetProject(), req.GetInterconnect()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "interconnect", url.QueryEscape(req.GetInterconnect()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InterconnectsGetDiagnosticsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -362,7 +386,10 @@ func (c *interconnectsRESTClient) Insert(ctx context.Context, req *computepb.Ins return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnects", req.GetProject()) params := url.Values{} @@ -373,10 +400,15 @@ func (c *interconnectsRESTClient) Insert(ctx context.Context, req *computepb.Ins baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -433,7 +465,10 @@ func (c *interconnectsRESTClient) List(ctx context.Context, req *computepb.ListI } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnects", req.GetProject()) params := url.Values{} @@ -458,6 +493,9 @@ func (c *interconnectsRESTClient) List(ctx context.Context, req *computepb.ListI // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -517,7 +555,10 @@ func (c *interconnectsRESTClient) Patch(ctx context.Context, req *computepb.Patc return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnects/%v", req.GetProject(), req.GetInterconnect()) params := url.Values{} @@ -528,10 +569,15 @@ func (c *interconnectsRESTClient) Patch(ctx context.Context, req *computepb.Patc baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "interconnect", url.QueryEscape(req.GetInterconnect()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/license_codes_client.go b/vendor/cloud.google.com/go/compute/apiv1/license_codes_client.go index 75fb5ece5..7cea459a5 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/license_codes_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/license_codes_client.go @@ -162,14 +162,22 @@ func (c *licenseCodesRESTClient) Connection() *grpc.ClientConn { // Get return a specified license code. License codes are mirrored across all projects that have permissions to read the License Code. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. func (c *licenseCodesRESTClient) Get(ctx context.Context, req *computepb.GetLicenseCodeRequest, opts ...gax.CallOption) (*computepb.LicenseCode, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenseCodes/%v", req.GetProject(), req.GetLicenseCode()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "license_code", url.QueryEscape(req.GetLicenseCode()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.LicenseCode{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -213,14 +221,22 @@ func (c *licenseCodesRESTClient) TestIamPermissions(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenseCodes/%v/testIamPermissions", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/licenses_client.go b/vendor/cloud.google.com/go/compute/apiv1/licenses_client.go index 98667d8d7..7861783ca 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/licenses_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/licenses_client.go @@ -216,7 +216,10 @@ func (c *licensesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified license. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. func (c *licensesRESTClient) Delete(ctx context.Context, req *computepb.DeleteLicenseRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses/%v", req.GetProject(), req.GetLicense()) params := url.Values{} @@ -227,10 +230,15 @@ func (c *licensesRESTClient) Delete(ctx context.Context, req *computepb.DeleteLi baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "license", url.QueryEscape(req.GetLicense()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -274,14 +282,22 @@ func (c *licensesRESTClient) Delete(ctx context.Context, req *computepb.DeleteLi // Get returns the specified License resource. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. func (c *licensesRESTClient) Get(ctx context.Context, req *computepb.GetLicenseRequest, opts ...gax.CallOption) (*computepb.License, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses/%v", req.GetProject(), req.GetLicense()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "license", url.QueryEscape(req.GetLicense()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.License{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -318,7 +334,10 @@ func (c *licensesRESTClient) Get(ctx context.Context, req *computepb.GetLicenseR // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. func (c *licensesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyLicenseRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses/%v/getIamPolicy", req.GetProject(), req.GetResource()) params := url.Values{} @@ -329,10 +348,15 @@ func (c *licensesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.Ge baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -376,7 +400,10 @@ func (c *licensesRESTClient) Insert(ctx context.Context, req *computepb.InsertLi return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses", req.GetProject()) params := url.Values{} @@ -387,10 +414,15 @@ func (c *licensesRESTClient) Insert(ctx context.Context, req *computepb.InsertLi baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -447,7 +479,10 @@ func (c *licensesRESTClient) List(ctx context.Context, req *computepb.ListLicens } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses", req.GetProject()) params := url.Values{} @@ -472,6 +507,9 @@ func (c *licensesRESTClient) List(ctx context.Context, req *computepb.ListLicens // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -531,14 +569,22 @@ func (c *licensesRESTClient) SetIamPolicy(ctx context.Context, req *computepb.Se return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses/%v/setIamPolicy", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -582,14 +628,22 @@ func (c *licensesRESTClient) TestIamPermissions(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses/%v/testIamPermissions", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/machine_images_client.go b/vendor/cloud.google.com/go/compute/apiv1/machine_images_client.go index 2ebc3ceef..1b85ad331 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/machine_images_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/machine_images_client.go @@ -216,7 +216,10 @@ func (c *machineImagesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified machine image. Deleting a machine image is permanent and cannot be undone. func (c *machineImagesRESTClient) Delete(ctx context.Context, req *computepb.DeleteMachineImageRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/machineImages/%v", req.GetProject(), req.GetMachineImage()) params := url.Values{} @@ -227,10 +230,15 @@ func (c *machineImagesRESTClient) Delete(ctx context.Context, req *computepb.Del baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "machine_image", url.QueryEscape(req.GetMachineImage()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -274,14 +282,22 @@ func (c *machineImagesRESTClient) Delete(ctx context.Context, req *computepb.Del // Get returns the specified machine image. Gets a list of available machine images by making a list() request. func (c *machineImagesRESTClient) Get(ctx context.Context, req *computepb.GetMachineImageRequest, opts ...gax.CallOption) (*computepb.MachineImage, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/machineImages/%v", req.GetProject(), req.GetMachineImage()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "machine_image", url.QueryEscape(req.GetMachineImage()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.MachineImage{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -318,7 +334,10 @@ func (c *machineImagesRESTClient) Get(ctx context.Context, req *computepb.GetMac // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *machineImagesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyMachineImageRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/machineImages/%v/getIamPolicy", req.GetProject(), req.GetResource()) params := url.Values{} @@ -329,10 +348,15 @@ func (c *machineImagesRESTClient) GetIamPolicy(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -376,7 +400,10 @@ func (c *machineImagesRESTClient) Insert(ctx context.Context, req *computepb.Ins return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/machineImages", req.GetProject()) params := url.Values{} @@ -390,10 +417,15 @@ func (c *machineImagesRESTClient) Insert(ctx context.Context, req *computepb.Ins baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -450,7 +482,10 @@ func (c *machineImagesRESTClient) List(ctx context.Context, req *computepb.ListM } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/machineImages", req.GetProject()) params := url.Values{} @@ -475,6 +510,9 @@ func (c *machineImagesRESTClient) List(ctx context.Context, req *computepb.ListM // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -534,14 +572,22 @@ func (c *machineImagesRESTClient) SetIamPolicy(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/machineImages/%v/setIamPolicy", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -585,14 +631,22 @@ func (c *machineImagesRESTClient) TestIamPermissions(ctx context.Context, req *c return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/machineImages/%v/testIamPermissions", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/machine_types_client.go b/vendor/cloud.google.com/go/compute/apiv1/machine_types_client.go index 11b5e330a..0140f638f 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/machine_types_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/machine_types_client.go @@ -185,7 +185,10 @@ func (c *machineTypesRESTClient) AggregatedList(ctx context.Context, req *comput } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/machineTypes", req.GetProject()) params := url.Values{} @@ -213,6 +216,9 @@ func (c *machineTypesRESTClient) AggregatedList(ctx context.Context, req *comput // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -272,14 +278,22 @@ func (c *machineTypesRESTClient) AggregatedList(ctx context.Context, req *comput // Get returns the specified machine type. Gets a list of available machine types by making a list() request. func (c *machineTypesRESTClient) Get(ctx context.Context, req *computepb.GetMachineTypeRequest, opts ...gax.CallOption) (*computepb.MachineType, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/machineTypes/%v", req.GetProject(), req.GetZone(), req.GetMachineType()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "machine_type", url.QueryEscape(req.GetMachineType()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.MachineType{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -329,7 +343,10 @@ func (c *machineTypesRESTClient) List(ctx context.Context, req *computepb.ListMa } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/machineTypes", req.GetProject(), req.GetZone()) params := url.Values{} @@ -354,6 +371,9 @@ func (c *machineTypesRESTClient) List(ctx context.Context, req *computepb.ListMa // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/network_edge_security_services_client.go b/vendor/cloud.google.com/go/compute/apiv1/network_edge_security_services_client.go index ed3577584..a1ee868b8 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/network_edge_security_services_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/network_edge_security_services_client.go @@ -216,7 +216,10 @@ func (c *networkEdgeSecurityServicesRESTClient) AggregatedList(ctx context.Conte } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/networkEdgeSecurityServices", req.GetProject()) params := url.Values{} @@ -244,6 +247,9 @@ func (c *networkEdgeSecurityServicesRESTClient) AggregatedList(ctx context.Conte // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -303,7 +309,10 @@ func (c *networkEdgeSecurityServicesRESTClient) AggregatedList(ctx context.Conte // Delete deletes the specified service. func (c *networkEdgeSecurityServicesRESTClient) Delete(ctx context.Context, req *computepb.DeleteNetworkEdgeSecurityServiceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEdgeSecurityServices/%v", req.GetProject(), req.GetRegion(), req.GetNetworkEdgeSecurityService()) params := url.Values{} @@ -314,10 +323,15 @@ func (c *networkEdgeSecurityServicesRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "network_edge_security_service", url.QueryEscape(req.GetNetworkEdgeSecurityService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -362,14 +376,22 @@ func (c *networkEdgeSecurityServicesRESTClient) Delete(ctx context.Context, req // Get gets a specified NetworkEdgeSecurityService. func (c *networkEdgeSecurityServicesRESTClient) Get(ctx context.Context, req *computepb.GetNetworkEdgeSecurityServiceRequest, opts ...gax.CallOption) (*computepb.NetworkEdgeSecurityService, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEdgeSecurityServices/%v", req.GetProject(), req.GetRegion(), req.GetNetworkEdgeSecurityService()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "network_edge_security_service", url.QueryEscape(req.GetNetworkEdgeSecurityService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NetworkEdgeSecurityService{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -413,7 +435,10 @@ func (c *networkEdgeSecurityServicesRESTClient) Insert(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEdgeSecurityServices", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -427,10 +452,15 @@ func (c *networkEdgeSecurityServicesRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -482,7 +512,10 @@ func (c *networkEdgeSecurityServicesRESTClient) Patch(ctx context.Context, req * return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEdgeSecurityServices/%v", req.GetProject(), req.GetRegion(), req.GetNetworkEdgeSecurityService()) params := url.Values{} @@ -499,10 +532,15 @@ func (c *networkEdgeSecurityServicesRESTClient) Patch(ctx context.Context, req * baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "network_edge_security_service", url.QueryEscape(req.GetNetworkEdgeSecurityService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/network_endpoint_groups_client.go b/vendor/cloud.google.com/go/compute/apiv1/network_endpoint_groups_client.go index 12d01943f..e4cf38a57 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/network_endpoint_groups_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/network_endpoint_groups_client.go @@ -244,7 +244,10 @@ func (c *networkEndpointGroupsRESTClient) AggregatedList(ctx context.Context, re } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/networkEndpointGroups", req.GetProject()) params := url.Values{} @@ -272,6 +275,9 @@ func (c *networkEndpointGroupsRESTClient) AggregatedList(ctx context.Context, re // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -338,7 +344,10 @@ func (c *networkEndpointGroupsRESTClient) AttachNetworkEndpoints(ctx context.Con return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups/%v/attachNetworkEndpoints", req.GetProject(), req.GetZone(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -349,10 +358,15 @@ func (c *networkEndpointGroupsRESTClient) AttachNetworkEndpoints(ctx context.Con baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -397,7 +411,10 @@ func (c *networkEndpointGroupsRESTClient) AttachNetworkEndpoints(ctx context.Con // Delete deletes the specified network endpoint group. The network endpoints in the NEG and the VM instances they belong to are not terminated when the NEG is deleted. Note that the NEG cannot be deleted if there are backend services referencing it. func (c *networkEndpointGroupsRESTClient) Delete(ctx context.Context, req *computepb.DeleteNetworkEndpointGroupRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups/%v", req.GetProject(), req.GetZone(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -408,10 +425,15 @@ func (c *networkEndpointGroupsRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -463,7 +485,10 @@ func (c *networkEndpointGroupsRESTClient) DetachNetworkEndpoints(ctx context.Con return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups/%v/detachNetworkEndpoints", req.GetProject(), req.GetZone(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -474,10 +499,15 @@ func (c *networkEndpointGroupsRESTClient) DetachNetworkEndpoints(ctx context.Con baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -522,14 +552,22 @@ func (c *networkEndpointGroupsRESTClient) DetachNetworkEndpoints(ctx context.Con // Get returns the specified network endpoint group. Gets a list of available network endpoint groups by making a list() request. func (c *networkEndpointGroupsRESTClient) Get(ctx context.Context, req *computepb.GetNetworkEndpointGroupRequest, opts ...gax.CallOption) (*computepb.NetworkEndpointGroup, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups/%v", req.GetProject(), req.GetZone(), req.GetNetworkEndpointGroup()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NetworkEndpointGroup{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -573,7 +611,10 @@ func (c *networkEndpointGroupsRESTClient) Insert(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups", req.GetProject(), req.GetZone()) params := url.Values{} @@ -584,10 +625,15 @@ func (c *networkEndpointGroupsRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -645,7 +691,10 @@ func (c *networkEndpointGroupsRESTClient) List(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups", req.GetProject(), req.GetZone()) params := url.Values{} @@ -670,6 +719,9 @@ func (c *networkEndpointGroupsRESTClient) List(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -741,7 +793,10 @@ func (c *networkEndpointGroupsRESTClient) ListNetworkEndpoints(ctx context.Conte return nil, "", err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups/%v/listNetworkEndpoints", req.GetProject(), req.GetZone(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -766,6 +821,9 @@ func (c *networkEndpointGroupsRESTClient) ListNetworkEndpoints(ctx context.Conte // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -825,14 +883,22 @@ func (c *networkEndpointGroupsRESTClient) TestIamPermissions(ctx context.Context return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/network_firewall_policies_client.go b/vendor/cloud.google.com/go/compute/apiv1/network_firewall_policies_client.go index 94de6acc2..58ca54817 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/network_firewall_policies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/network_firewall_policies_client.go @@ -286,7 +286,10 @@ func (c *networkFirewallPoliciesRESTClient) AddAssociation(ctx context.Context, return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/addAssociation", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -300,10 +303,15 @@ func (c *networkFirewallPoliciesRESTClient) AddAssociation(ctx context.Context, baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -354,7 +362,10 @@ func (c *networkFirewallPoliciesRESTClient) AddRule(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/addRule", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -371,10 +382,15 @@ func (c *networkFirewallPoliciesRESTClient) AddRule(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -418,7 +434,10 @@ func (c *networkFirewallPoliciesRESTClient) AddRule(ctx context.Context, req *co // CloneRules copies rules to the specified firewall policy. func (c *networkFirewallPoliciesRESTClient) CloneRules(ctx context.Context, req *computepb.CloneRulesNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/cloneRules", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -432,10 +451,15 @@ func (c *networkFirewallPoliciesRESTClient) CloneRules(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -479,7 +503,10 @@ func (c *networkFirewallPoliciesRESTClient) CloneRules(ctx context.Context, req // Delete deletes the specified policy. func (c *networkFirewallPoliciesRESTClient) Delete(ctx context.Context, req *computepb.DeleteNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -490,10 +517,15 @@ func (c *networkFirewallPoliciesRESTClient) Delete(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -537,14 +569,22 @@ func (c *networkFirewallPoliciesRESTClient) Delete(ctx context.Context, req *com // Get returns the specified network firewall policy. func (c *networkFirewallPoliciesRESTClient) Get(ctx context.Context, req *computepb.GetNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v", req.GetProject(), req.GetFirewallPolicy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -581,7 +621,10 @@ func (c *networkFirewallPoliciesRESTClient) Get(ctx context.Context, req *comput // GetAssociation gets an association with the specified name. func (c *networkFirewallPoliciesRESTClient) GetAssociation(ctx context.Context, req *computepb.GetAssociationNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicyAssociation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/getAssociation", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -592,10 +635,15 @@ func (c *networkFirewallPoliciesRESTClient) GetAssociation(ctx context.Context, baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicyAssociation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -632,7 +680,10 @@ func (c *networkFirewallPoliciesRESTClient) GetAssociation(ctx context.Context, // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *networkFirewallPoliciesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/getIamPolicy", req.GetProject(), req.GetResource()) params := url.Values{} @@ -643,10 +694,15 @@ func (c *networkFirewallPoliciesRESTClient) GetIamPolicy(ctx context.Context, re baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -683,7 +739,10 @@ func (c *networkFirewallPoliciesRESTClient) GetIamPolicy(ctx context.Context, re // GetRule gets a rule of the specified priority. func (c *networkFirewallPoliciesRESTClient) GetRule(ctx context.Context, req *computepb.GetRuleNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicyRule, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/getRule", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -694,10 +753,15 @@ func (c *networkFirewallPoliciesRESTClient) GetRule(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicyRule{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -741,7 +805,10 @@ func (c *networkFirewallPoliciesRESTClient) Insert(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies", req.GetProject()) params := url.Values{} @@ -752,10 +819,15 @@ func (c *networkFirewallPoliciesRESTClient) Insert(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -812,7 +884,10 @@ func (c *networkFirewallPoliciesRESTClient) List(ctx context.Context, req *compu } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies", req.GetProject()) params := url.Values{} @@ -837,6 +912,9 @@ func (c *networkFirewallPoliciesRESTClient) List(ctx context.Context, req *compu // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -896,7 +974,10 @@ func (c *networkFirewallPoliciesRESTClient) Patch(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -907,10 +988,15 @@ func (c *networkFirewallPoliciesRESTClient) Patch(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -961,7 +1047,10 @@ func (c *networkFirewallPoliciesRESTClient) PatchRule(ctx context.Context, req * return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/patchRule", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -975,10 +1064,15 @@ func (c *networkFirewallPoliciesRESTClient) PatchRule(ctx context.Context, req * baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1022,7 +1116,10 @@ func (c *networkFirewallPoliciesRESTClient) PatchRule(ctx context.Context, req * // RemoveAssociation removes an association for the specified firewall policy. func (c *networkFirewallPoliciesRESTClient) RemoveAssociation(ctx context.Context, req *computepb.RemoveAssociationNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/removeAssociation", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -1036,10 +1133,15 @@ func (c *networkFirewallPoliciesRESTClient) RemoveAssociation(ctx context.Contex baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1083,7 +1185,10 @@ func (c *networkFirewallPoliciesRESTClient) RemoveAssociation(ctx context.Contex // RemoveRule deletes a rule of the specified priority. func (c *networkFirewallPoliciesRESTClient) RemoveRule(ctx context.Context, req *computepb.RemoveRuleNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/removeRule", req.GetProject(), req.GetFirewallPolicy()) params := url.Values{} @@ -1097,10 +1202,15 @@ func (c *networkFirewallPoliciesRESTClient) RemoveRule(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1151,14 +1261,22 @@ func (c *networkFirewallPoliciesRESTClient) SetIamPolicy(ctx context.Context, re return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/setIamPolicy", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1202,14 +1320,22 @@ func (c *networkFirewallPoliciesRESTClient) TestIamPermissions(ctx context.Conte return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewallPolicies/%v/testIamPermissions", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/networks_client.go b/vendor/cloud.google.com/go/compute/apiv1/networks_client.go index 108e54a4c..0912a85de 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/networks_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/networks_client.go @@ -251,7 +251,10 @@ func (c *networksRESTClient) AddPeering(ctx context.Context, req *computepb.AddP return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v/addPeering", req.GetProject(), req.GetNetwork()) params := url.Values{} @@ -262,10 +265,15 @@ func (c *networksRESTClient) AddPeering(ctx context.Context, req *computepb.AddP baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -309,7 +317,10 @@ func (c *networksRESTClient) AddPeering(ctx context.Context, req *computepb.AddP // Delete deletes the specified network. func (c *networksRESTClient) Delete(ctx context.Context, req *computepb.DeleteNetworkRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v", req.GetProject(), req.GetNetwork()) params := url.Values{} @@ -320,10 +331,15 @@ func (c *networksRESTClient) Delete(ctx context.Context, req *computepb.DeleteNe baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -367,14 +383,22 @@ func (c *networksRESTClient) Delete(ctx context.Context, req *computepb.DeleteNe // Get returns the specified network. Gets a list of available networks by making a list() request. func (c *networksRESTClient) Get(ctx context.Context, req *computepb.GetNetworkRequest, opts ...gax.CallOption) (*computepb.Network, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v", req.GetProject(), req.GetNetwork()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Network{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -411,14 +435,22 @@ func (c *networksRESTClient) Get(ctx context.Context, req *computepb.GetNetworkR // GetEffectiveFirewalls returns the effective firewalls on a given network. func (c *networksRESTClient) GetEffectiveFirewalls(ctx context.Context, req *computepb.GetEffectiveFirewallsNetworkRequest, opts ...gax.CallOption) (*computepb.NetworksGetEffectiveFirewallsResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v/getEffectiveFirewalls", req.GetProject(), req.GetNetwork()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NetworksGetEffectiveFirewallsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -462,7 +494,10 @@ func (c *networksRESTClient) Insert(ctx context.Context, req *computepb.InsertNe return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks", req.GetProject()) params := url.Values{} @@ -473,10 +508,15 @@ func (c *networksRESTClient) Insert(ctx context.Context, req *computepb.InsertNe baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -533,7 +573,10 @@ func (c *networksRESTClient) List(ctx context.Context, req *computepb.ListNetwor } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks", req.GetProject()) params := url.Values{} @@ -558,6 +601,9 @@ func (c *networksRESTClient) List(ctx context.Context, req *computepb.ListNetwor // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -623,7 +669,10 @@ func (c *networksRESTClient) ListPeeringRoutes(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v/listPeeringRoutes", req.GetProject(), req.GetNetwork()) params := url.Values{} @@ -657,6 +706,9 @@ func (c *networksRESTClient) ListPeeringRoutes(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -716,7 +768,10 @@ func (c *networksRESTClient) Patch(ctx context.Context, req *computepb.PatchNetw return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v", req.GetProject(), req.GetNetwork()) params := url.Values{} @@ -727,10 +782,15 @@ func (c *networksRESTClient) Patch(ctx context.Context, req *computepb.PatchNetw baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -781,7 +841,10 @@ func (c *networksRESTClient) RemovePeering(ctx context.Context, req *computepb.R return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v/removePeering", req.GetProject(), req.GetNetwork()) params := url.Values{} @@ -792,10 +855,15 @@ func (c *networksRESTClient) RemovePeering(ctx context.Context, req *computepb.R baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -839,7 +907,10 @@ func (c *networksRESTClient) RemovePeering(ctx context.Context, req *computepb.R // SwitchToCustomMode switches the network mode from auto subnet mode to custom subnet mode. func (c *networksRESTClient) SwitchToCustomMode(ctx context.Context, req *computepb.SwitchToCustomModeNetworkRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v/switchToCustomMode", req.GetProject(), req.GetNetwork()) params := url.Values{} @@ -850,10 +921,15 @@ func (c *networksRESTClient) SwitchToCustomMode(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -904,7 +980,10 @@ func (c *networksRESTClient) UpdatePeering(ctx context.Context, req *computepb.U return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v/updatePeering", req.GetProject(), req.GetNetwork()) params := url.Values{} @@ -915,10 +994,15 @@ func (c *networksRESTClient) UpdatePeering(ctx context.Context, req *computepb.U baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/node_groups_client.go b/vendor/cloud.google.com/go/compute/apiv1/node_groups_client.go index 1d48efd6d..3f4887830 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/node_groups_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/node_groups_client.go @@ -266,7 +266,10 @@ func (c *nodeGroupsRESTClient) AddNodes(ctx context.Context, req *computepb.AddN return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/addNodes", req.GetProject(), req.GetZone(), req.GetNodeGroup()) params := url.Values{} @@ -277,10 +280,15 @@ func (c *nodeGroupsRESTClient) AddNodes(ctx context.Context, req *computepb.AddN baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "node_group", url.QueryEscape(req.GetNodeGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -338,7 +346,10 @@ func (c *nodeGroupsRESTClient) AggregatedList(ctx context.Context, req *computep } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/nodeGroups", req.GetProject()) params := url.Values{} @@ -366,6 +377,9 @@ func (c *nodeGroupsRESTClient) AggregatedList(ctx context.Context, req *computep // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -425,7 +439,10 @@ func (c *nodeGroupsRESTClient) AggregatedList(ctx context.Context, req *computep // Delete deletes the specified NodeGroup resource. func (c *nodeGroupsRESTClient) Delete(ctx context.Context, req *computepb.DeleteNodeGroupRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v", req.GetProject(), req.GetZone(), req.GetNodeGroup()) params := url.Values{} @@ -436,10 +453,15 @@ func (c *nodeGroupsRESTClient) Delete(ctx context.Context, req *computepb.Delete baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "node_group", url.QueryEscape(req.GetNodeGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -491,7 +513,10 @@ func (c *nodeGroupsRESTClient) DeleteNodes(ctx context.Context, req *computepb.D return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/deleteNodes", req.GetProject(), req.GetZone(), req.GetNodeGroup()) params := url.Values{} @@ -502,10 +527,15 @@ func (c *nodeGroupsRESTClient) DeleteNodes(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "node_group", url.QueryEscape(req.GetNodeGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -550,14 +580,22 @@ func (c *nodeGroupsRESTClient) DeleteNodes(ctx context.Context, req *computepb.D // Get returns the specified NodeGroup. Get a list of available NodeGroups by making a list() request. Note: the “nodes” field should not be used. Use nodeGroups.listNodes instead. func (c *nodeGroupsRESTClient) Get(ctx context.Context, req *computepb.GetNodeGroupRequest, opts ...gax.CallOption) (*computepb.NodeGroup, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v", req.GetProject(), req.GetZone(), req.GetNodeGroup()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "node_group", url.QueryEscape(req.GetNodeGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NodeGroup{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -594,7 +632,10 @@ func (c *nodeGroupsRESTClient) Get(ctx context.Context, req *computepb.GetNodeGr // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *nodeGroupsRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyNodeGroupRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/getIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) params := url.Values{} @@ -605,10 +646,15 @@ func (c *nodeGroupsRESTClient) GetIamPolicy(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -652,7 +698,10 @@ func (c *nodeGroupsRESTClient) Insert(ctx context.Context, req *computepb.Insert return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups", req.GetProject(), req.GetZone()) params := url.Values{} @@ -664,10 +713,15 @@ func (c *nodeGroupsRESTClient) Insert(ctx context.Context, req *computepb.Insert baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -725,7 +779,10 @@ func (c *nodeGroupsRESTClient) List(ctx context.Context, req *computepb.ListNode } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups", req.GetProject(), req.GetZone()) params := url.Values{} @@ -750,6 +807,9 @@ func (c *nodeGroupsRESTClient) List(ctx context.Context, req *computepb.ListNode // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -815,7 +875,10 @@ func (c *nodeGroupsRESTClient) ListNodes(ctx context.Context, req *computepb.Lis } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/listNodes", req.GetProject(), req.GetZone(), req.GetNodeGroup()) params := url.Values{} @@ -840,6 +903,9 @@ func (c *nodeGroupsRESTClient) ListNodes(ctx context.Context, req *computepb.Lis // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -899,7 +965,10 @@ func (c *nodeGroupsRESTClient) Patch(ctx context.Context, req *computepb.PatchNo return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v", req.GetProject(), req.GetZone(), req.GetNodeGroup()) params := url.Values{} @@ -910,10 +979,15 @@ func (c *nodeGroupsRESTClient) Patch(ctx context.Context, req *computepb.PatchNo baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "node_group", url.QueryEscape(req.GetNodeGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -965,14 +1039,22 @@ func (c *nodeGroupsRESTClient) SetIamPolicy(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/setIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1016,7 +1098,10 @@ func (c *nodeGroupsRESTClient) SetNodeTemplate(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/setNodeTemplate", req.GetProject(), req.GetZone(), req.GetNodeGroup()) params := url.Values{} @@ -1027,10 +1112,15 @@ func (c *nodeGroupsRESTClient) SetNodeTemplate(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "node_group", url.QueryEscape(req.GetNodeGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1082,14 +1172,22 @@ func (c *nodeGroupsRESTClient) TestIamPermissions(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/node_templates_client.go b/vendor/cloud.google.com/go/compute/apiv1/node_templates_client.go index e6c533a68..0df7b4c5e 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/node_templates_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/node_templates_client.go @@ -237,7 +237,10 @@ func (c *nodeTemplatesRESTClient) AggregatedList(ctx context.Context, req *compu } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/nodeTemplates", req.GetProject()) params := url.Values{} @@ -265,6 +268,9 @@ func (c *nodeTemplatesRESTClient) AggregatedList(ctx context.Context, req *compu // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -324,7 +330,10 @@ func (c *nodeTemplatesRESTClient) AggregatedList(ctx context.Context, req *compu // Delete deletes the specified NodeTemplate resource. func (c *nodeTemplatesRESTClient) Delete(ctx context.Context, req *computepb.DeleteNodeTemplateRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates/%v", req.GetProject(), req.GetRegion(), req.GetNodeTemplate()) params := url.Values{} @@ -335,10 +344,15 @@ func (c *nodeTemplatesRESTClient) Delete(ctx context.Context, req *computepb.Del baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "node_template", url.QueryEscape(req.GetNodeTemplate()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -383,14 +397,22 @@ func (c *nodeTemplatesRESTClient) Delete(ctx context.Context, req *computepb.Del // Get returns the specified node template. Gets a list of available node templates by making a list() request. func (c *nodeTemplatesRESTClient) Get(ctx context.Context, req *computepb.GetNodeTemplateRequest, opts ...gax.CallOption) (*computepb.NodeTemplate, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates/%v", req.GetProject(), req.GetRegion(), req.GetNodeTemplate()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "node_template", url.QueryEscape(req.GetNodeTemplate()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NodeTemplate{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -427,7 +449,10 @@ func (c *nodeTemplatesRESTClient) Get(ctx context.Context, req *computepb.GetNod // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *nodeTemplatesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyNodeTemplateRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates/%v/getIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -438,10 +463,15 @@ func (c *nodeTemplatesRESTClient) GetIamPolicy(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -485,7 +515,10 @@ func (c *nodeTemplatesRESTClient) Insert(ctx context.Context, req *computepb.Ins return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -496,10 +529,15 @@ func (c *nodeTemplatesRESTClient) Insert(ctx context.Context, req *computepb.Ins baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -557,7 +595,10 @@ func (c *nodeTemplatesRESTClient) List(ctx context.Context, req *computepb.ListN } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -582,6 +623,9 @@ func (c *nodeTemplatesRESTClient) List(ctx context.Context, req *computepb.ListN // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -641,14 +685,22 @@ func (c *nodeTemplatesRESTClient) SetIamPolicy(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -692,14 +744,22 @@ func (c *nodeTemplatesRESTClient) TestIamPermissions(ctx context.Context, req *c return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/node_types_client.go b/vendor/cloud.google.com/go/compute/apiv1/node_types_client.go index 18aebb225..29955d7b2 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/node_types_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/node_types_client.go @@ -185,7 +185,10 @@ func (c *nodeTypesRESTClient) AggregatedList(ctx context.Context, req *computepb } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/nodeTypes", req.GetProject()) params := url.Values{} @@ -213,6 +216,9 @@ func (c *nodeTypesRESTClient) AggregatedList(ctx context.Context, req *computepb // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -272,14 +278,22 @@ func (c *nodeTypesRESTClient) AggregatedList(ctx context.Context, req *computepb // Get returns the specified node type. Gets a list of available node types by making a list() request. func (c *nodeTypesRESTClient) Get(ctx context.Context, req *computepb.GetNodeTypeRequest, opts ...gax.CallOption) (*computepb.NodeType, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeTypes/%v", req.GetProject(), req.GetZone(), req.GetNodeType()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "node_type", url.QueryEscape(req.GetNodeType()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NodeType{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -329,7 +343,10 @@ func (c *nodeTypesRESTClient) List(ctx context.Context, req *computepb.ListNodeT } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeTypes", req.GetProject(), req.GetZone()) params := url.Values{} @@ -354,6 +371,9 @@ func (c *nodeTypesRESTClient) List(ctx context.Context, req *computepb.ListNodeT // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/packet_mirrorings_client.go b/vendor/cloud.google.com/go/compute/apiv1/packet_mirrorings_client.go index 3da2a0f57..b6eb1e407 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/packet_mirrorings_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/packet_mirrorings_client.go @@ -230,7 +230,10 @@ func (c *packetMirroringsRESTClient) AggregatedList(ctx context.Context, req *co } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/packetMirrorings", req.GetProject()) params := url.Values{} @@ -258,6 +261,9 @@ func (c *packetMirroringsRESTClient) AggregatedList(ctx context.Context, req *co // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -317,7 +323,10 @@ func (c *packetMirroringsRESTClient) AggregatedList(ctx context.Context, req *co // Delete deletes the specified PacketMirroring resource. func (c *packetMirroringsRESTClient) Delete(ctx context.Context, req *computepb.DeletePacketMirroringRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/packetMirrorings/%v", req.GetProject(), req.GetRegion(), req.GetPacketMirroring()) params := url.Values{} @@ -328,10 +337,15 @@ func (c *packetMirroringsRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "packet_mirroring", url.QueryEscape(req.GetPacketMirroring()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -376,14 +390,22 @@ func (c *packetMirroringsRESTClient) Delete(ctx context.Context, req *computepb. // Get returns the specified PacketMirroring resource. func (c *packetMirroringsRESTClient) Get(ctx context.Context, req *computepb.GetPacketMirroringRequest, opts ...gax.CallOption) (*computepb.PacketMirroring, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/packetMirrorings/%v", req.GetProject(), req.GetRegion(), req.GetPacketMirroring()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "packet_mirroring", url.QueryEscape(req.GetPacketMirroring()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.PacketMirroring{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -427,7 +449,10 @@ func (c *packetMirroringsRESTClient) Insert(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/packetMirrorings", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -438,10 +463,15 @@ func (c *packetMirroringsRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -499,7 +529,10 @@ func (c *packetMirroringsRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/packetMirrorings", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -524,6 +557,9 @@ func (c *packetMirroringsRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -583,7 +619,10 @@ func (c *packetMirroringsRESTClient) Patch(ctx context.Context, req *computepb.P return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/packetMirrorings/%v", req.GetProject(), req.GetRegion(), req.GetPacketMirroring()) params := url.Values{} @@ -594,10 +633,15 @@ func (c *packetMirroringsRESTClient) Patch(ctx context.Context, req *computepb.P baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "packet_mirroring", url.QueryEscape(req.GetPacketMirroring()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -649,14 +693,22 @@ func (c *packetMirroringsRESTClient) TestIamPermissions(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/packetMirrorings/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/projects_client.go b/vendor/cloud.google.com/go/compute/apiv1/projects_client.go index 4bc69d6eb..1c11c53d8 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/projects_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/projects_client.go @@ -258,7 +258,10 @@ func (c *projectsRESTClient) Connection() *grpc.ClientConn { // DisableXpnHost disable this project as a shared VPC host project. func (c *projectsRESTClient) DisableXpnHost(ctx context.Context, req *computepb.DisableXpnHostProjectRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/disableXpnHost", req.GetProject()) params := url.Values{} @@ -269,10 +272,15 @@ func (c *projectsRESTClient) DisableXpnHost(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -323,7 +331,10 @@ func (c *projectsRESTClient) DisableXpnResource(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/disableXpnResource", req.GetProject()) params := url.Values{} @@ -334,10 +345,15 @@ func (c *projectsRESTClient) DisableXpnResource(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -381,7 +397,10 @@ func (c *projectsRESTClient) DisableXpnResource(ctx context.Context, req *comput // EnableXpnHost enable this project as a shared VPC host project. func (c *projectsRESTClient) EnableXpnHost(ctx context.Context, req *computepb.EnableXpnHostProjectRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/enableXpnHost", req.GetProject()) params := url.Values{} @@ -392,10 +411,15 @@ func (c *projectsRESTClient) EnableXpnHost(ctx context.Context, req *computepb.E baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -446,7 +470,10 @@ func (c *projectsRESTClient) EnableXpnResource(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/enableXpnResource", req.GetProject()) params := url.Values{} @@ -457,10 +484,15 @@ func (c *projectsRESTClient) EnableXpnResource(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -504,14 +536,22 @@ func (c *projectsRESTClient) EnableXpnResource(ctx context.Context, req *compute // Get returns the specified Project resource. To decrease latency for this method, you can optionally omit any unneeded information from the response by using a field mask. This practice is especially recommended for unused quota information (the quotas field). To exclude one or more fields, set your request’s fields query parameter to only include the fields you need. For example, to only include the id and selfLink fields, add the query parameter ?fields=id,selfLink to your request. func (c *projectsRESTClient) Get(ctx context.Context, req *computepb.GetProjectRequest, opts ...gax.CallOption) (*computepb.Project, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v", req.GetProject()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Project{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -548,14 +588,22 @@ func (c *projectsRESTClient) Get(ctx context.Context, req *computepb.GetProjectR // GetXpnHost gets the shared VPC host project that this project links to. May be empty if no link exists. func (c *projectsRESTClient) GetXpnHost(ctx context.Context, req *computepb.GetXpnHostProjectRequest, opts ...gax.CallOption) (*computepb.Project, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/getXpnHost", req.GetProject()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Project{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -605,7 +653,10 @@ func (c *projectsRESTClient) GetXpnResources(ctx context.Context, req *computepb } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/getXpnResources", req.GetProject()) params := url.Values{} @@ -630,6 +681,9 @@ func (c *projectsRESTClient) GetXpnResources(ctx context.Context, req *computepb // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -701,7 +755,10 @@ func (c *projectsRESTClient) ListXpnHosts(ctx context.Context, req *computepb.Li return nil, "", err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/listXpnHosts", req.GetProject()) params := url.Values{} @@ -726,6 +783,9 @@ func (c *projectsRESTClient) ListXpnHosts(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -785,7 +845,10 @@ func (c *projectsRESTClient) MoveDisk(ctx context.Context, req *computepb.MoveDi return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/moveDisk", req.GetProject()) params := url.Values{} @@ -796,10 +859,15 @@ func (c *projectsRESTClient) MoveDisk(ctx context.Context, req *computepb.MoveDi baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -850,7 +918,10 @@ func (c *projectsRESTClient) MoveInstance(ctx context.Context, req *computepb.Mo return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/moveInstance", req.GetProject()) params := url.Values{} @@ -861,10 +932,15 @@ func (c *projectsRESTClient) MoveInstance(ctx context.Context, req *computepb.Mo baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -915,7 +991,10 @@ func (c *projectsRESTClient) SetCommonInstanceMetadata(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/setCommonInstanceMetadata", req.GetProject()) params := url.Values{} @@ -926,10 +1005,15 @@ func (c *projectsRESTClient) SetCommonInstanceMetadata(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -980,7 +1064,10 @@ func (c *projectsRESTClient) SetDefaultNetworkTier(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/setDefaultNetworkTier", req.GetProject()) params := url.Values{} @@ -991,10 +1078,15 @@ func (c *projectsRESTClient) SetDefaultNetworkTier(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1045,7 +1137,10 @@ func (c *projectsRESTClient) SetUsageExportBucket(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/setUsageExportBucket", req.GetProject()) params := url.Values{} @@ -1056,10 +1151,15 @@ func (c *projectsRESTClient) SetUsageExportBucket(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/public_advertised_prefixes_client.go b/vendor/cloud.google.com/go/compute/apiv1/public_advertised_prefixes_client.go index 7fa4b1c30..63b35d28b 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/public_advertised_prefixes_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/public_advertised_prefixes_client.go @@ -202,7 +202,10 @@ func (c *publicAdvertisedPrefixesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified PublicAdvertisedPrefix func (c *publicAdvertisedPrefixesRESTClient) Delete(ctx context.Context, req *computepb.DeletePublicAdvertisedPrefixeRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicAdvertisedPrefixes/%v", req.GetProject(), req.GetPublicAdvertisedPrefix()) params := url.Values{} @@ -213,10 +216,15 @@ func (c *publicAdvertisedPrefixesRESTClient) Delete(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "public_advertised_prefix", url.QueryEscape(req.GetPublicAdvertisedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -260,14 +268,22 @@ func (c *publicAdvertisedPrefixesRESTClient) Delete(ctx context.Context, req *co // Get returns the specified PublicAdvertisedPrefix resource. func (c *publicAdvertisedPrefixesRESTClient) Get(ctx context.Context, req *computepb.GetPublicAdvertisedPrefixeRequest, opts ...gax.CallOption) (*computepb.PublicAdvertisedPrefix, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicAdvertisedPrefixes/%v", req.GetProject(), req.GetPublicAdvertisedPrefix()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "public_advertised_prefix", url.QueryEscape(req.GetPublicAdvertisedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.PublicAdvertisedPrefix{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -311,7 +327,10 @@ func (c *publicAdvertisedPrefixesRESTClient) Insert(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicAdvertisedPrefixes", req.GetProject()) params := url.Values{} @@ -322,10 +341,15 @@ func (c *publicAdvertisedPrefixesRESTClient) Insert(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -382,7 +406,10 @@ func (c *publicAdvertisedPrefixesRESTClient) List(ctx context.Context, req *comp } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicAdvertisedPrefixes", req.GetProject()) params := url.Values{} @@ -407,6 +434,9 @@ func (c *publicAdvertisedPrefixesRESTClient) List(ctx context.Context, req *comp // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -466,7 +496,10 @@ func (c *publicAdvertisedPrefixesRESTClient) Patch(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicAdvertisedPrefixes/%v", req.GetProject(), req.GetPublicAdvertisedPrefix()) params := url.Values{} @@ -477,10 +510,15 @@ func (c *publicAdvertisedPrefixesRESTClient) Patch(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "public_advertised_prefix", url.QueryEscape(req.GetPublicAdvertisedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/public_delegated_prefixes_client.go b/vendor/cloud.google.com/go/compute/apiv1/public_delegated_prefixes_client.go index 160afbc86..08a942b6e 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/public_delegated_prefixes_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/public_delegated_prefixes_client.go @@ -223,7 +223,10 @@ func (c *publicDelegatedPrefixesRESTClient) AggregatedList(ctx context.Context, } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/publicDelegatedPrefixes", req.GetProject()) params := url.Values{} @@ -251,6 +254,9 @@ func (c *publicDelegatedPrefixesRESTClient) AggregatedList(ctx context.Context, // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -310,7 +316,10 @@ func (c *publicDelegatedPrefixesRESTClient) AggregatedList(ctx context.Context, // Delete deletes the specified PublicDelegatedPrefix in the given region. func (c *publicDelegatedPrefixesRESTClient) Delete(ctx context.Context, req *computepb.DeletePublicDelegatedPrefixeRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/publicDelegatedPrefixes/%v", req.GetProject(), req.GetRegion(), req.GetPublicDelegatedPrefix()) params := url.Values{} @@ -321,10 +330,15 @@ func (c *publicDelegatedPrefixesRESTClient) Delete(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "public_delegated_prefix", url.QueryEscape(req.GetPublicDelegatedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -369,14 +383,22 @@ func (c *publicDelegatedPrefixesRESTClient) Delete(ctx context.Context, req *com // Get returns the specified PublicDelegatedPrefix resource in the given region. func (c *publicDelegatedPrefixesRESTClient) Get(ctx context.Context, req *computepb.GetPublicDelegatedPrefixeRequest, opts ...gax.CallOption) (*computepb.PublicDelegatedPrefix, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/publicDelegatedPrefixes/%v", req.GetProject(), req.GetRegion(), req.GetPublicDelegatedPrefix()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "public_delegated_prefix", url.QueryEscape(req.GetPublicDelegatedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.PublicDelegatedPrefix{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -420,7 +442,10 @@ func (c *publicDelegatedPrefixesRESTClient) Insert(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/publicDelegatedPrefixes", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -431,10 +456,15 @@ func (c *publicDelegatedPrefixesRESTClient) Insert(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -492,7 +522,10 @@ func (c *publicDelegatedPrefixesRESTClient) List(ctx context.Context, req *compu } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/publicDelegatedPrefixes", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -517,6 +550,9 @@ func (c *publicDelegatedPrefixesRESTClient) List(ctx context.Context, req *compu // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -576,7 +612,10 @@ func (c *publicDelegatedPrefixesRESTClient) Patch(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/publicDelegatedPrefixes/%v", req.GetProject(), req.GetRegion(), req.GetPublicDelegatedPrefix()) params := url.Values{} @@ -587,10 +626,15 @@ func (c *publicDelegatedPrefixesRESTClient) Patch(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "public_delegated_prefix", url.QueryEscape(req.GetPublicDelegatedPrefix()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_autoscalers_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_autoscalers_client.go index d5cfa979d..e533502cc 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_autoscalers_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_autoscalers_client.go @@ -209,7 +209,10 @@ func (c *regionAutoscalersRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified autoscaler. func (c *regionAutoscalersRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionAutoscalerRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/autoscalers/%v", req.GetProject(), req.GetRegion(), req.GetAutoscaler()) params := url.Values{} @@ -220,10 +223,15 @@ func (c *regionAutoscalersRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "autoscaler", url.QueryEscape(req.GetAutoscaler()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -268,14 +276,22 @@ func (c *regionAutoscalersRESTClient) Delete(ctx context.Context, req *computepb // Get returns the specified autoscaler. func (c *regionAutoscalersRESTClient) Get(ctx context.Context, req *computepb.GetRegionAutoscalerRequest, opts ...gax.CallOption) (*computepb.Autoscaler, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/autoscalers/%v", req.GetProject(), req.GetRegion(), req.GetAutoscaler()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "autoscaler", url.QueryEscape(req.GetAutoscaler()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Autoscaler{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -319,7 +335,10 @@ func (c *regionAutoscalersRESTClient) Insert(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/autoscalers", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -330,10 +349,15 @@ func (c *regionAutoscalersRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -391,7 +415,10 @@ func (c *regionAutoscalersRESTClient) List(ctx context.Context, req *computepb.L } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/autoscalers", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -416,6 +443,9 @@ func (c *regionAutoscalersRESTClient) List(ctx context.Context, req *computepb.L // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -475,7 +505,10 @@ func (c *regionAutoscalersRESTClient) Patch(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/autoscalers", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -489,10 +522,15 @@ func (c *regionAutoscalersRESTClient) Patch(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -544,7 +582,10 @@ func (c *regionAutoscalersRESTClient) Update(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/autoscalers", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -558,10 +599,15 @@ func (c *regionAutoscalersRESTClient) Update(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_backend_services_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_backend_services_client.go index 469cdbb91..44ee9ab9c 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_backend_services_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_backend_services_client.go @@ -216,7 +216,10 @@ func (c *regionBackendServicesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified regional BackendService resource. func (c *regionBackendServicesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionBackendServiceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices/%v", req.GetProject(), req.GetRegion(), req.GetBackendService()) params := url.Values{} @@ -227,10 +230,15 @@ func (c *regionBackendServicesRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -275,14 +283,22 @@ func (c *regionBackendServicesRESTClient) Delete(ctx context.Context, req *compu // Get returns the specified regional BackendService resource. func (c *regionBackendServicesRESTClient) Get(ctx context.Context, req *computepb.GetRegionBackendServiceRequest, opts ...gax.CallOption) (*computepb.BackendService, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices/%v", req.GetProject(), req.GetRegion(), req.GetBackendService()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.BackendService{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -326,14 +342,22 @@ func (c *regionBackendServicesRESTClient) GetHealth(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices/%v/getHealth", req.GetProject(), req.GetRegion(), req.GetBackendService()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.BackendServiceGroupHealth{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -377,7 +401,10 @@ func (c *regionBackendServicesRESTClient) Insert(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -388,10 +415,15 @@ func (c *regionBackendServicesRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -449,7 +481,10 @@ func (c *regionBackendServicesRESTClient) List(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -474,6 +509,9 @@ func (c *regionBackendServicesRESTClient) List(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -533,7 +571,10 @@ func (c *regionBackendServicesRESTClient) Patch(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices/%v", req.GetProject(), req.GetRegion(), req.GetBackendService()) params := url.Values{} @@ -544,10 +585,15 @@ func (c *regionBackendServicesRESTClient) Patch(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -599,7 +645,10 @@ func (c *regionBackendServicesRESTClient) Update(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices/%v", req.GetProject(), req.GetRegion(), req.GetBackendService()) params := url.Values{} @@ -610,10 +659,15 @@ func (c *regionBackendServicesRESTClient) Update(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "backend_service", url.QueryEscape(req.GetBackendService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_commitments_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_commitments_client.go index 0877c85d5..f7ec26bc8 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_commitments_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_commitments_client.go @@ -216,7 +216,10 @@ func (c *regionCommitmentsRESTClient) AggregatedList(ctx context.Context, req *c } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/commitments", req.GetProject()) params := url.Values{} @@ -244,6 +247,9 @@ func (c *regionCommitmentsRESTClient) AggregatedList(ctx context.Context, req *c // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -303,14 +309,22 @@ func (c *regionCommitmentsRESTClient) AggregatedList(ctx context.Context, req *c // Get returns the specified commitment resource. Gets a list of available commitments by making a list() request. func (c *regionCommitmentsRESTClient) Get(ctx context.Context, req *computepb.GetRegionCommitmentRequest, opts ...gax.CallOption) (*computepb.Commitment, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/commitments/%v", req.GetProject(), req.GetRegion(), req.GetCommitment()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "commitment", url.QueryEscape(req.GetCommitment()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Commitment{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -354,7 +368,10 @@ func (c *regionCommitmentsRESTClient) Insert(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/commitments", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -365,10 +382,15 @@ func (c *regionCommitmentsRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -426,7 +448,10 @@ func (c *regionCommitmentsRESTClient) List(ctx context.Context, req *computepb.L } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/commitments", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -451,6 +476,9 @@ func (c *regionCommitmentsRESTClient) List(ctx context.Context, req *computepb.L // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -510,7 +538,10 @@ func (c *regionCommitmentsRESTClient) Update(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/commitments/%v", req.GetProject(), req.GetRegion(), req.GetCommitment()) params := url.Values{} @@ -527,10 +558,15 @@ func (c *regionCommitmentsRESTClient) Update(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "commitment", url.QueryEscape(req.GetCommitment()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_disk_types_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_disk_types_client.go index 78ad10d29..b20cfa4d7 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_disk_types_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_disk_types_client.go @@ -164,14 +164,22 @@ func (c *regionDiskTypesRESTClient) Connection() *grpc.ClientConn { // Get returns the specified regional disk type. Gets a list of available disk types by making a list() request. func (c *regionDiskTypesRESTClient) Get(ctx context.Context, req *computepb.GetRegionDiskTypeRequest, opts ...gax.CallOption) (*computepb.DiskType, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/diskTypes/%v", req.GetProject(), req.GetRegion(), req.GetDiskType()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "disk_type", url.QueryEscape(req.GetDiskType()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.DiskType{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -221,7 +229,10 @@ func (c *regionDiskTypesRESTClient) List(ctx context.Context, req *computepb.Lis } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/diskTypes", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -246,6 +257,9 @@ func (c *regionDiskTypesRESTClient) List(ctx context.Context, req *computepb.Lis // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_disks_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_disks_client.go index 55466ba69..6ad79826f 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_disks_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_disks_client.go @@ -258,7 +258,10 @@ func (c *regionDisksRESTClient) AddResourcePolicies(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/addResourcePolicies", req.GetProject(), req.GetRegion(), req.GetDisk()) params := url.Values{} @@ -269,10 +272,15 @@ func (c *regionDisksRESTClient) AddResourcePolicies(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -324,7 +332,10 @@ func (c *regionDisksRESTClient) CreateSnapshot(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/createSnapshot", req.GetProject(), req.GetRegion(), req.GetDisk()) params := url.Values{} @@ -335,10 +346,15 @@ func (c *regionDisksRESTClient) CreateSnapshot(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -383,7 +399,10 @@ func (c *regionDisksRESTClient) CreateSnapshot(ctx context.Context, req *compute // Delete deletes the specified regional persistent disk. Deleting a regional disk removes all the replicas of its data permanently and is irreversible. However, deleting a disk does not delete any snapshots previously made from the disk. You must separately delete snapshots. func (c *regionDisksRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionDiskRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v", req.GetProject(), req.GetRegion(), req.GetDisk()) params := url.Values{} @@ -394,10 +413,15 @@ func (c *regionDisksRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -442,14 +466,22 @@ func (c *regionDisksRESTClient) Delete(ctx context.Context, req *computepb.Delet // Get returns a specified regional persistent disk. func (c *regionDisksRESTClient) Get(ctx context.Context, req *computepb.GetRegionDiskRequest, opts ...gax.CallOption) (*computepb.Disk, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v", req.GetProject(), req.GetRegion(), req.GetDisk()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Disk{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -486,7 +518,10 @@ func (c *regionDisksRESTClient) Get(ctx context.Context, req *computepb.GetRegio // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *regionDisksRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyRegionDiskRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/getIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -497,10 +532,15 @@ func (c *regionDisksRESTClient) GetIamPolicy(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -544,7 +584,10 @@ func (c *regionDisksRESTClient) Insert(ctx context.Context, req *computepb.Inser return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -558,10 +601,15 @@ func (c *regionDisksRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -619,7 +667,10 @@ func (c *regionDisksRESTClient) List(ctx context.Context, req *computepb.ListReg } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -644,6 +695,9 @@ func (c *regionDisksRESTClient) List(ctx context.Context, req *computepb.ListReg // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -703,7 +757,10 @@ func (c *regionDisksRESTClient) RemoveResourcePolicies(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/removeResourcePolicies", req.GetProject(), req.GetRegion(), req.GetDisk()) params := url.Values{} @@ -714,10 +771,15 @@ func (c *regionDisksRESTClient) RemoveResourcePolicies(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -769,7 +831,10 @@ func (c *regionDisksRESTClient) Resize(ctx context.Context, req *computepb.Resiz return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/resize", req.GetProject(), req.GetRegion(), req.GetDisk()) params := url.Values{} @@ -780,10 +845,15 @@ func (c *regionDisksRESTClient) Resize(ctx context.Context, req *computepb.Resiz baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "disk", url.QueryEscape(req.GetDisk()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -835,14 +905,22 @@ func (c *regionDisksRESTClient) SetIamPolicy(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -886,7 +964,10 @@ func (c *regionDisksRESTClient) SetLabels(ctx context.Context, req *computepb.Se return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/setLabels", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -897,10 +978,15 @@ func (c *regionDisksRESTClient) SetLabels(ctx context.Context, req *computepb.Se baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -952,14 +1038,22 @@ func (c *regionDisksRESTClient) TestIamPermissions(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_health_check_services_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_health_check_services_client.go index 005bb2608..258265a21 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_health_check_services_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_health_check_services_client.go @@ -202,7 +202,10 @@ func (c *regionHealthCheckServicesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified regional HealthCheckService. func (c *regionHealthCheckServicesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionHealthCheckServiceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthCheckServices/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheckService()) params := url.Values{} @@ -213,10 +216,15 @@ func (c *regionHealthCheckServicesRESTClient) Delete(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "health_check_service", url.QueryEscape(req.GetHealthCheckService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -261,14 +269,22 @@ func (c *regionHealthCheckServicesRESTClient) Delete(ctx context.Context, req *c // Get returns the specified regional HealthCheckService resource. func (c *regionHealthCheckServicesRESTClient) Get(ctx context.Context, req *computepb.GetRegionHealthCheckServiceRequest, opts ...gax.CallOption) (*computepb.HealthCheckService, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthCheckServices/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheckService()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "health_check_service", url.QueryEscape(req.GetHealthCheckService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.HealthCheckService{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -312,7 +328,10 @@ func (c *regionHealthCheckServicesRESTClient) Insert(ctx context.Context, req *c return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthCheckServices", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -323,10 +342,15 @@ func (c *regionHealthCheckServicesRESTClient) Insert(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -384,7 +408,10 @@ func (c *regionHealthCheckServicesRESTClient) List(ctx context.Context, req *com } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthCheckServices", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -409,6 +436,9 @@ func (c *regionHealthCheckServicesRESTClient) List(ctx context.Context, req *com // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -468,7 +498,10 @@ func (c *regionHealthCheckServicesRESTClient) Patch(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthCheckServices/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheckService()) params := url.Values{} @@ -479,10 +512,15 @@ func (c *regionHealthCheckServicesRESTClient) Patch(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "health_check_service", url.QueryEscape(req.GetHealthCheckService()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_health_checks_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_health_checks_client.go index cd21c5050..19dc052a7 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_health_checks_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_health_checks_client.go @@ -209,7 +209,10 @@ func (c *regionHealthChecksRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified HealthCheck resource. func (c *regionHealthChecksRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionHealthCheckRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthChecks/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheck()) params := url.Values{} @@ -220,10 +223,15 @@ func (c *regionHealthChecksRESTClient) Delete(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "health_check", url.QueryEscape(req.GetHealthCheck()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -268,14 +276,22 @@ func (c *regionHealthChecksRESTClient) Delete(ctx context.Context, req *computep // Get returns the specified HealthCheck resource. Gets a list of available health checks by making a list() request. func (c *regionHealthChecksRESTClient) Get(ctx context.Context, req *computepb.GetRegionHealthCheckRequest, opts ...gax.CallOption) (*computepb.HealthCheck, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthChecks/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheck()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "health_check", url.QueryEscape(req.GetHealthCheck()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.HealthCheck{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -319,7 +335,10 @@ func (c *regionHealthChecksRESTClient) Insert(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthChecks", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -330,10 +349,15 @@ func (c *regionHealthChecksRESTClient) Insert(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -391,7 +415,10 @@ func (c *regionHealthChecksRESTClient) List(ctx context.Context, req *computepb. } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthChecks", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -416,6 +443,9 @@ func (c *regionHealthChecksRESTClient) List(ctx context.Context, req *computepb. // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -475,7 +505,10 @@ func (c *regionHealthChecksRESTClient) Patch(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthChecks/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheck()) params := url.Values{} @@ -486,10 +519,15 @@ func (c *regionHealthChecksRESTClient) Patch(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "health_check", url.QueryEscape(req.GetHealthCheck()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -541,7 +579,10 @@ func (c *regionHealthChecksRESTClient) Update(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthChecks/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheck()) params := url.Values{} @@ -552,10 +593,15 @@ func (c *regionHealthChecksRESTClient) Update(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "health_check", url.QueryEscape(req.GetHealthCheck()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_instance_group_managers_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_instance_group_managers_client.go index ba5b1ee3d..9ef2e95b2 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_instance_group_managers_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_instance_group_managers_client.go @@ -307,7 +307,10 @@ func (c *regionInstanceGroupManagersRESTClient) AbandonInstances(ctx context.Con return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/abandonInstances", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -318,10 +321,15 @@ func (c *regionInstanceGroupManagersRESTClient) AbandonInstances(ctx context.Con baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -373,14 +381,22 @@ func (c *regionInstanceGroupManagersRESTClient) ApplyUpdatesToInstances(ctx cont return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/applyUpdatesToInstances", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -432,7 +448,10 @@ func (c *regionInstanceGroupManagersRESTClient) CreateInstances(ctx context.Cont return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/createInstances", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -443,10 +462,15 @@ func (c *regionInstanceGroupManagersRESTClient) CreateInstances(ctx context.Cont baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -491,7 +515,10 @@ func (c *regionInstanceGroupManagersRESTClient) CreateInstances(ctx context.Cont // Delete deletes the specified managed instance group and all of the instances in that group. func (c *regionInstanceGroupManagersRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionInstanceGroupManagerRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -502,10 +529,15 @@ func (c *regionInstanceGroupManagersRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -557,7 +589,10 @@ func (c *regionInstanceGroupManagersRESTClient) DeleteInstances(ctx context.Cont return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/deleteInstances", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -568,10 +603,15 @@ func (c *regionInstanceGroupManagersRESTClient) DeleteInstances(ctx context.Cont baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -623,14 +663,22 @@ func (c *regionInstanceGroupManagersRESTClient) DeletePerInstanceConfigs(ctx con return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/deletePerInstanceConfigs", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -675,14 +723,22 @@ func (c *regionInstanceGroupManagersRESTClient) DeletePerInstanceConfigs(ctx con // Get returns all of the details about the specified managed instance group. func (c *regionInstanceGroupManagersRESTClient) Get(ctx context.Context, req *computepb.GetRegionInstanceGroupManagerRequest, opts ...gax.CallOption) (*computepb.InstanceGroupManager, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InstanceGroupManager{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -726,7 +782,10 @@ func (c *regionInstanceGroupManagersRESTClient) Insert(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -737,10 +796,15 @@ func (c *regionInstanceGroupManagersRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -798,7 +862,10 @@ func (c *regionInstanceGroupManagersRESTClient) List(ctx context.Context, req *c } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -823,6 +890,9 @@ func (c *regionInstanceGroupManagersRESTClient) List(ctx context.Context, req *c // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -888,7 +958,10 @@ func (c *regionInstanceGroupManagersRESTClient) ListErrors(ctx context.Context, } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/listErrors", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -913,6 +986,9 @@ func (c *regionInstanceGroupManagersRESTClient) ListErrors(ctx context.Context, // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -978,7 +1054,10 @@ func (c *regionInstanceGroupManagersRESTClient) ListManagedInstances(ctx context } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/listManagedInstances", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1003,6 +1082,9 @@ func (c *regionInstanceGroupManagersRESTClient) ListManagedInstances(ctx context // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1068,7 +1150,10 @@ func (c *regionInstanceGroupManagersRESTClient) ListPerInstanceConfigs(ctx conte } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/listPerInstanceConfigs", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1093,6 +1178,9 @@ func (c *regionInstanceGroupManagersRESTClient) ListPerInstanceConfigs(ctx conte // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1152,7 +1240,10 @@ func (c *regionInstanceGroupManagersRESTClient) Patch(ctx context.Context, req * return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1163,10 +1254,15 @@ func (c *regionInstanceGroupManagersRESTClient) Patch(ctx context.Context, req * baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1218,7 +1314,10 @@ func (c *regionInstanceGroupManagersRESTClient) PatchPerInstanceConfigs(ctx cont return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/patchPerInstanceConfigs", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1229,10 +1328,15 @@ func (c *regionInstanceGroupManagersRESTClient) PatchPerInstanceConfigs(ctx cont baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1284,7 +1388,10 @@ func (c *regionInstanceGroupManagersRESTClient) RecreateInstances(ctx context.Co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/recreateInstances", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1295,10 +1402,15 @@ func (c *regionInstanceGroupManagersRESTClient) RecreateInstances(ctx context.Co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1343,7 +1455,10 @@ func (c *regionInstanceGroupManagersRESTClient) RecreateInstances(ctx context.Co // Resize changes the intended size of the managed instance group. If you increase the size, the group creates new instances using the current instance template. If you decrease the size, the group deletes one or more instances. The resize operation is marked DONE if the resize request is successful. The underlying actions take additional time. You must separately verify the status of the creating or deleting actions with the listmanagedinstances method. If the group is part of a backend service that has enabled connection draining, it can take up to 60 seconds after the connection draining duration has elapsed before the VM instance is removed or deleted. func (c *regionInstanceGroupManagersRESTClient) Resize(ctx context.Context, req *computepb.ResizeRegionInstanceGroupManagerRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/resize", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1355,10 +1470,15 @@ func (c *regionInstanceGroupManagersRESTClient) Resize(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1410,7 +1530,10 @@ func (c *regionInstanceGroupManagersRESTClient) SetInstanceTemplate(ctx context. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/setInstanceTemplate", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1421,10 +1544,15 @@ func (c *regionInstanceGroupManagersRESTClient) SetInstanceTemplate(ctx context. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1476,7 +1604,10 @@ func (c *regionInstanceGroupManagersRESTClient) SetTargetPools(ctx context.Conte return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/setTargetPools", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1487,10 +1618,15 @@ func (c *regionInstanceGroupManagersRESTClient) SetTargetPools(ctx context.Conte baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1542,7 +1678,10 @@ func (c *regionInstanceGroupManagersRESTClient) UpdatePerInstanceConfigs(ctx con return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/updatePerInstanceConfigs", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) params := url.Values{} @@ -1553,10 +1692,15 @@ func (c *regionInstanceGroupManagersRESTClient) UpdatePerInstanceConfigs(ctx con baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group_manager", url.QueryEscape(req.GetInstanceGroupManager()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_instance_groups_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_instance_groups_client.go index e646958e0..66266f8dc 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_instance_groups_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_instance_groups_client.go @@ -195,14 +195,22 @@ func (c *regionInstanceGroupsRESTClient) Connection() *grpc.ClientConn { // Get returns the specified instance group resource. func (c *regionInstanceGroupsRESTClient) Get(ctx context.Context, req *computepb.GetRegionInstanceGroupRequest, opts ...gax.CallOption) (*computepb.InstanceGroup, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroups/%v", req.GetProject(), req.GetRegion(), req.GetInstanceGroup()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group", url.QueryEscape(req.GetInstanceGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.InstanceGroup{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -252,7 +260,10 @@ func (c *regionInstanceGroupsRESTClient) List(ctx context.Context, req *computep } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroups", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -277,6 +288,9 @@ func (c *regionInstanceGroupsRESTClient) List(ctx context.Context, req *computep // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -348,7 +362,10 @@ func (c *regionInstanceGroupsRESTClient) ListInstances(ctx context.Context, req return nil, "", err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroups/%v/listInstances", req.GetProject(), req.GetRegion(), req.GetInstanceGroup()) params := url.Values{} @@ -373,6 +390,9 @@ func (c *regionInstanceGroupsRESTClient) ListInstances(ctx context.Context, req // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -432,7 +452,10 @@ func (c *regionInstanceGroupsRESTClient) SetNamedPorts(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroups/%v/setNamedPorts", req.GetProject(), req.GetRegion(), req.GetInstanceGroup()) params := url.Values{} @@ -443,10 +466,15 @@ func (c *regionInstanceGroupsRESTClient) SetNamedPorts(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "instance_group", url.QueryEscape(req.GetInstanceGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_instances_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_instances_client.go index 8891d806d..6696ec950 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_instances_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_instances_client.go @@ -178,7 +178,10 @@ func (c *regionInstancesRESTClient) BulkInsert(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instances/bulkInsert", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -189,10 +192,15 @@ func (c *regionInstancesRESTClient) BulkInsert(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_network_endpoint_groups_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_network_endpoint_groups_client.go index 3869e83ca..91818c342 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_network_endpoint_groups_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_network_endpoint_groups_client.go @@ -195,7 +195,10 @@ func (c *regionNetworkEndpointGroupsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified network endpoint group. Note that the NEG cannot be deleted if it is configured as a backend of a backend service. func (c *regionNetworkEndpointGroupsRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionNetworkEndpointGroupRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEndpointGroups/%v", req.GetProject(), req.GetRegion(), req.GetNetworkEndpointGroup()) params := url.Values{} @@ -206,10 +209,15 @@ func (c *regionNetworkEndpointGroupsRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -254,14 +262,22 @@ func (c *regionNetworkEndpointGroupsRESTClient) Delete(ctx context.Context, req // Get returns the specified network endpoint group. Gets a list of available network endpoint groups by making a list() request. func (c *regionNetworkEndpointGroupsRESTClient) Get(ctx context.Context, req *computepb.GetRegionNetworkEndpointGroupRequest, opts ...gax.CallOption) (*computepb.NetworkEndpointGroup, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEndpointGroups/%v", req.GetProject(), req.GetRegion(), req.GetNetworkEndpointGroup()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "network_endpoint_group", url.QueryEscape(req.GetNetworkEndpointGroup()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NetworkEndpointGroup{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -305,7 +321,10 @@ func (c *regionNetworkEndpointGroupsRESTClient) Insert(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEndpointGroups", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -316,10 +335,15 @@ func (c *regionNetworkEndpointGroupsRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -377,7 +401,10 @@ func (c *regionNetworkEndpointGroupsRESTClient) List(ctx context.Context, req *c } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEndpointGroups", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -402,6 +429,9 @@ func (c *regionNetworkEndpointGroupsRESTClient) List(ctx context.Context, req *c // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_network_firewall_policies_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_network_firewall_policies_client.go index 91a3beb90..df1d329b1 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_network_firewall_policies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_network_firewall_policies_client.go @@ -293,7 +293,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) AddAssociation(ctx context.Con return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/addAssociation", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -307,10 +310,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) AddAssociation(ctx context.Con baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -362,7 +370,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) AddRule(ctx context.Context, r return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/addRule", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -379,10 +390,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) AddRule(ctx context.Context, r baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -427,7 +443,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) AddRule(ctx context.Context, r // CloneRules copies rules to the specified network firewall policy. func (c *regionNetworkFirewallPoliciesRESTClient) CloneRules(ctx context.Context, req *computepb.CloneRulesRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/cloneRules", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -441,10 +460,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) CloneRules(ctx context.Context baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -489,7 +513,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) CloneRules(ctx context.Context // Delete deletes the specified network firewall policy. func (c *regionNetworkFirewallPoliciesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -500,10 +527,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) Delete(ctx context.Context, re baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -548,14 +580,22 @@ func (c *regionNetworkFirewallPoliciesRESTClient) Delete(ctx context.Context, re // Get returns the specified network firewall policy. func (c *regionNetworkFirewallPoliciesRESTClient) Get(ctx context.Context, req *computepb.GetRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -592,7 +632,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) Get(ctx context.Context, req * // GetAssociation gets an association with the specified name. func (c *regionNetworkFirewallPoliciesRESTClient) GetAssociation(ctx context.Context, req *computepb.GetAssociationRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicyAssociation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/getAssociation", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -603,10 +646,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) GetAssociation(ctx context.Con baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicyAssociation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -643,7 +691,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) GetAssociation(ctx context.Con // GetEffectiveFirewalls returns the effective firewalls on a given network. func (c *regionNetworkFirewallPoliciesRESTClient) GetEffectiveFirewalls(ctx context.Context, req *computepb.GetEffectiveFirewallsRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/getEffectiveFirewalls", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -652,10 +703,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) GetEffectiveFirewalls(ctx cont baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.RegionNetworkFirewallPoliciesGetEffectiveFirewallsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -692,7 +748,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) GetEffectiveFirewalls(ctx cont // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *regionNetworkFirewallPoliciesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/getIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -703,10 +762,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) GetIamPolicy(ctx context.Conte baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -743,7 +807,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) GetIamPolicy(ctx context.Conte // GetRule gets a rule of the specified priority. func (c *regionNetworkFirewallPoliciesRESTClient) GetRule(ctx context.Context, req *computepb.GetRuleRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*computepb.FirewallPolicyRule, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/getRule", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -754,10 +821,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) GetRule(ctx context.Context, r baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.FirewallPolicyRule{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -801,7 +873,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) Insert(ctx context.Context, re return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -812,10 +887,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) Insert(ctx context.Context, re baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -873,7 +953,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) List(ctx context.Context, req } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -898,6 +981,9 @@ func (c *regionNetworkFirewallPoliciesRESTClient) List(ctx context.Context, req // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -957,7 +1043,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) Patch(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -968,10 +1057,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) Patch(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1023,7 +1117,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) PatchRule(ctx context.Context, return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/patchRule", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -1037,10 +1134,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) PatchRule(ctx context.Context, baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1085,7 +1187,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) PatchRule(ctx context.Context, // RemoveAssociation removes an association for the specified network firewall policy. func (c *regionNetworkFirewallPoliciesRESTClient) RemoveAssociation(ctx context.Context, req *computepb.RemoveAssociationRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/removeAssociation", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -1099,10 +1204,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) RemoveAssociation(ctx context. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1147,7 +1257,10 @@ func (c *regionNetworkFirewallPoliciesRESTClient) RemoveAssociation(ctx context. // RemoveRule deletes a rule of the specified priority. func (c *regionNetworkFirewallPoliciesRESTClient) RemoveRule(ctx context.Context, req *computepb.RemoveRuleRegionNetworkFirewallPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/removeRule", req.GetProject(), req.GetRegion(), req.GetFirewallPolicy()) params := url.Values{} @@ -1161,10 +1274,15 @@ func (c *regionNetworkFirewallPoliciesRESTClient) RemoveRule(ctx context.Context baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "firewall_policy", url.QueryEscape(req.GetFirewallPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err @@ -1216,14 +1334,22 @@ func (c *regionNetworkFirewallPoliciesRESTClient) SetIamPolicy(ctx context.Conte return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1267,14 +1393,22 @@ func (c *regionNetworkFirewallPoliciesRESTClient) TestIamPermissions(ctx context return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/firewallPolicies/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_notification_endpoints_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_notification_endpoints_client.go index 7254fb47d..8a7875603 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_notification_endpoints_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_notification_endpoints_client.go @@ -195,7 +195,10 @@ func (c *regionNotificationEndpointsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified NotificationEndpoint in the given region func (c *regionNotificationEndpointsRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionNotificationEndpointRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/notificationEndpoints/%v", req.GetProject(), req.GetRegion(), req.GetNotificationEndpoint()) params := url.Values{} @@ -206,10 +209,15 @@ func (c *regionNotificationEndpointsRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "notification_endpoint", url.QueryEscape(req.GetNotificationEndpoint()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -254,14 +262,22 @@ func (c *regionNotificationEndpointsRESTClient) Delete(ctx context.Context, req // Get returns the specified NotificationEndpoint resource in the given region. func (c *regionNotificationEndpointsRESTClient) Get(ctx context.Context, req *computepb.GetRegionNotificationEndpointRequest, opts ...gax.CallOption) (*computepb.NotificationEndpoint, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/notificationEndpoints/%v", req.GetProject(), req.GetRegion(), req.GetNotificationEndpoint()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "notification_endpoint", url.QueryEscape(req.GetNotificationEndpoint()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.NotificationEndpoint{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -305,7 +321,10 @@ func (c *regionNotificationEndpointsRESTClient) Insert(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/notificationEndpoints", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -316,10 +335,15 @@ func (c *regionNotificationEndpointsRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -377,7 +401,10 @@ func (c *regionNotificationEndpointsRESTClient) List(ctx context.Context, req *c } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/notificationEndpoints", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -402,6 +429,9 @@ func (c *regionNotificationEndpointsRESTClient) List(ctx context.Context, req *c // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_operations_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_operations_client.go index 665fbb323..1e09ff379 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_operations_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_operations_client.go @@ -178,14 +178,22 @@ func (c *regionOperationsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified region-specific Operations resource. func (c *regionOperationsRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionOperationRequest, opts ...gax.CallOption) (*computepb.DeleteRegionOperationResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/operations/%v", req.GetProject(), req.GetRegion(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.DeleteRegionOperationResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -222,14 +230,22 @@ func (c *regionOperationsRESTClient) Delete(ctx context.Context, req *computepb. // Get retrieves the specified region-specific Operations resource. func (c *regionOperationsRESTClient) Get(ctx context.Context, req *computepb.GetRegionOperationRequest, opts ...gax.CallOption) (*computepb.Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/operations/%v", req.GetProject(), req.GetRegion(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -279,7 +295,10 @@ func (c *regionOperationsRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/operations", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -304,6 +323,9 @@ func (c *regionOperationsRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -356,14 +378,22 @@ func (c *regionOperationsRESTClient) List(ctx context.Context, req *computepb.Li // Wait waits for the specified Operation resource to return as DONE or for the request to approach the 2 minute deadline, and retrieves the specified Operation resource. This method differs from the GET method in that it waits for no more than the default deadline (2 minutes) and then returns the current state of the operation, which might be DONE or still in progress. This method is called on a best-effort basis. Specifically: - In uncommon cases, when the server is overloaded, the request might return before the default deadline is reached, or might return after zero seconds. - If the default deadline is reached, there is no guarantee that the operation is actually done when the method returns. Be prepared to retry if the operation is not DONE. func (c *regionOperationsRESTClient) Wait(ctx context.Context, req *computepb.WaitRegionOperationRequest, opts ...gax.CallOption) (*computepb.Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/operations/%v/wait", req.GetProject(), req.GetRegion(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_security_policies_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_security_policies_client.go index 56fea671f..4aedc8d91 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_security_policies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_security_policies_client.go @@ -202,7 +202,10 @@ func (c *regionSecurityPoliciesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified policy. func (c *regionSecurityPoliciesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionSecurityPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/securityPolicies/%v", req.GetProject(), req.GetRegion(), req.GetSecurityPolicy()) params := url.Values{} @@ -213,10 +216,15 @@ func (c *regionSecurityPoliciesRESTClient) Delete(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -261,14 +269,22 @@ func (c *regionSecurityPoliciesRESTClient) Delete(ctx context.Context, req *comp // Get list all of the ordered rules present in a single specified policy. func (c *regionSecurityPoliciesRESTClient) Get(ctx context.Context, req *computepb.GetRegionSecurityPolicyRequest, opts ...gax.CallOption) (*computepb.SecurityPolicy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/securityPolicies/%v", req.GetProject(), req.GetRegion(), req.GetSecurityPolicy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SecurityPolicy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -312,7 +328,10 @@ func (c *regionSecurityPoliciesRESTClient) Insert(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/securityPolicies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -326,10 +345,15 @@ func (c *regionSecurityPoliciesRESTClient) Insert(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -387,7 +411,10 @@ func (c *regionSecurityPoliciesRESTClient) List(ctx context.Context, req *comput } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/securityPolicies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -412,6 +439,9 @@ func (c *regionSecurityPoliciesRESTClient) List(ctx context.Context, req *comput // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -471,7 +501,10 @@ func (c *regionSecurityPoliciesRESTClient) Patch(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/securityPolicies/%v", req.GetProject(), req.GetRegion(), req.GetSecurityPolicy()) params := url.Values{} @@ -482,10 +515,15 @@ func (c *regionSecurityPoliciesRESTClient) Patch(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_ssl_certificates_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_ssl_certificates_client.go index 43cad36e6..ec11de169 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_ssl_certificates_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_ssl_certificates_client.go @@ -195,7 +195,10 @@ func (c *regionSslCertificatesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified SslCertificate resource in the region. func (c *regionSslCertificatesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionSslCertificateRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/sslCertificates/%v", req.GetProject(), req.GetRegion(), req.GetSslCertificate()) params := url.Values{} @@ -206,10 +209,15 @@ func (c *regionSslCertificatesRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "ssl_certificate", url.QueryEscape(req.GetSslCertificate()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -254,14 +262,22 @@ func (c *regionSslCertificatesRESTClient) Delete(ctx context.Context, req *compu // Get returns the specified SslCertificate resource in the specified region. Get a list of available SSL certificates by making a list() request. func (c *regionSslCertificatesRESTClient) Get(ctx context.Context, req *computepb.GetRegionSslCertificateRequest, opts ...gax.CallOption) (*computepb.SslCertificate, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/sslCertificates/%v", req.GetProject(), req.GetRegion(), req.GetSslCertificate()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "ssl_certificate", url.QueryEscape(req.GetSslCertificate()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SslCertificate{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -305,7 +321,10 @@ func (c *regionSslCertificatesRESTClient) Insert(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/sslCertificates", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -316,10 +335,15 @@ func (c *regionSslCertificatesRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -377,7 +401,10 @@ func (c *regionSslCertificatesRESTClient) List(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/sslCertificates", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -402,6 +429,9 @@ func (c *regionSslCertificatesRESTClient) List(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_target_http_proxies_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_target_http_proxies_client.go index fd3b18234..c38f3dd75 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_target_http_proxies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_target_http_proxies_client.go @@ -202,7 +202,10 @@ func (c *regionTargetHttpProxiesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified TargetHttpProxy resource. func (c *regionTargetHttpProxiesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionTargetHttpProxyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpProxies/%v", req.GetProject(), req.GetRegion(), req.GetTargetHttpProxy()) params := url.Values{} @@ -213,10 +216,15 @@ func (c *regionTargetHttpProxiesRESTClient) Delete(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_http_proxy", url.QueryEscape(req.GetTargetHttpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -261,14 +269,22 @@ func (c *regionTargetHttpProxiesRESTClient) Delete(ctx context.Context, req *com // Get returns the specified TargetHttpProxy resource in the specified region. Gets a list of available target HTTP proxies by making a list() request. func (c *regionTargetHttpProxiesRESTClient) Get(ctx context.Context, req *computepb.GetRegionTargetHttpProxyRequest, opts ...gax.CallOption) (*computepb.TargetHttpProxy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpProxies/%v", req.GetProject(), req.GetRegion(), req.GetTargetHttpProxy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_http_proxy", url.QueryEscape(req.GetTargetHttpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetHttpProxy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -312,7 +328,10 @@ func (c *regionTargetHttpProxiesRESTClient) Insert(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpProxies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -323,10 +342,15 @@ func (c *regionTargetHttpProxiesRESTClient) Insert(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -384,7 +408,10 @@ func (c *regionTargetHttpProxiesRESTClient) List(ctx context.Context, req *compu } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpProxies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -409,6 +436,9 @@ func (c *regionTargetHttpProxiesRESTClient) List(ctx context.Context, req *compu // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -468,7 +498,10 @@ func (c *regionTargetHttpProxiesRESTClient) SetUrlMap(ctx context.Context, req * return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpProxies/%v/setUrlMap", req.GetProject(), req.GetRegion(), req.GetTargetHttpProxy()) params := url.Values{} @@ -479,10 +512,15 @@ func (c *regionTargetHttpProxiesRESTClient) SetUrlMap(ctx context.Context, req * baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_http_proxy", url.QueryEscape(req.GetTargetHttpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_target_https_proxies_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_target_https_proxies_client.go index 90688888e..91145a686 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_target_https_proxies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_target_https_proxies_client.go @@ -216,7 +216,10 @@ func (c *regionTargetHttpsProxiesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified TargetHttpsProxy resource. func (c *regionTargetHttpsProxiesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionTargetHttpsProxyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpsProxies/%v", req.GetProject(), req.GetRegion(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -227,10 +230,15 @@ func (c *regionTargetHttpsProxiesRESTClient) Delete(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -275,14 +283,22 @@ func (c *regionTargetHttpsProxiesRESTClient) Delete(ctx context.Context, req *co // Get returns the specified TargetHttpsProxy resource in the specified region. Gets a list of available target HTTP proxies by making a list() request. func (c *regionTargetHttpsProxiesRESTClient) Get(ctx context.Context, req *computepb.GetRegionTargetHttpsProxyRequest, opts ...gax.CallOption) (*computepb.TargetHttpsProxy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpsProxies/%v", req.GetProject(), req.GetRegion(), req.GetTargetHttpsProxy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetHttpsProxy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -326,7 +342,10 @@ func (c *regionTargetHttpsProxiesRESTClient) Insert(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpsProxies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -337,10 +356,15 @@ func (c *regionTargetHttpsProxiesRESTClient) Insert(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -398,7 +422,10 @@ func (c *regionTargetHttpsProxiesRESTClient) List(ctx context.Context, req *comp } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpsProxies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -423,6 +450,9 @@ func (c *regionTargetHttpsProxiesRESTClient) List(ctx context.Context, req *comp // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -482,7 +512,10 @@ func (c *regionTargetHttpsProxiesRESTClient) Patch(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpsProxies/%v", req.GetProject(), req.GetRegion(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -493,10 +526,15 @@ func (c *regionTargetHttpsProxiesRESTClient) Patch(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -548,7 +586,10 @@ func (c *regionTargetHttpsProxiesRESTClient) SetSslCertificates(ctx context.Cont return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpsProxies/%v/setSslCertificates", req.GetProject(), req.GetRegion(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -559,10 +600,15 @@ func (c *regionTargetHttpsProxiesRESTClient) SetSslCertificates(ctx context.Cont baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -614,7 +660,10 @@ func (c *regionTargetHttpsProxiesRESTClient) SetUrlMap(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpsProxies/%v/setUrlMap", req.GetProject(), req.GetRegion(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -625,10 +674,15 @@ func (c *regionTargetHttpsProxiesRESTClient) SetUrlMap(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/region_url_maps_client.go b/vendor/cloud.google.com/go/compute/apiv1/region_url_maps_client.go index 78ce133be..7c463ddd2 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/region_url_maps_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/region_url_maps_client.go @@ -216,7 +216,10 @@ func (c *regionUrlMapsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified UrlMap resource. func (c *regionUrlMapsRESTClient) Delete(ctx context.Context, req *computepb.DeleteRegionUrlMapRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps/%v", req.GetProject(), req.GetRegion(), req.GetUrlMap()) params := url.Values{} @@ -227,10 +230,15 @@ func (c *regionUrlMapsRESTClient) Delete(ctx context.Context, req *computepb.Del baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -275,14 +283,22 @@ func (c *regionUrlMapsRESTClient) Delete(ctx context.Context, req *computepb.Del // Get returns the specified UrlMap resource. Gets a list of available URL maps by making a list() request. func (c *regionUrlMapsRESTClient) Get(ctx context.Context, req *computepb.GetRegionUrlMapRequest, opts ...gax.CallOption) (*computepb.UrlMap, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps/%v", req.GetProject(), req.GetRegion(), req.GetUrlMap()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.UrlMap{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -326,7 +342,10 @@ func (c *regionUrlMapsRESTClient) Insert(ctx context.Context, req *computepb.Ins return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -337,10 +356,15 @@ func (c *regionUrlMapsRESTClient) Insert(ctx context.Context, req *computepb.Ins baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -398,7 +422,10 @@ func (c *regionUrlMapsRESTClient) List(ctx context.Context, req *computepb.ListR } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -423,6 +450,9 @@ func (c *regionUrlMapsRESTClient) List(ctx context.Context, req *computepb.ListR // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -482,7 +512,10 @@ func (c *regionUrlMapsRESTClient) Patch(ctx context.Context, req *computepb.Patc return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps/%v", req.GetProject(), req.GetRegion(), req.GetUrlMap()) params := url.Values{} @@ -493,10 +526,15 @@ func (c *regionUrlMapsRESTClient) Patch(ctx context.Context, req *computepb.Patc baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -548,7 +586,10 @@ func (c *regionUrlMapsRESTClient) Update(ctx context.Context, req *computepb.Upd return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps/%v", req.GetProject(), req.GetRegion(), req.GetUrlMap()) params := url.Values{} @@ -559,10 +600,15 @@ func (c *regionUrlMapsRESTClient) Update(ctx context.Context, req *computepb.Upd baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -614,14 +660,22 @@ func (c *regionUrlMapsRESTClient) Validate(ctx context.Context, req *computepb.V return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps/%v/validate", req.GetProject(), req.GetRegion(), req.GetUrlMap()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.UrlMapsValidateResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/regions_client.go b/vendor/cloud.google.com/go/compute/apiv1/regions_client.go index 62a62c1c3..f4226fe8c 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/regions_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/regions_client.go @@ -164,14 +164,22 @@ func (c *regionsRESTClient) Connection() *grpc.ClientConn { // Get returns the specified Region resource. Gets a list of available regions by making a list() request. To decrease latency for this method, you can optionally omit any unneeded information from the response by using a field mask. This practice is especially recommended for unused quota information (the quotas field). To exclude one or more fields, set your request’s fields query parameter to only include the fields you need. For example, to only include the id and selfLink fields, add the query parameter ?fields=id,selfLink to your request. func (c *regionsRESTClient) Get(ctx context.Context, req *computepb.GetRegionRequest, opts ...gax.CallOption) (*computepb.Region, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v", req.GetProject(), req.GetRegion()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Region{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -221,7 +229,10 @@ func (c *regionsRESTClient) List(ctx context.Context, req *computepb.ListRegions } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions", req.GetProject()) params := url.Values{} @@ -246,6 +257,9 @@ func (c *regionsRESTClient) List(ctx context.Context, req *computepb.ListRegions // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/reservations_client.go b/vendor/cloud.google.com/go/compute/apiv1/reservations_client.go index 7e25b4085..663abc2a9 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/reservations_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/reservations_client.go @@ -251,7 +251,10 @@ func (c *reservationsRESTClient) AggregatedList(ctx context.Context, req *comput } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/reservations", req.GetProject()) params := url.Values{} @@ -279,6 +282,9 @@ func (c *reservationsRESTClient) AggregatedList(ctx context.Context, req *comput // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -338,7 +344,10 @@ func (c *reservationsRESTClient) AggregatedList(ctx context.Context, req *comput // Delete deletes the specified reservation. func (c *reservationsRESTClient) Delete(ctx context.Context, req *computepb.DeleteReservationRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v", req.GetProject(), req.GetZone(), req.GetReservation()) params := url.Values{} @@ -349,10 +358,15 @@ func (c *reservationsRESTClient) Delete(ctx context.Context, req *computepb.Dele baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "reservation", url.QueryEscape(req.GetReservation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -397,14 +411,22 @@ func (c *reservationsRESTClient) Delete(ctx context.Context, req *computepb.Dele // Get retrieves information about the specified reservation. func (c *reservationsRESTClient) Get(ctx context.Context, req *computepb.GetReservationRequest, opts ...gax.CallOption) (*computepb.Reservation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v", req.GetProject(), req.GetZone(), req.GetReservation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "reservation", url.QueryEscape(req.GetReservation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Reservation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -441,7 +463,10 @@ func (c *reservationsRESTClient) Get(ctx context.Context, req *computepb.GetRese // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *reservationsRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyReservationRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v/getIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) params := url.Values{} @@ -452,10 +477,15 @@ func (c *reservationsRESTClient) GetIamPolicy(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -499,7 +529,10 @@ func (c *reservationsRESTClient) Insert(ctx context.Context, req *computepb.Inse return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations", req.GetProject(), req.GetZone()) params := url.Values{} @@ -510,10 +543,15 @@ func (c *reservationsRESTClient) Insert(ctx context.Context, req *computepb.Inse baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -571,7 +609,10 @@ func (c *reservationsRESTClient) List(ctx context.Context, req *computepb.ListRe } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations", req.GetProject(), req.GetZone()) params := url.Values{} @@ -596,6 +637,9 @@ func (c *reservationsRESTClient) List(ctx context.Context, req *computepb.ListRe // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -655,7 +699,10 @@ func (c *reservationsRESTClient) Resize(ctx context.Context, req *computepb.Resi return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v/resize", req.GetProject(), req.GetZone(), req.GetReservation()) params := url.Values{} @@ -666,10 +713,15 @@ func (c *reservationsRESTClient) Resize(ctx context.Context, req *computepb.Resi baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "reservation", url.QueryEscape(req.GetReservation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -721,14 +773,22 @@ func (c *reservationsRESTClient) SetIamPolicy(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v/setIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -772,14 +832,22 @@ func (c *reservationsRESTClient) TestIamPermissions(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -823,7 +891,10 @@ func (c *reservationsRESTClient) Update(ctx context.Context, req *computepb.Upda return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v", req.GetProject(), req.GetZone(), req.GetReservation()) params := url.Values{} @@ -840,10 +911,15 @@ func (c *reservationsRESTClient) Update(ctx context.Context, req *computepb.Upda baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "reservation", url.QueryEscape(req.GetReservation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/resource_policies_client.go b/vendor/cloud.google.com/go/compute/apiv1/resource_policies_client.go index 868306bf5..7943bae75 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/resource_policies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/resource_policies_client.go @@ -237,7 +237,10 @@ func (c *resourcePoliciesRESTClient) AggregatedList(ctx context.Context, req *co } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/resourcePolicies", req.GetProject()) params := url.Values{} @@ -265,6 +268,9 @@ func (c *resourcePoliciesRESTClient) AggregatedList(ctx context.Context, req *co // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -324,7 +330,10 @@ func (c *resourcePoliciesRESTClient) AggregatedList(ctx context.Context, req *co // Delete deletes the specified resource policy. func (c *resourcePoliciesRESTClient) Delete(ctx context.Context, req *computepb.DeleteResourcePolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies/%v", req.GetProject(), req.GetRegion(), req.GetResourcePolicy()) params := url.Values{} @@ -335,10 +344,15 @@ func (c *resourcePoliciesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource_policy", url.QueryEscape(req.GetResourcePolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -383,14 +397,22 @@ func (c *resourcePoliciesRESTClient) Delete(ctx context.Context, req *computepb. // Get retrieves all information of the specified resource policy. func (c *resourcePoliciesRESTClient) Get(ctx context.Context, req *computepb.GetResourcePolicyRequest, opts ...gax.CallOption) (*computepb.ResourcePolicy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies/%v", req.GetProject(), req.GetRegion(), req.GetResourcePolicy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource_policy", url.QueryEscape(req.GetResourcePolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.ResourcePolicy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -427,7 +449,10 @@ func (c *resourcePoliciesRESTClient) Get(ctx context.Context, req *computepb.Get // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *resourcePoliciesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyResourcePolicyRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies/%v/getIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -438,10 +463,15 @@ func (c *resourcePoliciesRESTClient) GetIamPolicy(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -485,7 +515,10 @@ func (c *resourcePoliciesRESTClient) Insert(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -496,10 +529,15 @@ func (c *resourcePoliciesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -557,7 +595,10 @@ func (c *resourcePoliciesRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -582,6 +623,9 @@ func (c *resourcePoliciesRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -641,14 +685,22 @@ func (c *resourcePoliciesRESTClient) SetIamPolicy(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -692,14 +744,22 @@ func (c *resourcePoliciesRESTClient) TestIamPermissions(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/routers_client.go b/vendor/cloud.google.com/go/compute/apiv1/routers_client.go index ff1f4a9a0..18ec317ce 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/routers_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/routers_client.go @@ -251,7 +251,10 @@ func (c *routersRESTClient) AggregatedList(ctx context.Context, req *computepb.A } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/routers", req.GetProject()) params := url.Values{} @@ -279,6 +282,9 @@ func (c *routersRESTClient) AggregatedList(ctx context.Context, req *computepb.A // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -338,7 +344,10 @@ func (c *routersRESTClient) AggregatedList(ctx context.Context, req *computepb.A // Delete deletes the specified Router resource. func (c *routersRESTClient) Delete(ctx context.Context, req *computepb.DeleteRouterRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v", req.GetProject(), req.GetRegion(), req.GetRouter()) params := url.Values{} @@ -349,10 +358,15 @@ func (c *routersRESTClient) Delete(ctx context.Context, req *computepb.DeleteRou baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "router", url.QueryEscape(req.GetRouter()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -397,14 +411,22 @@ func (c *routersRESTClient) Delete(ctx context.Context, req *computepb.DeleteRou // Get returns the specified Router resource. Gets a list of available routers by making a list() request. func (c *routersRESTClient) Get(ctx context.Context, req *computepb.GetRouterRequest, opts ...gax.CallOption) (*computepb.Router, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v", req.GetProject(), req.GetRegion(), req.GetRouter()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "router", url.QueryEscape(req.GetRouter()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Router{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -454,7 +476,10 @@ func (c *routersRESTClient) GetNatMappingInfo(ctx context.Context, req *computep } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v/getNatMappingInfo", req.GetProject(), req.GetRegion(), req.GetRouter()) params := url.Values{} @@ -479,6 +504,9 @@ func (c *routersRESTClient) GetNatMappingInfo(ctx context.Context, req *computep // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -531,14 +559,22 @@ func (c *routersRESTClient) GetNatMappingInfo(ctx context.Context, req *computep // GetRouterStatus retrieves runtime information of the specified router. func (c *routersRESTClient) GetRouterStatus(ctx context.Context, req *computepb.GetRouterStatusRouterRequest, opts ...gax.CallOption) (*computepb.RouterStatusResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v/getRouterStatus", req.GetProject(), req.GetRegion(), req.GetRouter()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "router", url.QueryEscape(req.GetRouter()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.RouterStatusResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -582,7 +618,10 @@ func (c *routersRESTClient) Insert(ctx context.Context, req *computepb.InsertRou return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -593,10 +632,15 @@ func (c *routersRESTClient) Insert(ctx context.Context, req *computepb.InsertRou baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -654,7 +698,10 @@ func (c *routersRESTClient) List(ctx context.Context, req *computepb.ListRouters } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -679,6 +726,9 @@ func (c *routersRESTClient) List(ctx context.Context, req *computepb.ListRouters // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -738,7 +788,10 @@ func (c *routersRESTClient) Patch(ctx context.Context, req *computepb.PatchRoute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v", req.GetProject(), req.GetRegion(), req.GetRouter()) params := url.Values{} @@ -749,10 +802,15 @@ func (c *routersRESTClient) Patch(ctx context.Context, req *computepb.PatchRoute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "router", url.QueryEscape(req.GetRouter()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -804,14 +862,22 @@ func (c *routersRESTClient) Preview(ctx context.Context, req *computepb.PreviewR return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v/preview", req.GetProject(), req.GetRegion(), req.GetRouter()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "router", url.QueryEscape(req.GetRouter()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.RoutersPreviewResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -855,7 +921,10 @@ func (c *routersRESTClient) Update(ctx context.Context, req *computepb.UpdateRou return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v", req.GetProject(), req.GetRegion(), req.GetRouter()) params := url.Values{} @@ -866,10 +935,15 @@ func (c *routersRESTClient) Update(ctx context.Context, req *computepb.UpdateRou baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "router", url.QueryEscape(req.GetRouter()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/routes_client.go b/vendor/cloud.google.com/go/compute/apiv1/routes_client.go index 3e2e8f67f..9a4b8c6aa 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/routes_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/routes_client.go @@ -195,7 +195,10 @@ func (c *routesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified Route resource. func (c *routesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRouteRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/routes/%v", req.GetProject(), req.GetRoute()) params := url.Values{} @@ -206,10 +209,15 @@ func (c *routesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRout baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "route", url.QueryEscape(req.GetRoute()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -253,14 +261,22 @@ func (c *routesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRout // Get returns the specified Route resource. Gets a list of available routes by making a list() request. func (c *routesRESTClient) Get(ctx context.Context, req *computepb.GetRouteRequest, opts ...gax.CallOption) (*computepb.Route, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/routes/%v", req.GetProject(), req.GetRoute()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "route", url.QueryEscape(req.GetRoute()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Route{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -304,7 +320,10 @@ func (c *routesRESTClient) Insert(ctx context.Context, req *computepb.InsertRout return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/routes", req.GetProject()) params := url.Values{} @@ -315,10 +334,15 @@ func (c *routesRESTClient) Insert(ctx context.Context, req *computepb.InsertRout baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -375,7 +399,10 @@ func (c *routesRESTClient) List(ctx context.Context, req *computepb.ListRoutesRe } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/routes", req.GetProject()) params := url.Values{} @@ -400,6 +427,9 @@ func (c *routesRESTClient) List(ctx context.Context, req *computepb.ListRoutesRe // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/security_policies_client.go b/vendor/cloud.google.com/go/compute/apiv1/security_policies_client.go index a63d254f2..36a1bee9e 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/security_policies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/security_policies_client.go @@ -252,14 +252,22 @@ func (c *securityPoliciesRESTClient) AddRule(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v/addRule", req.GetProject(), req.GetSecurityPolicy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -316,7 +324,10 @@ func (c *securityPoliciesRESTClient) AggregatedList(ctx context.Context, req *co } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/securityPolicies", req.GetProject()) params := url.Values{} @@ -344,6 +355,9 @@ func (c *securityPoliciesRESTClient) AggregatedList(ctx context.Context, req *co // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -403,7 +417,10 @@ func (c *securityPoliciesRESTClient) AggregatedList(ctx context.Context, req *co // Delete deletes the specified policy. func (c *securityPoliciesRESTClient) Delete(ctx context.Context, req *computepb.DeleteSecurityPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v", req.GetProject(), req.GetSecurityPolicy()) params := url.Values{} @@ -414,10 +431,15 @@ func (c *securityPoliciesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -461,14 +483,22 @@ func (c *securityPoliciesRESTClient) Delete(ctx context.Context, req *computepb. // Get list all of the ordered rules present in a single specified policy. func (c *securityPoliciesRESTClient) Get(ctx context.Context, req *computepb.GetSecurityPolicyRequest, opts ...gax.CallOption) (*computepb.SecurityPolicy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v", req.GetProject(), req.GetSecurityPolicy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SecurityPolicy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -505,7 +535,10 @@ func (c *securityPoliciesRESTClient) Get(ctx context.Context, req *computepb.Get // GetRule gets a rule at the specified priority. func (c *securityPoliciesRESTClient) GetRule(ctx context.Context, req *computepb.GetRuleSecurityPolicyRequest, opts ...gax.CallOption) (*computepb.SecurityPolicyRule, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v/getRule", req.GetProject(), req.GetSecurityPolicy()) params := url.Values{} @@ -516,10 +549,15 @@ func (c *securityPoliciesRESTClient) GetRule(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SecurityPolicyRule{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -563,7 +601,10 @@ func (c *securityPoliciesRESTClient) Insert(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies", req.GetProject()) params := url.Values{} @@ -574,10 +615,15 @@ func (c *securityPoliciesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -634,7 +680,10 @@ func (c *securityPoliciesRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies", req.GetProject()) params := url.Values{} @@ -659,6 +708,9 @@ func (c *securityPoliciesRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -711,7 +763,10 @@ func (c *securityPoliciesRESTClient) List(ctx context.Context, req *computepb.Li // ListPreconfiguredExpressionSets gets the current list of preconfigured Web Application Firewall (WAF) expressions. func (c *securityPoliciesRESTClient) ListPreconfiguredExpressionSets(ctx context.Context, req *computepb.ListPreconfiguredExpressionSetsSecurityPoliciesRequest, opts ...gax.CallOption) (*computepb.SecurityPoliciesListPreconfiguredExpressionSetsResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/listPreconfiguredExpressionSets", req.GetProject()) params := url.Values{} @@ -734,10 +789,15 @@ func (c *securityPoliciesRESTClient) ListPreconfiguredExpressionSets(ctx context baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SecurityPoliciesListPreconfiguredExpressionSetsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -781,7 +841,10 @@ func (c *securityPoliciesRESTClient) Patch(ctx context.Context, req *computepb.P return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v", req.GetProject(), req.GetSecurityPolicy()) params := url.Values{} @@ -792,10 +855,15 @@ func (c *securityPoliciesRESTClient) Patch(ctx context.Context, req *computepb.P baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -846,7 +914,10 @@ func (c *securityPoliciesRESTClient) PatchRule(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v/patchRule", req.GetProject(), req.GetSecurityPolicy()) params := url.Values{} @@ -857,10 +928,15 @@ func (c *securityPoliciesRESTClient) PatchRule(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -904,7 +980,10 @@ func (c *securityPoliciesRESTClient) PatchRule(ctx context.Context, req *compute // RemoveRule deletes a rule at the specified priority. func (c *securityPoliciesRESTClient) RemoveRule(ctx context.Context, req *computepb.RemoveRuleSecurityPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v/removeRule", req.GetProject(), req.GetSecurityPolicy()) params := url.Values{} @@ -915,10 +994,15 @@ func (c *securityPoliciesRESTClient) RemoveRule(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "security_policy", url.QueryEscape(req.GetSecurityPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/service_attachments_client.go b/vendor/cloud.google.com/go/compute/apiv1/service_attachments_client.go index 41d210b99..1f0fc67ac 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/service_attachments_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/service_attachments_client.go @@ -244,7 +244,10 @@ func (c *serviceAttachmentsRESTClient) AggregatedList(ctx context.Context, req * } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/serviceAttachments", req.GetProject()) params := url.Values{} @@ -272,6 +275,9 @@ func (c *serviceAttachmentsRESTClient) AggregatedList(ctx context.Context, req * // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -331,7 +337,10 @@ func (c *serviceAttachmentsRESTClient) AggregatedList(ctx context.Context, req * // Delete deletes the specified ServiceAttachment in the given scope func (c *serviceAttachmentsRESTClient) Delete(ctx context.Context, req *computepb.DeleteServiceAttachmentRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v", req.GetProject(), req.GetRegion(), req.GetServiceAttachment()) params := url.Values{} @@ -342,10 +351,15 @@ func (c *serviceAttachmentsRESTClient) Delete(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "service_attachment", url.QueryEscape(req.GetServiceAttachment()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -390,14 +404,22 @@ func (c *serviceAttachmentsRESTClient) Delete(ctx context.Context, req *computep // Get returns the specified ServiceAttachment resource in the given scope. func (c *serviceAttachmentsRESTClient) Get(ctx context.Context, req *computepb.GetServiceAttachmentRequest, opts ...gax.CallOption) (*computepb.ServiceAttachment, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v", req.GetProject(), req.GetRegion(), req.GetServiceAttachment()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "service_attachment", url.QueryEscape(req.GetServiceAttachment()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.ServiceAttachment{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -434,7 +456,10 @@ func (c *serviceAttachmentsRESTClient) Get(ctx context.Context, req *computepb.G // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *serviceAttachmentsRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicyServiceAttachmentRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v/getIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -445,10 +470,15 @@ func (c *serviceAttachmentsRESTClient) GetIamPolicy(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -492,7 +522,10 @@ func (c *serviceAttachmentsRESTClient) Insert(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -503,10 +536,15 @@ func (c *serviceAttachmentsRESTClient) Insert(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -564,7 +602,10 @@ func (c *serviceAttachmentsRESTClient) List(ctx context.Context, req *computepb. } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -589,6 +630,9 @@ func (c *serviceAttachmentsRESTClient) List(ctx context.Context, req *computepb. // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -648,7 +692,10 @@ func (c *serviceAttachmentsRESTClient) Patch(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v", req.GetProject(), req.GetRegion(), req.GetServiceAttachment()) params := url.Values{} @@ -659,10 +706,15 @@ func (c *serviceAttachmentsRESTClient) Patch(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "service_attachment", url.QueryEscape(req.GetServiceAttachment()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -714,14 +766,22 @@ func (c *serviceAttachmentsRESTClient) SetIamPolicy(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -765,14 +825,22 @@ func (c *serviceAttachmentsRESTClient) TestIamPermissions(ctx context.Context, r return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/snapshots_client.go b/vendor/cloud.google.com/go/compute/apiv1/snapshots_client.go index 766265968..10dc0dfc6 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/snapshots_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/snapshots_client.go @@ -223,7 +223,10 @@ func (c *snapshotsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified Snapshot resource. Keep in mind that deleting a single snapshot might not necessarily delete all the data on that snapshot. If any data on the snapshot that is marked for deletion is needed for subsequent snapshots, the data will be moved to the next corresponding snapshot. For more information, see Deleting snapshots. func (c *snapshotsRESTClient) Delete(ctx context.Context, req *computepb.DeleteSnapshotRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v", req.GetProject(), req.GetSnapshot()) params := url.Values{} @@ -234,10 +237,15 @@ func (c *snapshotsRESTClient) Delete(ctx context.Context, req *computepb.DeleteS baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "snapshot", url.QueryEscape(req.GetSnapshot()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -281,14 +289,22 @@ func (c *snapshotsRESTClient) Delete(ctx context.Context, req *computepb.DeleteS // Get returns the specified Snapshot resource. Gets a list of available snapshots by making a list() request. func (c *snapshotsRESTClient) Get(ctx context.Context, req *computepb.GetSnapshotRequest, opts ...gax.CallOption) (*computepb.Snapshot, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v", req.GetProject(), req.GetSnapshot()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "snapshot", url.QueryEscape(req.GetSnapshot()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Snapshot{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -325,7 +341,10 @@ func (c *snapshotsRESTClient) Get(ctx context.Context, req *computepb.GetSnapsho // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *snapshotsRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicySnapshotRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v/getIamPolicy", req.GetProject(), req.GetResource()) params := url.Values{} @@ -336,10 +355,15 @@ func (c *snapshotsRESTClient) GetIamPolicy(ctx context.Context, req *computepb.G baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -383,7 +407,10 @@ func (c *snapshotsRESTClient) Insert(ctx context.Context, req *computepb.InsertS return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots", req.GetProject()) params := url.Values{} @@ -394,10 +421,15 @@ func (c *snapshotsRESTClient) Insert(ctx context.Context, req *computepb.InsertS baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -454,7 +486,10 @@ func (c *snapshotsRESTClient) List(ctx context.Context, req *computepb.ListSnaps } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots", req.GetProject()) params := url.Values{} @@ -479,6 +514,9 @@ func (c *snapshotsRESTClient) List(ctx context.Context, req *computepb.ListSnaps // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -538,14 +576,22 @@ func (c *snapshotsRESTClient) SetIamPolicy(ctx context.Context, req *computepb.S return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v/setIamPolicy", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -589,14 +635,22 @@ func (c *snapshotsRESTClient) SetLabels(ctx context.Context, req *computepb.SetL return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v/setLabels", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -647,14 +701,22 @@ func (c *snapshotsRESTClient) TestIamPermissions(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v/testIamPermissions", req.GetProject(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/ssl_certificates_client.go b/vendor/cloud.google.com/go/compute/apiv1/ssl_certificates_client.go index f7d631ac8..937b0d105 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/ssl_certificates_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/ssl_certificates_client.go @@ -216,7 +216,10 @@ func (c *sslCertificatesRESTClient) AggregatedList(ctx context.Context, req *com } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/sslCertificates", req.GetProject()) params := url.Values{} @@ -244,6 +247,9 @@ func (c *sslCertificatesRESTClient) AggregatedList(ctx context.Context, req *com // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -303,7 +309,10 @@ func (c *sslCertificatesRESTClient) AggregatedList(ctx context.Context, req *com // Delete deletes the specified SslCertificate resource. func (c *sslCertificatesRESTClient) Delete(ctx context.Context, req *computepb.DeleteSslCertificateRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslCertificates/%v", req.GetProject(), req.GetSslCertificate()) params := url.Values{} @@ -314,10 +323,15 @@ func (c *sslCertificatesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "ssl_certificate", url.QueryEscape(req.GetSslCertificate()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -361,14 +375,22 @@ func (c *sslCertificatesRESTClient) Delete(ctx context.Context, req *computepb.D // Get returns the specified SslCertificate resource. Gets a list of available SSL certificates by making a list() request. func (c *sslCertificatesRESTClient) Get(ctx context.Context, req *computepb.GetSslCertificateRequest, opts ...gax.CallOption) (*computepb.SslCertificate, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslCertificates/%v", req.GetProject(), req.GetSslCertificate()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "ssl_certificate", url.QueryEscape(req.GetSslCertificate()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SslCertificate{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -412,7 +434,10 @@ func (c *sslCertificatesRESTClient) Insert(ctx context.Context, req *computepb.I return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslCertificates", req.GetProject()) params := url.Values{} @@ -423,10 +448,15 @@ func (c *sslCertificatesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -483,7 +513,10 @@ func (c *sslCertificatesRESTClient) List(ctx context.Context, req *computepb.Lis } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslCertificates", req.GetProject()) params := url.Values{} @@ -508,6 +541,9 @@ func (c *sslCertificatesRESTClient) List(ctx context.Context, req *computepb.Lis // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/ssl_policies_client.go b/vendor/cloud.google.com/go/compute/apiv1/ssl_policies_client.go index c38b28edc..bd5ea14b1 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/ssl_policies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/ssl_policies_client.go @@ -209,7 +209,10 @@ func (c *sslPoliciesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified SSL policy. The SSL policy resource can be deleted only if it is not in use by any TargetHttpsProxy or TargetSslProxy resources. func (c *sslPoliciesRESTClient) Delete(ctx context.Context, req *computepb.DeleteSslPolicyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslPolicies/%v", req.GetProject(), req.GetSslPolicy()) params := url.Values{} @@ -220,10 +223,15 @@ func (c *sslPoliciesRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "ssl_policy", url.QueryEscape(req.GetSslPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -267,14 +275,22 @@ func (c *sslPoliciesRESTClient) Delete(ctx context.Context, req *computepb.Delet // Get lists all of the ordered rules present in a single specified policy. func (c *sslPoliciesRESTClient) Get(ctx context.Context, req *computepb.GetSslPolicyRequest, opts ...gax.CallOption) (*computepb.SslPolicy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslPolicies/%v", req.GetProject(), req.GetSslPolicy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "ssl_policy", url.QueryEscape(req.GetSslPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SslPolicy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -318,7 +334,10 @@ func (c *sslPoliciesRESTClient) Insert(ctx context.Context, req *computepb.Inser return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslPolicies", req.GetProject()) params := url.Values{} @@ -329,10 +348,15 @@ func (c *sslPoliciesRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -389,7 +413,10 @@ func (c *sslPoliciesRESTClient) List(ctx context.Context, req *computepb.ListSsl } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslPolicies", req.GetProject()) params := url.Values{} @@ -414,6 +441,9 @@ func (c *sslPoliciesRESTClient) List(ctx context.Context, req *computepb.ListSsl // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -466,7 +496,10 @@ func (c *sslPoliciesRESTClient) List(ctx context.Context, req *computepb.ListSsl // ListAvailableFeatures lists all features that can be specified in the SSL policy when using custom profile. func (c *sslPoliciesRESTClient) ListAvailableFeatures(ctx context.Context, req *computepb.ListAvailableFeaturesSslPoliciesRequest, opts ...gax.CallOption) (*computepb.SslPoliciesListAvailableFeaturesResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslPolicies/listAvailableFeatures", req.GetProject()) params := url.Values{} @@ -489,10 +522,15 @@ func (c *sslPoliciesRESTClient) ListAvailableFeatures(ctx context.Context, req * baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.SslPoliciesListAvailableFeaturesResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -536,7 +574,10 @@ func (c *sslPoliciesRESTClient) Patch(ctx context.Context, req *computepb.PatchS return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslPolicies/%v", req.GetProject(), req.GetSslPolicy()) params := url.Values{} @@ -547,10 +588,15 @@ func (c *sslPoliciesRESTClient) Patch(ctx context.Context, req *computepb.PatchS baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "ssl_policy", url.QueryEscape(req.GetSslPolicy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/subnetworks_client.go b/vendor/cloud.google.com/go/compute/apiv1/subnetworks_client.go index 25e18f7d0..606e787ed 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/subnetworks_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/subnetworks_client.go @@ -265,7 +265,10 @@ func (c *subnetworksRESTClient) AggregatedList(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/subnetworks", req.GetProject()) params := url.Values{} @@ -293,6 +296,9 @@ func (c *subnetworksRESTClient) AggregatedList(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -352,7 +358,10 @@ func (c *subnetworksRESTClient) AggregatedList(ctx context.Context, req *compute // Delete deletes the specified subnetwork. func (c *subnetworksRESTClient) Delete(ctx context.Context, req *computepb.DeleteSubnetworkRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v", req.GetProject(), req.GetRegion(), req.GetSubnetwork()) params := url.Values{} @@ -363,10 +372,15 @@ func (c *subnetworksRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "subnetwork", url.QueryEscape(req.GetSubnetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -418,7 +432,10 @@ func (c *subnetworksRESTClient) ExpandIpCidrRange(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v/expandIpCidrRange", req.GetProject(), req.GetRegion(), req.GetSubnetwork()) params := url.Values{} @@ -429,10 +446,15 @@ func (c *subnetworksRESTClient) ExpandIpCidrRange(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "subnetwork", url.QueryEscape(req.GetSubnetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -477,14 +499,22 @@ func (c *subnetworksRESTClient) ExpandIpCidrRange(ctx context.Context, req *comp // Get returns the specified subnetwork. Gets a list of available subnetworks list() request. func (c *subnetworksRESTClient) Get(ctx context.Context, req *computepb.GetSubnetworkRequest, opts ...gax.CallOption) (*computepb.Subnetwork, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v", req.GetProject(), req.GetRegion(), req.GetSubnetwork()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "subnetwork", url.QueryEscape(req.GetSubnetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Subnetwork{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -521,7 +551,10 @@ func (c *subnetworksRESTClient) Get(ctx context.Context, req *computepb.GetSubne // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. func (c *subnetworksRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIamPolicySubnetworkRequest, opts ...gax.CallOption) (*computepb.Policy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v/getIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -532,10 +565,15 @@ func (c *subnetworksRESTClient) GetIamPolicy(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -579,7 +617,10 @@ func (c *subnetworksRESTClient) Insert(ctx context.Context, req *computepb.Inser return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -590,10 +631,15 @@ func (c *subnetworksRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -651,7 +697,10 @@ func (c *subnetworksRESTClient) List(ctx context.Context, req *computepb.ListSub } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -676,6 +725,9 @@ func (c *subnetworksRESTClient) List(ctx context.Context, req *computepb.ListSub // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -741,7 +793,10 @@ func (c *subnetworksRESTClient) ListUsable(ctx context.Context, req *computepb.L } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/subnetworks/listUsable", req.GetProject()) params := url.Values{} @@ -766,6 +821,9 @@ func (c *subnetworksRESTClient) ListUsable(ctx context.Context, req *computepb.L // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -825,7 +883,10 @@ func (c *subnetworksRESTClient) Patch(ctx context.Context, req *computepb.PatchS return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v", req.GetProject(), req.GetRegion(), req.GetSubnetwork()) params := url.Values{} @@ -839,10 +900,15 @@ func (c *subnetworksRESTClient) Patch(ctx context.Context, req *computepb.PatchS baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "subnetwork", url.QueryEscape(req.GetSubnetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -894,14 +960,22 @@ func (c *subnetworksRESTClient) SetIamPolicy(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Policy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -945,7 +1019,10 @@ func (c *subnetworksRESTClient) SetPrivateIpGoogleAccess(ctx context.Context, re return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v/setPrivateIpGoogleAccess", req.GetProject(), req.GetRegion(), req.GetSubnetwork()) params := url.Values{} @@ -956,10 +1033,15 @@ func (c *subnetworksRESTClient) SetPrivateIpGoogleAccess(ctx context.Context, re baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "subnetwork", url.QueryEscape(req.GetSubnetwork()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -1011,14 +1093,22 @@ func (c *subnetworksRESTClient) TestIamPermissions(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/target_grpc_proxies_client.go b/vendor/cloud.google.com/go/compute/apiv1/target_grpc_proxies_client.go index bde0ffaf0..dd3c351f4 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/target_grpc_proxies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/target_grpc_proxies_client.go @@ -202,7 +202,10 @@ func (c *targetGrpcProxiesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified TargetGrpcProxy in the given scope func (c *targetGrpcProxiesRESTClient) Delete(ctx context.Context, req *computepb.DeleteTargetGrpcProxyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetGrpcProxies/%v", req.GetProject(), req.GetTargetGrpcProxy()) params := url.Values{} @@ -213,10 +216,15 @@ func (c *targetGrpcProxiesRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_grpc_proxy", url.QueryEscape(req.GetTargetGrpcProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -260,14 +268,22 @@ func (c *targetGrpcProxiesRESTClient) Delete(ctx context.Context, req *computepb // Get returns the specified TargetGrpcProxy resource in the given scope. func (c *targetGrpcProxiesRESTClient) Get(ctx context.Context, req *computepb.GetTargetGrpcProxyRequest, opts ...gax.CallOption) (*computepb.TargetGrpcProxy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetGrpcProxies/%v", req.GetProject(), req.GetTargetGrpcProxy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_grpc_proxy", url.QueryEscape(req.GetTargetGrpcProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetGrpcProxy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -311,7 +327,10 @@ func (c *targetGrpcProxiesRESTClient) Insert(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetGrpcProxies", req.GetProject()) params := url.Values{} @@ -322,10 +341,15 @@ func (c *targetGrpcProxiesRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -382,7 +406,10 @@ func (c *targetGrpcProxiesRESTClient) List(ctx context.Context, req *computepb.L } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetGrpcProxies", req.GetProject()) params := url.Values{} @@ -407,6 +434,9 @@ func (c *targetGrpcProxiesRESTClient) List(ctx context.Context, req *computepb.L // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -466,7 +496,10 @@ func (c *targetGrpcProxiesRESTClient) Patch(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetGrpcProxies/%v", req.GetProject(), req.GetTargetGrpcProxy()) params := url.Values{} @@ -477,10 +510,15 @@ func (c *targetGrpcProxiesRESTClient) Patch(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_grpc_proxy", url.QueryEscape(req.GetTargetGrpcProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/target_http_proxies_client.go b/vendor/cloud.google.com/go/compute/apiv1/target_http_proxies_client.go index f464fce21..e2925adc1 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/target_http_proxies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/target_http_proxies_client.go @@ -230,7 +230,10 @@ func (c *targetHttpProxiesRESTClient) AggregatedList(ctx context.Context, req *c } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/targetHttpProxies", req.GetProject()) params := url.Values{} @@ -258,6 +261,9 @@ func (c *targetHttpProxiesRESTClient) AggregatedList(ctx context.Context, req *c // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -317,7 +323,10 @@ func (c *targetHttpProxiesRESTClient) AggregatedList(ctx context.Context, req *c // Delete deletes the specified TargetHttpProxy resource. func (c *targetHttpProxiesRESTClient) Delete(ctx context.Context, req *computepb.DeleteTargetHttpProxyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpProxies/%v", req.GetProject(), req.GetTargetHttpProxy()) params := url.Values{} @@ -328,10 +337,15 @@ func (c *targetHttpProxiesRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_http_proxy", url.QueryEscape(req.GetTargetHttpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -375,14 +389,22 @@ func (c *targetHttpProxiesRESTClient) Delete(ctx context.Context, req *computepb // Get returns the specified TargetHttpProxy resource. Gets a list of available target HTTP proxies by making a list() request. func (c *targetHttpProxiesRESTClient) Get(ctx context.Context, req *computepb.GetTargetHttpProxyRequest, opts ...gax.CallOption) (*computepb.TargetHttpProxy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpProxies/%v", req.GetProject(), req.GetTargetHttpProxy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_http_proxy", url.QueryEscape(req.GetTargetHttpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetHttpProxy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -426,7 +448,10 @@ func (c *targetHttpProxiesRESTClient) Insert(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpProxies", req.GetProject()) params := url.Values{} @@ -437,10 +462,15 @@ func (c *targetHttpProxiesRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -497,7 +527,10 @@ func (c *targetHttpProxiesRESTClient) List(ctx context.Context, req *computepb.L } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpProxies", req.GetProject()) params := url.Values{} @@ -522,6 +555,9 @@ func (c *targetHttpProxiesRESTClient) List(ctx context.Context, req *computepb.L // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -581,7 +617,10 @@ func (c *targetHttpProxiesRESTClient) Patch(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpProxies/%v", req.GetProject(), req.GetTargetHttpProxy()) params := url.Values{} @@ -592,10 +631,15 @@ func (c *targetHttpProxiesRESTClient) Patch(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_http_proxy", url.QueryEscape(req.GetTargetHttpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -646,7 +690,10 @@ func (c *targetHttpProxiesRESTClient) SetUrlMap(ctx context.Context, req *comput return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/targetHttpProxies/%v/setUrlMap", req.GetProject(), req.GetTargetHttpProxy()) params := url.Values{} @@ -657,10 +704,15 @@ func (c *targetHttpProxiesRESTClient) SetUrlMap(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_http_proxy", url.QueryEscape(req.GetTargetHttpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/target_https_proxies_client.go b/vendor/cloud.google.com/go/compute/apiv1/target_https_proxies_client.go index 84763143a..625dcabb1 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/target_https_proxies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/target_https_proxies_client.go @@ -251,7 +251,10 @@ func (c *targetHttpsProxiesRESTClient) AggregatedList(ctx context.Context, req * } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/targetHttpsProxies", req.GetProject()) params := url.Values{} @@ -279,6 +282,9 @@ func (c *targetHttpsProxiesRESTClient) AggregatedList(ctx context.Context, req * // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -338,7 +344,10 @@ func (c *targetHttpsProxiesRESTClient) AggregatedList(ctx context.Context, req * // Delete deletes the specified TargetHttpsProxy resource. func (c *targetHttpsProxiesRESTClient) Delete(ctx context.Context, req *computepb.DeleteTargetHttpsProxyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpsProxies/%v", req.GetProject(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -349,10 +358,15 @@ func (c *targetHttpsProxiesRESTClient) Delete(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -396,14 +410,22 @@ func (c *targetHttpsProxiesRESTClient) Delete(ctx context.Context, req *computep // Get returns the specified TargetHttpsProxy resource. Gets a list of available target HTTPS proxies by making a list() request. func (c *targetHttpsProxiesRESTClient) Get(ctx context.Context, req *computepb.GetTargetHttpsProxyRequest, opts ...gax.CallOption) (*computepb.TargetHttpsProxy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpsProxies/%v", req.GetProject(), req.GetTargetHttpsProxy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetHttpsProxy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -447,7 +469,10 @@ func (c *targetHttpsProxiesRESTClient) Insert(ctx context.Context, req *computep return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpsProxies", req.GetProject()) params := url.Values{} @@ -458,10 +483,15 @@ func (c *targetHttpsProxiesRESTClient) Insert(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -518,7 +548,10 @@ func (c *targetHttpsProxiesRESTClient) List(ctx context.Context, req *computepb. } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpsProxies", req.GetProject()) params := url.Values{} @@ -543,6 +576,9 @@ func (c *targetHttpsProxiesRESTClient) List(ctx context.Context, req *computepb. // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -602,7 +638,10 @@ func (c *targetHttpsProxiesRESTClient) Patch(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpsProxies/%v", req.GetProject(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -613,10 +652,15 @@ func (c *targetHttpsProxiesRESTClient) Patch(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -667,7 +711,10 @@ func (c *targetHttpsProxiesRESTClient) SetQuicOverride(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpsProxies/%v/setQuicOverride", req.GetProject(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -678,10 +725,15 @@ func (c *targetHttpsProxiesRESTClient) SetQuicOverride(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -732,7 +784,10 @@ func (c *targetHttpsProxiesRESTClient) SetSslCertificates(ctx context.Context, r return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/targetHttpsProxies/%v/setSslCertificates", req.GetProject(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -743,10 +798,15 @@ func (c *targetHttpsProxiesRESTClient) SetSslCertificates(ctx context.Context, r baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -797,7 +857,10 @@ func (c *targetHttpsProxiesRESTClient) SetSslPolicy(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpsProxies/%v/setSslPolicy", req.GetProject(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -808,10 +871,15 @@ func (c *targetHttpsProxiesRESTClient) SetSslPolicy(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -862,7 +930,10 @@ func (c *targetHttpsProxiesRESTClient) SetUrlMap(ctx context.Context, req *compu return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/targetHttpsProxies/%v/setUrlMap", req.GetProject(), req.GetTargetHttpsProxy()) params := url.Values{} @@ -873,10 +944,15 @@ func (c *targetHttpsProxiesRESTClient) SetUrlMap(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_https_proxy", url.QueryEscape(req.GetTargetHttpsProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/target_instances_client.go b/vendor/cloud.google.com/go/compute/apiv1/target_instances_client.go index d6550e6d7..3b65045be 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/target_instances_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/target_instances_client.go @@ -216,7 +216,10 @@ func (c *targetInstancesRESTClient) AggregatedList(ctx context.Context, req *com } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/targetInstances", req.GetProject()) params := url.Values{} @@ -244,6 +247,9 @@ func (c *targetInstancesRESTClient) AggregatedList(ctx context.Context, req *com // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -303,7 +309,10 @@ func (c *targetInstancesRESTClient) AggregatedList(ctx context.Context, req *com // Delete deletes the specified TargetInstance resource. func (c *targetInstancesRESTClient) Delete(ctx context.Context, req *computepb.DeleteTargetInstanceRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/targetInstances/%v", req.GetProject(), req.GetZone(), req.GetTargetInstance()) params := url.Values{} @@ -314,10 +323,15 @@ func (c *targetInstancesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "target_instance", url.QueryEscape(req.GetTargetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -362,14 +376,22 @@ func (c *targetInstancesRESTClient) Delete(ctx context.Context, req *computepb.D // Get returns the specified TargetInstance resource. Gets a list of available target instances by making a list() request. func (c *targetInstancesRESTClient) Get(ctx context.Context, req *computepb.GetTargetInstanceRequest, opts ...gax.CallOption) (*computepb.TargetInstance, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/targetInstances/%v", req.GetProject(), req.GetZone(), req.GetTargetInstance()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "target_instance", url.QueryEscape(req.GetTargetInstance()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetInstance{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -413,7 +435,10 @@ func (c *targetInstancesRESTClient) Insert(ctx context.Context, req *computepb.I return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/targetInstances", req.GetProject(), req.GetZone()) params := url.Values{} @@ -424,10 +449,15 @@ func (c *targetInstancesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -485,7 +515,10 @@ func (c *targetInstancesRESTClient) List(ctx context.Context, req *computepb.Lis } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/targetInstances", req.GetProject(), req.GetZone()) params := url.Values{} @@ -510,6 +543,9 @@ func (c *targetInstancesRESTClient) List(ctx context.Context, req *computepb.Lis // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/target_pools_client.go b/vendor/cloud.google.com/go/compute/apiv1/target_pools_client.go index 0751d7be4..c16c5b435 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/target_pools_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/target_pools_client.go @@ -252,7 +252,10 @@ func (c *targetPoolsRESTClient) AddHealthCheck(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v/addHealthCheck", req.GetProject(), req.GetRegion(), req.GetTargetPool()) params := url.Values{} @@ -263,10 +266,15 @@ func (c *targetPoolsRESTClient) AddHealthCheck(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_pool", url.QueryEscape(req.GetTargetPool()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -318,7 +326,10 @@ func (c *targetPoolsRESTClient) AddInstance(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v/addInstance", req.GetProject(), req.GetRegion(), req.GetTargetPool()) params := url.Values{} @@ -329,10 +340,15 @@ func (c *targetPoolsRESTClient) AddInstance(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_pool", url.QueryEscape(req.GetTargetPool()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -390,7 +406,10 @@ func (c *targetPoolsRESTClient) AggregatedList(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/targetPools", req.GetProject()) params := url.Values{} @@ -418,6 +437,9 @@ func (c *targetPoolsRESTClient) AggregatedList(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -477,7 +499,10 @@ func (c *targetPoolsRESTClient) AggregatedList(ctx context.Context, req *compute // Delete deletes the specified target pool. func (c *targetPoolsRESTClient) Delete(ctx context.Context, req *computepb.DeleteTargetPoolRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v", req.GetProject(), req.GetRegion(), req.GetTargetPool()) params := url.Values{} @@ -488,10 +513,15 @@ func (c *targetPoolsRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_pool", url.QueryEscape(req.GetTargetPool()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -536,14 +566,22 @@ func (c *targetPoolsRESTClient) Delete(ctx context.Context, req *computepb.Delet // Get returns the specified target pool. Gets a list of available target pools by making a list() request. func (c *targetPoolsRESTClient) Get(ctx context.Context, req *computepb.GetTargetPoolRequest, opts ...gax.CallOption) (*computepb.TargetPool, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v", req.GetProject(), req.GetRegion(), req.GetTargetPool()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_pool", url.QueryEscape(req.GetTargetPool()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetPool{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -587,14 +625,22 @@ func (c *targetPoolsRESTClient) GetHealth(ctx context.Context, req *computepb.Ge return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v/getHealth", req.GetProject(), req.GetRegion(), req.GetTargetPool()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_pool", url.QueryEscape(req.GetTargetPool()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetPoolInstanceHealth{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -638,7 +684,10 @@ func (c *targetPoolsRESTClient) Insert(ctx context.Context, req *computepb.Inser return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -649,10 +698,15 @@ func (c *targetPoolsRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -710,7 +764,10 @@ func (c *targetPoolsRESTClient) List(ctx context.Context, req *computepb.ListTar } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -735,6 +792,9 @@ func (c *targetPoolsRESTClient) List(ctx context.Context, req *computepb.ListTar // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -794,7 +854,10 @@ func (c *targetPoolsRESTClient) RemoveHealthCheck(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v/removeHealthCheck", req.GetProject(), req.GetRegion(), req.GetTargetPool()) params := url.Values{} @@ -805,10 +868,15 @@ func (c *targetPoolsRESTClient) RemoveHealthCheck(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_pool", url.QueryEscape(req.GetTargetPool()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -860,7 +928,10 @@ func (c *targetPoolsRESTClient) RemoveInstance(ctx context.Context, req *compute return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v/removeInstance", req.GetProject(), req.GetRegion(), req.GetTargetPool()) params := url.Values{} @@ -871,10 +942,15 @@ func (c *targetPoolsRESTClient) RemoveInstance(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_pool", url.QueryEscape(req.GetTargetPool()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -926,7 +1002,10 @@ func (c *targetPoolsRESTClient) SetBackup(ctx context.Context, req *computepb.Se return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v/setBackup", req.GetProject(), req.GetRegion(), req.GetTargetPool()) params := url.Values{} @@ -940,10 +1019,15 @@ func (c *targetPoolsRESTClient) SetBackup(ctx context.Context, req *computepb.Se baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_pool", url.QueryEscape(req.GetTargetPool()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/target_ssl_proxies_client.go b/vendor/cloud.google.com/go/compute/apiv1/target_ssl_proxies_client.go index 8cf983b66..44d24b07a 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/target_ssl_proxies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/target_ssl_proxies_client.go @@ -223,7 +223,10 @@ func (c *targetSslProxiesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified TargetSslProxy resource. func (c *targetSslProxiesRESTClient) Delete(ctx context.Context, req *computepb.DeleteTargetSslProxyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies/%v", req.GetProject(), req.GetTargetSslProxy()) params := url.Values{} @@ -234,10 +237,15 @@ func (c *targetSslProxiesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_ssl_proxy", url.QueryEscape(req.GetTargetSslProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -281,14 +289,22 @@ func (c *targetSslProxiesRESTClient) Delete(ctx context.Context, req *computepb. // Get returns the specified TargetSslProxy resource. Gets a list of available target SSL proxies by making a list() request. func (c *targetSslProxiesRESTClient) Get(ctx context.Context, req *computepb.GetTargetSslProxyRequest, opts ...gax.CallOption) (*computepb.TargetSslProxy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies/%v", req.GetProject(), req.GetTargetSslProxy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_ssl_proxy", url.QueryEscape(req.GetTargetSslProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetSslProxy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -332,7 +348,10 @@ func (c *targetSslProxiesRESTClient) Insert(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies", req.GetProject()) params := url.Values{} @@ -343,10 +362,15 @@ func (c *targetSslProxiesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -403,7 +427,10 @@ func (c *targetSslProxiesRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies", req.GetProject()) params := url.Values{} @@ -428,6 +455,9 @@ func (c *targetSslProxiesRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -487,7 +517,10 @@ func (c *targetSslProxiesRESTClient) SetBackendService(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies/%v/setBackendService", req.GetProject(), req.GetTargetSslProxy()) params := url.Values{} @@ -498,10 +531,15 @@ func (c *targetSslProxiesRESTClient) SetBackendService(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_ssl_proxy", url.QueryEscape(req.GetTargetSslProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -552,7 +590,10 @@ func (c *targetSslProxiesRESTClient) SetProxyHeader(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies/%v/setProxyHeader", req.GetProject(), req.GetTargetSslProxy()) params := url.Values{} @@ -563,10 +604,15 @@ func (c *targetSslProxiesRESTClient) SetProxyHeader(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_ssl_proxy", url.QueryEscape(req.GetTargetSslProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -617,7 +663,10 @@ func (c *targetSslProxiesRESTClient) SetSslCertificates(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies/%v/setSslCertificates", req.GetProject(), req.GetTargetSslProxy()) params := url.Values{} @@ -628,10 +677,15 @@ func (c *targetSslProxiesRESTClient) SetSslCertificates(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_ssl_proxy", url.QueryEscape(req.GetTargetSslProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -682,7 +736,10 @@ func (c *targetSslProxiesRESTClient) SetSslPolicy(ctx context.Context, req *comp return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies/%v/setSslPolicy", req.GetProject(), req.GetTargetSslProxy()) params := url.Values{} @@ -693,10 +750,15 @@ func (c *targetSslProxiesRESTClient) SetSslPolicy(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_ssl_proxy", url.QueryEscape(req.GetTargetSslProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/target_tcp_proxies_client.go b/vendor/cloud.google.com/go/compute/apiv1/target_tcp_proxies_client.go index 1afef81b2..aad65852f 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/target_tcp_proxies_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/target_tcp_proxies_client.go @@ -209,7 +209,10 @@ func (c *targetTcpProxiesRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified TargetTcpProxy resource. func (c *targetTcpProxiesRESTClient) Delete(ctx context.Context, req *computepb.DeleteTargetTcpProxyRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetTcpProxies/%v", req.GetProject(), req.GetTargetTcpProxy()) params := url.Values{} @@ -220,10 +223,15 @@ func (c *targetTcpProxiesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_tcp_proxy", url.QueryEscape(req.GetTargetTcpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -267,14 +275,22 @@ func (c *targetTcpProxiesRESTClient) Delete(ctx context.Context, req *computepb. // Get returns the specified TargetTcpProxy resource. Gets a list of available target TCP proxies by making a list() request. func (c *targetTcpProxiesRESTClient) Get(ctx context.Context, req *computepb.GetTargetTcpProxyRequest, opts ...gax.CallOption) (*computepb.TargetTcpProxy, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetTcpProxies/%v", req.GetProject(), req.GetTargetTcpProxy()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_tcp_proxy", url.QueryEscape(req.GetTargetTcpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetTcpProxy{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -318,7 +334,10 @@ func (c *targetTcpProxiesRESTClient) Insert(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetTcpProxies", req.GetProject()) params := url.Values{} @@ -329,10 +348,15 @@ func (c *targetTcpProxiesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -389,7 +413,10 @@ func (c *targetTcpProxiesRESTClient) List(ctx context.Context, req *computepb.Li } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetTcpProxies", req.GetProject()) params := url.Values{} @@ -414,6 +441,9 @@ func (c *targetTcpProxiesRESTClient) List(ctx context.Context, req *computepb.Li // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -473,7 +503,10 @@ func (c *targetTcpProxiesRESTClient) SetBackendService(ctx context.Context, req return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetTcpProxies/%v/setBackendService", req.GetProject(), req.GetTargetTcpProxy()) params := url.Values{} @@ -484,10 +517,15 @@ func (c *targetTcpProxiesRESTClient) SetBackendService(ctx context.Context, req baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_tcp_proxy", url.QueryEscape(req.GetTargetTcpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -538,7 +576,10 @@ func (c *targetTcpProxiesRESTClient) SetProxyHeader(ctx context.Context, req *co return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetTcpProxies/%v/setProxyHeader", req.GetProject(), req.GetTargetTcpProxy()) params := url.Values{} @@ -549,10 +590,15 @@ func (c *targetTcpProxiesRESTClient) SetProxyHeader(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "target_tcp_proxy", url.QueryEscape(req.GetTargetTcpProxy()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/target_vpn_gateways_client.go b/vendor/cloud.google.com/go/compute/apiv1/target_vpn_gateways_client.go index b531ad213..74c588390 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/target_vpn_gateways_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/target_vpn_gateways_client.go @@ -216,7 +216,10 @@ func (c *targetVpnGatewaysRESTClient) AggregatedList(ctx context.Context, req *c } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/targetVpnGateways", req.GetProject()) params := url.Values{} @@ -244,6 +247,9 @@ func (c *targetVpnGatewaysRESTClient) AggregatedList(ctx context.Context, req *c // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -303,7 +309,10 @@ func (c *targetVpnGatewaysRESTClient) AggregatedList(ctx context.Context, req *c // Delete deletes the specified target VPN gateway. func (c *targetVpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb.DeleteTargetVpnGatewayRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetVpnGateways/%v", req.GetProject(), req.GetRegion(), req.GetTargetVpnGateway()) params := url.Values{} @@ -314,10 +323,15 @@ func (c *targetVpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_vpn_gateway", url.QueryEscape(req.GetTargetVpnGateway()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -362,14 +376,22 @@ func (c *targetVpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb // Get returns the specified target VPN gateway. Gets a list of available target VPN gateways by making a list() request. func (c *targetVpnGatewaysRESTClient) Get(ctx context.Context, req *computepb.GetTargetVpnGatewayRequest, opts ...gax.CallOption) (*computepb.TargetVpnGateway, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetVpnGateways/%v", req.GetProject(), req.GetRegion(), req.GetTargetVpnGateway()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "target_vpn_gateway", url.QueryEscape(req.GetTargetVpnGateway()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TargetVpnGateway{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -413,7 +435,10 @@ func (c *targetVpnGatewaysRESTClient) Insert(ctx context.Context, req *computepb return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetVpnGateways", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -424,10 +449,15 @@ func (c *targetVpnGatewaysRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -485,7 +515,10 @@ func (c *targetVpnGatewaysRESTClient) List(ctx context.Context, req *computepb.L } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetVpnGateways", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -510,6 +543,9 @@ func (c *targetVpnGatewaysRESTClient) List(ctx context.Context, req *computepb.L // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/url_maps_client.go b/vendor/cloud.google.com/go/compute/apiv1/url_maps_client.go index 2c6316c89..6814a5822 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/url_maps_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/url_maps_client.go @@ -244,7 +244,10 @@ func (c *urlMapsRESTClient) AggregatedList(ctx context.Context, req *computepb.A } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/urlMaps", req.GetProject()) params := url.Values{} @@ -272,6 +275,9 @@ func (c *urlMapsRESTClient) AggregatedList(ctx context.Context, req *computepb.A // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -331,7 +337,10 @@ func (c *urlMapsRESTClient) AggregatedList(ctx context.Context, req *computepb.A // Delete deletes the specified UrlMap resource. func (c *urlMapsRESTClient) Delete(ctx context.Context, req *computepb.DeleteUrlMapRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps/%v", req.GetProject(), req.GetUrlMap()) params := url.Values{} @@ -342,10 +351,15 @@ func (c *urlMapsRESTClient) Delete(ctx context.Context, req *computepb.DeleteUrl baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -389,14 +403,22 @@ func (c *urlMapsRESTClient) Delete(ctx context.Context, req *computepb.DeleteUrl // Get returns the specified UrlMap resource. Gets a list of available URL maps by making a list() request. func (c *urlMapsRESTClient) Get(ctx context.Context, req *computepb.GetUrlMapRequest, opts ...gax.CallOption) (*computepb.UrlMap, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps/%v", req.GetProject(), req.GetUrlMap()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.UrlMap{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -440,7 +462,10 @@ func (c *urlMapsRESTClient) Insert(ctx context.Context, req *computepb.InsertUrl return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps", req.GetProject()) params := url.Values{} @@ -451,10 +476,15 @@ func (c *urlMapsRESTClient) Insert(ctx context.Context, req *computepb.InsertUrl baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project", url.QueryEscape(req.GetProject()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -505,7 +535,10 @@ func (c *urlMapsRESTClient) InvalidateCache(ctx context.Context, req *computepb. return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps/%v/invalidateCache", req.GetProject(), req.GetUrlMap()) params := url.Values{} @@ -516,10 +549,15 @@ func (c *urlMapsRESTClient) InvalidateCache(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -576,7 +614,10 @@ func (c *urlMapsRESTClient) List(ctx context.Context, req *computepb.ListUrlMaps } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps", req.GetProject()) params := url.Values{} @@ -601,6 +642,9 @@ func (c *urlMapsRESTClient) List(ctx context.Context, req *computepb.ListUrlMaps // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -660,7 +704,10 @@ func (c *urlMapsRESTClient) Patch(ctx context.Context, req *computepb.PatchUrlMa return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps/%v", req.GetProject(), req.GetUrlMap()) params := url.Values{} @@ -671,10 +718,15 @@ func (c *urlMapsRESTClient) Patch(ctx context.Context, req *computepb.PatchUrlMa baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -725,7 +777,10 @@ func (c *urlMapsRESTClient) Update(ctx context.Context, req *computepb.UpdateUrl return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps/%v", req.GetProject(), req.GetUrlMap()) params := url.Values{} @@ -736,10 +791,15 @@ func (c *urlMapsRESTClient) Update(ctx context.Context, req *computepb.UpdateUrl baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -790,14 +850,22 @@ func (c *urlMapsRESTClient) Validate(ctx context.Context, req *computepb.Validat return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps/%v/validate", req.GetProject(), req.GetUrlMap()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "url_map", url.QueryEscape(req.GetUrlMap()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.UrlMapsValidateResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/vpn_gateways_client.go b/vendor/cloud.google.com/go/compute/apiv1/vpn_gateways_client.go index 3f1ca764d..fd93b65b1 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/vpn_gateways_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/vpn_gateways_client.go @@ -237,7 +237,10 @@ func (c *vpnGatewaysRESTClient) AggregatedList(ctx context.Context, req *compute } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/vpnGateways", req.GetProject()) params := url.Values{} @@ -265,6 +268,9 @@ func (c *vpnGatewaysRESTClient) AggregatedList(ctx context.Context, req *compute // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -324,7 +330,10 @@ func (c *vpnGatewaysRESTClient) AggregatedList(ctx context.Context, req *compute // Delete deletes the specified VPN gateway. func (c *vpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb.DeleteVpnGatewayRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways/%v", req.GetProject(), req.GetRegion(), req.GetVpnGateway()) params := url.Values{} @@ -335,10 +344,15 @@ func (c *vpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "vpn_gateway", url.QueryEscape(req.GetVpnGateway()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -383,14 +397,22 @@ func (c *vpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb.Delet // Get returns the specified VPN gateway. Gets a list of available VPN gateways by making a list() request. func (c *vpnGatewaysRESTClient) Get(ctx context.Context, req *computepb.GetVpnGatewayRequest, opts ...gax.CallOption) (*computepb.VpnGateway, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways/%v", req.GetProject(), req.GetRegion(), req.GetVpnGateway()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "vpn_gateway", url.QueryEscape(req.GetVpnGateway()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.VpnGateway{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -427,14 +449,22 @@ func (c *vpnGatewaysRESTClient) Get(ctx context.Context, req *computepb.GetVpnGa // GetStatus returns the status for the specified VPN gateway. func (c *vpnGatewaysRESTClient) GetStatus(ctx context.Context, req *computepb.GetStatusVpnGatewayRequest, opts ...gax.CallOption) (*computepb.VpnGatewaysGetStatusResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways/%v/getStatus", req.GetProject(), req.GetRegion(), req.GetVpnGateway()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "vpn_gateway", url.QueryEscape(req.GetVpnGateway()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.VpnGatewaysGetStatusResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -478,7 +508,10 @@ func (c *vpnGatewaysRESTClient) Insert(ctx context.Context, req *computepb.Inser return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -489,10 +522,15 @@ func (c *vpnGatewaysRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -550,7 +588,10 @@ func (c *vpnGatewaysRESTClient) List(ctx context.Context, req *computepb.ListVpn } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -575,6 +616,9 @@ func (c *vpnGatewaysRESTClient) List(ctx context.Context, req *computepb.ListVpn // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -634,7 +678,10 @@ func (c *vpnGatewaysRESTClient) SetLabels(ctx context.Context, req *computepb.Se return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways/%v/setLabels", req.GetProject(), req.GetRegion(), req.GetResource()) params := url.Values{} @@ -645,10 +692,15 @@ func (c *vpnGatewaysRESTClient) SetLabels(ctx context.Context, req *computepb.Se baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -700,14 +752,22 @@ func (c *vpnGatewaysRESTClient) TestIamPermissions(ctx context.Context, req *com return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "resource", url.QueryEscape(req.GetResource()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.TestPermissionsResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/vpn_tunnels_client.go b/vendor/cloud.google.com/go/compute/apiv1/vpn_tunnels_client.go index 217e3076e..73d7c0c10 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/vpn_tunnels_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/vpn_tunnels_client.go @@ -216,7 +216,10 @@ func (c *vpnTunnelsRESTClient) AggregatedList(ctx context.Context, req *computep } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/aggregated/vpnTunnels", req.GetProject()) params := url.Values{} @@ -244,6 +247,9 @@ func (c *vpnTunnelsRESTClient) AggregatedList(ctx context.Context, req *computep // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -303,7 +309,10 @@ func (c *vpnTunnelsRESTClient) AggregatedList(ctx context.Context, req *computep // Delete deletes the specified VpnTunnel resource. func (c *vpnTunnelsRESTClient) Delete(ctx context.Context, req *computepb.DeleteVpnTunnelRequest, opts ...gax.CallOption) (*Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnTunnels/%v", req.GetProject(), req.GetRegion(), req.GetVpnTunnel()) params := url.Values{} @@ -314,10 +323,15 @@ func (c *vpnTunnelsRESTClient) Delete(ctx context.Context, req *computepb.Delete baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "vpn_tunnel", url.QueryEscape(req.GetVpnTunnel()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -362,14 +376,22 @@ func (c *vpnTunnelsRESTClient) Delete(ctx context.Context, req *computepb.Delete // Get returns the specified VpnTunnel resource. Gets a list of available VPN tunnels by making a list() request. func (c *vpnTunnelsRESTClient) Get(ctx context.Context, req *computepb.GetVpnTunnelRequest, opts ...gax.CallOption) (*computepb.VpnTunnel, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnTunnels/%v", req.GetProject(), req.GetRegion(), req.GetVpnTunnel()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()), "vpn_tunnel", url.QueryEscape(req.GetVpnTunnel()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.VpnTunnel{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -413,7 +435,10 @@ func (c *vpnTunnelsRESTClient) Insert(ctx context.Context, req *computepb.Insert return nil, err } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnTunnels", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -424,10 +449,15 @@ func (c *vpnTunnelsRESTClient) Insert(ctx context.Context, req *computepb.Insert baseUrl.RawQuery = params.Encode() // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "region", url.QueryEscape(req.GetRegion()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) if err != nil { return err @@ -485,7 +515,10 @@ func (c *vpnTunnelsRESTClient) List(ctx context.Context, req *computepb.ListVpnT } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnTunnels", req.GetProject(), req.GetRegion()) params := url.Values{} @@ -510,6 +543,9 @@ func (c *vpnTunnelsRESTClient) List(ctx context.Context, req *computepb.ListVpnT // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/zone_operations_client.go b/vendor/cloud.google.com/go/compute/apiv1/zone_operations_client.go index fa78ac3ac..9fc5b0a40 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/zone_operations_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/zone_operations_client.go @@ -178,14 +178,22 @@ func (c *zoneOperationsRESTClient) Connection() *grpc.ClientConn { // Delete deletes the specified zone-specific Operations resource. func (c *zoneOperationsRESTClient) Delete(ctx context.Context, req *computepb.DeleteZoneOperationRequest, opts ...gax.CallOption) (*computepb.DeleteZoneOperationResponse, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/operations/%v", req.GetProject(), req.GetZone(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.DeleteZoneOperationResponse{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) if err != nil { return err @@ -222,14 +230,22 @@ func (c *zoneOperationsRESTClient) Delete(ctx context.Context, req *computepb.De // Get retrieves the specified zone-specific Operations resource. func (c *zoneOperationsRESTClient) Get(ctx context.Context, req *computepb.GetZoneOperationRequest, opts ...gax.CallOption) (*computepb.Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/operations/%v", req.GetProject(), req.GetZone(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -279,7 +295,10 @@ func (c *zoneOperationsRESTClient) List(ctx context.Context, req *computepb.List } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/operations", req.GetProject(), req.GetZone()) params := url.Values{} @@ -304,6 +323,9 @@ func (c *zoneOperationsRESTClient) List(ctx context.Context, req *computepb.List // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -356,14 +378,22 @@ func (c *zoneOperationsRESTClient) List(ctx context.Context, req *computepb.List // Wait waits for the specified Operation resource to return as DONE or for the request to approach the 2 minute deadline, and retrieves the specified Operation resource. This method waits for no more than the 2 minutes and then returns the current state of the operation, which might be DONE or still in progress. This method is called on a best-effort basis. Specifically: - In uncommon cases, when the server is overloaded, the request might return before the default deadline is reached, or might return after zero seconds. - If the default deadline is reached, there is no guarantee that the operation is actually done when the method returns. Be prepared to retry if the operation is not DONE. func (c *zoneOperationsRESTClient) Wait(ctx context.Context, req *computepb.WaitZoneOperationRequest, opts ...gax.CallOption) (*computepb.Operation, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/operations/%v/wait", req.GetProject(), req.GetZone(), req.GetOperation()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()), "operation", url.QueryEscape(req.GetOperation()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Operation{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/apiv1/zones_client.go b/vendor/cloud.google.com/go/compute/apiv1/zones_client.go index 5949dc069..905dc0530 100644 --- a/vendor/cloud.google.com/go/compute/apiv1/zones_client.go +++ b/vendor/cloud.google.com/go/compute/apiv1/zones_client.go @@ -164,14 +164,22 @@ func (c *zonesRESTClient) Connection() *grpc.ClientConn { // Get returns the specified Zone resource. Gets a list of available zones by making a list() request. func (c *zonesRESTClient) Get(ctx context.Context, req *computepb.GetZoneRequest, opts ...gax.CallOption) (*computepb.Zone, error) { - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v", req.GetProject(), req.GetZone()) // Build HTTP headers from client and context metadata. - headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "zone", url.QueryEscape(req.GetZone()))) + + headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} resp := &computepb.Zone{} e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err @@ -221,7 +229,10 @@ func (c *zonesRESTClient) List(ctx context.Context, req *computepb.ListZonesRequ } else if pageSize != 0 { req.MaxResults = proto.Uint32(uint32(pageSize)) } - baseUrl, _ := url.Parse(c.endpoint) + baseUrl, err := url.Parse(c.endpoint) + if err != nil { + return nil, "", err + } baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones", req.GetProject()) params := url.Values{} @@ -246,6 +257,9 @@ func (c *zonesRESTClient) List(ctx context.Context, req *computepb.ListZonesRequ // Build HTTP headers from client and context metadata. headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + if settings.Path != "" { + baseUrl.Path = settings.Path + } httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) if err != nil { return err diff --git a/vendor/cloud.google.com/go/compute/internal/version.go b/vendor/cloud.google.com/go/compute/internal/version.go index 05d3396f1..b819fa786 100644 --- a/vendor/cloud.google.com/go/compute/internal/version.go +++ b/vendor/cloud.google.com/go/compute/internal/version.go @@ -15,4 +15,4 @@ package internal // Version is the current tagged release of the library. -const Version = "1.6.0" +const Version = "1.6.1" diff --git a/vendor/google.golang.org/genproto/googleapis/cloud/compute/v1/compute.pb.go b/vendor/google.golang.org/genproto/googleapis/cloud/compute/v1/compute.pb.go index 9d67723ad..a2a9e1f93 100644 --- a/vendor/google.golang.org/genproto/googleapis/cloud/compute/v1/compute.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/cloud/compute/v1/compute.pb.go @@ -74855,7 +74855,7 @@ type MoveFirewallPolicyRequest struct { // Name of the firewall policy to update. FirewallPolicy string `protobuf:"bytes,498173265,opt,name=firewall_policy,json=firewallPolicy,proto3" json:"firewall_policy,omitempty"` // The new parent of the firewall policy. - ParentId *string `protobuf:"bytes,459714768,opt,name=parent_id,json=parentId,proto3,oneof" json:"parent_id,omitempty"` + ParentId string `protobuf:"bytes,459714768,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty"` // An optional request ID to identify requests. Specify a unique request ID so that if you must retry your request, the server will know to ignore the request if it has already been completed. For example, consider a situation where you make an initial request and the request times out. If you make the request again with the same request ID, the server can check if original operation with the same request ID was received, and if so, will ignore the second request. This prevents clients from accidentally creating duplicate commitments. The request ID must be a valid UUID with the exception that zero UUID is not supported ( 00000000-0000-0000-0000-000000000000). RequestId *string `protobuf:"bytes,37109963,opt,name=request_id,json=requestId,proto3,oneof" json:"request_id,omitempty"` } @@ -74900,8 +74900,8 @@ func (x *MoveFirewallPolicyRequest) GetFirewallPolicy() string { } func (x *MoveFirewallPolicyRequest) GetParentId() string { - if x != nil && x.ParentId != nil { - return *x.ParentId + if x != nil { + return x.ParentId } return "" } @@ -132959,19 +132959,18 @@ var file_google_cloud_compute_v1_compute_proto_rawDesc = []byte{ 0x63, 0x74, 0x12, 0x25, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0xcb, 0x81, 0xd9, 0x11, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x72, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x22, 0xc5, 0x01, 0x0a, 0x19, 0x4d, 0x6f, 0x76, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x22, 0xb5, 0x01, 0x0a, 0x19, 0x4d, 0x6f, 0x76, 0x65, 0x46, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x0f, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0xd1, 0x8a, 0xc6, 0xed, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x0e, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, - 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x32, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x65, + 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x30, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0xd0, 0xe1, 0x9a, 0xdb, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x0c, 0xf2, 0x47, 0x09, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x48, 0x00, 0x52, - 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0a, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0xcb, 0x81, 0xd9, 0x11, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, - 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, - 0x64, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, + 0x0f, 0xe0, 0x41, 0x02, 0xf2, 0x47, 0x09, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, + 0x52, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x0a, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0xcb, 0x81, 0xd9, 0x11, 0x20, 0x01, 0x28, + 0x09, 0x48, 0x00, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x88, 0x01, + 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x22, 0xfa, 0x01, 0x0a, 0x1a, 0x4d, 0x6f, 0x76, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x7a, 0x0a, 0x1e, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x76, 0x65, diff --git a/vendor/modules.txt b/vendor/modules.txt index 0ed514305..4d35b402c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -9,7 +9,7 @@ cloud.google.com/go/longrunning/autogen # cloud.google.com/go/cloudbuild v1.2.0 ## explicit cloud.google.com/go/cloudbuild/apiv1 -# cloud.google.com/go/compute v1.6.0 +# cloud.google.com/go/compute v1.6.1 ## explicit cloud.google.com/go/compute/apiv1 cloud.google.com/go/compute/internal @@ -524,7 +524,7 @@ google.golang.org/appengine/internal/socket google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/socket google.golang.org/appengine/urlfetch -# google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 +# google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 ## explicit google.golang.org/genproto/googleapis/api/annotations google.golang.org/genproto/googleapis/api/httpbody