krombel/oauth2
1
0
Fork 0
forked from remote/oauth2
Code Pull Requests 1 Activity

Changes requested by @codyoss

Browse Source
This commit is contained in:
Ryan Kohler
2022-04-22 10:37:47 -07:00
parent 922b64a39c
commit 8e4e7dc9f8
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
google/internal/externalaccount/basecredentials.go
View File

@@ -214,7 +214,7 @@ func (c *Config) parse(ctx context.Context) (baseCredentialSource, error) {
} else if c.CredentialSource.URL != "" { } else if c.CredentialSource.URL != "" {
return urlCredentialSource{URL: c.CredentialSource.URL, Headers: c.CredentialSource.Headers, Format: c.CredentialSource.Format, ctx: ctx}, nil return urlCredentialSource{URL: c.CredentialSource.URL, Headers: c.CredentialSource.Headers, Format: c.CredentialSource.Format, ctx: ctx}, nil
} else if c.CredentialSource.Executable != nil { } else if c.CredentialSource.Executable != nil {
return CreateExecutableCredential(*c.CredentialSource.Executable, c, ctx), nil return CreateExecutableCredential(ctx, c.CredentialSource.Executable, c), nil
} }
return nil, fmt.Errorf("oauth2/google: unable to parse credential source") return nil, fmt.Errorf("oauth2/google: unable to parse credential source")
} }

2
google/internal/externalaccount/executablecredsource.go
View File

@@ -102,7 +102,7 @@ type executableCredentialSource struct {
// CreateExecutableCredential creates an executableCredentialSource given an ExecutableConfig. // CreateExecutableCredential creates an executableCredentialSource given an ExecutableConfig.
// It also performs defaulting and type conversions. // It also performs defaulting and type conversions.
func CreateExecutableCredential(ec ExecutableConfig, config *Config, ctx context.Context) (result executableCredentialSource) { func CreateExecutableCredential(ctx context.Context, ec *ExecutableConfig, config *Config) (result executableCredentialSource) {
result.Command = ec.Command result.Command = ec.Command
if ec.TimeoutMillis == 0 { if ec.TimeoutMillis == 0 {
result.Timeout = defaultTimeout result.Timeout = defaultTimeout

10
google/internal/externalaccount/executablecredsource_test.go
View File

@@ -38,7 +38,7 @@ func TestCreateExecutableCredential(t *testing.T) {
TimeoutMillis: 50000, TimeoutMillis: 50000,
} }
ecs := CreateExecutableCredential(ec, nil, context.Background()) ecs := CreateExecutableCredential(context.Background(), &ec, nil)
if ecs.Command != "blarg" { if ecs.Command != "blarg" {
t.Errorf("ecs.Command got %v but want %v", ecs.Command, "blarg") t.Errorf("ecs.Command got %v but want %v", ecs.Command, "blarg")
} }
@@ -52,7 +52,7 @@ func TestCreateExecutableCredential_WithoutTimeout(t *testing.T) {
Command: "blarg", Command: "blarg",
} }
ecs := CreateExecutableCredential(ec, nil, context.Background()) ecs := CreateExecutableCredential(context.Background(), &ec, nil)
if ecs.Command != "blarg" { if ecs.Command != "blarg" {
t.Errorf("ecs.Command got %v but want %v", ecs.Command, "blarg") t.Errorf("ecs.Command got %v but want %v", ecs.Command, "blarg")
} }
@@ -89,7 +89,7 @@ func TestMinimalExecutableCredentialGetEnvironment(t *testing.T) {
}, },
} }
ecs := CreateExecutableCredential(*config.CredentialSource.Executable, &config, context.Background()) ecs := CreateExecutableCredential(context.Background(), config.CredentialSource.Executable, &config)
oldBaseEnv := baseEnv oldBaseEnv := baseEnv
defer func() { baseEnv = oldBaseEnv }() defer func() { baseEnv = oldBaseEnv }()
@@ -122,7 +122,7 @@ func TestExectuableCredentialGetEnvironmentMalformedImpersonationUrl(t *testing.
}, },
} }
ecs := CreateExecutableCredential(*config.CredentialSource.Executable, &config, context.Background()) ecs := CreateExecutableCredential(context.Background(), config.CredentialSource.Executable, &config)
oldBaseEnv := baseEnv oldBaseEnv := baseEnv
defer func() { baseEnv = oldBaseEnv }() defer func() { baseEnv = oldBaseEnv }()
@@ -157,7 +157,7 @@ func TestExectuableCredentialGetEnvironment(t *testing.T) {
}, },
} }
ecs := CreateExecutableCredential(*config.CredentialSource.Executable, &config, context.Background()) ecs := CreateExecutableCredential(context.Background(), config.CredentialSource.Executable, &config)
oldBaseEnv := baseEnv oldBaseEnv := baseEnv
defer func() { baseEnv = oldBaseEnv }() defer func() { baseEnv = oldBaseEnv }()