little fixes

Signed-off-by: Grant Linville <[email protected]>

Author: g-linville

pkg/credentials/credential.go

@@ -49,7 +49,7 @@ func (c Credential) toDockerAuthConfig() (types.AuthConfig, error) {
 
 func credentialFromDockerAuthConfig(authCfg types.AuthConfig) (Credential, error) {
 	var cred Credential
-	if err := json.Unmarshal([]byte(authCfg.Password), &cred); err != nil {
+	if err := json.Unmarshal([]byte(authCfg.Password), &cred); err != nil || len(cred.Env) == 0 {
 		// Legacy: try unmarshalling into just an env map
 		var env map[string]string
 		if err := json.Unmarshal([]byte(authCfg.Password), &env); err != nil {

pkg/runner/runner.go

@@ -879,11 +879,11 @@ func (r *Runner) handleCredentials(callCtx engine.Context, monitor Monitor, env
 
 			// If the existing credential is expired, we need to provide it to the cred tool through the environment.
 			if exists && c.IsExpired() {
-				credJson, err := json.Marshal(c)
+				credJSON, err := json.Marshal(c)
 				if err != nil {
 					return nil, fmt.Errorf("failed to marshal credential: %w", err)
 				}
-				env = append(env, fmt.Sprintf("%s=%s", credentials.ExistingCredential, string(credJson)))
+				env = append(env, fmt.Sprintf("%s=%s", credentials.ExistingCredential, string(credJSON)))
 			}
 
 			// Get the input for the credential tool, if there is any.