Debug or Trace logging for get_aws_account_id() #4751
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ import ( | |
| "runtime" | ||
| "slices" | ||
| "strings" | ||
| "time" | ||
| "unicode/utf8" | ||
|
|
||
| "github.com/getsops/sops/v3/cmd/sops/formats" | ||
|
|
@@ -632,17 +633,26 @@ func getAWSAccountAlias(ctx *ParsingContext, l log.Logger) (string, error) { | |
|
|
||
| // Return the AWS account id associated to the current set of credentials | ||
| func getAWSAccountID(ctx *ParsingContext, l log.Logger) (string, error) { | ||
| l.Tracef("Invoking get_aws_account_id()...") | ||
|
|
||
| awsConfig, err := awshelper.CreateAwsConfig(ctx.Context, l, nil, ctx.TerragruntOptions) | ||
| if err != nil { | ||
| l.Errorf("get_aws_account_id(): failed to create AWS config: %v", err) | ||
|
There was a problem hiding this comment. Please remove this. The error should be propagated correctly to make it clear what happened. Consider wrapping the error below instead. fmt.Errorf("failed to create AWS config for get_aws_account_id(): %w", err) |
||
| return "", err | ||
| } | ||
|
|
||
| start := time.Now() | ||
|
There was a problem hiding this comment. Please remove this timer. If you want to instrument code to determine durations, it should be done with our OpenTelemetry integration: |
||
| accountID, err := awshelper.GetAWSAccountID(ctx.Context, awsConfig) | ||
| duration := time.Since(start) | ||
|
There was a problem hiding this comment. See comment above about the timer |
||
|
|
||
| if err != nil { | ||
| l.Errorf("get_aws_account_id(): error retriving accound ID: %v", err) | ||
|
There was a problem hiding this comment. See comment above about removing this |
||
| return "", err | ||
| } | ||
|
|
||
| l.Tracef("get_aws_account_id(): resolved account ID %q in %s", accountID, duration) | ||
|
|
||
| return accountID, nil | ||
| } | ||
|
|
||
| // Return the ARN of the AWS identity associated with the current set of credentials | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ticket also mentioned adding extra logs to this function
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you mean like this
l.Debugf("TRACE: invoking get_aws_account_id()...")There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wakeful have a look ??