diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/BUILD b/staging/src/k8s.io/legacy-cloud-providers/gce/BUILD index 1354a0ab1b7..813442ecace 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/BUILD +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/BUILD @@ -79,6 +79,7 @@ go_library( "//vendor/google.golang.org/api/compute/v1:go_default_library", "//vendor/google.golang.org/api/container/v1:go_default_library", "//vendor/google.golang.org/api/googleapi:go_default_library", + "//vendor/google.golang.org/api/option:go_default_library", "//vendor/google.golang.org/api/tpu/v1:go_default_library", "//vendor/gopkg.in/gcfg.v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce.go index 6dfff3df6e8..1de777909c0 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce.go @@ -38,6 +38,7 @@ import ( computebeta "google.golang.org/api/compute/v0.beta" compute "google.golang.org/api/compute/v1" container "google.golang.org/api/container/v1" + "google.golang.org/api/option" "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud" @@ -395,31 +396,19 @@ func CreateGCECloud(config *CloudConfig) (*Cloud, error) { config.NetworkProjectID = config.ProjectID } - client, err := newOauthClient(config.TokenSource) - if err != nil { - return nil, err - } - service, err := compute.New(client) + service, err := compute.NewService(context.Background(), option.WithTokenSource(config.TokenSource)) if err != nil { return nil, err } service.UserAgent = userAgent - client, err = newOauthClient(config.TokenSource) - if err != nil { - return nil, err - } - serviceBeta, err := computebeta.New(client) + serviceBeta, err := computebeta.NewService(context.Background(), option.WithTokenSource(config.TokenSource)) if err != nil { return nil, err } serviceBeta.UserAgent = userAgent - client, err = newOauthClient(config.TokenSource) - if err != nil { - return nil, err - } - serviceAlpha, err := computealpha.New(client) + serviceAlpha, err := computealpha.NewService(context.Background(), option.WithTokenSource(config.TokenSource)) if err != nil { return nil, err } @@ -435,7 +424,7 @@ func CreateGCECloud(config *CloudConfig) (*Cloud, error) { serviceAlpha.BasePath = fmt.Sprintf("%sprojects/", strings.Replace(config.APIEndpoint, "v1", "alpha", -1)) } - containerService, err := container.New(client) + containerService, err := container.NewService(context.Background(), option.WithTokenSource(config.TokenSource)) if err != nil { return nil, err } @@ -444,6 +433,10 @@ func CreateGCECloud(config *CloudConfig) (*Cloud, error) { containerService.BasePath = config.ContainerAPIEndpoint } + client, err := newOauthClient(config.TokenSource) + if err != nil { + return nil, err + } tpuService, err := newTPUService(client) if err != nil { return nil, err diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_fake.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_fake.go index a2ea59f8b32..07c42477f9e 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_fake.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_fake.go @@ -19,8 +19,7 @@ limitations under the License. package gce import ( - "fmt" - "net/http" + "context" "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud" compute "google.golang.org/api/compute/v1" @@ -50,12 +49,6 @@ func DefaultTestClusterValues() TestClusterValues { } } -type fakeRoundTripper struct{} - -func (*fakeRoundTripper) RoundTrip(*http.Request) (*http.Response, error) { - return nil, fmt.Errorf("err: test used fake http client") -} - // Stubs ClusterID so that ClusterID.getOrInitialize() does not require calling // gce.Initialize() func fakeClusterID(clusterID string) ClusterID { @@ -69,8 +62,7 @@ func fakeClusterID(clusterID string) ClusterID { // NewFakeGCECloud constructs a fake GCE Cloud from the cluster values. func NewFakeGCECloud(vals TestClusterValues) *Cloud { - client := &http.Client{Transport: &fakeRoundTripper{}} - service, _ := compute.New(client) + service, _ := compute.NewService(context.Background()) gce := &Cloud{ region: vals.Region, service: service, diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_tpu.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_tpu.go index 61d35592054..27f472fb0e3 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_tpu.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_tpu.go @@ -35,7 +35,7 @@ import ( // newTPUService returns a new tpuService using the client to communicate with // the Cloud TPU APIs. func newTPUService(client *http.Client) (*tpuService, error) { - s, err := tpuapi.New(client) + s, err := tpuapi.NewService(context.Background()) if err != nil { return nil, err }