Merge pull request kubernetes#87178 from YuikoTakada/fix_81657_1

k8s-ci-robot · web-flow · commit f0486a6b6a0b · 2020-01-23T06:00:49.000-08:00
Fix static check failures in test/e2e/instrumentation/logging/st…
diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
@@ -40,7 +40,6 @@ pkg/volume/util/subpath
 pkg/volume/vsphere_volume
 test/e2e/apps
 test/e2e/autoscaling
-test/e2e/instrumentation/logging/stackdriver
 test/integration/deployment
 test/integration/examples
 test/integration/framework
diff --git a/test/e2e/instrumentation/logging/stackdriver/BUILD b/test/e2e/instrumentation/logging/stackdriver/BUILD
@@ -25,6 +25,7 @@ go_library(
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/golang.org/x/oauth2/google:go_default_library",
         "//vendor/google.golang.org/api/logging/v2beta1:go_default_library",
+        "//vendor/google.golang.org/api/option:go_default_library",
         "//vendor/google.golang.org/api/pubsub/v1:go_default_library",
     ],
 )
diff --git a/test/e2e/instrumentation/logging/stackdriver/utils.go b/test/e2e/instrumentation/logging/stackdriver/utils.go
@@ -30,6 +30,7 @@ import (
 
 	"golang.org/x/oauth2/google"
 	sd "google.golang.org/api/logging/v2beta1"
+	"google.golang.org/api/option"
 	pubsub "google.golang.org/api/pubsub/v1"
 )
 
@@ -85,7 +86,8 @@ type sdLogProvider struct {
 func newSdLogProvider(f *framework.Framework, scope logProviderScope) (*sdLogProvider, error) {
 	ctx := context.Background()
 	hc, err := google.DefaultClient(ctx, sd.CloudPlatformScope)
-	sdService, err := sd.New(hc)
+	framework.ExpectNoError(err)
+	sdService, err := sd.NewService(ctx, option.WithHTTPClient(hc))
 	if err != nil {
 		return nil, err
 	}
@@ -94,7 +96,7 @@ func newSdLogProvider(f *framework.Framework, scope logProviderScope) (*sdLogPro
 		return nil, err
 	}
 
-	pubsubService, err := pubsub.New(hc)
+	pubsubService, err := pubsub.NewService(ctx, option.WithHTTPClient(hc))
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ go_library(`
`25`	`25`	`"//vendor/github.com/onsi/ginkgo:go_default_library",`
`26`	`26`	`"//vendor/golang.org/x/oauth2/google:go_default_library",`
`27`	`27`	`"//vendor/google.golang.org/api/logging/v2beta1:go_default_library",`
	`28`	`+ "//vendor/google.golang.org/api/option:go_default_library",`
`28`	`29`	`"//vendor/google.golang.org/api/pubsub/v1:go_default_library",`
`29`	`30`	`],`
`30`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ import (`
`30`	`30`
`31`	`31`	`"golang.org/x/oauth2/google"`
`32`	`32`	`sd "google.golang.org/api/logging/v2beta1"`
	`33`	`+ "google.golang.org/api/option"`
`33`	`34`	`pubsub "google.golang.org/api/pubsub/v1"`
`34`	`35`	`)`
`35`	`36`
`@@ -85,7 +86,8 @@ type sdLogProvider struct {`
`85`	`86`	`func newSdLogProvider(f framework.Framework, scope logProviderScope) (sdLogProvider, error) {`
`86`	`87`	`ctx := context.Background()`
`87`	`88`	`hc, err := google.DefaultClient(ctx, sd.CloudPlatformScope)`
`88`		`- sdService, err := sd.New(hc)`
	`89`	`+ framework.ExpectNoError(err)`
	`90`	`+ sdService, err := sd.NewService(ctx, option.WithHTTPClient(hc))`
`89`	`91`	`if err != nil {`
`90`	`92`	`return nil, err`
`91`	`93`	`}`
`@@ -94,7 +96,7 @@ func newSdLogProvider(f framework.Framework, scope logProviderScope) (sdLogPro`
`94`	`96`	`return nil, err`
`95`	`97`	`}`
`96`	`98`
`97`		`- pubsubService, err := pubsub.New(hc)`
	`99`	`+ pubsubService, err := pubsub.NewService(ctx, option.WithHTTPClient(hc))`
`98`	`100`	`if err != nil {`
`99`	`101`	`return nil, err`
`100`	`102`	`}`