ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't try to rework credentials field

This commit is contained in:
upodroid 2021-04-07 00:05:11 +01:00
parent 5441d88233
commit f0eb3b0310
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/remote-state/gcs/backend.go
View File

@ -151,6 +151,7 @@ func (b *Backend) configure(ctx context.Context) error {
if tokenSource != nil { if tokenSource != nil {
opts = append(opts, option.WithTokenSource(tokenSource)) opts = append(opts, option.WithTokenSource(tokenSource))
} else if creds != "" { } else if creds != "" {
var account accountFile
// to mirror how the provider works, we accept the file path or the contents // to mirror how the provider works, we accept the file path or the contents
contents, err := backend.ReadPathOrContents(creds) contents, err := backend.ReadPathOrContents(creds)
@ -162,7 +163,14 @@ func (b *Backend) configure(ctx context.Context) error {
return fmt.Errorf("Error parsing credentials '%s': %s", contents, err) return fmt.Errorf("Error parsing credentials '%s': %s", contents, err)
} }
opts = append(opts, optionWithCredentialsJSON(), option.WithScopes(storage.ScopeReadWrite)) conf := jwt.Config{
Email: account.ClientEmail,
PrivateKey: []byte(account.PrivateKey),
Scopes: []string{storage.ScopeReadWrite},
TokenURL: "https://oauth2.googleapis.com/token",
}
opts = append(opts, option.WithHTTPClient(conf.Client(ctx)))
} else { } else {
opts = append(opts, option.WithScopes(storage.ScopeReadWrite)) opts = append(opts, option.WithScopes(storage.ScopeReadWrite))
} }