[infra] Roll infra to update vpython

Bug: chromium:1244124
Change-Id: If44330139ddecc37da40ad7ad4ef90dbf45ddf6a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/447586
Reviewed-by: Erik Rose <erikrose@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2021-09-10 10:41:08 -04:00 committed by SkCQ
parent d4da5d1fd6
commit 81f03a4f4c
6 changed files with 1600 additions and 1598 deletions

2
go.mod
View File

@ -49,7 +49,7 @@ require (
github.com/yosuke-furukawa/json5 v0.1.1 // indirect
go.chromium.org/gae v0.0.0-20190826183307-50a499513efa // indirect
go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect
go.skia.org/infra v0.0.0-20210907185953-86c4d2f6fc33
go.skia.org/infra v0.0.0-20210910143316-141caab7391e
go.starlark.net v0.0.0-20201118183435-e55f603d8c79 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect

2
go.sum
View File

@ -2089,6 +2089,8 @@ go.skia.org/infra v0.0.0-20210907181340-7a7b1124f8fa h1:TC6DdCxBpp4u57PJuvjSkdKW
go.skia.org/infra v0.0.0-20210907181340-7a7b1124f8fa/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
go.skia.org/infra v0.0.0-20210907185953-86c4d2f6fc33 h1:VAeUs+hEzAhHZTwoubBD2jnUCgAJR7C91ukORoXDKDU=
go.skia.org/infra v0.0.0-20210907185953-86c4d2f6fc33/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
go.skia.org/infra v0.0.0-20210910143316-141caab7391e h1:klXhFdngbjdDI+e9m+iLvFquoCT+VqXGzAO0VI4BUaw=
go.skia.org/infra v0.0.0-20210910143316-141caab7391e/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
go.starlark.net v0.0.0-20201118183435-e55f603d8c79 h1:JPjLPz44y2N9mkzh2N344kTk1Y4/V4yJAjTrXGmzv8I=
go.starlark.net v0.0.0-20201118183435-e55f603d8c79/go.mod h1:5YFcFnRptTN+41758c2bMPiqpGg4zBfYji1IQz8wNFk=

View File

@ -61,7 +61,7 @@ func main() {
}
// Create token source with scope for datastore access.
ts, err := auth_steps.Init(ctx, *local, auth.SCOPE_USERINFO_EMAIL, datastore.ScopeDatastore)
ts, err := auth_steps.Init(ctx, *local, auth.ScopeUserinfoEmail, datastore.ScopeDatastore)
if err != nil {
td.Fatal(ctx, skerr.Wrap(err))
}

View File

@ -75,7 +75,7 @@ func setupDocker(ctx context.Context, isLocal bool) (*docker.Docker, error) {
ctx = td.StartStep(ctx, td.Props("setup docker").Infra())
defer td.EndStep(ctx)
// Create token source with scope for cloud registry (storage).
ts, err := auth_steps.Init(ctx, isLocal, auth.SCOPE_USERINFO_EMAIL, storage.ScopeReadOnly)
ts, err := auth_steps.Init(ctx, isLocal, auth.ScopeUserinfoEmail, storage.ScopeReadOnly)
if err != nil {
return nil, td.FailStep(ctx, err)
}

View File

@ -78,7 +78,7 @@ func main() {
}
// Create token source with scope for GCS access.
ts, err := auth_steps.Init(ctx, *local, auth.SCOPE_USERINFO_EMAIL, auth.SCOPE_FULL_CONTROL)
ts, err := auth_steps.Init(ctx, *local, auth.ScopeUserinfoEmail, auth.ScopeFullControl)
if err != nil {
td.Fatal(ctx, skerr.Wrap(err))
}

File diff suppressed because it is too large Load Diff