fix: check []bytes > 0 instead of nil (#2667)

codyoss · web-flow · commit 711eb913fe45 · 2024-07-02T08:20:27.000-07:00
Fixes: #2647
diff --git a/internal/creds.go b/internal/creds.go
@@ -127,7 +127,7 @@ func baseCreds(ctx context.Context, ds *DialSettings) (*google.Credentials, erro
 	if ds.Credentials != nil {
 		return ds.Credentials, nil
 	}
-	if ds.CredentialsJSON != nil {
+	if len(ds.CredentialsJSON) > 0 {
 		return credentialsFromJSON(ctx, ds.CredentialsJSON, ds)
 	}
 	if ds.CredentialsFile != "" {
diff --git a/internal/settings.go b/internal/settings.go
@@ -126,7 +126,7 @@ func (ds *DialSettings) Validate() error {
 	if ds.Credentials != nil {
 		nCreds++
 	}
-	if ds.CredentialsJSON != nil {
+	if len(ds.CredentialsJSON) > 0 {
 		nCreds++
 	}
 	if ds.CredentialsFile != "" {

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func baseCreds(ctx context.Context, ds DialSettings) (google.Credentials, erro`
`127`	`127`	`if ds.Credentials != nil {`
`128`	`128`	`return ds.Credentials, nil`
`129`	`129`	`}`
`130`		`- if ds.CredentialsJSON != nil {`
	`130`	`+ if len(ds.CredentialsJSON) > 0 {`
`131`	`131`	`return credentialsFromJSON(ctx, ds.CredentialsJSON, ds)`
`132`	`132`	`}`
`133`	`133`	`if ds.CredentialsFile != "" {`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func (ds *DialSettings) Validate() error {`
`126`	`126`	`if ds.Credentials != nil {`
`127`	`127`	`nCreds++`
`128`	`128`	`}`
`129`		`- if ds.CredentialsJSON != nil {`
	`129`	`+ if len(ds.CredentialsJSON) > 0 {`
`130`	`130`	`nCreds++`
`131`	`131`	`}`
`132`	`132`	`if ds.CredentialsFile != "" {`