google/externalaccount: return error messages from file cred opening

kaovilai · kaovilai · commit e72b1dc7d116 · 2024-10-22T17:00:42.000-05:00
subjectToken function now return error messages when failing to open file credentials.

This will allow distinguishing between file not found and other errors.
diff --git a/google/externalaccount/filecredsource.go b/google/externalaccount/filecredsource.go
@@ -26,7 +26,7 @@ func (cs fileCredentialSource) credentialSourceType() string {
 func (cs fileCredentialSource) subjectToken() (string, error) {
 	tokenFile, err := os.Open(cs.File)
 	if err != nil {
-		return "", fmt.Errorf("oauth2/google/externalaccount: failed to open credential file %q", cs.File)
+		return "", fmt.Errorf("oauth2/google/externalaccount: failed to open credential file %q due to %v", cs.File, err)
 	}
 	defer tokenFile.Close()
 	tokenBytes, err := ioutil.ReadAll(io.LimitReader(tokenFile, 1<<20))

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func (cs fileCredentialSource) credentialSourceType() string {`
`26`	`26`	`func (cs fileCredentialSource) subjectToken() (string, error) {`
`27`	`27`	`tokenFile, err := os.Open(cs.File)`
`28`	`28`	`if err != nil {`
`29`		`- return "", fmt.Errorf("oauth2/google/externalaccount: failed to open credential file %q", cs.File)`
	`29`	`+ return "", fmt.Errorf("oauth2/google/externalaccount: failed to open credential file %q due to %v", cs.File, err)`
`30`	`30`	`}`
`31`	`31`	`defer tokenFile.Close()`
`32`	`32`	`tokenBytes, err := ioutil.ReadAll(io.LimitReader(tokenFile, 1<<20))`