From 6e560776fd6e574320ce2dbad1f9eb9e22999185 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 1 Feb 2022 14:18:45 -0800 Subject: [PATCH] chore(all): auto-regenerate gapics (#5418) This is an auto-generated regeneration of the gapic clients by cloud.google.com/go/internal/gapicgen. Once the corresponding genproto PR is submitted, genbot will update this PR with a newer dependency to the newer version of genproto and assign reviewers to this PR. If you have been assigned to review this PR, please: - Ensure that the version of genproto in go.mod has been updated. - Ensure that CI is passing. If it's failing, it requires your manual attention. - Approve and submit this PR if you believe it's ready to ship. Corresponding genproto PR: https://github.com/googleapis/go-genproto/pull/749 Changes: feat(aiplatform): add dedicated_resources to DeployedIndex message in aiplatform v1 index_endpoint.proto chore: sort imports PiperOrigin-RevId: 425394497 Source-Link: https://github.com/googleapis/googleapis/commit/bd97e467afc78c328426d2f06fa4d7cc2d0bfc51 feat(secretmanager): Checksums in Secret Manager Users can now use checksums for data integrity assurance when adding and accessing SecretVersions. PiperOrigin-RevId: 425369494 Source-Link: https://github.com/googleapis/googleapis/commit/70d389ce893cc2b817ff6aeef5763922c9a9a9aa feat(documentai): add question_id field in ReviewDocumentOperationMetadata PiperOrigin-RevId: 424949086 Source-Link: https://github.com/googleapis/googleapis/commit/087bceb20b8f938e5167e1272c1b7fba50feae19 docs(texttospeech): update comments for ListVoicesRequest PiperOrigin-RevId: 424942023 Source-Link: https://github.com/googleapis/googleapis/commit/8ce193463ae79d1580533d636a6a016d4963867c feat(redis): Add automated RDB (AKA persistence) PiperOrigin-RevId: 424884640 Source-Link: https://github.com/googleapis/googleapis/commit/28c6bb97cac6f16c69879be4e655674a74b886ef fix(iap): remove unpublished service from service config PiperOrigin-RevId: 424797968 Source-Link: https://github.com/googleapis/googleapis/commit/b93bf558b8a0158d21798b3b279138ecebea8ef8 --- aiplatform/apiv1/doc.go | 2 +- aiplatform/go.mod | 4 +- aiplatform/go.sum | 14 +- compute/apiv1/accelerator_types_client.go | 174 +- compute/apiv1/addresses_client.go | 294 +- compute/apiv1/autoscalers_client.go | 414 +-- compute/apiv1/backend_buckets_client.go | 476 +-- compute/apiv1/backend_services_client.go | 652 +++-- compute/apiv1/disk_types_client.go | 174 +- compute/apiv1/disks_client.go | 768 ++--- compute/apiv1/doc.go | 13 +- compute/apiv1/external_vpn_gateways_client.go | 354 +-- compute/apiv1/firewall_policies_client.go | 1064 +++---- compute/apiv1/firewalls_client.go | 356 +-- compute/apiv1/forwarding_rules_client.go | 474 +-- compute/apiv1/global_addresses_client.go | 236 +- .../apiv1/global_forwarding_rules_client.go | 416 +-- .../global_network_endpoint_groups_client.go | 414 +-- compute/apiv1/global_operations_client.go | 290 +- .../global_organization_operations_client.go | 174 +- ...global_public_delegated_prefixes_client.go | 296 +- compute/apiv1/health_checks_client.go | 414 +-- compute/apiv1/image_family_views_client.go | 66 +- compute/apiv1/images_client.go | 648 +++-- .../apiv1/instance_group_managers_client.go | 1188 ++++---- compute/apiv1/instance_groups_client.go | 532 ++-- compute/apiv1/instance_templates_client.go | 410 +-- compute/apiv1/instances_client.go | 2558 +++++++++-------- .../apiv1/interconnect_attachments_client.go | 354 +-- .../apiv1/interconnect_locations_client.go | 116 +- compute/apiv1/interconnects_client.go | 354 +-- compute/apiv1/license_codes_client.go | 132 +- compute/apiv1/licenses_client.go | 410 +-- compute/apiv1/machine_types_client.go | 174 +- .../apiv1/network_endpoint_groups_client.go | 530 ++-- compute/apiv1/networks_client.go | 652 +++-- compute/apiv1/node_groups_client.go | 766 ++--- compute/apiv1/node_templates_client.go | 468 +-- compute/apiv1/node_types_client.go | 174 +- compute/apiv1/packet_mirrorings_client.go | 412 +-- compute/apiv1/projects_client.go | 772 ++--- .../public_advertised_prefixes_client.go | 296 +- .../apiv1/public_delegated_prefixes_client.go | 354 +-- compute/apiv1/region_autoscalers_client.go | 356 +-- .../apiv1/region_backend_services_client.go | 414 +-- compute/apiv1/region_commitments_client.go | 234 +- compute/apiv1/region_disk_types_client.go | 116 +- compute/apiv1/region_disks_client.go | 710 ++--- .../region_health_check_services_client.go | 296 +- compute/apiv1/region_health_checks_client.go | 356 +-- .../region_instance_group_managers_client.go | 1130 ++++---- .../apiv1/region_instance_groups_client.go | 234 +- compute/apiv1/region_instances_client.go | 68 +- .../region_network_endpoint_groups_client.go | 236 +- .../region_notification_endpoints_client.go | 236 +- compute/apiv1/region_operations_client.go | 232 +- .../apiv1/region_ssl_certificates_client.go | 236 +- .../region_target_http_proxies_client.go | 296 +- .../region_target_https_proxies_client.go | 356 +-- compute/apiv1/region_url_maps_client.go | 414 +-- compute/apiv1/regions_client.go | 116 +- compute/apiv1/reservations_client.go | 528 ++-- compute/apiv1/resource_policies_client.go | 468 +-- compute/apiv1/routers_client.go | 588 ++-- compute/apiv1/routes_client.go | 236 +- compute/apiv1/security_policies_client.go | 592 ++-- compute/apiv1/service_attachments_client.go | 528 ++-- compute/apiv1/snapshots_client.go | 410 +-- compute/apiv1/ssl_certificates_client.go | 294 +- compute/apiv1/ssl_policies_client.go | 354 +-- compute/apiv1/subnetworks_client.go | 706 ++--- compute/apiv1/target_grpc_proxies_client.go | 296 +- compute/apiv1/target_http_proxies_client.go | 414 +-- compute/apiv1/target_https_proxies_client.go | 594 ++-- compute/apiv1/target_instances_client.go | 294 +- compute/apiv1/target_pools_client.go | 652 +++-- compute/apiv1/target_ssl_proxies_client.go | 476 +-- compute/apiv1/target_tcp_proxies_client.go | 356 +-- compute/apiv1/target_vpn_gateways_client.go | 294 +- compute/apiv1/url_maps_client.go | 532 ++-- compute/apiv1/vpn_gateways_client.go | 470 +-- compute/apiv1/vpn_tunnels_client.go | 294 +- compute/apiv1/zone_operations_client.go | 232 +- compute/apiv1/zones_client.go | 116 +- compute/go.mod | 4 +- compute/go.sum | 14 +- documentai/apiv1/doc.go | 2 +- documentai/go.mod | 4 +- documentai/go.sum | 14 +- go.mod | 4 +- go.sum | 14 +- iap/apiv1/doc.go | 2 +- iap/go.mod | 4 +- iap/go.sum | 14 +- .../dataplex/apiv1/Client/CancelJob/main.go | 46 + .../dataplex/apiv1/Client/CreateAsset/main.go | 53 + .../dataplex/apiv1/Client/CreateLake/main.go | 53 + .../dataplex/apiv1/Client/CreateTask/main.go | 53 + .../dataplex/apiv1/Client/CreateZone/main.go | 53 + .../dataplex/apiv1/Client/DeleteAsset/main.go | 51 + .../dataplex/apiv1/Client/DeleteLake/main.go | 51 + .../dataplex/apiv1/Client/DeleteTask/main.go | 51 + .../dataplex/apiv1/Client/DeleteZone/main.go | 51 + .../dataplex/apiv1/Client/GetAsset/main.go | 48 + .../dataplex/apiv1/Client/GetJob/main.go | 48 + .../dataplex/apiv1/Client/GetLake/main.go | 48 + .../dataplex/apiv1/Client/GetTask/main.go | 48 + .../dataplex/apiv1/Client/GetZone/main.go | 48 + .../apiv1/Client/ListAssetActions/main.go | 55 + .../dataplex/apiv1/Client/ListAssets/main.go | 55 + .../dataplex/apiv1/Client/ListJobs/main.go | 55 + .../apiv1/Client/ListLakeActions/main.go | 55 + .../dataplex/apiv1/Client/ListLakes/main.go | 55 + .../dataplex/apiv1/Client/ListTasks/main.go | 55 + .../apiv1/Client/ListZoneActions/main.go | 55 + .../dataplex/apiv1/Client/ListZones/main.go | 55 + .../dataplex/apiv1/Client/UpdateAsset/main.go | 53 + .../dataplex/apiv1/Client/UpdateLake/main.go | 53 + .../dataplex/apiv1/Client/UpdateTask/main.go | 53 + .../dataplex/apiv1/Client/UpdateZone/main.go | 53 + .../apiv1/MetadataClient/GetEntity/main.go | 48 + .../apiv1/MetadataClient/GetPartition/main.go | 48 + .../apiv1/MetadataClient/ListEntities/main.go | 55 + .../MetadataClient/ListPartitions/main.go | 55 + internal/generated/snippets/go.mod | 9 +- internal/generated/snippets/go.sum | 15 +- .../apiv1/Client/CreateChannel/main.go | 53 + .../apiv1/Client/CreateEvent/main.go | 48 + .../apiv1/Client/CreateInput/main.go | 53 + .../apiv1/Client/DeleteChannel/main.go | 51 + .../apiv1/Client/DeleteEvent/main.go | 46 + .../apiv1/Client/DeleteInput/main.go | 51 + .../apiv1/Client/GetChannel/main.go | 48 + .../livestream/apiv1/Client/GetEvent/main.go | 48 + .../livestream/apiv1/Client/GetInput/main.go | 48 + .../apiv1/Client/ListChannels/main.go | 55 + .../apiv1/Client/ListEvents/main.go | 55 + .../apiv1/Client/ListInputs/main.go | 55 + .../apiv1/Client/StartChannel/main.go | 53 + .../apiv1/Client/StopChannel/main.go | 53 + .../apiv1/Client/UpdateChannel/main.go | 53 + .../apiv1/Client/UpdateInput/main.go | 53 + internal/godocfx/go.sum | 14 +- longrunning/autogen/doc.go | 6 +- osconfig/agentendpoint/apiv1/doc.go | 6 +- osconfig/agentendpoint/apiv1beta/doc.go | 6 +- osconfig/go.mod | 4 +- osconfig/go.sum | 14 +- redis/apiv1beta1/doc.go | 2 +- redis/go.mod | 4 +- redis/go.sum | 14 +- secretmanager/apiv1/doc.go | 2 +- secretmanager/go.mod | 4 +- secretmanager/go.sum | 14 +- texttospeech/apiv1/doc.go | 2 +- texttospeech/go.mod | 4 +- texttospeech/go.sum | 14 +- 157 files changed, 21096 insertions(+), 16096 deletions(-) create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/CancelJob/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/CreateAsset/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/CreateLake/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/CreateTask/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/CreateZone/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/DeleteAsset/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/DeleteLake/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/DeleteTask/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/DeleteZone/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/GetAsset/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/GetJob/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/GetLake/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/GetTask/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/GetZone/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/ListAssetActions/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/ListAssets/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/ListJobs/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/ListLakeActions/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/ListLakes/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/ListTasks/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/ListZoneActions/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/ListZones/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/UpdateAsset/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/UpdateLake/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/UpdateTask/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/Client/UpdateZone/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/MetadataClient/GetEntity/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/MetadataClient/GetPartition/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/MetadataClient/ListEntities/main.go create mode 100644 internal/generated/snippets/dataplex/apiv1/MetadataClient/ListPartitions/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/CreateChannel/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/CreateEvent/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/CreateInput/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/DeleteChannel/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/DeleteEvent/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/DeleteInput/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/GetChannel/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/GetEvent/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/GetInput/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/ListChannels/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/ListEvents/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/ListInputs/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/StartChannel/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/StopChannel/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/UpdateChannel/main.go create mode 100644 internal/generated/snippets/video/livestream/apiv1/Client/UpdateInput/main.go diff --git a/aiplatform/apiv1/doc.go b/aiplatform/apiv1/doc.go index a1d03f96526..411c8b04e61 100644 --- a/aiplatform/apiv1/doc.go +++ b/aiplatform/apiv1/doc.go @@ -90,7 +90,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) diff --git a/aiplatform/go.mod b/aiplatform/go.mod index 3eace2add49..07f1640d545 100644 --- a/aiplatform/go.mod +++ b/aiplatform/go.mod @@ -5,8 +5,8 @@ go 1.16 require ( cloud.google.com/go v0.100.2 github.com/googleapis/gax-go/v2 v2.1.1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.27.1 ) diff --git a/aiplatform/go.sum b/aiplatform/go.sum index 284fe124169..6cd198a3158 100644 --- a/aiplatform/go.sum +++ b/aiplatform/go.sum @@ -333,8 +333,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -435,8 +435,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -505,9 +505,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/compute/apiv1/accelerator_types_client.go b/compute/apiv1/accelerator_types_client.go index f20a35967e7..e369967f982 100644 --- a/compute/apiv1/accelerator_types_client.go +++ b/compute/apiv1/accelerator_types_client.go @@ -214,33 +214,39 @@ func (c *acceleratorTypesRESTClient) AggregatedList(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]AcceleratorTypesScopedListPair, 0, len(resp.GetItems())) @@ -273,39 +279,43 @@ func (c *acceleratorTypesRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/acceleratorTypes/%v", req.GetProject(), req.GetZone(), req.GetAcceleratorType()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.AcceleratorType{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of accelerator types that are available to the specified project. @@ -345,33 +355,39 @@ func (c *acceleratorTypesRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/addresses_client.go b/compute/apiv1/addresses_client.go index 5df87440ccd..34f88f810d8 100644 --- a/compute/apiv1/addresses_client.go +++ b/compute/apiv1/addresses_client.go @@ -225,33 +225,39 @@ func (c *addressesRESTClient) AggregatedList(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]AddressesScopedListPair, 0, len(resp.GetItems())) @@ -291,40 +297,44 @@ func (c *addressesRESTClient) Delete(ctx context.Context, req *computepb.DeleteA baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified address resource. @@ -332,39 +342,43 @@ func (c *addressesRESTClient) Get(ctx context.Context, req *computepb.GetAddress baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/addresses/%v", req.GetProject(), req.GetRegion(), req.GetAddress()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Address{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an address resource in the specified project by using the data included in the request. @@ -386,40 +400,44 @@ func (c *addressesRESTClient) Insert(ctx context.Context, req *computepb.InsertA baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of addresses contained within the specified region. @@ -459,33 +477,39 @@ func (c *addressesRESTClient) List(ctx context.Context, req *computepb.ListAddre baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/autoscalers_client.go b/compute/apiv1/autoscalers_client.go index 7cf36e7e237..7f4994152bd 100644 --- a/compute/apiv1/autoscalers_client.go +++ b/compute/apiv1/autoscalers_client.go @@ -239,33 +239,39 @@ func (c *autoscalersRESTClient) AggregatedList(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]AutoscalersScopedListPair, 0, len(resp.GetItems())) @@ -305,40 +311,44 @@ func (c *autoscalersRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified autoscaler resource. Gets a list of available autoscalers by making a list() request. @@ -346,39 +356,43 @@ func (c *autoscalersRESTClient) Get(ctx context.Context, req *computepb.GetAutos baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/autoscalers/%v", req.GetProject(), req.GetZone(), req.GetAutoscaler()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Autoscaler{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an autoscaler in the specified project using the data included in the request. @@ -400,40 +414,44 @@ func (c *autoscalersRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of autoscalers contained within the specified zone. @@ -473,33 +491,39 @@ func (c *autoscalersRESTClient) List(ctx context.Context, req *computepb.ListAut baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -542,40 +566,44 @@ func (c *autoscalersRESTClient) Patch(ctx context.Context, req *computepb.PatchA baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates an autoscaler in the specified project using the data included in the request. @@ -600,40 +628,44 @@ func (c *autoscalersRESTClient) Update(ctx context.Context, req *computepb.Updat baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AutoscalerIterator manages a stream of *computepb.Autoscaler. diff --git a/compute/apiv1/backend_buckets_client.go b/compute/apiv1/backend_buckets_client.go index 2d0f0cf6b25..44fd9c39382 100644 --- a/compute/apiv1/backend_buckets_client.go +++ b/compute/apiv1/backend_buckets_client.go @@ -224,40 +224,44 @@ func (c *backendBucketsRESTClient) AddSignedUrlKey(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Delete deletes the specified BackendBucket resource. @@ -272,40 +276,44 @@ func (c *backendBucketsRESTClient) Delete(ctx context.Context, req *computepb.De baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DeleteSignedUrlKey deletes a key for validating requests with signed URLs for this backend bucket. @@ -321,40 +329,44 @@ func (c *backendBucketsRESTClient) DeleteSignedUrlKey(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified BackendBucket resource. Gets a list of available backend buckets by making a list() request. @@ -362,39 +374,43 @@ func (c *backendBucketsRESTClient) Get(ctx context.Context, req *computepb.GetBa baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendBuckets/%v", req.GetProject(), req.GetBackendBucket()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.BackendBucket{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a BackendBucket resource in the specified project using the data included in the request. @@ -416,40 +432,44 @@ func (c *backendBucketsRESTClient) Insert(ctx context.Context, req *computepb.In baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of BackendBucket resources available to the specified project. @@ -489,33 +509,39 @@ func (c *backendBucketsRESTClient) List(ctx context.Context, req *computepb.List baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -555,40 +581,44 @@ func (c *backendBucketsRESTClient) Patch(ctx context.Context, req *computepb.Pat baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates the specified BackendBucket resource with the data included in the request. @@ -610,40 +640,44 @@ func (c *backendBucketsRESTClient) Update(ctx context.Context, req *computepb.Up baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // BackendBucketIterator manages a stream of *computepb.BackendBucket. diff --git a/compute/apiv1/backend_services_client.go b/compute/apiv1/backend_services_client.go index 051b4da069b..f560861383a 100644 --- a/compute/apiv1/backend_services_client.go +++ b/compute/apiv1/backend_services_client.go @@ -246,40 +246,44 @@ func (c *backendServicesRESTClient) AddSignedUrlKey(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AggregatedList retrieves the list of all BackendService resources, regional and global, available to the specified project. @@ -322,33 +326,39 @@ func (c *backendServicesRESTClient) AggregatedList(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]BackendServicesScopedListPair, 0, len(resp.GetItems())) @@ -388,40 +398,44 @@ func (c *backendServicesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DeleteSignedUrlKey deletes a key for validating requests with signed URLs for this backend service. @@ -437,40 +451,44 @@ func (c *backendServicesRESTClient) DeleteSignedUrlKey(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified BackendService resource. Gets a list of available backend services. @@ -478,39 +496,43 @@ func (c *backendServicesRESTClient) Get(ctx context.Context, req *computepb.GetB baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v", req.GetProject(), req.GetBackendService()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.BackendService{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetHealth gets the most recent health check results for this BackendService. Example request body: { “group”: “/zones/us-east1-b/instanceGroups/lb-backend-example” } @@ -525,39 +547,43 @@ func (c *backendServicesRESTClient) GetHealth(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/backendServices/%v/getHealth", req.GetProject(), req.GetBackendService()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.BackendServiceGroupHealth{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a BackendService resource in the specified project using the data included in the request. For more information, see Backend services overview . @@ -579,40 +605,44 @@ func (c *backendServicesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of BackendService resources available to the specified project. @@ -652,33 +682,39 @@ func (c *backendServicesRESTClient) List(ctx context.Context, req *computepb.Lis baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -718,40 +754,44 @@ func (c *backendServicesRESTClient) Patch(ctx context.Context, req *computepb.Pa baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetSecurityPolicy sets the Google Cloud Armor security policy for the specified backend service. For more information, see Google Cloud Armor Overview @@ -773,40 +813,44 @@ func (c *backendServicesRESTClient) SetSecurityPolicy(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates the specified BackendService resource with the data included in the request. For more information, see Backend services overview. @@ -828,40 +872,44 @@ func (c *backendServicesRESTClient) Update(ctx context.Context, req *computepb.U baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // BackendServiceIterator manages a stream of *computepb.BackendService. diff --git a/compute/apiv1/disk_types_client.go b/compute/apiv1/disk_types_client.go index 10894e31bb5..d580a76078c 100644 --- a/compute/apiv1/disk_types_client.go +++ b/compute/apiv1/disk_types_client.go @@ -210,33 +210,39 @@ func (c *diskTypesRESTClient) AggregatedList(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]DiskTypesScopedListPair, 0, len(resp.GetItems())) @@ -269,39 +275,43 @@ func (c *diskTypesRESTClient) Get(ctx context.Context, req *computepb.GetDiskTyp baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/diskTypes/%v", req.GetProject(), req.GetZone(), req.GetDiskType()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.DiskType{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of disk types available to the specified project. @@ -341,33 +351,39 @@ func (c *diskTypesRESTClient) List(ctx context.Context, req *computepb.ListDiskT baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/disks_client.go b/compute/apiv1/disks_client.go index b5823dde815..c64a2bf98a3 100644 --- a/compute/apiv1/disks_client.go +++ b/compute/apiv1/disks_client.go @@ -260,40 +260,44 @@ func (c *disksRESTClient) AddResourcePolicies(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AggregatedList retrieves an aggregated list of persistent disks. @@ -336,33 +340,39 @@ func (c *disksRESTClient) AggregatedList(ctx context.Context, req *computepb.Agg baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]DisksScopedListPair, 0, len(resp.GetItems())) @@ -412,40 +422,44 @@ func (c *disksRESTClient) CreateSnapshot(ctx context.Context, req *computepb.Cre baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -460,40 +474,44 @@ func (c *disksRESTClient) Delete(ctx context.Context, req *computepb.DeleteDiskR baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns a specified persistent disk. Gets a list of available persistent disks by making a list() request. @@ -501,39 +519,43 @@ func (c *disksRESTClient) Get(ctx context.Context, req *computepb.GetDiskRequest baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v", req.GetProject(), req.GetZone(), req.GetDisk()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Disk{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -548,39 +570,43 @@ func (c *disksRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetIa baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a persistent disk in the specified project using the data in the request. You can create a disk from a source (sourceImage, sourceSnapshot, or sourceDisk) or create an empty 500 GB data disk by omitting all properties. You can also create a disk that is larger than the default size by specifying the sizeGb property. @@ -605,40 +631,44 @@ func (c *disksRESTClient) Insert(ctx context.Context, req *computepb.InsertDiskR baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of persistent disks contained within the specified zone. @@ -678,33 +708,39 @@ func (c *disksRESTClient) List(ctx context.Context, req *computepb.ListDisksRequ baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -744,40 +780,44 @@ func (c *disksRESTClient) RemoveResourcePolicies(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Resize resizes the specified persistent disk. You can only increase the size of the disk. @@ -799,40 +839,44 @@ func (c *disksRESTClient) Resize(ctx context.Context, req *computepb.ResizeDiskR baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -847,39 +891,43 @@ func (c *disksRESTClient) SetIamPolicy(ctx context.Context, req *computepb.SetIa baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/setIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SetLabels sets the labels on a disk. To learn more about labels, read the Labeling Resources documentation. @@ -901,40 +949,44 @@ func (c *disksRESTClient) SetLabels(ctx context.Context, req *computepb.SetLabel baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -949,39 +1001,43 @@ func (c *disksRESTClient) TestIamPermissions(ctx context.Context, req *computepb baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/disks/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // DiskIterator manages a stream of *computepb.Disk. diff --git a/compute/apiv1/doc.go b/compute/apiv1/doc.go index 0ad432bfe78..19cd8171715 100644 --- a/compute/apiv1/doc.go +++ b/compute/apiv1/doc.go @@ -73,6 +73,7 @@ package compute // import "cloud.google.com/go/compute/apiv1" import ( "context" + "net/http" "os" "runtime" "strconv" @@ -89,7 +90,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) @@ -166,3 +167,13 @@ func maybeUnknownEnum(err error) error { } return err } + +// buildHeaders extracts metadata from the outgoing context, joins it with any other +// given metadata, and converts them into a http.Header. +func buildHeaders(ctx context.Context, mds ...metadata.MD) http.Header { + if cmd, ok := metadata.FromOutgoingContext(ctx); ok { + mds = append(mds, cmd) + } + md := metadata.Join(mds...) + return http.Header(md) +} diff --git a/compute/apiv1/external_vpn_gateways_client.go b/compute/apiv1/external_vpn_gateways_client.go index e34ec3e7484..ec1d849eba0 100644 --- a/compute/apiv1/external_vpn_gateways_client.go +++ b/compute/apiv1/external_vpn_gateways_client.go @@ -203,40 +203,44 @@ func (c *externalVpnGatewaysRESTClient) Delete(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified externalVpnGateway. Get a list of available externalVpnGateways by making a list() request. @@ -244,39 +248,43 @@ func (c *externalVpnGatewaysRESTClient) Get(ctx context.Context, req *computepb. baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways/%v", req.GetProject(), req.GetExternalVpnGateway()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.ExternalVpnGateway{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a ExternalVpnGateway in the specified project using the data included in the request. @@ -298,40 +306,44 @@ func (c *externalVpnGatewaysRESTClient) Insert(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of ExternalVpnGateway available to the specified project. @@ -371,33 +383,39 @@ func (c *externalVpnGatewaysRESTClient) List(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -430,40 +448,44 @@ func (c *externalVpnGatewaysRESTClient) SetLabels(ctx context.Context, req *comp baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways/%v/setLabels", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -478,39 +500,43 @@ func (c *externalVpnGatewaysRESTClient) TestIamPermissions(ctx context.Context, baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/externalVpnGateways/%v/testIamPermissions", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // ExternalVpnGatewayIterator manages a stream of *computepb.ExternalVpnGateway. diff --git a/compute/apiv1/firewall_policies_client.go b/compute/apiv1/firewall_policies_client.go index d1bb0d141c6..5786f3adc1a 100644 --- a/compute/apiv1/firewall_policies_client.go +++ b/compute/apiv1/firewall_policies_client.go @@ -297,40 +297,44 @@ func (c *firewallPoliciesRESTClient) AddAssociation(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AddRule inserts a rule into a firewall policy. @@ -352,40 +356,44 @@ func (c *firewallPoliciesRESTClient) AddRule(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // CloneRules copies rules to the specified firewall policy. @@ -403,40 +411,44 @@ func (c *firewallPoliciesRESTClient) CloneRules(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Delete deletes the specified policy. @@ -451,40 +463,44 @@ func (c *firewallPoliciesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified firewall policy. @@ -492,39 +508,43 @@ func (c *firewallPoliciesRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v", req.GetFirewallPolicy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.FirewallPolicy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetAssociation gets an association with the specified name. @@ -539,39 +559,43 @@ func (c *firewallPoliciesRESTClient) GetAssociation(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.FirewallPolicyAssociation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -586,39 +610,43 @@ func (c *firewallPoliciesRESTClient) GetIamPolicy(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetRule gets a rule of the specified priority. @@ -633,39 +661,43 @@ func (c *firewallPoliciesRESTClient) GetRule(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.FirewallPolicyRule{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a new policy in the specified project using the data included in the request. @@ -688,40 +720,44 @@ func (c *firewallPoliciesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists all the policies that have been configured for the specified folder or organization. @@ -764,33 +800,39 @@ func (c *firewallPoliciesRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -823,39 +865,43 @@ func (c *firewallPoliciesRESTClient) ListAssociations(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.FirewallPoliciesListAssociationsResponse{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.FirewallPoliciesListAssociationsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Move moves the specified firewall policy. @@ -871,40 +917,44 @@ func (c *firewallPoliciesRESTClient) Move(ctx context.Context, req *computepb.Mo baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Patch patches the specified policy with the data included in the request. @@ -926,40 +976,44 @@ func (c *firewallPoliciesRESTClient) Patch(ctx context.Context, req *computepb.P baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // PatchRule patches a rule of the specified priority. @@ -984,40 +1038,44 @@ func (c *firewallPoliciesRESTClient) PatchRule(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // RemoveAssociation removes an association for the specified firewall policy. @@ -1035,40 +1093,44 @@ func (c *firewallPoliciesRESTClient) RemoveAssociation(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // RemoveRule deletes a rule of the specified priority. @@ -1086,40 +1148,44 @@ func (c *firewallPoliciesRESTClient) RemoveRule(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -1134,39 +1200,43 @@ func (c *firewallPoliciesRESTClient) SetIamPolicy(ctx context.Context, req *comp baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/setIamPolicy", req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -1181,39 +1251,43 @@ func (c *firewallPoliciesRESTClient) TestIamPermissions(ctx context.Context, req baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/locations/global/firewallPolicies/%v/testIamPermissions", req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // FirewallPolicyIterator manages a stream of *computepb.FirewallPolicy. diff --git a/compute/apiv1/firewalls_client.go b/compute/apiv1/firewalls_client.go index 3ae5790e603..c7e319e56e2 100644 --- a/compute/apiv1/firewalls_client.go +++ b/compute/apiv1/firewalls_client.go @@ -203,40 +203,44 @@ func (c *firewallsRESTClient) Delete(ctx context.Context, req *computepb.DeleteF baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified firewall. @@ -244,39 +248,43 @@ func (c *firewallsRESTClient) Get(ctx context.Context, req *computepb.GetFirewal baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/firewalls/%v", req.GetProject(), req.GetFirewall()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Firewall{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a firewall rule in the specified project using the data included in the request. @@ -298,40 +306,44 @@ func (c *firewallsRESTClient) Insert(ctx context.Context, req *computepb.InsertF baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of firewall rules available to the specified project. @@ -371,33 +383,39 @@ func (c *firewallsRESTClient) List(ctx context.Context, req *computepb.ListFirew baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -437,40 +455,44 @@ func (c *firewallsRESTClient) Patch(ctx context.Context, req *computepb.PatchFir baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates the specified firewall rule with the data included in the request. Note that all fields will be updated if using PUT, even fields that are not specified. To update individual fields, please use PATCH instead. @@ -492,40 +514,44 @@ func (c *firewallsRESTClient) Update(ctx context.Context, req *computepb.UpdateF baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // FirewallIterator manages a stream of *computepb.Firewall. diff --git a/compute/apiv1/forwarding_rules_client.go b/compute/apiv1/forwarding_rules_client.go index 8a63e39a735..d11244c4ec4 100644 --- a/compute/apiv1/forwarding_rules_client.go +++ b/compute/apiv1/forwarding_rules_client.go @@ -246,33 +246,39 @@ func (c *forwardingRulesRESTClient) AggregatedList(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]ForwardingRulesScopedListPair, 0, len(resp.GetItems())) @@ -312,40 +318,44 @@ func (c *forwardingRulesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified ForwardingRule resource. @@ -353,39 +363,43 @@ func (c *forwardingRulesRESTClient) Get(ctx context.Context, req *computepb.GetF baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/forwardingRules/%v", req.GetProject(), req.GetRegion(), req.GetForwardingRule()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.ForwardingRule{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a ForwardingRule resource in the specified project and region using the data included in the request. @@ -407,40 +421,44 @@ func (c *forwardingRulesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of ForwardingRule resources available to the specified project and region. @@ -480,33 +498,39 @@ func (c *forwardingRulesRESTClient) List(ctx context.Context, req *computepb.Lis baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -546,40 +570,44 @@ func (c *forwardingRulesRESTClient) Patch(ctx context.Context, req *computepb.Pa baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetLabels sets the labels on the specified resource. To learn more about labels, read the Labeling Resources documentation. @@ -601,40 +629,44 @@ func (c *forwardingRulesRESTClient) SetLabels(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetTarget changes target URL for forwarding rule. The new target should be of the same type as the old target. @@ -656,40 +688,44 @@ func (c *forwardingRulesRESTClient) SetTarget(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // ForwardingRuleIterator manages a stream of *computepb.ForwardingRule. diff --git a/compute/apiv1/global_addresses_client.go b/compute/apiv1/global_addresses_client.go index 408b38fbd03..fd5dd7e4c9a 100644 --- a/compute/apiv1/global_addresses_client.go +++ b/compute/apiv1/global_addresses_client.go @@ -189,40 +189,44 @@ func (c *globalAddressesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified address resource. Gets a list of available addresses by making a list() request. @@ -230,39 +234,43 @@ func (c *globalAddressesRESTClient) Get(ctx context.Context, req *computepb.GetG baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/addresses/%v", req.GetProject(), req.GetAddress()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Address{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an address resource in the specified project by using the data included in the request. @@ -284,40 +292,44 @@ func (c *globalAddressesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of global addresses. @@ -357,33 +369,39 @@ func (c *globalAddressesRESTClient) List(ctx context.Context, req *computepb.Lis baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/global_forwarding_rules_client.go b/compute/apiv1/global_forwarding_rules_client.go index 82740532f9a..d94eefe4d63 100644 --- a/compute/apiv1/global_forwarding_rules_client.go +++ b/compute/apiv1/global_forwarding_rules_client.go @@ -210,40 +210,44 @@ func (c *globalForwardingRulesRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified GlobalForwardingRule resource. Gets a list of available forwarding rules by making a list() request. @@ -251,39 +255,43 @@ func (c *globalForwardingRulesRESTClient) Get(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules/%v", req.GetProject(), req.GetForwardingRule()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.ForwardingRule{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a GlobalForwardingRule resource in the specified project using the data included in the request. @@ -305,40 +313,44 @@ func (c *globalForwardingRulesRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of GlobalForwardingRule resources available to the specified project. @@ -378,33 +390,39 @@ func (c *globalForwardingRulesRESTClient) List(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -444,40 +462,44 @@ func (c *globalForwardingRulesRESTClient) Patch(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetLabels sets the labels on the specified resource. To learn more about labels, read the Labeling resources documentation. @@ -492,40 +514,44 @@ func (c *globalForwardingRulesRESTClient) SetLabels(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/forwardingRules/%v/setLabels", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetTarget changes target URL for the GlobalForwardingRule resource. The new target should be of the same type as the old target. @@ -547,38 +573,42 @@ func (c *globalForwardingRulesRESTClient) SetTarget(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } diff --git a/compute/apiv1/global_network_endpoint_groups_client.go b/compute/apiv1/global_network_endpoint_groups_client.go index 582be62b6bd..fe94bc38ae3 100644 --- a/compute/apiv1/global_network_endpoint_groups_client.go +++ b/compute/apiv1/global_network_endpoint_groups_client.go @@ -217,40 +217,44 @@ func (c *globalNetworkEndpointGroupsRESTClient) AttachNetworkEndpoints(ctx conte baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Delete deletes the specified network endpoint group.Note that the NEG cannot be deleted if there are backend services referencing it. @@ -265,40 +269,44 @@ func (c *globalNetworkEndpointGroupsRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DetachNetworkEndpoints detach the network endpoint from the specified network endpoint group. @@ -320,40 +328,44 @@ func (c *globalNetworkEndpointGroupsRESTClient) DetachNetworkEndpoints(ctx conte baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified network endpoint group. Gets a list of available network endpoint groups by making a list() request. @@ -361,39 +373,43 @@ func (c *globalNetworkEndpointGroupsRESTClient) Get(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networkEndpointGroups/%v", req.GetProject(), req.GetNetworkEndpointGroup()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.NetworkEndpointGroup{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a network endpoint group in the specified project using the parameters that are included in the request. @@ -415,40 +431,44 @@ func (c *globalNetworkEndpointGroupsRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of network endpoint groups that are located in the specified project. @@ -488,33 +508,39 @@ func (c *globalNetworkEndpointGroupsRESTClient) List(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -572,33 +598,39 @@ func (c *globalNetworkEndpointGroupsRESTClient) ListNetworkEndpoints(ctx context baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/global_operations_client.go b/compute/apiv1/global_operations_client.go index fed99815ebc..13521a6f40a 100644 --- a/compute/apiv1/global_operations_client.go +++ b/compute/apiv1/global_operations_client.go @@ -224,33 +224,39 @@ func (c *globalOperationsRESTClient) AggregatedList(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]OperationsScopedListPair, 0, len(resp.GetItems())) @@ -283,39 +289,43 @@ func (c *globalOperationsRESTClient) Delete(ctx context.Context, req *computepb. baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/operations/%v", req.GetProject(), req.GetOperation()) - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.DeleteGlobalOperationResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Get retrieves the specified Operations resource. @@ -323,39 +333,43 @@ func (c *globalOperationsRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/operations/%v", req.GetProject(), req.GetOperation()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of Operation resources contained within the specified project. @@ -395,33 +409,39 @@ func (c *globalOperationsRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -447,39 +467,43 @@ func (c *globalOperationsRESTClient) Wait(ctx context.Context, req *computepb.Wa baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/operations/%v/wait", req.GetProject(), req.GetOperation()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // OperationIterator manages a stream of *computepb.Operation. diff --git a/compute/apiv1/global_organization_operations_client.go b/compute/apiv1/global_organization_operations_client.go index e6816cd336d..b3870d70316 100644 --- a/compute/apiv1/global_organization_operations_client.go +++ b/compute/apiv1/global_organization_operations_client.go @@ -181,39 +181,43 @@ func (c *globalOrganizationOperationsRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.DeleteGlobalOrganizationOperationResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Get retrieves the specified Operations resource. Gets a list of operations by making a list() request. @@ -228,39 +232,43 @@ func (c *globalOrganizationOperationsRESTClient) Get(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of Operation resources contained within the specified organization. @@ -303,33 +311,39 @@ func (c *globalOrganizationOperationsRESTClient) List(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/global_public_delegated_prefixes_client.go b/compute/apiv1/global_public_delegated_prefixes_client.go index 8932c632937..cd3073dd076 100644 --- a/compute/apiv1/global_public_delegated_prefixes_client.go +++ b/compute/apiv1/global_public_delegated_prefixes_client.go @@ -196,40 +196,44 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Delete(ctx context.Context, re baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified global PublicDelegatedPrefix resource. @@ -237,39 +241,43 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Get(ctx context.Context, req * baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicDelegatedPrefixes/%v", req.GetProject(), req.GetPublicDelegatedPrefix()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.PublicDelegatedPrefix{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a global PublicDelegatedPrefix in the specified project using the parameters that are included in the request. @@ -291,40 +299,44 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Insert(ctx context.Context, re baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists the global PublicDelegatedPrefixes for a project. @@ -364,33 +376,39 @@ func (c *globalPublicDelegatedPrefixesRESTClient) List(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -430,40 +448,44 @@ func (c *globalPublicDelegatedPrefixesRESTClient) Patch(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // PublicDelegatedPrefixIterator manages a stream of *computepb.PublicDelegatedPrefix. diff --git a/compute/apiv1/health_checks_client.go b/compute/apiv1/health_checks_client.go index c3759efb0ae..dba1f910aff 100644 --- a/compute/apiv1/health_checks_client.go +++ b/compute/apiv1/health_checks_client.go @@ -239,33 +239,39 @@ func (c *healthChecksRESTClient) AggregatedList(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]HealthChecksScopedListPair, 0, len(resp.GetItems())) @@ -305,40 +311,44 @@ func (c *healthChecksRESTClient) Delete(ctx context.Context, req *computepb.Dele baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified HealthCheck resource. Gets a list of available health checks by making a list() request. @@ -346,39 +356,43 @@ func (c *healthChecksRESTClient) Get(ctx context.Context, req *computepb.GetHeal baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/healthChecks/%v", req.GetProject(), req.GetHealthCheck()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.HealthCheck{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a HealthCheck resource in the specified project using the data included in the request. @@ -400,40 +414,44 @@ func (c *healthChecksRESTClient) Insert(ctx context.Context, req *computepb.Inse baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of HealthCheck resources available to the specified project. @@ -473,33 +491,39 @@ func (c *healthChecksRESTClient) List(ctx context.Context, req *computepb.ListHe baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -539,40 +563,44 @@ func (c *healthChecksRESTClient) Patch(ctx context.Context, req *computepb.Patch baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates a HealthCheck resource in the specified project using the data included in the request. @@ -594,40 +622,44 @@ func (c *healthChecksRESTClient) Update(ctx context.Context, req *computepb.Upda baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // HealthCheckIterator manages a stream of *computepb.HealthCheck. diff --git a/compute/apiv1/image_family_views_client.go b/compute/apiv1/image_family_views_client.go index 9326bf94186..52f776533f2 100644 --- a/compute/apiv1/image_family_views_client.go +++ b/compute/apiv1/image_family_views_client.go @@ -157,37 +157,41 @@ func (c *imageFamilyViewsRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/imageFamilyViews/%v", req.GetProject(), req.GetZone(), req.GetFamily()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} - - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } - + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.ImageFamilyView{} - - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + resp := &computepb.ImageFamilyView{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } diff --git a/compute/apiv1/images_client.go b/compute/apiv1/images_client.go index 63f220b5cb0..2bdcb5584e6 100644 --- a/compute/apiv1/images_client.go +++ b/compute/apiv1/images_client.go @@ -238,40 +238,44 @@ func (c *imagesRESTClient) Delete(ctx context.Context, req *computepb.DeleteImag baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Deprecate sets the deprecation status of an image. If an empty request body is given, clears the deprecation status instead. @@ -293,40 +297,44 @@ func (c *imagesRESTClient) Deprecate(ctx context.Context, req *computepb.Depreca baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified image. Gets a list of available images by making a list() request. @@ -334,39 +342,43 @@ func (c *imagesRESTClient) Get(ctx context.Context, req *computepb.GetImageReque baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v", req.GetProject(), req.GetImage()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Image{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetFromFamily returns the latest image that is part of an image family and is not deprecated. @@ -374,39 +386,43 @@ func (c *imagesRESTClient) GetFromFamily(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/family/%v", req.GetProject(), req.GetFamily()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Image{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -421,39 +437,43 @@ func (c *imagesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.GetI baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an image in the specified project using the data included in the request. @@ -478,40 +498,44 @@ func (c *imagesRESTClient) Insert(ctx context.Context, req *computepb.InsertImag baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of custom images available to the specified project. Custom images are images you create that belong to your project. This method does not get any images that belong to other projects, including publicly-available images, like Debian 8. If you want to get a list of publicly-available images, use this method to make a request to the respective image project, such as debian-cloud or windows-cloud. @@ -551,33 +575,39 @@ func (c *imagesRESTClient) List(ctx context.Context, req *computepb.ListImagesRe baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -617,40 +647,44 @@ func (c *imagesRESTClient) Patch(ctx context.Context, req *computepb.PatchImageR baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -665,39 +699,43 @@ func (c *imagesRESTClient) SetIamPolicy(ctx context.Context, req *computepb.SetI baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v/setIamPolicy", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SetLabels sets the labels on an image. To learn more about labels, read the Labeling Resources documentation. @@ -712,40 +750,44 @@ func (c *imagesRESTClient) SetLabels(ctx context.Context, req *computepb.SetLabe baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v/setLabels", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -760,39 +802,43 @@ func (c *imagesRESTClient) TestIamPermissions(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/images/%v/testIamPermissions", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // ImageIterator manages a stream of *computepb.Image. diff --git a/compute/apiv1/instance_group_managers_client.go b/compute/apiv1/instance_group_managers_client.go index bf7062bd58c..44c5bc5ac84 100644 --- a/compute/apiv1/instance_group_managers_client.go +++ b/compute/apiv1/instance_group_managers_client.go @@ -309,40 +309,44 @@ func (c *instanceGroupManagersRESTClient) AbandonInstances(ctx context.Context, baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AggregatedList retrieves the list of managed instance groups and groups them by zone. @@ -385,33 +389,39 @@ func (c *instanceGroupManagersRESTClient) AggregatedList(ctx context.Context, re baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]InstanceGroupManagersScopedListPair, 0, len(resp.GetItems())) @@ -451,40 +461,44 @@ func (c *instanceGroupManagersRESTClient) ApplyUpdatesToInstances(ctx context.Co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/applyUpdatesToInstances", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // CreateInstances creates instances with per-instance configs in this managed instance group. Instances are created using the current instance template. The create instances operation is marked DONE if the createInstances request is successful. The underlying actions take additional time. You must separately verify the status of the creating or actions with the listmanagedinstances method. @@ -506,40 +520,44 @@ func (c *instanceGroupManagersRESTClient) CreateInstances(ctx context.Context, r baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -554,40 +572,44 @@ func (c *instanceGroupManagersRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DeleteInstances flags the specified instances in the managed instance group for immediate deletion. The instances are also removed from any target pools of which they were a member. This method reduces the targetSize of the managed instance group by the number of instances that you delete. This operation is marked as DONE when the action is scheduled even if the instances are still being deleted. You must separately verify the status of the deleting action 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. You can specify a maximum of 1000 instances with this method per request. @@ -609,40 +631,44 @@ func (c *instanceGroupManagersRESTClient) DeleteInstances(ctx context.Context, r baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DeletePerInstanceConfigs deletes selected per-instance configs for the managed instance group. @@ -657,40 +683,44 @@ func (c *instanceGroupManagersRESTClient) DeletePerInstanceConfigs(ctx context.C baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v/deletePerInstanceConfigs", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -698,39 +728,43 @@ func (c *instanceGroupManagersRESTClient) Get(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroupManagers/%v", req.GetProject(), req.GetZone(), req.GetInstanceGroupManager()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InstanceGroupManager{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a managed instance group using the information that you specify in the request. After the group is created, instances in the group are created using the specified instance template. This operation is marked as DONE when the group is created even if the instances in the group have not yet been created. You must separately verify the status of the individual instances with the listmanagedinstances method. A managed instance group can have up to 1000 VM instances per group. Please contact Cloud Support if you need an increase in this limit. @@ -752,40 +786,44 @@ func (c *instanceGroupManagersRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of managed instance groups that are contained within the specified project and zone. @@ -825,33 +863,39 @@ func (c *instanceGroupManagersRESTClient) List(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -909,33 +953,39 @@ func (c *instanceGroupManagersRESTClient) ListErrors(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -993,33 +1043,39 @@ func (c *instanceGroupManagersRESTClient) ListManagedInstances(ctx context.Conte baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetManagedInstances(), resp.GetNextPageToken(), nil } @@ -1077,33 +1133,39 @@ func (c *instanceGroupManagersRESTClient) ListPerInstanceConfigs(ctx context.Con baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -1143,40 +1205,44 @@ func (c *instanceGroupManagersRESTClient) Patch(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // PatchPerInstanceConfigs inserts or patches per-instance configs for the managed instance group. perInstanceConfig.name (at http://perInstanceConfig.name) serves as a key used to distinguish whether to perform insert or patch. @@ -1198,40 +1264,44 @@ func (c *instanceGroupManagersRESTClient) PatchPerInstanceConfigs(ctx context.Co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // RecreateInstances flags the specified VM instances in the managed instance group to be immediately recreated. Each instance is recreated using the group’s current configuration. This operation is marked as DONE when the flag is set even if the instances have not yet been recreated. You must separately verify the status of each instance by checking its currentAction field; for more information, see Checking the status of managed instances. 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. You can specify a maximum of 1000 instances with this method per request. @@ -1253,40 +1323,44 @@ func (c *instanceGroupManagersRESTClient) RecreateInstances(ctx context.Context, baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -1302,40 +1376,44 @@ func (c *instanceGroupManagersRESTClient) Resize(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetInstanceTemplate specifies the instance template to use when creating new instances in this group. The templates for existing instances in the group do not change unless you run recreateInstances, run applyUpdatesToInstances, or set the group’s updatePolicy.type to PROACTIVE. @@ -1357,40 +1435,44 @@ func (c *instanceGroupManagersRESTClient) SetInstanceTemplate(ctx context.Contex baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetTargetPools modifies the target pools to which all instances in this managed instance group are assigned. The target pools automatically apply to all of the instances in the managed instance group. This operation is marked DONE when you make the request even if the instances have not yet been added to their target pools. The change might take some time to apply to all of the instances in the group depending on the size of the group. @@ -1412,40 +1494,44 @@ func (c *instanceGroupManagersRESTClient) SetTargetPools(ctx context.Context, re baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // UpdatePerInstanceConfigs inserts or updates per-instance configs for the managed instance group. perInstanceConfig.name (at http://perInstanceConfig.name) serves as a key used to distinguish whether to perform insert or patch. @@ -1467,40 +1553,44 @@ func (c *instanceGroupManagersRESTClient) UpdatePerInstanceConfigs(ctx context.C baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // InstanceGroupManagerIterator manages a stream of *computepb.InstanceGroupManager. diff --git a/compute/apiv1/instance_groups_client.go b/compute/apiv1/instance_groups_client.go index 5f5d6c7109e..3ffe1930d35 100644 --- a/compute/apiv1/instance_groups_client.go +++ b/compute/apiv1/instance_groups_client.go @@ -232,40 +232,44 @@ func (c *instanceGroupsRESTClient) AddInstances(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AggregatedList retrieves the list of instance groups and sorts them by zone. @@ -308,33 +312,39 @@ func (c *instanceGroupsRESTClient) AggregatedList(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]InstanceGroupsScopedListPair, 0, len(resp.GetItems())) @@ -374,40 +384,44 @@ func (c *instanceGroupsRESTClient) Delete(ctx context.Context, req *computepb.De baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -415,39 +429,43 @@ func (c *instanceGroupsRESTClient) Get(ctx context.Context, req *computepb.GetIn baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instanceGroups/%v", req.GetProject(), req.GetZone(), req.GetInstanceGroup()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InstanceGroup{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an instance group in the specified project using the parameters that are included in the request. @@ -469,40 +487,44 @@ func (c *instanceGroupsRESTClient) Insert(ctx context.Context, req *computepb.In baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of zonal instance group resources contained within the specified zone. For managed instance groups, use the instanceGroupManagers or regionInstanceGroupManagers methods instead. @@ -542,33 +564,39 @@ func (c *instanceGroupsRESTClient) List(ctx context.Context, req *computepb.List baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -632,33 +660,39 @@ func (c *instanceGroupsRESTClient) ListInstances(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -698,40 +732,44 @@ func (c *instanceGroupsRESTClient) RemoveInstances(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetNamedPorts sets the named ports for the specified instance group. @@ -753,40 +791,44 @@ func (c *instanceGroupsRESTClient) SetNamedPorts(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // InstanceGroupIterator manages a stream of *computepb.InstanceGroup. diff --git a/compute/apiv1/instance_templates_client.go b/compute/apiv1/instance_templates_client.go index 149c3c1ccc6..555fa105b2d 100644 --- a/compute/apiv1/instance_templates_client.go +++ b/compute/apiv1/instance_templates_client.go @@ -210,40 +210,44 @@ func (c *instanceTemplatesRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified instance template. Gets a list of available instance templates by making a list() request. @@ -251,39 +255,43 @@ func (c *instanceTemplatesRESTClient) Get(ctx context.Context, req *computepb.Ge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates/%v", req.GetProject(), req.GetInstanceTemplate()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InstanceTemplate{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -298,39 +306,43 @@ func (c *instanceTemplatesRESTClient) GetIamPolicy(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an instance template in the specified project using the data that is included in the request. If you are creating a new template to update an existing instance group, your new instance template must use the same network or, if applicable, the same subnetwork as the original template. @@ -352,40 +364,44 @@ func (c *instanceTemplatesRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of instance templates that are contained within the specified project. @@ -425,33 +441,39 @@ func (c *instanceTemplatesRESTClient) List(ctx context.Context, req *computepb.L baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -484,39 +506,43 @@ func (c *instanceTemplatesRESTClient) SetIamPolicy(ctx context.Context, req *com baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates/%v/setIamPolicy", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -531,39 +557,43 @@ func (c *instanceTemplatesRESTClient) TestIamPermissions(ctx context.Context, re baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/instanceTemplates/%v/testIamPermissions", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // InstanceTemplateIterator manages a stream of *computepb.InstanceTemplate. diff --git a/compute/apiv1/instances_client.go b/compute/apiv1/instances_client.go index ee646cd7e2f..e38a8441ef5 100644 --- a/compute/apiv1/instances_client.go +++ b/compute/apiv1/instances_client.go @@ -471,40 +471,44 @@ func (c *instancesRESTClient) AddAccessConfig(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AddResourcePolicies adds existing resource policies to an instance. You can only add one policy right now which will be applied to this instance for scheduling live migrations. @@ -526,40 +530,44 @@ func (c *instancesRESTClient) AddResourcePolicies(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AggregatedList retrieves an aggregated list of all of the instances in your project across all regions and zones. The performance of this method degrades when a filter is specified on a project that has a very large number of instances. @@ -602,33 +610,39 @@ func (c *instancesRESTClient) AggregatedList(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]InstancesScopedListPair, 0, len(resp.GetItems())) @@ -678,40 +692,44 @@ func (c *instancesRESTClient) AttachDisk(ctx context.Context, req *computepb.Att baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // BulkInsert creates multiple instances. Count specifies the number of instances to create. @@ -733,40 +751,44 @@ func (c *instancesRESTClient) BulkInsert(ctx context.Context, req *computepb.Bul baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Delete deletes the specified Instance resource. For more information, see Deleting an instance. @@ -781,40 +803,44 @@ func (c *instancesRESTClient) Delete(ctx context.Context, req *computepb.DeleteI baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DeleteAccessConfig deletes an access config from an instance’s network interface. @@ -831,40 +857,44 @@ func (c *instancesRESTClient) DeleteAccessConfig(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DetachDisk detaches a disk from an instance. @@ -880,40 +910,44 @@ func (c *instancesRESTClient) DetachDisk(ctx context.Context, req *computepb.Det baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified Instance resource. Gets a list of available instances by making a list() request. @@ -921,39 +955,43 @@ func (c *instancesRESTClient) Get(ctx context.Context, req *computepb.GetInstanc baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v", req.GetProject(), req.GetZone(), req.GetInstance()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Instance{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetEffectiveFirewalls returns effective firewalls applied to an interface of the instance. @@ -966,39 +1004,43 @@ func (c *instancesRESTClient) GetEffectiveFirewalls(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InstancesGetEffectiveFirewallsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetGuestAttributes returns the specified guest attributes entry. @@ -1016,39 +1058,43 @@ func (c *instancesRESTClient) GetGuestAttributes(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.GuestAttributes{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -1063,39 +1109,43 @@ func (c *instancesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.G baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetScreenshot returns the screenshot from the specified instance. @@ -1103,39 +1153,43 @@ func (c *instancesRESTClient) GetScreenshot(ctx context.Context, req *computepb. baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/screenshot", req.GetProject(), req.GetZone(), req.GetInstance()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Screenshot{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetSerialPortOutput returns the last 1 MB of serial port output from the specified instance. @@ -1153,39 +1207,43 @@ func (c *instancesRESTClient) GetSerialPortOutput(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SerialPortOutput{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetShieldedInstanceIdentity returns the Shielded Instance Identity of an instance @@ -1193,39 +1251,43 @@ func (c *instancesRESTClient) GetShieldedInstanceIdentity(ctx context.Context, r baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/getShieldedInstanceIdentity", req.GetProject(), req.GetZone(), req.GetInstance()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.ShieldedInstanceIdentity{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an instance resource in the specified project using the data included in the request. @@ -1250,40 +1312,44 @@ func (c *instancesRESTClient) Insert(ctx context.Context, req *computepb.InsertI baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of instances contained within the specified zone. @@ -1323,33 +1389,39 @@ func (c *instancesRESTClient) List(ctx context.Context, req *computepb.ListInsta baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -1407,33 +1479,39 @@ func (c *instancesRESTClient) ListReferrers(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -1473,40 +1551,44 @@ func (c *instancesRESTClient) RemoveResourcePolicies(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -1521,40 +1603,44 @@ func (c *instancesRESTClient) Reset(ctx context.Context, req *computepb.ResetIns baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SendDiagnosticInterrupt sends diagnostic interrupt to the instance. @@ -1562,39 +1648,43 @@ func (c *instancesRESTClient) SendDiagnosticInterrupt(ctx context.Context, req * baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/sendDiagnosticInterrupt", req.GetProject(), req.GetZone(), req.GetInstance()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} - - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SendDiagnosticInterruptInstanceResponse{} + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SetDeletionProtection sets deletion protection on the instance. @@ -1612,40 +1702,44 @@ func (c *instancesRESTClient) SetDeletionProtection(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetDiskAutoDelete sets the auto-delete flag for a disk attached to an instance. @@ -1662,40 +1756,44 @@ func (c *instancesRESTClient) SetDiskAutoDelete(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -1710,39 +1808,43 @@ func (c *instancesRESTClient) SetIamPolicy(ctx context.Context, req *computepb.S baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/setIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SetLabels sets labels on an instance. To learn more about labels, read the Labeling Resources documentation. @@ -1764,40 +1866,44 @@ func (c *instancesRESTClient) SetLabels(ctx context.Context, req *computepb.SetL baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetMachineResources changes the number and/or type of accelerator for a stopped instance to the values specified in the request. @@ -1819,40 +1925,44 @@ func (c *instancesRESTClient) SetMachineResources(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetMachineType changes the machine type for a stopped instance to the machine type specified in the request. @@ -1874,40 +1984,44 @@ func (c *instancesRESTClient) SetMachineType(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetMetadata sets metadata for the specified instance to the data included in the request. @@ -1929,40 +2043,44 @@ func (c *instancesRESTClient) SetMetadata(ctx context.Context, req *computepb.Se baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetMinCpuPlatform changes the minimum CPU platform that this instance should use. This method can only be called on a stopped instance. For more information, read Specifying a Minimum CPU Platform. @@ -1984,40 +2102,44 @@ func (c *instancesRESTClient) SetMinCpuPlatform(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetScheduling sets an instance’s scheduling options. You can only call this method on a stopped instance, that is, a VM instance that is in a TERMINATED state. See Instance Life Cycle for more information on the possible instance states. @@ -2039,40 +2161,44 @@ func (c *instancesRESTClient) SetScheduling(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetServiceAccount sets the service account on the instance. For more information, read Changing the service account and access scopes for an instance. @@ -2094,40 +2220,44 @@ func (c *instancesRESTClient) SetServiceAccount(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} - - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetShieldedInstanceIntegrityPolicy sets the Shielded Instance integrity policy for an instance. You can only use this method on a running instance. This method supports PATCH semantics and uses the JSON merge patch format and processing rules. @@ -2149,40 +2279,44 @@ func (c *instancesRESTClient) SetShieldedInstanceIntegrityPolicy(ctx context.Con baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetTags sets network tags for the specified instance to the data included in the request. @@ -2204,40 +2338,44 @@ func (c *instancesRESTClient) SetTags(ctx context.Context, req *computepb.SetTag baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SimulateMaintenanceEvent simulates a maintenance event on the instance. @@ -2245,40 +2383,44 @@ func (c *instancesRESTClient) SimulateMaintenanceEvent(ctx context.Context, req baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/simulateMaintenanceEvent", req.GetProject(), req.GetZone(), req.GetInstance()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Start starts an instance that was stopped using the instances().stop method. For more information, see Restart an instance. @@ -2293,40 +2435,44 @@ func (c *instancesRESTClient) Start(ctx context.Context, req *computepb.StartIns baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // StartWithEncryptionKey starts an instance that was stopped using the instances().stop method. For more information, see Restart an instance. @@ -2348,40 +2494,44 @@ func (c *instancesRESTClient) StartWithEncryptionKey(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -2396,40 +2546,44 @@ func (c *instancesRESTClient) Stop(ctx context.Context, req *computepb.StopInsta baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -2444,39 +2598,43 @@ func (c *instancesRESTClient) TestIamPermissions(ctx context.Context, req *compu baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/instances/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Update updates an instance only if the necessary resources are available. This method can update only a specific set of instance properties. See Updating a running instance for a list of updatable instance properties. @@ -2504,40 +2662,44 @@ func (c *instancesRESTClient) Update(ctx context.Context, req *computepb.UpdateI baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // UpdateAccessConfig updates the specified access config from an instance’s network interface with the data included in the request. This method supports PATCH semantics and uses the JSON merge patch format and processing rules. @@ -2560,40 +2722,44 @@ func (c *instancesRESTClient) UpdateAccessConfig(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // UpdateDisplayDevice updates the Display config for a VM instance. You can only use this method on a stopped VM instance. This method supports PATCH semantics and uses the JSON merge patch format and processing rules. @@ -2615,40 +2781,44 @@ func (c *instancesRESTClient) UpdateDisplayDevice(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // UpdateNetworkInterface updates an instance’s network interface. This method can only update an interface’s alias IP range and attached network. See Modifying alias IP ranges for an existing instance for instructions on changing alias IP ranges. See Migrating a VM between networks for instructions on migrating an interface. This method follows PATCH semantics. @@ -2671,40 +2841,44 @@ func (c *instancesRESTClient) UpdateNetworkInterface(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // UpdateShieldedInstanceConfig updates the Shielded Instance config for an instance. You can only use this method on a stopped instance. This method supports PATCH semantics and uses the JSON merge patch format and processing rules. @@ -2726,40 +2900,44 @@ func (c *instancesRESTClient) UpdateShieldedInstanceConfig(ctx context.Context, baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // InstanceIterator manages a stream of *computepb.Instance. diff --git a/compute/apiv1/interconnect_attachments_client.go b/compute/apiv1/interconnect_attachments_client.go index 0e7a1088cd9..c04acb0838e 100644 --- a/compute/apiv1/interconnect_attachments_client.go +++ b/compute/apiv1/interconnect_attachments_client.go @@ -232,33 +232,39 @@ func (c *interconnectAttachmentsRESTClient) AggregatedList(ctx context.Context, baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]InterconnectAttachmentsScopedListPair, 0, len(resp.GetItems())) @@ -298,40 +304,44 @@ func (c *interconnectAttachmentsRESTClient) Delete(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified interconnect attachment. @@ -339,39 +349,43 @@ func (c *interconnectAttachmentsRESTClient) Get(ctx context.Context, req *comput baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/interconnectAttachments/%v", req.GetProject(), req.GetRegion(), req.GetInterconnectAttachment()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InterconnectAttachment{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an InterconnectAttachment in the specified project using the data included in the request. @@ -396,40 +410,44 @@ func (c *interconnectAttachmentsRESTClient) Insert(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of interconnect attachments contained within the specified region. @@ -469,33 +487,39 @@ func (c *interconnectAttachmentsRESTClient) List(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -535,40 +559,44 @@ func (c *interconnectAttachmentsRESTClient) Patch(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // InterconnectAttachmentIterator manages a stream of *computepb.InterconnectAttachment. diff --git a/compute/apiv1/interconnect_locations_client.go b/compute/apiv1/interconnect_locations_client.go index 2a1731d489b..dc5b78387fd 100644 --- a/compute/apiv1/interconnect_locations_client.go +++ b/compute/apiv1/interconnect_locations_client.go @@ -167,39 +167,43 @@ func (c *interconnectLocationsRESTClient) Get(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnectLocations/%v", req.GetProject(), req.GetInterconnectLocation()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InterconnectLocation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves the list of interconnect locations available to the specified project. @@ -239,33 +243,39 @@ func (c *interconnectLocationsRESTClient) List(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/interconnects_client.go b/compute/apiv1/interconnects_client.go index b4bc5f103ba..2b1854d8430 100644 --- a/compute/apiv1/interconnects_client.go +++ b/compute/apiv1/interconnects_client.go @@ -203,40 +203,44 @@ func (c *interconnectsRESTClient) Delete(ctx context.Context, req *computepb.Del baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified interconnect. Get a list of available interconnects by making a list() request. @@ -244,39 +248,43 @@ func (c *interconnectsRESTClient) Get(ctx context.Context, req *computepb.GetInt baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnects/%v", req.GetProject(), req.GetInterconnect()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Interconnect{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetDiagnostics returns the interconnectDiagnostics for the specified interconnect. @@ -284,39 +292,43 @@ func (c *interconnectsRESTClient) GetDiagnostics(ctx context.Context, req *compu baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/interconnects/%v/getDiagnostics", req.GetProject(), req.GetInterconnect()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InterconnectsGetDiagnosticsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a Interconnect in the specified project using the data included in the request. @@ -338,40 +350,44 @@ func (c *interconnectsRESTClient) Insert(ctx context.Context, req *computepb.Ins baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of interconnect available to the specified project. @@ -411,33 +427,39 @@ func (c *interconnectsRESTClient) List(ctx context.Context, req *computepb.ListI baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -477,40 +499,44 @@ func (c *interconnectsRESTClient) Patch(ctx context.Context, req *computepb.Patc baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // InterconnectIterator manages a stream of *computepb.Interconnect. diff --git a/compute/apiv1/license_codes_client.go b/compute/apiv1/license_codes_client.go index e9bc38a574b..434dd621af0 100644 --- a/compute/apiv1/license_codes_client.go +++ b/compute/apiv1/license_codes_client.go @@ -165,39 +165,43 @@ func (c *licenseCodesRESTClient) Get(ctx context.Context, req *computepb.GetLice baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenseCodes/%v", req.GetProject(), req.GetLicenseCode()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} - - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } - + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.LicenseCode{} - - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + resp := &computepb.LicenseCode{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. @@ -212,37 +216,41 @@ func (c *licenseCodesRESTClient) TestIamPermissions(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenseCodes/%v/testIamPermissions", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} - - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } - + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} - - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + resp := &computepb.TestPermissionsResponse{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } diff --git a/compute/apiv1/licenses_client.go b/compute/apiv1/licenses_client.go index df0a9d291e5..4562d4221b8 100644 --- a/compute/apiv1/licenses_client.go +++ b/compute/apiv1/licenses_client.go @@ -210,40 +210,44 @@ func (c *licensesRESTClient) Delete(ctx context.Context, req *computepb.DeleteLi baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified License resource. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. @@ -251,39 +255,43 @@ func (c *licensesRESTClient) Get(ctx context.Context, req *computepb.GetLicenseR baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses/%v", req.GetProject(), req.GetLicense()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.License{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // 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. @@ -298,39 +306,43 @@ func (c *licensesRESTClient) GetIamPolicy(ctx context.Context, req *computepb.Ge baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert create a License resource in the specified project. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. @@ -352,40 +364,44 @@ func (c *licensesRESTClient) Insert(ctx context.Context, req *computepb.InsertLi baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of licenses available in the specified project. This method does not get any licenses that belong to other projects, including licenses attached to publicly-available images, like Debian 9. If you want to get a list of publicly-available licenses, use this method to make a request to the respective image project, such as debian-cloud or windows-cloud. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. @@ -425,33 +441,39 @@ func (c *licensesRESTClient) List(ctx context.Context, req *computepb.ListLicens baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -484,39 +506,43 @@ func (c *licensesRESTClient) SetIamPolicy(ctx context.Context, req *computepb.Se baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses/%v/setIamPolicy", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. Caution This resource is intended for use only by third-party partners who are creating Cloud Marketplace images. @@ -531,39 +557,43 @@ func (c *licensesRESTClient) TestIamPermissions(ctx context.Context, req *comput baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/licenses/%v/testIamPermissions", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // LicenseIterator manages a stream of *computepb.License. diff --git a/compute/apiv1/machine_types_client.go b/compute/apiv1/machine_types_client.go index ede996bbf94..55b724258ef 100644 --- a/compute/apiv1/machine_types_client.go +++ b/compute/apiv1/machine_types_client.go @@ -210,33 +210,39 @@ func (c *machineTypesRESTClient) AggregatedList(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]MachineTypesScopedListPair, 0, len(resp.GetItems())) @@ -269,39 +275,43 @@ func (c *machineTypesRESTClient) Get(ctx context.Context, req *computepb.GetMach baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/machineTypes/%v", req.GetProject(), req.GetZone(), req.GetMachineType()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.MachineType{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of machine types available to the specified project. @@ -341,33 +351,39 @@ func (c *machineTypesRESTClient) List(ctx context.Context, req *computepb.ListMa baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/network_endpoint_groups_client.go b/compute/apiv1/network_endpoint_groups_client.go index e5eff1abeba..569c3f64540 100644 --- a/compute/apiv1/network_endpoint_groups_client.go +++ b/compute/apiv1/network_endpoint_groups_client.go @@ -253,33 +253,39 @@ func (c *networkEndpointGroupsRESTClient) AggregatedList(ctx context.Context, re baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]NetworkEndpointGroupsScopedListPair, 0, len(resp.GetItems())) @@ -326,40 +332,44 @@ func (c *networkEndpointGroupsRESTClient) AttachNetworkEndpoints(ctx context.Con baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -374,40 +384,44 @@ func (c *networkEndpointGroupsRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DetachNetworkEndpoints detach a list of network endpoints from the specified network endpoint group. @@ -429,40 +443,44 @@ func (c *networkEndpointGroupsRESTClient) DetachNetworkEndpoints(ctx context.Con baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified network endpoint group. Gets a list of available network endpoint groups by making a list() request. @@ -470,39 +488,43 @@ func (c *networkEndpointGroupsRESTClient) Get(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups/%v", req.GetProject(), req.GetZone(), req.GetNetworkEndpointGroup()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.NetworkEndpointGroup{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a network endpoint group in the specified project using the parameters that are included in the request. @@ -524,40 +546,44 @@ func (c *networkEndpointGroupsRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of network endpoint groups that are located in the specified project and zone. @@ -597,33 +623,39 @@ func (c *networkEndpointGroupsRESTClient) List(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -687,33 +719,39 @@ func (c *networkEndpointGroupsRESTClient) ListNetworkEndpoints(ctx context.Conte baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -746,39 +784,43 @@ func (c *networkEndpointGroupsRESTClient) TestIamPermissions(ctx context.Context baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/networkEndpointGroups/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // NetworkEndpointGroupsScopedListPair is a holder type for string/*computepb.NetworkEndpointGroupsScopedList map entries diff --git a/compute/apiv1/networks_client.go b/compute/apiv1/networks_client.go index 25503a4ae4c..20f680f0752 100644 --- a/compute/apiv1/networks_client.go +++ b/compute/apiv1/networks_client.go @@ -245,40 +245,44 @@ func (c *networksRESTClient) AddPeering(ctx context.Context, req *computepb.AddP baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Delete deletes the specified network. @@ -293,40 +297,44 @@ func (c *networksRESTClient) Delete(ctx context.Context, req *computepb.DeleteNe baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified network. Gets a list of available networks by making a list() request. @@ -334,39 +342,43 @@ func (c *networksRESTClient) Get(ctx context.Context, req *computepb.GetNetworkR baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v", req.GetProject(), req.GetNetwork()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Network{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetEffectiveFirewalls returns the effective firewalls on a given network. @@ -374,39 +386,43 @@ func (c *networksRESTClient) GetEffectiveFirewalls(ctx context.Context, req *com baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v/getEffectiveFirewalls", req.GetProject(), req.GetNetwork()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.NetworksGetEffectiveFirewallsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a network in the specified project using the data included in the request. @@ -428,40 +444,44 @@ func (c *networksRESTClient) Insert(ctx context.Context, req *computepb.InsertNe baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of networks available to the specified project. @@ -501,33 +521,39 @@ func (c *networksRESTClient) List(ctx context.Context, req *computepb.ListNetwor baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -594,33 +620,39 @@ func (c *networksRESTClient) ListPeeringRoutes(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -660,40 +692,44 @@ func (c *networksRESTClient) Patch(ctx context.Context, req *computepb.PatchNetw baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // RemovePeering removes a peering from the specified network. @@ -715,40 +751,44 @@ func (c *networksRESTClient) RemovePeering(ctx context.Context, req *computepb.R baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SwitchToCustomMode switches the network mode from auto subnet mode to custom subnet mode. @@ -763,40 +803,44 @@ func (c *networksRESTClient) SwitchToCustomMode(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // UpdatePeering updates the specified network peering with the data included in the request. You can only modify the NetworkPeering.export_custom_routes field and the NetworkPeering.import_custom_routes field. @@ -818,40 +862,44 @@ func (c *networksRESTClient) UpdatePeering(ctx context.Context, req *computepb.U baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // ExchangedPeeringRouteIterator manages a stream of *computepb.ExchangedPeeringRoute. diff --git a/compute/apiv1/node_groups_client.go b/compute/apiv1/node_groups_client.go index 4c8ca865b5a..d68ff9e5d35 100644 --- a/compute/apiv1/node_groups_client.go +++ b/compute/apiv1/node_groups_client.go @@ -260,40 +260,44 @@ func (c *nodeGroupsRESTClient) AddNodes(ctx context.Context, req *computepb.AddN baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AggregatedList retrieves an aggregated list of node groups. Note: use nodeGroups.listNodes for more details about each group. @@ -336,33 +340,39 @@ func (c *nodeGroupsRESTClient) AggregatedList(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]NodeGroupsScopedListPair, 0, len(resp.GetItems())) @@ -402,40 +412,44 @@ func (c *nodeGroupsRESTClient) Delete(ctx context.Context, req *computepb.Delete baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DeleteNodes deletes specified nodes from the node group. @@ -457,40 +471,44 @@ func (c *nodeGroupsRESTClient) DeleteNodes(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -498,39 +516,43 @@ func (c *nodeGroupsRESTClient) Get(ctx context.Context, req *computepb.GetNodeGr baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v", req.GetProject(), req.GetZone(), req.GetNodeGroup()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.NodeGroup{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -545,39 +567,43 @@ func (c *nodeGroupsRESTClient) GetIamPolicy(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a NodeGroup resource in the specified project using the data included in the request. @@ -600,40 +626,44 @@ func (c *nodeGroupsRESTClient) Insert(ctx context.Context, req *computepb.Insert baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of node groups available to the specified project. Note: use nodeGroups.listNodes for more details about each group. @@ -673,33 +703,39 @@ func (c *nodeGroupsRESTClient) List(ctx context.Context, req *computepb.ListNode baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -757,33 +793,39 @@ func (c *nodeGroupsRESTClient) ListNodes(ctx context.Context, req *computepb.Lis baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -823,40 +865,44 @@ func (c *nodeGroupsRESTClient) Patch(ctx context.Context, req *computepb.PatchNo baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -871,39 +917,43 @@ func (c *nodeGroupsRESTClient) SetIamPolicy(ctx context.Context, req *computepb. baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/setIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SetNodeTemplate updates the node template of the node group. @@ -925,40 +975,44 @@ func (c *nodeGroupsRESTClient) SetNodeTemplate(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -973,39 +1027,43 @@ func (c *nodeGroupsRESTClient) TestIamPermissions(ctx context.Context, req *comp baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeGroups/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // NodeGroupIterator manages a stream of *computepb.NodeGroup. diff --git a/compute/apiv1/node_templates_client.go b/compute/apiv1/node_templates_client.go index 38c811d6585..9d3c5d2c00a 100644 --- a/compute/apiv1/node_templates_client.go +++ b/compute/apiv1/node_templates_client.go @@ -246,33 +246,39 @@ func (c *nodeTemplatesRESTClient) AggregatedList(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]NodeTemplatesScopedListPair, 0, len(resp.GetItems())) @@ -312,40 +318,44 @@ func (c *nodeTemplatesRESTClient) Delete(ctx context.Context, req *computepb.Del baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified node template. Gets a list of available node templates by making a list() request. @@ -353,39 +363,43 @@ func (c *nodeTemplatesRESTClient) Get(ctx context.Context, req *computepb.GetNod baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates/%v", req.GetProject(), req.GetRegion(), req.GetNodeTemplate()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.NodeTemplate{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -400,39 +414,43 @@ func (c *nodeTemplatesRESTClient) GetIamPolicy(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a NodeTemplate resource in the specified project using the data included in the request. @@ -454,40 +472,44 @@ func (c *nodeTemplatesRESTClient) Insert(ctx context.Context, req *computepb.Ins baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of node templates available to the specified project. @@ -527,33 +549,39 @@ func (c *nodeTemplatesRESTClient) List(ctx context.Context, req *computepb.ListN baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -586,39 +614,43 @@ func (c *nodeTemplatesRESTClient) SetIamPolicy(ctx context.Context, req *compute baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -633,39 +665,43 @@ func (c *nodeTemplatesRESTClient) TestIamPermissions(ctx context.Context, req *c baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/nodeTemplates/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // NodeTemplateIterator manages a stream of *computepb.NodeTemplate. diff --git a/compute/apiv1/node_types_client.go b/compute/apiv1/node_types_client.go index 2a70a72fad4..a03886a2c23 100644 --- a/compute/apiv1/node_types_client.go +++ b/compute/apiv1/node_types_client.go @@ -210,33 +210,39 @@ func (c *nodeTypesRESTClient) AggregatedList(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]NodeTypesScopedListPair, 0, len(resp.GetItems())) @@ -269,39 +275,43 @@ func (c *nodeTypesRESTClient) Get(ctx context.Context, req *computepb.GetNodeTyp baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/nodeTypes/%v", req.GetProject(), req.GetZone(), req.GetNodeType()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.NodeType{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of node types available to the specified project. @@ -341,33 +351,39 @@ func (c *nodeTypesRESTClient) List(ctx context.Context, req *computepb.ListNodeT baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/packet_mirrorings_client.go b/compute/apiv1/packet_mirrorings_client.go index 5fca93fbff6..92a5de7a4ee 100644 --- a/compute/apiv1/packet_mirrorings_client.go +++ b/compute/apiv1/packet_mirrorings_client.go @@ -239,33 +239,39 @@ func (c *packetMirroringsRESTClient) AggregatedList(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]PacketMirroringsScopedListPair, 0, len(resp.GetItems())) @@ -305,40 +311,44 @@ func (c *packetMirroringsRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified PacketMirroring resource. @@ -346,39 +356,43 @@ func (c *packetMirroringsRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/packetMirrorings/%v", req.GetProject(), req.GetRegion(), req.GetPacketMirroring()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.PacketMirroring{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a PacketMirroring resource in the specified project and region using the data included in the request. @@ -400,40 +414,44 @@ func (c *packetMirroringsRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of PacketMirroring resources available to the specified project and region. @@ -473,33 +491,39 @@ func (c *packetMirroringsRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -539,40 +563,44 @@ func (c *packetMirroringsRESTClient) Patch(ctx context.Context, req *computepb.P baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -587,39 +615,43 @@ func (c *packetMirroringsRESTClient) TestIamPermissions(ctx context.Context, req baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/packetMirrorings/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // PacketMirroringIterator manages a stream of *computepb.PacketMirroring. diff --git a/compute/apiv1/projects_client.go b/compute/apiv1/projects_client.go index 7f7589c1fd0..7fe25cebb21 100644 --- a/compute/apiv1/projects_client.go +++ b/compute/apiv1/projects_client.go @@ -252,40 +252,44 @@ func (c *projectsRESTClient) DisableXpnHost(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DisableXpnResource disable a service resource (also known as service project) associated with this host project. @@ -307,40 +311,44 @@ func (c *projectsRESTClient) DisableXpnResource(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // EnableXpnHost enable this project as a shared VPC host project. @@ -355,40 +363,44 @@ func (c *projectsRESTClient) EnableXpnHost(ctx context.Context, req *computepb.E baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // EnableXpnResource enable service resource (a.k.a service project) for a host project, so that subnets in the host project can be used by instances in the service project. @@ -410,40 +422,44 @@ func (c *projectsRESTClient) EnableXpnResource(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified Project resource. @@ -451,39 +467,43 @@ func (c *projectsRESTClient) Get(ctx context.Context, req *computepb.GetProjectR baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v", req.GetProject()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Project{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetXpnHost gets the shared VPC host project that this project links to. May be empty if no link exists. @@ -491,39 +511,43 @@ func (c *projectsRESTClient) GetXpnHost(ctx context.Context, req *computepb.GetX baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/getXpnHost", req.GetProject()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Project{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetXpnResources gets service resources (a.k.a service project) associated with this host project. @@ -563,33 +587,39 @@ func (c *projectsRESTClient) GetXpnResources(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetResources(), resp.GetNextPageToken(), nil } @@ -653,33 +683,39 @@ func (c *projectsRESTClient) ListXpnHosts(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -719,40 +755,44 @@ func (c *projectsRESTClient) MoveDisk(ctx context.Context, req *computepb.MoveDi baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // MoveInstance moves an instance and its attached persistent disks from one zone to another. @@ -774,40 +814,44 @@ func (c *projectsRESTClient) MoveInstance(ctx context.Context, req *computepb.Mo baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetCommonInstanceMetadata sets metadata common to all instances within the specified project using the data included in the request. @@ -829,40 +873,44 @@ func (c *projectsRESTClient) SetCommonInstanceMetadata(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetDefaultNetworkTier sets the default network tier of the project. The default network tier is used when an address/forwardingRule/instance is created without specifying the network tier field. @@ -884,40 +932,44 @@ func (c *projectsRESTClient) SetDefaultNetworkTier(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetUsageExportBucket enables the usage export feature and sets the usage export bucket where reports are stored. If you provide an empty request body using this method, the usage export feature will be disabled. @@ -939,40 +991,44 @@ func (c *projectsRESTClient) SetUsageExportBucket(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // ProjectIterator manages a stream of *computepb.Project. diff --git a/compute/apiv1/public_advertised_prefixes_client.go b/compute/apiv1/public_advertised_prefixes_client.go index e664894f4d6..2527b4fd92a 100644 --- a/compute/apiv1/public_advertised_prefixes_client.go +++ b/compute/apiv1/public_advertised_prefixes_client.go @@ -196,40 +196,44 @@ func (c *publicAdvertisedPrefixesRESTClient) Delete(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified PublicAdvertisedPrefix resource. @@ -237,39 +241,43 @@ func (c *publicAdvertisedPrefixesRESTClient) Get(ctx context.Context, req *compu baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/publicAdvertisedPrefixes/%v", req.GetProject(), req.GetPublicAdvertisedPrefix()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.PublicAdvertisedPrefix{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a PublicAdvertisedPrefix in the specified project using the parameters that are included in the request. @@ -291,40 +299,44 @@ func (c *publicAdvertisedPrefixesRESTClient) Insert(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists the PublicAdvertisedPrefixes for a project. @@ -364,33 +376,39 @@ func (c *publicAdvertisedPrefixesRESTClient) List(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -430,40 +448,44 @@ func (c *publicAdvertisedPrefixesRESTClient) Patch(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // PublicAdvertisedPrefixIterator manages a stream of *computepb.PublicAdvertisedPrefix. diff --git a/compute/apiv1/public_delegated_prefixes_client.go b/compute/apiv1/public_delegated_prefixes_client.go index 5533ed7f82c..fd232bf53f8 100644 --- a/compute/apiv1/public_delegated_prefixes_client.go +++ b/compute/apiv1/public_delegated_prefixes_client.go @@ -232,33 +232,39 @@ func (c *publicDelegatedPrefixesRESTClient) AggregatedList(ctx context.Context, baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]PublicDelegatedPrefixesScopedListPair, 0, len(resp.GetItems())) @@ -298,40 +304,44 @@ func (c *publicDelegatedPrefixesRESTClient) Delete(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified PublicDelegatedPrefix resource in the given region. @@ -339,39 +349,43 @@ func (c *publicDelegatedPrefixesRESTClient) Get(ctx context.Context, req *comput baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/publicDelegatedPrefixes/%v", req.GetProject(), req.GetRegion(), req.GetPublicDelegatedPrefix()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.PublicDelegatedPrefix{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a PublicDelegatedPrefix in the specified project in the given region using the parameters that are included in the request. @@ -393,40 +407,44 @@ func (c *publicDelegatedPrefixesRESTClient) Insert(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists the PublicDelegatedPrefixes for a project in the given region. @@ -466,33 +484,39 @@ func (c *publicDelegatedPrefixesRESTClient) List(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -532,40 +556,44 @@ func (c *publicDelegatedPrefixesRESTClient) Patch(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // PublicDelegatedPrefixesScopedListPair is a holder type for string/*computepb.PublicDelegatedPrefixesScopedList map entries diff --git a/compute/apiv1/region_autoscalers_client.go b/compute/apiv1/region_autoscalers_client.go index 4d0cdba306b..4d210415bf4 100644 --- a/compute/apiv1/region_autoscalers_client.go +++ b/compute/apiv1/region_autoscalers_client.go @@ -203,40 +203,44 @@ func (c *regionAutoscalersRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified autoscaler. @@ -244,39 +248,43 @@ func (c *regionAutoscalersRESTClient) Get(ctx context.Context, req *computepb.Ge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/autoscalers/%v", req.GetProject(), req.GetRegion(), req.GetAutoscaler()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Autoscaler{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates an autoscaler in the specified project using the data included in the request. @@ -298,40 +306,44 @@ func (c *regionAutoscalersRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of autoscalers contained within the specified region. @@ -371,33 +383,39 @@ func (c *regionAutoscalersRESTClient) List(ctx context.Context, req *computepb.L baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -440,40 +458,44 @@ func (c *regionAutoscalersRESTClient) Patch(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates an autoscaler in the specified project using the data included in the request. @@ -498,38 +520,42 @@ func (c *regionAutoscalersRESTClient) Update(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } diff --git a/compute/apiv1/region_backend_services_client.go b/compute/apiv1/region_backend_services_client.go index 397dc65bfd2..618b8d72af6 100644 --- a/compute/apiv1/region_backend_services_client.go +++ b/compute/apiv1/region_backend_services_client.go @@ -210,40 +210,44 @@ func (c *regionBackendServicesRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified regional BackendService resource. @@ -251,39 +255,43 @@ func (c *regionBackendServicesRESTClient) Get(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices/%v", req.GetProject(), req.GetRegion(), req.GetBackendService()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.BackendService{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetHealth gets the most recent health check results for this regional BackendService. @@ -298,39 +306,43 @@ func (c *regionBackendServicesRESTClient) GetHealth(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/backendServices/%v/getHealth", req.GetProject(), req.GetRegion(), req.GetBackendService()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.BackendServiceGroupHealth{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a regional BackendService resource in the specified project using the data included in the request. For more information, see Backend services overview. @@ -352,40 +364,44 @@ func (c *regionBackendServicesRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of regional BackendService resources available to the specified project in the given region. @@ -425,33 +441,39 @@ func (c *regionBackendServicesRESTClient) List(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -491,40 +513,44 @@ func (c *regionBackendServicesRESTClient) Patch(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates the specified regional BackendService resource with the data included in the request. For more information, see Backend services overview . @@ -546,38 +572,42 @@ func (c *regionBackendServicesRESTClient) Update(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } diff --git a/compute/apiv1/region_commitments_client.go b/compute/apiv1/region_commitments_client.go index 06c372127fa..cddbbd750bb 100644 --- a/compute/apiv1/region_commitments_client.go +++ b/compute/apiv1/region_commitments_client.go @@ -218,33 +218,39 @@ func (c *regionCommitmentsRESTClient) AggregatedList(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]CommitmentsScopedListPair, 0, len(resp.GetItems())) @@ -277,39 +283,43 @@ func (c *regionCommitmentsRESTClient) Get(ctx context.Context, req *computepb.Ge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/commitments/%v", req.GetProject(), req.GetRegion(), req.GetCommitment()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Commitment{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a commitment in the specified project using the data included in the request. @@ -331,40 +341,44 @@ func (c *regionCommitmentsRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of commitments contained within the specified region. @@ -404,33 +418,39 @@ func (c *regionCommitmentsRESTClient) List(ctx context.Context, req *computepb.L baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/region_disk_types_client.go b/compute/apiv1/region_disk_types_client.go index f5c1f90f098..fea3b11c157 100644 --- a/compute/apiv1/region_disk_types_client.go +++ b/compute/apiv1/region_disk_types_client.go @@ -167,39 +167,43 @@ func (c *regionDiskTypesRESTClient) Get(ctx context.Context, req *computepb.GetR baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/diskTypes/%v", req.GetProject(), req.GetRegion(), req.GetDiskType()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.DiskType{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of regional disk types available to the specified project. @@ -239,33 +243,39 @@ func (c *regionDiskTypesRESTClient) List(ctx context.Context, req *computepb.Lis baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/region_disks_client.go b/compute/apiv1/region_disks_client.go index 6b528d423c7..5305914f117 100644 --- a/compute/apiv1/region_disks_client.go +++ b/compute/apiv1/region_disks_client.go @@ -252,40 +252,44 @@ func (c *regionDisksRESTClient) AddResourcePolicies(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // CreateSnapshot creates a snapshot of this regional disk. @@ -307,40 +311,44 @@ func (c *regionDisksRESTClient) CreateSnapshot(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -355,40 +363,44 @@ func (c *regionDisksRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns a specified regional persistent disk. @@ -396,39 +408,43 @@ func (c *regionDisksRESTClient) Get(ctx context.Context, req *computepb.GetRegio baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v", req.GetProject(), req.GetRegion(), req.GetDisk()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Disk{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -443,39 +459,43 @@ func (c *regionDisksRESTClient) GetIamPolicy(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a persistent regional disk in the specified project using the data included in the request. @@ -500,40 +520,44 @@ func (c *regionDisksRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of persistent disks contained within the specified region. @@ -573,33 +597,39 @@ func (c *regionDisksRESTClient) List(ctx context.Context, req *computepb.ListReg baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -639,40 +669,44 @@ func (c *regionDisksRESTClient) RemoveResourcePolicies(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Resize resizes the specified regional persistent disk. @@ -694,40 +728,44 @@ func (c *regionDisksRESTClient) Resize(ctx context.Context, req *computepb.Resiz baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -742,39 +780,43 @@ func (c *regionDisksRESTClient) SetIamPolicy(ctx context.Context, req *computepb baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SetLabels sets the labels on the target regional disk. @@ -796,40 +838,44 @@ func (c *regionDisksRESTClient) SetLabels(ctx context.Context, req *computepb.Se baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -844,37 +890,41 @@ func (c *regionDisksRESTClient) TestIamPermissions(ctx context.Context, req *com baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/disks/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } diff --git a/compute/apiv1/region_health_check_services_client.go b/compute/apiv1/region_health_check_services_client.go index 1963ce56849..a5005198c19 100644 --- a/compute/apiv1/region_health_check_services_client.go +++ b/compute/apiv1/region_health_check_services_client.go @@ -196,40 +196,44 @@ func (c *regionHealthCheckServicesRESTClient) Delete(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified regional HealthCheckService resource. @@ -237,39 +241,43 @@ func (c *regionHealthCheckServicesRESTClient) Get(ctx context.Context, req *comp baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthCheckServices/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheckService()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.HealthCheckService{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a regional HealthCheckService resource in the specified project and region using the data included in the request. @@ -291,40 +299,44 @@ func (c *regionHealthCheckServicesRESTClient) Insert(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists all the HealthCheckService resources that have been configured for the specified project in the given region. @@ -364,33 +376,39 @@ func (c *regionHealthCheckServicesRESTClient) List(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -430,40 +448,44 @@ func (c *regionHealthCheckServicesRESTClient) Patch(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // HealthCheckServiceIterator manages a stream of *computepb.HealthCheckService. diff --git a/compute/apiv1/region_health_checks_client.go b/compute/apiv1/region_health_checks_client.go index ce0a46daefe..2defdf3efd1 100644 --- a/compute/apiv1/region_health_checks_client.go +++ b/compute/apiv1/region_health_checks_client.go @@ -203,40 +203,44 @@ func (c *regionHealthChecksRESTClient) Delete(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified HealthCheck resource. Gets a list of available health checks by making a list() request. @@ -244,39 +248,43 @@ func (c *regionHealthChecksRESTClient) Get(ctx context.Context, req *computepb.G baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/healthChecks/%v", req.GetProject(), req.GetRegion(), req.GetHealthCheck()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.HealthCheck{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a HealthCheck resource in the specified project using the data included in the request. @@ -298,40 +306,44 @@ func (c *regionHealthChecksRESTClient) Insert(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of HealthCheck resources available to the specified project. @@ -371,33 +383,39 @@ func (c *regionHealthChecksRESTClient) List(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -437,40 +455,44 @@ func (c *regionHealthChecksRESTClient) Patch(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates a HealthCheck resource in the specified project using the data included in the request. @@ -492,38 +514,42 @@ func (c *regionHealthChecksRESTClient) Update(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } diff --git a/compute/apiv1/region_instance_group_managers_client.go b/compute/apiv1/region_instance_group_managers_client.go index 6533992bf9c..3eb5f6d558b 100644 --- a/compute/apiv1/region_instance_group_managers_client.go +++ b/compute/apiv1/region_instance_group_managers_client.go @@ -301,40 +301,44 @@ func (c *regionInstanceGroupManagersRESTClient) AbandonInstances(ctx context.Con baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // ApplyUpdatesToInstances apply updates to selected instances the managed instance group. @@ -349,40 +353,44 @@ func (c *regionInstanceGroupManagersRESTClient) ApplyUpdatesToInstances(ctx cont baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/applyUpdatesToInstances", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // CreateInstances creates instances with per-instance configs in this regional managed instance group. Instances are created using the current instance template. The create instances operation is marked DONE if the createInstances request is successful. The underlying actions take additional time. You must separately verify the status of the creating or actions with the listmanagedinstances method. @@ -404,40 +412,44 @@ func (c *regionInstanceGroupManagersRESTClient) CreateInstances(ctx context.Cont baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Delete deletes the specified managed instance group and all of the instances in that group. @@ -452,40 +464,44 @@ func (c *regionInstanceGroupManagersRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DeleteInstances flags the specified instances in the managed instance group to be immediately deleted. The instances are also removed from any target pools of which they were a member. This method reduces the targetSize of the managed instance group by the number of instances that you delete. The deleteInstances operation is marked DONE if the deleteInstances request is successful. The underlying actions take additional time. You must separately verify the status of the deleting action 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. You can specify a maximum of 1000 instances with this method per request. @@ -507,40 +523,44 @@ func (c *regionInstanceGroupManagersRESTClient) DeleteInstances(ctx context.Cont baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // DeletePerInstanceConfigs deletes selected per-instance configs for the managed instance group. @@ -555,40 +575,44 @@ func (c *regionInstanceGroupManagersRESTClient) DeletePerInstanceConfigs(ctx con baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v/deletePerInstanceConfigs", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns all of the details about the specified managed instance group. @@ -596,39 +620,43 @@ func (c *regionInstanceGroupManagersRESTClient) Get(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroupManagers/%v", req.GetProject(), req.GetRegion(), req.GetInstanceGroupManager()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InstanceGroupManager{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a managed instance group using the information that you specify in the request. After the group is created, instances in the group are created using the specified instance template. This operation is marked as DONE when the group is created even if the instances in the group have not yet been created. You must separately verify the status of the individual instances with the listmanagedinstances method. A regional managed instance group can contain up to 2000 instances. @@ -650,40 +678,44 @@ func (c *regionInstanceGroupManagersRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of managed instance groups that are contained within the specified region. @@ -723,33 +755,39 @@ func (c *regionInstanceGroupManagersRESTClient) List(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -807,33 +845,39 @@ func (c *regionInstanceGroupManagersRESTClient) ListErrors(ctx context.Context, baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -891,33 +935,39 @@ func (c *regionInstanceGroupManagersRESTClient) ListManagedInstances(ctx context baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetManagedInstances(), resp.GetNextPageToken(), nil } @@ -975,33 +1025,39 @@ func (c *regionInstanceGroupManagersRESTClient) ListPerInstanceConfigs(ctx conte baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -1041,40 +1097,44 @@ func (c *regionInstanceGroupManagersRESTClient) Patch(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // PatchPerInstanceConfigs inserts or patches per-instance configs for the managed instance group. perInstanceConfig.name (at http://perInstanceConfig.name) serves as a key used to distinguish whether to perform insert or patch. @@ -1096,40 +1156,44 @@ func (c *regionInstanceGroupManagersRESTClient) PatchPerInstanceConfigs(ctx cont baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // RecreateInstances flags the specified VM instances in the managed instance group to be immediately recreated. Each instance is recreated using the group’s current configuration. This operation is marked as DONE when the flag is set even if the instances have not yet been recreated. You must separately verify the status of each instance by checking its currentAction field; for more information, see Checking the status of managed instances. 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. You can specify a maximum of 1000 instances with this method per request. @@ -1151,40 +1215,44 @@ func (c *regionInstanceGroupManagersRESTClient) RecreateInstances(ctx context.Co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // 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. @@ -1200,40 +1268,44 @@ func (c *regionInstanceGroupManagersRESTClient) Resize(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetInstanceTemplate sets the instance template to use when creating new instances or recreating instances in this group. Existing instances are not affected. @@ -1255,40 +1327,44 @@ func (c *regionInstanceGroupManagersRESTClient) SetInstanceTemplate(ctx context. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetTargetPools modifies the target pools to which all new instances in this group are assigned. Existing instances in the group are not affected. @@ -1310,40 +1386,44 @@ func (c *regionInstanceGroupManagersRESTClient) SetTargetPools(ctx context.Conte baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // UpdatePerInstanceConfigs inserts or updates per-instance configs for the managed instance group. perInstanceConfig.name (at http://perInstanceConfig.name) serves as a key used to distinguish whether to perform insert or patch. @@ -1365,38 +1445,42 @@ func (c *regionInstanceGroupManagersRESTClient) UpdatePerInstanceConfigs(ctx con baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } diff --git a/compute/apiv1/region_instance_groups_client.go b/compute/apiv1/region_instance_groups_client.go index efb46e73ade..c4434f19d39 100644 --- a/compute/apiv1/region_instance_groups_client.go +++ b/compute/apiv1/region_instance_groups_client.go @@ -182,39 +182,43 @@ func (c *regionInstanceGroupsRESTClient) Get(ctx context.Context, req *computepb baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/instanceGroups/%v", req.GetProject(), req.GetRegion(), req.GetInstanceGroup()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.InstanceGroup{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves the list of instance group resources contained within the specified region. @@ -254,33 +258,39 @@ func (c *regionInstanceGroupsRESTClient) List(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -344,33 +354,39 @@ func (c *regionInstanceGroupsRESTClient) ListInstances(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -410,38 +426,42 @@ func (c *regionInstanceGroupsRESTClient) SetNamedPorts(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } diff --git a/compute/apiv1/region_instances_client.go b/compute/apiv1/region_instances_client.go index 3a684bc8303..e2665e63bf1 100644 --- a/compute/apiv1/region_instances_client.go +++ b/compute/apiv1/region_instances_client.go @@ -172,38 +172,42 @@ func (c *regionInstancesRESTClient) BulkInsert(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} - - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } - + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} - - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } diff --git a/compute/apiv1/region_network_endpoint_groups_client.go b/compute/apiv1/region_network_endpoint_groups_client.go index 1bc6d4c3434..79a2c5cb9d0 100644 --- a/compute/apiv1/region_network_endpoint_groups_client.go +++ b/compute/apiv1/region_network_endpoint_groups_client.go @@ -189,40 +189,44 @@ func (c *regionNetworkEndpointGroupsRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified network endpoint group. Gets a list of available network endpoint groups by making a list() request. @@ -230,39 +234,43 @@ func (c *regionNetworkEndpointGroupsRESTClient) Get(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/networkEndpointGroups/%v", req.GetProject(), req.GetRegion(), req.GetNetworkEndpointGroup()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.NetworkEndpointGroup{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a network endpoint group in the specified project using the parameters that are included in the request. @@ -284,40 +292,44 @@ func (c *regionNetworkEndpointGroupsRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of regional network endpoint groups available to the specified project in the given region. @@ -357,33 +369,39 @@ func (c *regionNetworkEndpointGroupsRESTClient) List(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/region_notification_endpoints_client.go b/compute/apiv1/region_notification_endpoints_client.go index f37822a1425..d4488b722f7 100644 --- a/compute/apiv1/region_notification_endpoints_client.go +++ b/compute/apiv1/region_notification_endpoints_client.go @@ -189,40 +189,44 @@ func (c *regionNotificationEndpointsRESTClient) Delete(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified NotificationEndpoint resource in the given region. @@ -230,39 +234,43 @@ func (c *regionNotificationEndpointsRESTClient) Get(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/notificationEndpoints/%v", req.GetProject(), req.GetRegion(), req.GetNotificationEndpoint()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.NotificationEndpoint{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert create a NotificationEndpoint in the specified project in the given region using the parameters that are included in the request. @@ -284,40 +292,44 @@ func (c *regionNotificationEndpointsRESTClient) Insert(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists the NotificationEndpoints for a project in the given region. @@ -357,33 +369,39 @@ func (c *regionNotificationEndpointsRESTClient) List(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/region_operations_client.go b/compute/apiv1/region_operations_client.go index 06b147144ac..0235fa141b8 100644 --- a/compute/apiv1/region_operations_client.go +++ b/compute/apiv1/region_operations_client.go @@ -181,39 +181,43 @@ func (c *regionOperationsRESTClient) Delete(ctx context.Context, req *computepb. baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/operations/%v", req.GetProject(), req.GetRegion(), req.GetOperation()) - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.DeleteRegionOperationResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Get retrieves the specified region-specific Operations resource. @@ -221,39 +225,43 @@ func (c *regionOperationsRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/operations/%v", req.GetProject(), req.GetRegion(), req.GetOperation()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of Operation resources contained within the specified region. @@ -293,33 +301,39 @@ func (c *regionOperationsRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -345,37 +359,41 @@ func (c *regionOperationsRESTClient) Wait(ctx context.Context, req *computepb.Wa baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/operations/%v/wait", req.GetProject(), req.GetRegion(), req.GetOperation()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } diff --git a/compute/apiv1/region_ssl_certificates_client.go b/compute/apiv1/region_ssl_certificates_client.go index a260eb5f2c5..09574f797a2 100644 --- a/compute/apiv1/region_ssl_certificates_client.go +++ b/compute/apiv1/region_ssl_certificates_client.go @@ -189,40 +189,44 @@ func (c *regionSslCertificatesRESTClient) Delete(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified SslCertificate resource in the specified region. Get a list of available SSL certificates by making a list() request. @@ -230,39 +234,43 @@ func (c *regionSslCertificatesRESTClient) Get(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/sslCertificates/%v", req.GetProject(), req.GetRegion(), req.GetSslCertificate()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SslCertificate{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a SslCertificate resource in the specified project and region using the data included in the request @@ -284,40 +292,44 @@ func (c *regionSslCertificatesRESTClient) Insert(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of SslCertificate resources available to the specified project in the specified region. @@ -357,33 +369,39 @@ func (c *regionSslCertificatesRESTClient) List(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/region_target_http_proxies_client.go b/compute/apiv1/region_target_http_proxies_client.go index 5647b3afb09..b2b58022df3 100644 --- a/compute/apiv1/region_target_http_proxies_client.go +++ b/compute/apiv1/region_target_http_proxies_client.go @@ -196,40 +196,44 @@ func (c *regionTargetHttpProxiesRESTClient) Delete(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified TargetHttpProxy resource in the specified region. Gets a list of available target HTTP proxies by making a list() request. @@ -237,39 +241,43 @@ func (c *regionTargetHttpProxiesRESTClient) Get(ctx context.Context, req *comput baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpProxies/%v", req.GetProject(), req.GetRegion(), req.GetTargetHttpProxy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetHttpProxy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a TargetHttpProxy resource in the specified project and region using the data included in the request. @@ -291,40 +299,44 @@ func (c *regionTargetHttpProxiesRESTClient) Insert(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of TargetHttpProxy resources available to the specified project in the specified region. @@ -364,33 +376,39 @@ func (c *regionTargetHttpProxiesRESTClient) List(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -430,40 +448,44 @@ func (c *regionTargetHttpProxiesRESTClient) SetUrlMap(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TargetHttpProxyIterator manages a stream of *computepb.TargetHttpProxy. diff --git a/compute/apiv1/region_target_https_proxies_client.go b/compute/apiv1/region_target_https_proxies_client.go index 8a5e39b3e4c..9becf808794 100644 --- a/compute/apiv1/region_target_https_proxies_client.go +++ b/compute/apiv1/region_target_https_proxies_client.go @@ -203,40 +203,44 @@ func (c *regionTargetHttpsProxiesRESTClient) Delete(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified TargetHttpsProxy resource in the specified region. Gets a list of available target HTTP proxies by making a list() request. @@ -244,39 +248,43 @@ func (c *regionTargetHttpsProxiesRESTClient) Get(ctx context.Context, req *compu baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetHttpsProxies/%v", req.GetProject(), req.GetRegion(), req.GetTargetHttpsProxy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetHttpsProxy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a TargetHttpsProxy resource in the specified project and region using the data included in the request. @@ -298,40 +306,44 @@ func (c *regionTargetHttpsProxiesRESTClient) Insert(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of TargetHttpsProxy resources available to the specified project in the specified region. @@ -371,33 +383,39 @@ func (c *regionTargetHttpsProxiesRESTClient) List(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -437,40 +455,44 @@ func (c *regionTargetHttpsProxiesRESTClient) SetSslCertificates(ctx context.Cont baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetUrlMap changes the URL map for TargetHttpsProxy. @@ -492,40 +514,44 @@ func (c *regionTargetHttpsProxiesRESTClient) SetUrlMap(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TargetHttpsProxyIterator manages a stream of *computepb.TargetHttpsProxy. diff --git a/compute/apiv1/region_url_maps_client.go b/compute/apiv1/region_url_maps_client.go index 1389f65cb55..9fb2e87cd1f 100644 --- a/compute/apiv1/region_url_maps_client.go +++ b/compute/apiv1/region_url_maps_client.go @@ -210,40 +210,44 @@ func (c *regionUrlMapsRESTClient) Delete(ctx context.Context, req *computepb.Del baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified UrlMap resource. Gets a list of available URL maps by making a list() request. @@ -251,39 +255,43 @@ func (c *regionUrlMapsRESTClient) Get(ctx context.Context, req *computepb.GetReg baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps/%v", req.GetProject(), req.GetRegion(), req.GetUrlMap()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.UrlMap{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a UrlMap resource in the specified project using the data included in the request. @@ -305,40 +313,44 @@ func (c *regionUrlMapsRESTClient) Insert(ctx context.Context, req *computepb.Ins baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of UrlMap resources available to the specified project in the specified region. @@ -378,33 +390,39 @@ func (c *regionUrlMapsRESTClient) List(ctx context.Context, req *computepb.ListR baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -444,40 +462,44 @@ func (c *regionUrlMapsRESTClient) Patch(ctx context.Context, req *computepb.Patc baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates the specified UrlMap resource with the data included in the request. @@ -499,40 +521,44 @@ func (c *regionUrlMapsRESTClient) Update(ctx context.Context, req *computepb.Upd baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Validate runs static validation for the UrlMap. In particular, the tests of the provided UrlMap will be run. Calling this method does NOT create the UrlMap. @@ -547,39 +573,43 @@ func (c *regionUrlMapsRESTClient) Validate(ctx context.Context, req *computepb.V baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/urlMaps/%v/validate", req.GetProject(), req.GetRegion(), req.GetUrlMap()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.UrlMapsValidateResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // UrlMapIterator manages a stream of *computepb.UrlMap. diff --git a/compute/apiv1/regions_client.go b/compute/apiv1/regions_client.go index 45869e4483a..a0e9d6e96f9 100644 --- a/compute/apiv1/regions_client.go +++ b/compute/apiv1/regions_client.go @@ -167,39 +167,43 @@ func (c *regionsRESTClient) Get(ctx context.Context, req *computepb.GetRegionReq baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v", req.GetProject(), req.GetRegion()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Region{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves the list of region resources available to the specified project. @@ -239,33 +243,39 @@ func (c *regionsRESTClient) List(ctx context.Context, req *computepb.ListRegions baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/reservations_client.go b/compute/apiv1/reservations_client.go index 9aae937385c..a2a6b8a4425 100644 --- a/compute/apiv1/reservations_client.go +++ b/compute/apiv1/reservations_client.go @@ -253,33 +253,39 @@ func (c *reservationsRESTClient) AggregatedList(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]ReservationsScopedListPair, 0, len(resp.GetItems())) @@ -319,40 +325,44 @@ func (c *reservationsRESTClient) Delete(ctx context.Context, req *computepb.Dele baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get retrieves information about the specified reservation. @@ -360,39 +370,43 @@ func (c *reservationsRESTClient) Get(ctx context.Context, req *computepb.GetRese baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v", req.GetProject(), req.GetZone(), req.GetReservation()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Reservation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -407,39 +421,43 @@ func (c *reservationsRESTClient) GetIamPolicy(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a new reservation. For more information, read Reserving zonal resources. @@ -461,40 +479,44 @@ func (c *reservationsRESTClient) Insert(ctx context.Context, req *computepb.Inse baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List a list of all the reservations that have been configured for the specified project in specified zone. @@ -534,33 +556,39 @@ func (c *reservationsRESTClient) List(ctx context.Context, req *computepb.ListRe baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -600,40 +628,44 @@ func (c *reservationsRESTClient) Resize(ctx context.Context, req *computepb.Resi baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -648,39 +680,43 @@ func (c *reservationsRESTClient) SetIamPolicy(ctx context.Context, req *computep baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v/setIamPolicy", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -695,39 +731,43 @@ func (c *reservationsRESTClient) TestIamPermissions(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/reservations/%v/testIamPermissions", req.GetProject(), req.GetZone(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // ReservationIterator manages a stream of *computepb.Reservation. diff --git a/compute/apiv1/resource_policies_client.go b/compute/apiv1/resource_policies_client.go index 95da55b9952..49121cedf15 100644 --- a/compute/apiv1/resource_policies_client.go +++ b/compute/apiv1/resource_policies_client.go @@ -246,33 +246,39 @@ func (c *resourcePoliciesRESTClient) AggregatedList(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]ResourcePoliciesScopedListPair, 0, len(resp.GetItems())) @@ -312,40 +318,44 @@ func (c *resourcePoliciesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get retrieves all information of the specified resource policy. @@ -353,39 +363,43 @@ func (c *resourcePoliciesRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies/%v", req.GetProject(), req.GetRegion(), req.GetResourcePolicy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.ResourcePolicy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -400,39 +414,43 @@ func (c *resourcePoliciesRESTClient) GetIamPolicy(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a new resource policy. @@ -454,40 +472,44 @@ func (c *resourcePoliciesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List a list all the resource policies that have been configured for the specified project in specified region. @@ -527,33 +549,39 @@ func (c *resourcePoliciesRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -586,39 +614,43 @@ func (c *resourcePoliciesRESTClient) SetIamPolicy(ctx context.Context, req *comp baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -633,39 +665,43 @@ func (c *resourcePoliciesRESTClient) TestIamPermissions(ctx context.Context, req baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/resourcePolicies/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // ResourcePoliciesScopedListPair is a holder type for string/*computepb.ResourcePoliciesScopedList map entries diff --git a/compute/apiv1/routers_client.go b/compute/apiv1/routers_client.go index f524d413ab7..ab43fbe1561 100644 --- a/compute/apiv1/routers_client.go +++ b/compute/apiv1/routers_client.go @@ -260,33 +260,39 @@ func (c *routersRESTClient) AggregatedList(ctx context.Context, req *computepb.A baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]RoutersScopedListPair, 0, len(resp.GetItems())) @@ -326,40 +332,44 @@ func (c *routersRESTClient) Delete(ctx context.Context, req *computepb.DeleteRou baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified Router resource. Gets a list of available routers by making a list() request. @@ -367,39 +377,43 @@ func (c *routersRESTClient) Get(ctx context.Context, req *computepb.GetRouterReq baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v", req.GetProject(), req.GetRegion(), req.GetRouter()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Router{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetNatMappingInfo retrieves runtime Nat mapping information of VM endpoints. @@ -439,33 +453,39 @@ func (c *routersRESTClient) GetNatMappingInfo(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetResult(), resp.GetNextPageToken(), nil } @@ -491,39 +511,43 @@ func (c *routersRESTClient) GetRouterStatus(ctx context.Context, req *computepb. baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v/getRouterStatus", req.GetProject(), req.GetRegion(), req.GetRouter()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.RouterStatusResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a Router resource in the specified project and region using the data included in the request. @@ -545,40 +569,44 @@ func (c *routersRESTClient) Insert(ctx context.Context, req *computepb.InsertRou baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of Router resources available to the specified project. @@ -618,33 +646,39 @@ func (c *routersRESTClient) List(ctx context.Context, req *computepb.ListRouters baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -684,40 +718,44 @@ func (c *routersRESTClient) Patch(ctx context.Context, req *computepb.PatchRoute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Preview preview fields auto-generated during router create and update operations. Calling this method does NOT create or update the router. @@ -732,39 +770,43 @@ func (c *routersRESTClient) Preview(ctx context.Context, req *computepb.PreviewR baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/routers/%v/preview", req.GetProject(), req.GetRegion(), req.GetRouter()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.RoutersPreviewResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Update updates the specified Router resource with the data included in the request. This method conforms to PUT semantics, which requests that the state of the target resource be created or replaced with the state defined by the representation enclosed in the request message payload. @@ -786,40 +828,44 @@ func (c *routersRESTClient) Update(ctx context.Context, req *computepb.UpdateRou baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // RouterIterator manages a stream of *computepb.Router. diff --git a/compute/apiv1/routes_client.go b/compute/apiv1/routes_client.go index 9d2847cb6f3..d3c1e115798 100644 --- a/compute/apiv1/routes_client.go +++ b/compute/apiv1/routes_client.go @@ -189,40 +189,44 @@ func (c *routesRESTClient) Delete(ctx context.Context, req *computepb.DeleteRout baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified Route resource. Gets a list of available routes by making a list() request. @@ -230,39 +234,43 @@ func (c *routesRESTClient) Get(ctx context.Context, req *computepb.GetRouteReque baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/routes/%v", req.GetProject(), req.GetRoute()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Route{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a Route resource in the specified project using the data included in the request. @@ -284,40 +292,44 @@ func (c *routesRESTClient) Insert(ctx context.Context, req *computepb.InsertRout baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of Route resources available to the specified project. @@ -357,33 +369,39 @@ func (c *routesRESTClient) List(ctx context.Context, req *computepb.ListRoutesRe baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/security_policies_client.go b/compute/apiv1/security_policies_client.go index f472bc51078..de934a8d828 100644 --- a/compute/apiv1/security_policies_client.go +++ b/compute/apiv1/security_policies_client.go @@ -231,40 +231,44 @@ func (c *securityPoliciesRESTClient) AddRule(ctx context.Context, req *computepb baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v/addRule", req.GetProject(), req.GetSecurityPolicy()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Delete deletes the specified policy. @@ -279,40 +283,44 @@ func (c *securityPoliciesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get list all of the ordered rules present in a single specified policy. @@ -320,39 +328,43 @@ func (c *securityPoliciesRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/securityPolicies/%v", req.GetProject(), req.GetSecurityPolicy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SecurityPolicy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetRule gets a rule at the specified priority. @@ -367,39 +379,43 @@ func (c *securityPoliciesRESTClient) GetRule(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SecurityPolicyRule{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a new policy in the specified project using the data included in the request. @@ -421,40 +437,44 @@ func (c *securityPoliciesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List list all the policies that have been configured for the specified project. @@ -494,33 +514,39 @@ func (c *securityPoliciesRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -565,39 +591,43 @@ func (c *securityPoliciesRESTClient) ListPreconfiguredExpressionSets(ctx context baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SecurityPoliciesListPreconfiguredExpressionSetsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Patch patches the specified policy with the data included in the request. This cannot be used to be update the rules in the policy. Please use the per rule methods like addRule, patchRule, and removeRule instead. @@ -619,40 +649,44 @@ func (c *securityPoliciesRESTClient) Patch(ctx context.Context, req *computepb.P baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // PatchRule patches a rule at the specified priority. @@ -674,40 +708,44 @@ func (c *securityPoliciesRESTClient) PatchRule(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // RemoveRule deletes a rule at the specified priority. @@ -722,40 +760,44 @@ func (c *securityPoliciesRESTClient) RemoveRule(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SecurityPolicyIterator manages a stream of *computepb.SecurityPolicy. diff --git a/compute/apiv1/service_attachments_client.go b/compute/apiv1/service_attachments_client.go index 095fe554aae..a112c0baf2e 100644 --- a/compute/apiv1/service_attachments_client.go +++ b/compute/apiv1/service_attachments_client.go @@ -253,33 +253,39 @@ func (c *serviceAttachmentsRESTClient) AggregatedList(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]ServiceAttachmentsScopedListPair, 0, len(resp.GetItems())) @@ -319,40 +325,44 @@ func (c *serviceAttachmentsRESTClient) Delete(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified ServiceAttachment resource in the given scope. @@ -360,39 +370,43 @@ func (c *serviceAttachmentsRESTClient) Get(ctx context.Context, req *computepb.G baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v", req.GetProject(), req.GetRegion(), req.GetServiceAttachment()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.ServiceAttachment{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -407,39 +421,43 @@ func (c *serviceAttachmentsRESTClient) GetIamPolicy(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a ServiceAttachment in the specified project in the given scope using the parameters that are included in the request. @@ -461,40 +479,44 @@ func (c *serviceAttachmentsRESTClient) Insert(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists the ServiceAttachments for a project in the given scope. @@ -534,33 +556,39 @@ func (c *serviceAttachmentsRESTClient) List(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -600,40 +628,44 @@ func (c *serviceAttachmentsRESTClient) Patch(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -648,39 +680,43 @@ func (c *serviceAttachmentsRESTClient) SetIamPolicy(ctx context.Context, req *co baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -695,39 +731,43 @@ func (c *serviceAttachmentsRESTClient) TestIamPermissions(ctx context.Context, r baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/serviceAttachments/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // ServiceAttachmentIterator manages a stream of *computepb.ServiceAttachment. diff --git a/compute/apiv1/snapshots_client.go b/compute/apiv1/snapshots_client.go index b86c0781174..f71b3a7c0b5 100644 --- a/compute/apiv1/snapshots_client.go +++ b/compute/apiv1/snapshots_client.go @@ -210,40 +210,44 @@ func (c *snapshotsRESTClient) Delete(ctx context.Context, req *computepb.DeleteS baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified Snapshot resource. Gets a list of available snapshots by making a list() request. @@ -251,39 +255,43 @@ func (c *snapshotsRESTClient) Get(ctx context.Context, req *computepb.GetSnapsho baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v", req.GetProject(), req.GetSnapshot()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Snapshot{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -298,39 +306,43 @@ func (c *snapshotsRESTClient) GetIamPolicy(ctx context.Context, req *computepb.G baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves the list of Snapshot resources contained within the specified project. @@ -370,33 +382,39 @@ func (c *snapshotsRESTClient) List(ctx context.Context, req *computepb.ListSnaps baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -429,39 +447,43 @@ func (c *snapshotsRESTClient) SetIamPolicy(ctx context.Context, req *computepb.S baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v/setIamPolicy", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SetLabels sets the labels on a snapshot. To learn more about labels, read the Labeling Resources documentation. @@ -476,40 +498,44 @@ func (c *snapshotsRESTClient) SetLabels(ctx context.Context, req *computepb.SetL baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v/setLabels", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -524,39 +550,43 @@ func (c *snapshotsRESTClient) TestIamPermissions(ctx context.Context, req *compu baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/snapshots/%v/testIamPermissions", req.GetProject(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SnapshotIterator manages a stream of *computepb.Snapshot. diff --git a/compute/apiv1/ssl_certificates_client.go b/compute/apiv1/ssl_certificates_client.go index b57e727ca3d..36e8ac017a2 100644 --- a/compute/apiv1/ssl_certificates_client.go +++ b/compute/apiv1/ssl_certificates_client.go @@ -225,33 +225,39 @@ func (c *sslCertificatesRESTClient) AggregatedList(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]SslCertificatesScopedListPair, 0, len(resp.GetItems())) @@ -291,40 +297,44 @@ func (c *sslCertificatesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified SslCertificate resource. Gets a list of available SSL certificates by making a list() request. @@ -332,39 +342,43 @@ func (c *sslCertificatesRESTClient) Get(ctx context.Context, req *computepb.GetS baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslCertificates/%v", req.GetProject(), req.GetSslCertificate()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SslCertificate{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a SslCertificate resource in the specified project using the data included in the request. @@ -386,40 +400,44 @@ func (c *sslCertificatesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of SslCertificate resources available to the specified project. @@ -459,33 +477,39 @@ func (c *sslCertificatesRESTClient) List(ctx context.Context, req *computepb.Lis baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/ssl_policies_client.go b/compute/apiv1/ssl_policies_client.go index c5d4facb742..290aac8766f 100644 --- a/compute/apiv1/ssl_policies_client.go +++ b/compute/apiv1/ssl_policies_client.go @@ -203,40 +203,44 @@ func (c *sslPoliciesRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get lists all of the ordered rules present in a single specified policy. @@ -244,39 +248,43 @@ func (c *sslPoliciesRESTClient) Get(ctx context.Context, req *computepb.GetSslPo baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/sslPolicies/%v", req.GetProject(), req.GetSslPolicy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SslPolicy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert returns the specified SSL policy resource. Gets a list of available SSL policies by making a list() request. @@ -298,40 +306,44 @@ func (c *sslPoliciesRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists all the SSL policies that have been configured for the specified project. @@ -371,33 +383,39 @@ func (c *sslPoliciesRESTClient) List(ctx context.Context, req *computepb.ListSsl baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -442,39 +460,43 @@ func (c *sslPoliciesRESTClient) ListAvailableFeatures(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.SslPoliciesListAvailableFeaturesResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Patch patches the specified SSL policy with the data included in the request. @@ -496,40 +518,44 @@ func (c *sslPoliciesRESTClient) Patch(ctx context.Context, req *computepb.PatchS baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SslPolicyIterator manages a stream of *computepb.SslPolicy. diff --git a/compute/apiv1/subnetworks_client.go b/compute/apiv1/subnetworks_client.go index 0714b65b924..7db896ecb33 100644 --- a/compute/apiv1/subnetworks_client.go +++ b/compute/apiv1/subnetworks_client.go @@ -274,33 +274,39 @@ func (c *subnetworksRESTClient) AggregatedList(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]SubnetworksScopedListPair, 0, len(resp.GetItems())) @@ -340,40 +346,44 @@ func (c *subnetworksRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // ExpandIpCidrRange expands the IP CIDR range of the subnetwork to a specified value. @@ -395,40 +405,44 @@ func (c *subnetworksRESTClient) ExpandIpCidrRange(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified subnetwork. Gets a list of available subnetworks list() request. @@ -436,39 +450,43 @@ func (c *subnetworksRESTClient) Get(ctx context.Context, req *computepb.GetSubne baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v", req.GetProject(), req.GetRegion(), req.GetSubnetwork()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Subnetwork{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetIamPolicy gets the access control policy for a resource. May be empty if no such policy or resource exists. @@ -483,39 +501,43 @@ func (c *subnetworksRESTClient) GetIamPolicy(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a subnetwork in the specified project using the data included in the request. @@ -537,40 +559,44 @@ func (c *subnetworksRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of subnetworks available to the specified project. @@ -610,33 +636,39 @@ func (c *subnetworksRESTClient) List(ctx context.Context, req *computepb.ListSub baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -694,33 +726,39 @@ func (c *subnetworksRESTClient) ListUsable(ctx context.Context, req *computepb.L baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -763,40 +801,44 @@ func (c *subnetworksRESTClient) Patch(ctx context.Context, req *computepb.PatchS baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetIamPolicy sets the access control policy on the specified resource. Replaces any existing policy. @@ -811,39 +853,43 @@ func (c *subnetworksRESTClient) SetIamPolicy(ctx context.Context, req *computepb baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v/setIamPolicy", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Policy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SetPrivateIpGoogleAccess set whether VMs in this subnet can access Google services without assigning external IP addresses through Private Google Access. @@ -865,40 +911,44 @@ func (c *subnetworksRESTClient) SetPrivateIpGoogleAccess(ctx context.Context, re baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -913,39 +963,43 @@ func (c *subnetworksRESTClient) TestIamPermissions(ctx context.Context, req *com baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/subnetworks/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // SubnetworkIterator manages a stream of *computepb.Subnetwork. diff --git a/compute/apiv1/target_grpc_proxies_client.go b/compute/apiv1/target_grpc_proxies_client.go index ec18776d92e..2cd1aaf6884 100644 --- a/compute/apiv1/target_grpc_proxies_client.go +++ b/compute/apiv1/target_grpc_proxies_client.go @@ -196,40 +196,44 @@ func (c *targetGrpcProxiesRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified TargetGrpcProxy resource in the given scope. @@ -237,39 +241,43 @@ func (c *targetGrpcProxiesRESTClient) Get(ctx context.Context, req *computepb.Ge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetGrpcProxies/%v", req.GetProject(), req.GetTargetGrpcProxy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetGrpcProxy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a TargetGrpcProxy in the specified project in the given scope using the parameters that are included in the request. @@ -291,40 +299,44 @@ func (c *targetGrpcProxiesRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List lists the TargetGrpcProxies for a project in the given scope. @@ -364,33 +376,39 @@ func (c *targetGrpcProxiesRESTClient) List(ctx context.Context, req *computepb.L baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -430,40 +448,44 @@ func (c *targetGrpcProxiesRESTClient) Patch(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TargetGrpcProxyIterator manages a stream of *computepb.TargetGrpcProxy. diff --git a/compute/apiv1/target_http_proxies_client.go b/compute/apiv1/target_http_proxies_client.go index 4ad1b3613f9..9cfc2c2365b 100644 --- a/compute/apiv1/target_http_proxies_client.go +++ b/compute/apiv1/target_http_proxies_client.go @@ -239,33 +239,39 @@ func (c *targetHttpProxiesRESTClient) AggregatedList(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]TargetHttpProxiesScopedListPair, 0, len(resp.GetItems())) @@ -305,40 +311,44 @@ func (c *targetHttpProxiesRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified TargetHttpProxy resource. Gets a list of available target HTTP proxies by making a list() request. @@ -346,39 +356,43 @@ func (c *targetHttpProxiesRESTClient) Get(ctx context.Context, req *computepb.Ge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpProxies/%v", req.GetProject(), req.GetTargetHttpProxy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetHttpProxy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a TargetHttpProxy resource in the specified project using the data included in the request. @@ -400,40 +414,44 @@ func (c *targetHttpProxiesRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of TargetHttpProxy resources available to the specified project. @@ -473,33 +491,39 @@ func (c *targetHttpProxiesRESTClient) List(ctx context.Context, req *computepb.L baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -539,40 +563,44 @@ func (c *targetHttpProxiesRESTClient) Patch(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetUrlMap changes the URL map for TargetHttpProxy. @@ -594,40 +622,44 @@ func (c *targetHttpProxiesRESTClient) SetUrlMap(ctx context.Context, req *comput baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TargetHttpProxiesScopedListPair is a holder type for string/*computepb.TargetHttpProxiesScopedList map entries diff --git a/compute/apiv1/target_https_proxies_client.go b/compute/apiv1/target_https_proxies_client.go index b856e906d9a..1717aee9990 100644 --- a/compute/apiv1/target_https_proxies_client.go +++ b/compute/apiv1/target_https_proxies_client.go @@ -260,33 +260,39 @@ func (c *targetHttpsProxiesRESTClient) AggregatedList(ctx context.Context, req * baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]TargetHttpsProxiesScopedListPair, 0, len(resp.GetItems())) @@ -326,40 +332,44 @@ func (c *targetHttpsProxiesRESTClient) Delete(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified TargetHttpsProxy resource. Gets a list of available target HTTPS proxies by making a list() request. @@ -367,39 +377,43 @@ func (c *targetHttpsProxiesRESTClient) Get(ctx context.Context, req *computepb.G baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetHttpsProxies/%v", req.GetProject(), req.GetTargetHttpsProxy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetHttpsProxy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a TargetHttpsProxy resource in the specified project using the data included in the request. @@ -421,40 +435,44 @@ func (c *targetHttpsProxiesRESTClient) Insert(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of TargetHttpsProxy resources available to the specified project. @@ -494,33 +512,39 @@ func (c *targetHttpsProxiesRESTClient) List(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -560,40 +584,44 @@ func (c *targetHttpsProxiesRESTClient) Patch(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetQuicOverride sets the QUIC override policy for TargetHttpsProxy. @@ -615,40 +643,44 @@ func (c *targetHttpsProxiesRESTClient) SetQuicOverride(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetSslCertificates replaces SslCertificates for TargetHttpsProxy. @@ -670,40 +702,44 @@ func (c *targetHttpsProxiesRESTClient) SetSslCertificates(ctx context.Context, r baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetSslPolicy sets the SSL policy for TargetHttpsProxy. The SSL policy specifies the server-side support for SSL features. This affects connections between clients and the HTTPS proxy load balancer. They do not affect the connection between the load balancer and the backends. @@ -725,40 +761,44 @@ func (c *targetHttpsProxiesRESTClient) SetSslPolicy(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetUrlMap changes the URL map for TargetHttpsProxy. @@ -780,40 +820,44 @@ func (c *targetHttpsProxiesRESTClient) SetUrlMap(ctx context.Context, req *compu baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TargetHttpsProxiesScopedListPair is a holder type for string/*computepb.TargetHttpsProxiesScopedList map entries diff --git a/compute/apiv1/target_instances_client.go b/compute/apiv1/target_instances_client.go index d186c499c4f..ad4d22b94a0 100644 --- a/compute/apiv1/target_instances_client.go +++ b/compute/apiv1/target_instances_client.go @@ -225,33 +225,39 @@ func (c *targetInstancesRESTClient) AggregatedList(ctx context.Context, req *com baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]TargetInstancesScopedListPair, 0, len(resp.GetItems())) @@ -291,40 +297,44 @@ func (c *targetInstancesRESTClient) Delete(ctx context.Context, req *computepb.D baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified TargetInstance resource. Gets a list of available target instances by making a list() request. @@ -332,39 +342,43 @@ func (c *targetInstancesRESTClient) Get(ctx context.Context, req *computepb.GetT baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/targetInstances/%v", req.GetProject(), req.GetZone(), req.GetTargetInstance()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetInstance{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a TargetInstance resource in the specified project and zone using the data included in the request. @@ -386,40 +400,44 @@ func (c *targetInstancesRESTClient) Insert(ctx context.Context, req *computepb.I baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of TargetInstance resources available to the specified project and zone. @@ -459,33 +477,39 @@ func (c *targetInstancesRESTClient) List(ctx context.Context, req *computepb.Lis baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/target_pools_client.go b/compute/apiv1/target_pools_client.go index 287862935ce..d221d1efea9 100644 --- a/compute/apiv1/target_pools_client.go +++ b/compute/apiv1/target_pools_client.go @@ -246,40 +246,44 @@ func (c *targetPoolsRESTClient) AddHealthCheck(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AddInstance adds an instance to a target pool. @@ -301,40 +305,44 @@ func (c *targetPoolsRESTClient) AddInstance(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // AggregatedList retrieves an aggregated list of target pools. @@ -377,33 +385,39 @@ func (c *targetPoolsRESTClient) AggregatedList(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]TargetPoolsScopedListPair, 0, len(resp.GetItems())) @@ -443,40 +457,44 @@ func (c *targetPoolsRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified target pool. Gets a list of available target pools by making a list() request. @@ -484,39 +502,43 @@ func (c *targetPoolsRESTClient) Get(ctx context.Context, req *computepb.GetTarge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v", req.GetProject(), req.GetRegion(), req.GetTargetPool()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetPool{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetHealth gets the most recent health check results for each IP for the instance that is referenced by the given target pool. @@ -531,39 +553,43 @@ func (c *targetPoolsRESTClient) GetHealth(ctx context.Context, req *computepb.Ge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetPools/%v/getHealth", req.GetProject(), req.GetRegion(), req.GetTargetPool()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetPoolInstanceHealth{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a target pool in the specified project and region using the data included in the request. @@ -585,40 +611,44 @@ func (c *targetPoolsRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of target pools available to the specified project and region. @@ -658,33 +688,39 @@ func (c *targetPoolsRESTClient) List(ctx context.Context, req *computepb.ListTar baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -724,40 +760,44 @@ func (c *targetPoolsRESTClient) RemoveHealthCheck(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // RemoveInstance removes instance URL from a target pool. @@ -779,40 +819,44 @@ func (c *targetPoolsRESTClient) RemoveInstance(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetBackup changes a backup target pool’s configurations. @@ -837,40 +881,44 @@ func (c *targetPoolsRESTClient) SetBackup(ctx context.Context, req *computepb.Se baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TargetPoolIterator manages a stream of *computepb.TargetPool. diff --git a/compute/apiv1/target_ssl_proxies_client.go b/compute/apiv1/target_ssl_proxies_client.go index fb7f1abd21e..974c8abd529 100644 --- a/compute/apiv1/target_ssl_proxies_client.go +++ b/compute/apiv1/target_ssl_proxies_client.go @@ -217,40 +217,44 @@ func (c *targetSslProxiesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified TargetSslProxy resource. Gets a list of available target SSL proxies by making a list() request. @@ -258,39 +262,43 @@ func (c *targetSslProxiesRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetSslProxies/%v", req.GetProject(), req.GetTargetSslProxy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetSslProxy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a TargetSslProxy resource in the specified project using the data included in the request. @@ -312,40 +320,44 @@ func (c *targetSslProxiesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of TargetSslProxy resources available to the specified project. @@ -385,33 +397,39 @@ func (c *targetSslProxiesRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -451,40 +469,44 @@ func (c *targetSslProxiesRESTClient) SetBackendService(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetProxyHeader changes the ProxyHeaderType for TargetSslProxy. @@ -506,40 +528,44 @@ func (c *targetSslProxiesRESTClient) SetProxyHeader(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetSslCertificates changes SslCertificates for TargetSslProxy. @@ -561,40 +587,44 @@ func (c *targetSslProxiesRESTClient) SetSslCertificates(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetSslPolicy sets the SSL policy for TargetSslProxy. The SSL policy specifies the server-side support for SSL features. This affects connections between clients and the SSL proxy load balancer. They do not affect the connection between the load balancer and the backends. @@ -616,40 +646,44 @@ func (c *targetSslProxiesRESTClient) SetSslPolicy(ctx context.Context, req *comp baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TargetSslProxyIterator manages a stream of *computepb.TargetSslProxy. diff --git a/compute/apiv1/target_tcp_proxies_client.go b/compute/apiv1/target_tcp_proxies_client.go index 263f6a1208a..1ee25c017e0 100644 --- a/compute/apiv1/target_tcp_proxies_client.go +++ b/compute/apiv1/target_tcp_proxies_client.go @@ -203,40 +203,44 @@ func (c *targetTcpProxiesRESTClient) Delete(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified TargetTcpProxy resource. Gets a list of available target TCP proxies by making a list() request. @@ -244,39 +248,43 @@ func (c *targetTcpProxiesRESTClient) Get(ctx context.Context, req *computepb.Get baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/targetTcpProxies/%v", req.GetProject(), req.GetTargetTcpProxy()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetTcpProxy{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a TargetTcpProxy resource in the specified project using the data included in the request. @@ -298,40 +306,44 @@ func (c *targetTcpProxiesRESTClient) Insert(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of TargetTcpProxy resources available to the specified project. @@ -371,33 +383,39 @@ func (c *targetTcpProxiesRESTClient) List(ctx context.Context, req *computepb.Li baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -437,40 +455,44 @@ func (c *targetTcpProxiesRESTClient) SetBackendService(ctx context.Context, req baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // SetProxyHeader changes the ProxyHeaderType for TargetTcpProxy. @@ -492,40 +514,44 @@ func (c *targetTcpProxiesRESTClient) SetProxyHeader(ctx context.Context, req *co baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TargetTcpProxyIterator manages a stream of *computepb.TargetTcpProxy. diff --git a/compute/apiv1/target_vpn_gateways_client.go b/compute/apiv1/target_vpn_gateways_client.go index d4da0309c33..b57d16ec288 100644 --- a/compute/apiv1/target_vpn_gateways_client.go +++ b/compute/apiv1/target_vpn_gateways_client.go @@ -225,33 +225,39 @@ func (c *targetVpnGatewaysRESTClient) AggregatedList(ctx context.Context, req *c baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]TargetVpnGatewaysScopedListPair, 0, len(resp.GetItems())) @@ -291,40 +297,44 @@ func (c *targetVpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified target VPN gateway. Gets a list of available target VPN gateways by making a list() request. @@ -332,39 +342,43 @@ func (c *targetVpnGatewaysRESTClient) Get(ctx context.Context, req *computepb.Ge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/targetVpnGateways/%v", req.GetProject(), req.GetRegion(), req.GetTargetVpnGateway()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TargetVpnGateway{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a target VPN gateway in the specified project and region using the data included in the request. @@ -386,40 +400,44 @@ func (c *targetVpnGatewaysRESTClient) Insert(ctx context.Context, req *computepb baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of target VPN gateways available to the specified project and region. @@ -459,33 +477,39 @@ func (c *targetVpnGatewaysRESTClient) List(ctx context.Context, req *computepb.L baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/url_maps_client.go b/compute/apiv1/url_maps_client.go index 7835a4cca9e..996c45bd4e6 100644 --- a/compute/apiv1/url_maps_client.go +++ b/compute/apiv1/url_maps_client.go @@ -253,33 +253,39 @@ func (c *urlMapsRESTClient) AggregatedList(ctx context.Context, req *computepb.A baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]UrlMapsScopedListPair, 0, len(resp.GetItems())) @@ -319,40 +325,44 @@ func (c *urlMapsRESTClient) Delete(ctx context.Context, req *computepb.DeleteUrl baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified UrlMap resource. Gets a list of available URL maps by making a list() request. @@ -360,39 +370,43 @@ func (c *urlMapsRESTClient) Get(ctx context.Context, req *computepb.GetUrlMapReq baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps/%v", req.GetProject(), req.GetUrlMap()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.UrlMap{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a UrlMap resource in the specified project using the data included in the request. @@ -414,40 +428,44 @@ func (c *urlMapsRESTClient) Insert(ctx context.Context, req *computepb.InsertUrl baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // InvalidateCache initiates a cache invalidation operation, invalidating the specified path, scoped to the specified UrlMap. For more information, see Invalidating cached content (at /cdn/docs/invalidating-cached-content). @@ -469,40 +487,44 @@ func (c *urlMapsRESTClient) InvalidateCache(ctx context.Context, req *computepb. baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves the list of UrlMap resources available to the specified project. @@ -542,33 +564,39 @@ func (c *urlMapsRESTClient) List(ctx context.Context, req *computepb.ListUrlMaps baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -608,40 +636,44 @@ func (c *urlMapsRESTClient) Patch(ctx context.Context, req *computepb.PatchUrlMa baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PATCH", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Update updates the specified UrlMap resource with the data included in the request. @@ -663,40 +695,44 @@ func (c *urlMapsRESTClient) Update(ctx context.Context, req *computepb.UpdateUrl baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("PUT", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Validate runs static validation for the UrlMap. In particular, the tests of the provided UrlMap will be run. Calling this method does NOT create the UrlMap. @@ -711,39 +747,43 @@ func (c *urlMapsRESTClient) Validate(ctx context.Context, req *computepb.Validat baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/urlMaps/%v/validate", req.GetProject(), req.GetUrlMap()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.UrlMapsValidateResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // UrlMapsScopedListPair is a holder type for string/*computepb.UrlMapsScopedList map entries diff --git a/compute/apiv1/vpn_gateways_client.go b/compute/apiv1/vpn_gateways_client.go index 2ad6f0752c8..084879e2219 100644 --- a/compute/apiv1/vpn_gateways_client.go +++ b/compute/apiv1/vpn_gateways_client.go @@ -246,33 +246,39 @@ func (c *vpnGatewaysRESTClient) AggregatedList(ctx context.Context, req *compute baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]VpnGatewaysScopedListPair, 0, len(resp.GetItems())) @@ -312,40 +318,44 @@ func (c *vpnGatewaysRESTClient) Delete(ctx context.Context, req *computepb.Delet baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified VPN gateway. Gets a list of available VPN gateways by making a list() request. @@ -353,39 +363,43 @@ func (c *vpnGatewaysRESTClient) Get(ctx context.Context, req *computepb.GetVpnGa baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways/%v", req.GetProject(), req.GetRegion(), req.GetVpnGateway()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.VpnGateway{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // GetStatus returns the status for the specified VPN gateway. @@ -393,39 +407,43 @@ func (c *vpnGatewaysRESTClient) GetStatus(ctx context.Context, req *computepb.Ge baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways/%v/getStatus", req.GetProject(), req.GetRegion(), req.GetVpnGateway()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.VpnGatewaysGetStatusResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a VPN gateway in the specified project and region using the data included in the request. @@ -447,40 +465,44 @@ func (c *vpnGatewaysRESTClient) Insert(ctx context.Context, req *computepb.Inser baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of VPN gateways available to the specified project and region. @@ -520,33 +542,39 @@ func (c *vpnGatewaysRESTClient) List(ctx context.Context, req *computepb.ListVpn baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -586,40 +614,44 @@ func (c *vpnGatewaysRESTClient) SetLabels(ctx context.Context, req *computepb.Se baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // TestIamPermissions returns permissions that a caller has on the specified resource. @@ -634,39 +666,43 @@ func (c *vpnGatewaysRESTClient) TestIamPermissions(ctx context.Context, req *com baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnGateways/%v/testIamPermissions", req.GetProject(), req.GetRegion(), req.GetResource()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.TestPermissionsResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // VpnGatewayIterator manages a stream of *computepb.VpnGateway. diff --git a/compute/apiv1/vpn_tunnels_client.go b/compute/apiv1/vpn_tunnels_client.go index 6cc0966b4b8..9dd82b0b90f 100644 --- a/compute/apiv1/vpn_tunnels_client.go +++ b/compute/apiv1/vpn_tunnels_client.go @@ -225,33 +225,39 @@ func (c *vpnTunnelsRESTClient) AggregatedList(ctx context.Context, req *computep baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp elems := make([]VpnTunnelsScopedListPair, 0, len(resp.GetItems())) @@ -291,40 +297,44 @@ func (c *vpnTunnelsRESTClient) Delete(ctx context.Context, req *computepb.Delete baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // Get returns the specified VpnTunnel resource. Gets a list of available VPN tunnels by making a list() request. @@ -332,39 +342,43 @@ func (c *vpnTunnelsRESTClient) Get(ctx context.Context, req *computepb.GetVpnTun baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/regions/%v/vpnTunnels/%v", req.GetProject(), req.GetRegion(), req.GetVpnTunnel()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.VpnTunnel{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Insert creates a VpnTunnel resource in the specified project and region using the data included in the request. @@ -386,40 +400,44 @@ func (c *vpnTunnelsRESTClient) Insert(ctx context.Context, req *computepb.Insert baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - op := &Operation{proto: rsp} - return op, err + op := &Operation{proto: resp} + return op, nil } // List retrieves a list of VpnTunnel resources contained in the specified project and region. @@ -459,33 +477,39 @@ func (c *vpnTunnelsRESTClient) List(ctx context.Context, req *computepb.ListVpnT baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/apiv1/zone_operations_client.go b/compute/apiv1/zone_operations_client.go index bb027659d80..b679578fc31 100644 --- a/compute/apiv1/zone_operations_client.go +++ b/compute/apiv1/zone_operations_client.go @@ -181,39 +181,43 @@ func (c *zoneOperationsRESTClient) Delete(ctx context.Context, req *computepb.De baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/operations/%v", req.GetProject(), req.GetZone(), req.GetOperation()) - httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("DELETE", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.DeleteZoneOperationResponse{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // Get retrieves the specified zone-specific Operations resource. @@ -221,39 +225,43 @@ func (c *zoneOperationsRESTClient) Get(ctx context.Context, req *computepb.GetZo baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/operations/%v", req.GetProject(), req.GetZone(), req.GetOperation()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves a list of Operation resources contained within the specified zone. @@ -293,33 +301,39 @@ func (c *zoneOperationsRESTClient) List(ctx context.Context, req *computepb.List baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err - } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } @@ -345,37 +359,41 @@ func (c *zoneOperationsRESTClient) Wait(ctx context.Context, req *computepb.Wait baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v/operations/%v/wait", req.GetProject(), req.GetZone(), req.GetOperation()) - httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, metadata.Pairs("Content-Type", "application/json")) + unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} + resp := &computepb.Operation{} + e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { + httpReq, err := http.NewRequest("POST", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Operation{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } diff --git a/compute/apiv1/zones_client.go b/compute/apiv1/zones_client.go index 2a60f2e7070..dc5285109e4 100644 --- a/compute/apiv1/zones_client.go +++ b/compute/apiv1/zones_client.go @@ -167,39 +167,43 @@ func (c *zonesRESTClient) Get(ctx context.Context, req *computepb.GetZoneRequest baseUrl, _ := url.Parse(c.endpoint) baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/zones/%v", req.GetProject(), req.GetZone()) - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, err - } - httpReq = httpReq.WithContext(ctx) - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - httpReq.Header["Content-Type"] = []string{"application/json"} + // Build HTTP headers from client and context metadata. + headers := buildHeaders(ctx, c.xGoogMetadata, 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq = httpReq.WithContext(ctx) + httpReq.Header = headers - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, err - } - defer httpRsp.Body.Close() + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, err - } + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, err - } + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } - unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true} - rsp := &computepb.Zone{} + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } - if err := unm.Unmarshal(buf, rsp); err != nil { - return nil, maybeUnknownEnum(err) + return nil + }, opts...) + if e != nil { + return nil, e } - return rsp, nil + return resp, nil } // List retrieves the list of Zone resources available to the specified project. @@ -239,33 +243,39 @@ func (c *zonesRESTClient) List(ctx context.Context, req *computepb.ListZonesRequ baseUrl.RawQuery = params.Encode() - httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) - if err != nil { - return nil, "", err - } - - // Set the headers - for k, v := range c.xGoogMetadata { - httpReq.Header[k] = v - } - - httpReq.Header["Content-Type"] = []string{"application/json"} - httpRsp, err := c.httpClient.Do(httpReq) - if err != nil { - return nil, "", err - } - defer httpRsp.Body.Close() - - if err = googleapi.CheckResponse(httpRsp); err != nil { - return nil, "", err + // 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 { + httpReq, err := http.NewRequest("GET", baseUrl.String(), nil) + if err != nil { + return err + } + httpReq.Header = headers + + httpRsp, err := c.httpClient.Do(httpReq) + if err != nil { + return err + } + defer httpRsp.Body.Close() + + if err = googleapi.CheckResponse(httpRsp); err != nil { + return err + } + + buf, err := ioutil.ReadAll(httpRsp.Body) + if err != nil { + return err + } + + if err := unm.Unmarshal(buf, resp); err != nil { + return maybeUnknownEnum(err) + } + + return nil + }, opts...) + if e != nil { + return nil, "", e } - - buf, err := ioutil.ReadAll(httpRsp.Body) - if err != nil { - return nil, "", err - } - - unm.Unmarshal(buf, resp) it.Response = resp return resp.GetItems(), resp.GetNextPageToken(), nil } diff --git a/compute/go.mod b/compute/go.mod index 10f683be915..239353602cc 100644 --- a/compute/go.mod +++ b/compute/go.mod @@ -7,8 +7,8 @@ require ( github.com/google/go-cmp v0.5.7 github.com/googleapis/gax-go/v2 v2.1.1 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.27.1 ) diff --git a/compute/go.sum b/compute/go.sum index b4fb860f578..d871d61b5c9 100644 --- a/compute/go.sum +++ b/compute/go.sum @@ -333,8 +333,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -435,8 +435,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -505,9 +505,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/documentai/apiv1/doc.go b/documentai/apiv1/doc.go index 406ae7bd440..ab7e16acddf 100644 --- a/documentai/apiv1/doc.go +++ b/documentai/apiv1/doc.go @@ -86,7 +86,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) diff --git a/documentai/go.mod b/documentai/go.mod index dfe438f3a5c..76cfdf7f1ed 100644 --- a/documentai/go.mod +++ b/documentai/go.mod @@ -5,8 +5,8 @@ go 1.16 require ( cloud.google.com/go v0.100.2 github.com/googleapis/gax-go/v2 v2.1.1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.27.1 ) diff --git a/documentai/go.sum b/documentai/go.sum index 284fe124169..6cd198a3158 100644 --- a/documentai/go.sum +++ b/documentai/go.sum @@ -333,8 +333,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -435,8 +435,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -505,9 +505,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/go.mod b/go.mod index 5991f3fae03..006540c7906 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( go.opencensus.io v0.23.0 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.27.1 ) diff --git a/go.sum b/go.sum index 0fb4537c2cb..d8dfd792754 100644 --- a/go.sum +++ b/go.sum @@ -336,8 +336,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -438,8 +438,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -508,9 +508,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 h1:YxHp5zqIcAShDEvRr5/0rVESVS+njYF68PSdazrNLJo= -google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/iap/apiv1/doc.go b/iap/apiv1/doc.go index 88fcbc3e29d..10c82e6341c 100644 --- a/iap/apiv1/doc.go +++ b/iap/apiv1/doc.go @@ -84,7 +84,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) diff --git a/iap/go.mod b/iap/go.mod index ac93bf782f4..b1c05170790 100644 --- a/iap/go.mod +++ b/iap/go.mod @@ -4,8 +4,8 @@ go 1.16 require ( github.com/googleapis/gax-go/v2 v2.1.1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.27.1 ) diff --git a/iap/go.sum b/iap/go.sum index 284fe124169..6cd198a3158 100644 --- a/iap/go.sum +++ b/iap/go.sum @@ -333,8 +333,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -435,8 +435,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -505,9 +505,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CancelJob/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CancelJob/main.go new file mode 100644 index 00000000000..fabbbf1efa2 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/CancelJob/main.go @@ -0,0 +1,46 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_CancelJob_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.CancelJobRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CancelJobRequest. + } + err = c.CancelJob(ctx, req) + if err != nil { + // TODO: Handle error. + } +} + +// [END dataplex_v1_generated_DataplexService_CancelJob_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateAsset/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateAsset/main.go new file mode 100644 index 00000000000..f560f083097 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateAsset/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_CreateAsset_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.CreateAssetRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateAssetRequest. + } + op, err := c.CreateAsset(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_CreateAsset_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateLake/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateLake/main.go new file mode 100644 index 00000000000..9bea158d637 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateLake/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_CreateLake_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.CreateLakeRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateLakeRequest. + } + op, err := c.CreateLake(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_CreateLake_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateTask/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateTask/main.go new file mode 100644 index 00000000000..8bad520d939 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateTask/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_CreateTask_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.CreateTaskRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateTaskRequest. + } + op, err := c.CreateTask(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_CreateTask_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateZone/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateZone/main.go new file mode 100644 index 00000000000..f9c5a290cb5 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateZone/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_CreateZone_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.CreateZoneRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateZoneRequest. + } + op, err := c.CreateZone(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_CreateZone_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteAsset/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteAsset/main.go new file mode 100644 index 00000000000..b62be1ceefc --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteAsset/main.go @@ -0,0 +1,51 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_DeleteAsset_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.DeleteAssetRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteAssetRequest. + } + op, err := c.DeleteAsset(ctx, req) + if err != nil { + // TODO: Handle error. + } + + err = op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } +} + +// [END dataplex_v1_generated_DataplexService_DeleteAsset_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteLake/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteLake/main.go new file mode 100644 index 00000000000..a27bf1f83dc --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteLake/main.go @@ -0,0 +1,51 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_DeleteLake_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.DeleteLakeRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteLakeRequest. + } + op, err := c.DeleteLake(ctx, req) + if err != nil { + // TODO: Handle error. + } + + err = op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } +} + +// [END dataplex_v1_generated_DataplexService_DeleteLake_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteTask/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteTask/main.go new file mode 100644 index 00000000000..b0a8e1848d8 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteTask/main.go @@ -0,0 +1,51 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_DeleteTask_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.DeleteTaskRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteTaskRequest. + } + op, err := c.DeleteTask(ctx, req) + if err != nil { + // TODO: Handle error. + } + + err = op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } +} + +// [END dataplex_v1_generated_DataplexService_DeleteTask_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteZone/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteZone/main.go new file mode 100644 index 00000000000..7831038cec3 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteZone/main.go @@ -0,0 +1,51 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_DeleteZone_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.DeleteZoneRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteZoneRequest. + } + op, err := c.DeleteZone(ctx, req) + if err != nil { + // TODO: Handle error. + } + + err = op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } +} + +// [END dataplex_v1_generated_DataplexService_DeleteZone_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetAsset/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetAsset/main.go new file mode 100644 index 00000000000..651c9b8c55a --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/GetAsset/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_GetAsset_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.GetAssetRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetAssetRequest. + } + resp, err := c.GetAsset(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_GetAsset_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetJob/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetJob/main.go new file mode 100644 index 00000000000..c9c82d7cc1e --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/GetJob/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_GetJob_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.GetJobRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetJobRequest. + } + resp, err := c.GetJob(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_GetJob_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetLake/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetLake/main.go new file mode 100644 index 00000000000..32b8916086d --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/GetLake/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_GetLake_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.GetLakeRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetLakeRequest. + } + resp, err := c.GetLake(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_GetLake_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetTask/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetTask/main.go new file mode 100644 index 00000000000..fb4f224a31b --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/GetTask/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_GetTask_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.GetTaskRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetTaskRequest. + } + resp, err := c.GetTask(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_GetTask_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetZone/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetZone/main.go new file mode 100644 index 00000000000..ae928e566ea --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/GetZone/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_GetZone_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.GetZoneRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetZoneRequest. + } + resp, err := c.GetZone(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_GetZone_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListAssetActions/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListAssetActions/main.go new file mode 100644 index 00000000000..b5950e563aa --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/ListAssetActions/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_ListAssetActions_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListAssetActionsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListAssetActionsRequest. + } + it := c.ListAssetActions(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_DataplexService_ListAssetActions_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListAssets/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListAssets/main.go new file mode 100644 index 00000000000..eeb33506a63 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/ListAssets/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_ListAssets_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListAssetsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListAssetsRequest. + } + it := c.ListAssets(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_DataplexService_ListAssets_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListJobs/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListJobs/main.go new file mode 100644 index 00000000000..54345e5deba --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/ListJobs/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_ListJobs_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListJobsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListJobsRequest. + } + it := c.ListJobs(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_DataplexService_ListJobs_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListLakeActions/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListLakeActions/main.go new file mode 100644 index 00000000000..65097a9b27b --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/ListLakeActions/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_ListLakeActions_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListLakeActionsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListLakeActionsRequest. + } + it := c.ListLakeActions(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_DataplexService_ListLakeActions_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListLakes/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListLakes/main.go new file mode 100644 index 00000000000..c9762be0c52 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/ListLakes/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_ListLakes_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListLakesRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListLakesRequest. + } + it := c.ListLakes(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_DataplexService_ListLakes_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListTasks/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListTasks/main.go new file mode 100644 index 00000000000..eccd3113d8a --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/ListTasks/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_ListTasks_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListTasksRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListTasksRequest. + } + it := c.ListTasks(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_DataplexService_ListTasks_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListZoneActions/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListZoneActions/main.go new file mode 100644 index 00000000000..d6883936c8d --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/ListZoneActions/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_ListZoneActions_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListZoneActionsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListZoneActionsRequest. + } + it := c.ListZoneActions(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_DataplexService_ListZoneActions_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListZones/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListZones/main.go new file mode 100644 index 00000000000..ad94b3871f2 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/ListZones/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_ListZones_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListZonesRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListZonesRequest. + } + it := c.ListZones(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_DataplexService_ListZones_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateAsset/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateAsset/main.go new file mode 100644 index 00000000000..303f1f72b0f --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateAsset/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_UpdateAsset_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.UpdateAssetRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateAssetRequest. + } + op, err := c.UpdateAsset(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_UpdateAsset_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateLake/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateLake/main.go new file mode 100644 index 00000000000..12d75e8044e --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateLake/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_UpdateLake_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.UpdateLakeRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateLakeRequest. + } + op, err := c.UpdateLake(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_UpdateLake_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateTask/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateTask/main.go new file mode 100644 index 00000000000..4bae4821775 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateTask/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_UpdateTask_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.UpdateTaskRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateTaskRequest. + } + op, err := c.UpdateTask(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_UpdateTask_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateZone/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateZone/main.go new file mode 100644 index 00000000000..f3c4a508ef8 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateZone/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_DataplexService_UpdateZone_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.UpdateZoneRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateZoneRequest. + } + op, err := c.UpdateZone(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_DataplexService_UpdateZone_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetEntity/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetEntity/main.go new file mode 100644 index 00000000000..503537407ba --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetEntity/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_MetadataService_GetEntity_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewMetadataClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.GetEntityRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetEntityRequest. + } + resp, err := c.GetEntity(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_MetadataService_GetEntity_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetPartition/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetPartition/main.go new file mode 100644 index 00000000000..6142ad197cd --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetPartition/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_MetadataService_GetPartition_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewMetadataClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.GetPartitionRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetPartitionRequest. + } + resp, err := c.GetPartition(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END dataplex_v1_generated_MetadataService_GetPartition_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListEntities/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListEntities/main.go new file mode 100644 index 00000000000..b47da6be32b --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListEntities/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_MetadataService_ListEntities_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewMetadataClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListEntitiesRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListEntitiesRequest. + } + it := c.ListEntities(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_MetadataService_ListEntities_sync] diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListPartitions/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListPartitions/main.go new file mode 100644 index 00000000000..ed79df4afb3 --- /dev/null +++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListPartitions/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START dataplex_v1_generated_MetadataService_ListPartitions_sync] + +package main + +import ( + "context" + + dataplex "cloud.google.com/go/dataplex/apiv1" + "google.golang.org/api/iterator" + dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1" +) + +func main() { + ctx := context.Background() + c, err := dataplex.NewMetadataClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &dataplexpb.ListPartitionsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListPartitionsRequest. + } + it := c.ListPartitions(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END dataplex_v1_generated_MetadataService_ListPartitions_sync] diff --git a/internal/generated/snippets/go.mod b/internal/generated/snippets/go.mod index 93d05d54b07..e12f005f077 100644 --- a/internal/generated/snippets/go.mod +++ b/internal/generated/snippets/go.mod @@ -31,6 +31,7 @@ require ( cloud.google.com/go/dataflow v0.1.0 cloud.google.com/go/datafusion v1.0.0 cloud.google.com/go/datalabeling v0.1.0 + cloud.google.com/go/dataplex v0.0.0-00010101000000-000000000000 cloud.google.com/go/dataproc v1.2.0 cloud.google.com/go/dataqna v0.1.0 cloud.google.com/go/datastore v1.6.0 @@ -110,10 +111,8 @@ require ( cloud.google.com/go/workflows v1.1.0 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect - golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 - google.golang.org/grpc v1.43.0 // indirect + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 ) replace cloud.google.com/go/storagetransfer => ../../../storagetransfer @@ -333,3 +332,5 @@ replace cloud.google.com/go/pubsublite => ../../../pubsublite replace cloud.google.com/go/spanner => ../../../spanner replace cloud.google.com/go/storage => ../../../storage + +replace cloud.google.com/go/dataplex => ../../../dataplex diff --git a/internal/generated/snippets/go.sum b/internal/generated/snippets/go.sum index 211a3617892..d7da2d8a65b 100644 --- a/internal/generated/snippets/go.sum +++ b/internal/generated/snippets/go.sum @@ -122,8 +122,8 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -148,8 +148,9 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= @@ -164,9 +165,11 @@ google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 h1:YxHp5zqIcAShDEvRr5/0rVESVS+njYF68PSdazrNLJo= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -180,8 +183,8 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/CreateChannel/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/CreateChannel/main.go new file mode 100644 index 00000000000..e6888a34038 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/CreateChannel/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_CreateChannel_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.CreateChannelRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#CreateChannelRequest. + } + op, err := c.CreateChannel(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_CreateChannel_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/CreateEvent/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/CreateEvent/main.go new file mode 100644 index 00000000000..8463625b11f --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/CreateEvent/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_CreateEvent_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.CreateEventRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#CreateEventRequest. + } + resp, err := c.CreateEvent(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_CreateEvent_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/CreateInput/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/CreateInput/main.go new file mode 100644 index 00000000000..660fc64beed --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/CreateInput/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_CreateInput_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.CreateInputRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#CreateInputRequest. + } + op, err := c.CreateInput(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_CreateInput_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/DeleteChannel/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/DeleteChannel/main.go new file mode 100644 index 00000000000..eb054fa8482 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/DeleteChannel/main.go @@ -0,0 +1,51 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_DeleteChannel_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.DeleteChannelRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#DeleteChannelRequest. + } + op, err := c.DeleteChannel(ctx, req) + if err != nil { + // TODO: Handle error. + } + + err = op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } +} + +// [END livestream_v1_generated_LivestreamService_DeleteChannel_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/DeleteEvent/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/DeleteEvent/main.go new file mode 100644 index 00000000000..1d14dbadfd5 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/DeleteEvent/main.go @@ -0,0 +1,46 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_DeleteEvent_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.DeleteEventRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#DeleteEventRequest. + } + err = c.DeleteEvent(ctx, req) + if err != nil { + // TODO: Handle error. + } +} + +// [END livestream_v1_generated_LivestreamService_DeleteEvent_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/DeleteInput/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/DeleteInput/main.go new file mode 100644 index 00000000000..e1ff122bee5 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/DeleteInput/main.go @@ -0,0 +1,51 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_DeleteInput_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.DeleteInputRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#DeleteInputRequest. + } + op, err := c.DeleteInput(ctx, req) + if err != nil { + // TODO: Handle error. + } + + err = op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } +} + +// [END livestream_v1_generated_LivestreamService_DeleteInput_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/GetChannel/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/GetChannel/main.go new file mode 100644 index 00000000000..27ec25302cd --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/GetChannel/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_GetChannel_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.GetChannelRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#GetChannelRequest. + } + resp, err := c.GetChannel(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_GetChannel_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/GetEvent/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/GetEvent/main.go new file mode 100644 index 00000000000..fea97b3b3a0 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/GetEvent/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_GetEvent_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.GetEventRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#GetEventRequest. + } + resp, err := c.GetEvent(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_GetEvent_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/GetInput/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/GetInput/main.go new file mode 100644 index 00000000000..e1badc02a8d --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/GetInput/main.go @@ -0,0 +1,48 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_GetInput_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.GetInputRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#GetInputRequest. + } + resp, err := c.GetInput(ctx, req) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_GetInput_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/ListChannels/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/ListChannels/main.go new file mode 100644 index 00000000000..62ad835b7f5 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/ListChannels/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_ListChannels_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + "google.golang.org/api/iterator" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.ListChannelsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#ListChannelsRequest. + } + it := c.ListChannels(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END livestream_v1_generated_LivestreamService_ListChannels_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/ListEvents/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/ListEvents/main.go new file mode 100644 index 00000000000..46001f17307 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/ListEvents/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_ListEvents_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + "google.golang.org/api/iterator" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.ListEventsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#ListEventsRequest. + } + it := c.ListEvents(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END livestream_v1_generated_LivestreamService_ListEvents_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/ListInputs/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/ListInputs/main.go new file mode 100644 index 00000000000..c1adf417563 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/ListInputs/main.go @@ -0,0 +1,55 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_ListInputs_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + "google.golang.org/api/iterator" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.ListInputsRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#ListInputsRequest. + } + it := c.ListInputs(ctx, req) + for { + resp, err := it.Next() + if err == iterator.Done { + break + } + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp + } +} + +// [END livestream_v1_generated_LivestreamService_ListInputs_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/StartChannel/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/StartChannel/main.go new file mode 100644 index 00000000000..0e9a0ed18f4 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/StartChannel/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_StartChannel_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.StartChannelRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#StartChannelRequest. + } + op, err := c.StartChannel(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_StartChannel_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/StopChannel/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/StopChannel/main.go new file mode 100644 index 00000000000..7fdb2f986af --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/StopChannel/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_StopChannel_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.StopChannelRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#StopChannelRequest. + } + op, err := c.StopChannel(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_StopChannel_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/UpdateChannel/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/UpdateChannel/main.go new file mode 100644 index 00000000000..76e77949236 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/UpdateChannel/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_UpdateChannel_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.UpdateChannelRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#UpdateChannelRequest. + } + op, err := c.UpdateChannel(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_UpdateChannel_sync] diff --git a/internal/generated/snippets/video/livestream/apiv1/Client/UpdateInput/main.go b/internal/generated/snippets/video/livestream/apiv1/Client/UpdateInput/main.go new file mode 100644 index 00000000000..5214ddb5244 --- /dev/null +++ b/internal/generated/snippets/video/livestream/apiv1/Client/UpdateInput/main.go @@ -0,0 +1,53 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by cloud.google.com/go/internal/gapicgen/gensnippets. DO NOT EDIT. + +// [START livestream_v1_generated_LivestreamService_UpdateInput_sync] + +package main + +import ( + "context" + + livestream "cloud.google.com/go/video/livestream/apiv1" + livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1" +) + +func main() { + ctx := context.Background() + c, err := livestream.NewClient(ctx) + if err != nil { + // TODO: Handle error. + } + defer c.Close() + + req := &livestreampb.UpdateInputRequest{ + // TODO: Fill request struct fields. + // See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#UpdateInputRequest. + } + op, err := c.UpdateInput(ctx, req) + if err != nil { + // TODO: Handle error. + } + + resp, err := op.Wait(ctx) + if err != nil { + // TODO: Handle error. + } + // TODO: Use resp. + _ = resp +} + +// [END livestream_v1_generated_LivestreamService_UpdateInput_sync] diff --git a/internal/godocfx/go.sum b/internal/godocfx/go.sum index 730ea73d9b7..4e1c41e46f2 100644 --- a/internal/godocfx/go.sum +++ b/internal/godocfx/go.sum @@ -136,8 +136,8 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -166,8 +166,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3lv+E= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= @@ -187,9 +187,9 @@ google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211016002631-37fc39342514/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 h1:YxHp5zqIcAShDEvRr5/0rVESVS+njYF68PSdazrNLJo= -google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/longrunning/autogen/doc.go b/longrunning/autogen/doc.go index 7ee9a0d8f79..da087ca760c 100644 --- a/longrunning/autogen/doc.go +++ b/longrunning/autogen/doc.go @@ -90,7 +90,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) @@ -115,7 +115,9 @@ func checkDisableDeadlines() (bool, error) { // DefaultAuthScopes reports the default set of authentication scopes to use with this package. func DefaultAuthScopes() []string { - return []string{} + return []string{ + "", + } } // versionGo returns the Go runtime version. The returned string diff --git a/osconfig/agentendpoint/apiv1/doc.go b/osconfig/agentendpoint/apiv1/doc.go index c9a59db4294..193ccc57039 100644 --- a/osconfig/agentendpoint/apiv1/doc.go +++ b/osconfig/agentendpoint/apiv1/doc.go @@ -67,7 +67,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) @@ -92,7 +92,9 @@ func checkDisableDeadlines() (bool, error) { // DefaultAuthScopes reports the default set of authentication scopes to use with this package. func DefaultAuthScopes() []string { - return []string{} + return []string{ + "", + } } // versionGo returns the Go runtime version. The returned string diff --git a/osconfig/agentendpoint/apiv1beta/doc.go b/osconfig/agentendpoint/apiv1beta/doc.go index ad596c1b830..bb56bda8b64 100644 --- a/osconfig/agentendpoint/apiv1beta/doc.go +++ b/osconfig/agentendpoint/apiv1beta/doc.go @@ -69,7 +69,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) @@ -94,7 +94,9 @@ func checkDisableDeadlines() (bool, error) { // DefaultAuthScopes reports the default set of authentication scopes to use with this package. func DefaultAuthScopes() []string { - return []string{} + return []string{ + "", + } } // versionGo returns the Go runtime version. The returned string diff --git a/osconfig/go.mod b/osconfig/go.mod index d463e342b57..d0ab04224c8 100644 --- a/osconfig/go.mod +++ b/osconfig/go.mod @@ -5,8 +5,8 @@ go 1.16 require ( cloud.google.com/go v0.100.2 github.com/googleapis/gax-go/v2 v2.1.1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.27.1 ) diff --git a/osconfig/go.sum b/osconfig/go.sum index 284fe124169..6cd198a3158 100644 --- a/osconfig/go.sum +++ b/osconfig/go.sum @@ -333,8 +333,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -435,8 +435,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -505,9 +505,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/redis/apiv1beta1/doc.go b/redis/apiv1beta1/doc.go index 3ef2e326ed8..9af873f8c92 100644 --- a/redis/apiv1beta1/doc.go +++ b/redis/apiv1beta1/doc.go @@ -92,7 +92,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) diff --git a/redis/go.mod b/redis/go.mod index 4a5f0df94ab..939f0207956 100644 --- a/redis/go.mod +++ b/redis/go.mod @@ -6,8 +6,8 @@ require ( cloud.google.com/go v0.100.2 github.com/golang/protobuf v1.5.2 github.com/googleapis/gax-go/v2 v2.1.1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.27.1 ) diff --git a/redis/go.sum b/redis/go.sum index 284fe124169..6cd198a3158 100644 --- a/redis/go.sum +++ b/redis/go.sum @@ -333,8 +333,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -435,8 +435,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -505,9 +505,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/secretmanager/apiv1/doc.go b/secretmanager/apiv1/doc.go index f31e01ca106..4e9f4252301 100644 --- a/secretmanager/apiv1/doc.go +++ b/secretmanager/apiv1/doc.go @@ -91,7 +91,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) diff --git a/secretmanager/go.mod b/secretmanager/go.mod index 32ae01fc296..e67e4cfd8b8 100644 --- a/secretmanager/go.mod +++ b/secretmanager/go.mod @@ -5,8 +5,8 @@ go 1.16 require ( cloud.google.com/go/iam v0.1.0 github.com/googleapis/gax-go/v2 v2.1.1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.27.1 ) diff --git a/secretmanager/go.sum b/secretmanager/go.sum index 055870bf3cc..66ea022977b 100644 --- a/secretmanager/go.sum +++ b/secretmanager/go.sum @@ -336,8 +336,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -438,8 +438,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -508,9 +508,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/texttospeech/apiv1/doc.go b/texttospeech/apiv1/doc.go index 077c5c861d1..8be6e38132f 100644 --- a/texttospeech/apiv1/doc.go +++ b/texttospeech/apiv1/doc.go @@ -85,7 +85,7 @@ import ( type clientHookParams struct{} type clientHook func(context.Context, clientHookParams) ([]option.ClientOption, error) -const versionClient = "20220114" +const versionClient = "20220201" func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context { out, _ := metadata.FromOutgoingContext(ctx) diff --git a/texttospeech/go.mod b/texttospeech/go.mod index 9df834c576a..d1c103b42d9 100644 --- a/texttospeech/go.mod +++ b/texttospeech/go.mod @@ -6,7 +6,7 @@ require ( cloud.google.com/go v0.100.2 github.com/golang/protobuf v1.5.2 github.com/googleapis/gax-go/v2 v2.1.1 - google.golang.org/api v0.65.0 - google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 + google.golang.org/api v0.66.0 + google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 google.golang.org/grpc v1.40.1 ) diff --git a/texttospeech/go.sum b/texttospeech/go.sum index 284fe124169..6cd198a3158 100644 --- a/texttospeech/go.sum +++ b/texttospeech/go.sum @@ -333,8 +333,8 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -435,8 +435,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.65.0 h1:MTW9c+LIBAbwoS1Gb+YV7NjFBt2f7GtAS5hIzh2NjgQ= -google.golang.org/api v0.65.0/go.mod h1:ArYhxgGadlWmqO1IqVujw6Cs8IdD33bTmzKo2Sh+cbg= +google.golang.org/api v0.66.0 h1:CbGy4LEiXCVCiNEDFgGpWOVwsDT7E2Qej1ZvN1P7KPg= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -505,9 +505,9 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q= -google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44 h1:0UVUC7VWA/mIU+5a4hVWH6xa234gLcRX8ZcrFKmWWKA= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=