Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve error and info logging around v2 credentials requests
Browse files Browse the repository at this point in the history
sparrc committed Nov 5, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent e3503a8 commit 253a003
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions agent/handlers/v1/credentials_handler.go
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@ func CredentialsHandlerImpl(w http.ResponseWriter, r *http.Request, auditLogger
func processCredentialsRequest(credentialsManager credentials.Manager, r *http.Request, credentialsID string, errPrefix string) ([]byte, string, string, *handlersutils.ErrorMessage, error) {
if credentialsID == "" {
errText := errPrefix + "No Credential ID in the request"
seelog.Infof("%s. Request IP Address: %s", errText, r.RemoteAddr)
seelog.Errorf("Error processing credential request, requestIPAddress=%s credentialsID=%s: %s", r.RemoteAddr, credentialsID, errText)
msg := &handlersutils.ErrorMessage{
Code: ErrNoIDInRequest,
Message: errText,
@@ -97,7 +97,8 @@ func processCredentialsRequest(credentialsManager credentials.Manager, r *http.R
credentials, ok := credentialsManager.GetTaskCredentials(credentialsID)
if !ok {
errText := errPrefix + "Credentials not found"
seelog.Infof("%s. Request IP Address: %s", errText, r.RemoteAddr)
seelog.Errorf("Error processing credential request, requestIPAddress=%s credentialsID=%s: %s",
r.RemoteAddr, credentialsID, errText)
msg := &handlersutils.ErrorMessage{
Code: ErrInvalidIDInRequest,
Message: errText,
@@ -106,10 +107,14 @@ func processCredentialsRequest(credentialsManager credentials.Manager, r *http.R
return nil, "", "", msg, errors.New(errText)
}

seelog.Infof("Processing credential request, credentialsID=%s credentialType=%s",
credentialsID, credentials.IAMRoleCredentials.RoleType)

if utils.ZeroOrNil(credentials.ARN) && utils.ZeroOrNil(credentials.IAMRoleCredentials) {
// This can happen when the agent is restarted and is reconciling its state.
errText := errPrefix + "Credentials uninitialized for ID"
seelog.Infof("%s. Request IP Address: %s", errText, r.RemoteAddr)
seelog.Errorf("Error processing credential request, requestIPAddress=%s credentialsID=%s credentialType=%s: %s",
r.RemoteAddr, credentialsID, credentials.IAMRoleCredentials.RoleType, errText)
msg := &handlersutils.ErrorMessage{
Code: ErrCredentialsUninitialized,
Message: errText,
@@ -121,7 +126,8 @@ func processCredentialsRequest(credentialsManager credentials.Manager, r *http.R
credentialsJSON, err := json.Marshal(credentials.IAMRoleCredentials)
if err != nil {
errText := errPrefix + "Error marshaling credentials"
seelog.Errorf("%s. Request IP Address: %s", errText, r.RemoteAddr)
seelog.Errorf("Error processing credential request, requestIPAddress=%s credentialsID=%s credentialType=%s: %s",
r.RemoteAddr, credentialsID, credentials.IAMRoleCredentials.RoleType, errText)
msg := &handlersutils.ErrorMessage{
Code: ErrInternalServer,
Message: "Internal server error",

0 comments on commit 253a003

Please sign in to comment.