Skip to content

Update formatting string to see error message #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nss10 merged 1 commit into from
Aug 25, 2026
Merged

Update formatting string to see error message #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions plugin-gen3/auth_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,54 +129,54 @@ func (a Authorize) PluginAction(params map[string]string, headers map[string]*pr
userJWT = strings.TrimPrefix(userJWT, "bearer ")
userId, err := validateTokenAndExtractUserId(userJWT)
if err != nil {
return errorResponse(http.StatusUnauthorized, fmt.Sprintf("unable to parse token: %w", err))
return errorResponse(http.StatusUnauthorized, fmt.Errorf("unable to parse token: %w", err).Error())
}

// get the S3 bucket and region for this user
httpClient := &http.Client{Timeout: 10 * time.Second}
url := "http://gen3-workflow-service/storage/setup"
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return errorResponse(http.StatusInternalServerError, fmt.Sprintf("error creating HTTP request to '%s': %w", url, err))
return errorResponse(http.StatusInternalServerError, fmt.Errorf("error creating HTTP request to '%s': %w", url, err).Error())
}
req.Header.Add("Authorization", "bearer "+userJWT)
resp, err := httpClient.Do(req)
if err != nil {
return errorResponse(http.StatusInternalServerError, fmt.Sprintf("error making HTTP request to '%s': %w", url, err))
return errorResponse(http.StatusInternalServerError, fmt.Errorf("error making HTTP request to '%s': %w", url, err).Error())
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(resp.Body)
return errorResponse(int64(resp.StatusCode), fmt.Sprintf("http error from '%s': status code %d, body: %s", url, resp.StatusCode, string(body)))
return errorResponse(int64(resp.StatusCode), fmt.Errorf("http error from '%s': status code %d, body: %s", url, resp.StatusCode, string(body)).Error())
}
storageInfoResponse := new(StorageInfoResponse)
err = json.NewDecoder(resp.Body).Decode(storageInfoResponse)
if err != nil {
return errorResponse(http.StatusInternalServerError, fmt.Sprintf("could not parse '%s' response body: %w", url, err))
return errorResponse(http.StatusInternalServerError, fmt.Errorf("could not parse '%s' response body: %w", url, err).Error())
}
shared.Logger.Info("User's storage", "Bucket", storageInfoResponse.Bucket, "Region", storageInfoResponse.Region, "S3FilesFilesystemId", storageInfoResponse.S3FilesFilesystemId)

// exchange the OIDC client ID and secret for an access token
url = "http://fence-service/oauth2/token?grant_type=client_credentials&scope=openid%20user"
req, err = http.NewRequest("POST", url, nil)
if err != nil {
return errorResponse(http.StatusInternalServerError, fmt.Sprintf("error creating HTTP request to '%s': %w", url, err))
return errorResponse(http.StatusInternalServerError, fmt.Errorf("error creating HTTP request to '%s': %w", url, err).Error())
}
auth := base64.StdEncoding.EncodeToString([]byte(OidcClientId + ":" + OidcClientSecret))
req.Header.Add("Authorization", "Basic "+auth)
resp, err = httpClient.Do(req)
if err != nil {
return errorResponse(http.StatusInternalServerError, fmt.Sprintf("error making HTTP request to '%s': %w", url, err))
return errorResponse(http.StatusInternalServerError, fmt.Errorf("error making HTTP request to '%s': %w", url, err).Error())
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(resp.Body)
return errorResponse(int64(resp.StatusCode), fmt.Sprintf("http error from '%s': status code %d, body: %s", url, resp.StatusCode, string(body)))
return errorResponse(int64(resp.StatusCode), fmt.Errorf("http error from '%s': status code %d, body: %s", url, resp.StatusCode, string(body)).Error())
}
accessTokenResponse := new(AccessTokenResponse)
err = json.NewDecoder(resp.Body).Decode(accessTokenResponse)
if err != nil {
return errorResponse(http.StatusInternalServerError, fmt.Sprintf("could not parse '%s' response body: %w", url, err))
return errorResponse(http.StatusInternalServerError, fmt.Errorf("could not parse '%s' response body: %w", url, err).Error())
}

// generate and return the worker configuration
Expand Down
Loading