[CD] Include userinfo/email auth scope
Change-Id: I0ce464b0dd74437114c70c5c05a8ecafded155c8
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/605016
Auto-Submit: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
diff --git a/autoroll/go/autoroll-config-converter/BUILD.bazel b/autoroll/go/autoroll-config-converter/BUILD.bazel
index 47e4b5b..abc5613 100644
--- a/autoroll/go/autoroll-config-converter/BUILD.bazel
+++ b/autoroll/go/autoroll-config-converter/BUILD.bazel
@@ -13,6 +13,7 @@
"//autoroll/go/config",
"//autoroll/go/config_vars",
"//cd/go/cd",
+ "//go/auth",
"//go/chrome_branch",
"//go/gerrit",
"//go/git",
diff --git a/autoroll/go/autoroll-config-converter/main.go b/autoroll/go/autoroll-config-converter/main.go
index 5cbeba0..c2b7bb4 100644
--- a/autoroll/go/autoroll-config-converter/main.go
+++ b/autoroll/go/autoroll-config-converter/main.go
@@ -17,6 +17,7 @@
"go.skia.org/infra/autoroll/go/config"
"go.skia.org/infra/autoroll/go/config_vars"
"go.skia.org/infra/cd/go/cd"
+ "go.skia.org/infra/go/auth"
"go.skia.org/infra/go/chrome_branch"
"go.skia.org/infra/go/gerrit"
"go.skia.org/infra/go/git"
@@ -87,7 +88,7 @@
}
// Set up auth, load config variables.
- ts, err := google.DefaultTokenSource(ctx, gerrit.AuthScope)
+ ts, err := google.DefaultTokenSource(ctx, auth.ScopeUserinfoEmail, gerrit.AuthScope)
if err != nil {
td.Fatal(ctx, err)
}
diff --git a/cd/go/build-images/BUILD.bazel b/cd/go/build-images/BUILD.bazel
index 4923946..845d1b6 100644
--- a/cd/go/build-images/BUILD.bazel
+++ b/cd/go/build-images/BUILD.bazel
@@ -12,6 +12,7 @@
visibility = ["//visibility:private"],
deps = [
"//cd/go/cd",
+ "//go/auth",
"//go/exec",
"//go/gerrit",
"//go/git",
diff --git a/cd/go/build-images/update-refs.go b/cd/go/build-images/update-refs.go
index 817b896..88285fb 100644
--- a/cd/go/build-images/update-refs.go
+++ b/cd/go/build-images/update-refs.go
@@ -8,6 +8,7 @@
"strings"
"go.skia.org/infra/cd/go/cd"
+ "go.skia.org/infra/go/auth"
"go.skia.org/infra/go/exec"
"go.skia.org/infra/go/gerrit"
"go.skia.org/infra/go/git"
@@ -23,7 +24,7 @@
defer td.EndStep(ctx)
// Create the git repo.
- ts, err := google.DefaultTokenSource(ctx, gerrit.AuthScope)
+ ts, err := google.DefaultTokenSource(ctx, auth.ScopeUserinfoEmail, gerrit.AuthScope)
if err != nil {
return td.FailStep(ctx, err)
}
