Use local aws config in cli to get account and regions #7758
There are no files selected for viewing
This file contains 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
This file contains 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -18,6 +18,7 @@ package radinit | |||||
|
|
||||||
| import ( | ||||||
| "context" | ||||||
| "fmt" | ||||||
|
|
||||||
| "github.com/aws/aws-sdk-go-v2/service/ec2" | ||||||
| "github.com/charmbracelet/bubbles/textinput" | ||||||
|
|
@@ -27,15 +28,15 @@ import ( | |||||
| ) | ||||||
|
|
||||||
| const ( | ||||||
| selectAWSRegionPrompt = "Select the region you would like to deploy AWS resources to:" | ||||||
| enterAWSIAMAcessKeyIDPrompt = "Enter the IAM access key id:" | ||||||
| enterAWSIAMAcessKeyIDPlaceholder = "Enter IAM access key id..." | ||||||
| enterAWSIAMSecretAccessKeyPrompt = "Enter your IAM Secret Access Key:" | ||||||
| enterAWSIAMSecretAccessKeyPlaceholder = "Enter IAM secret access key..." | ||||||
| errNotEmptyTemplate = "%s cannot be empty" | ||||||
| confirmAWSAccountIDPromptFmt = "Use account id '%v'?" | ||||||
| enterAWSAccountIDPrompt = "Enter the account ID:" | ||||||
| enterAWSAccountIDPlaceholder = "Enter the account ID you want to use..." | ||||||
|
|
||||||
| awsAccessKeysCreateInstructionFmt = "\nAWS IAM Access keys (Access key ID and Secret access key) are required to access and create AWS resources.\n\nFor example, you can create one using the following command:\n\033[36maws iam create-access-key\033[0m\n\nFor more information refer to https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html.\n\n" | ||||||
| ) | ||||||
|
|
@@ -53,12 +54,24 @@ func (r *Runner) enterAWSCloudProvider(ctx context.Context) (*aws.Provider, erro | |||||
| return nil, err | ||||||
| } | ||||||
|
|
||||||
| accountId, err := r.getAccountId(ctx) | ||||||
| if err != nil { | ||||||
| return nil, err | ||||||
| } | ||||||
|
|
||||||
| // addAccountID, err := prompt.YesOrNoPrompt(fmt.Sprintf(confirmAWSAccountIDPromptFmt, accountId), prompt.ConfirmYes, r.Prompter) | ||||||
| // if err != nil { | ||||||
| // return nil, err | ||||||
| // } | ||||||
|
|
||||||
| // if !addAccountID { | ||||||
| // accountId, err = r.Prompter.GetTextInput(enterAWSAccountIDPrompt, prompt.TextInputOptions{Placeholder: enterAWSAccountIDPlaceholder}) | ||||||
| // if err != nil { | ||||||
| // return nil, err | ||||||
| // } | ||||||
| // } | ||||||
|
There was a problem hiding this comment. Is this supposed to be uncommented? There was a problem hiding this comment. missed to removed thess, updated in the pr |
||||||
|
|
||||||
| region, err := r.selectAWSRegion(ctx) | ||||||
| if err != nil { | ||||||
| return nil, err | ||||||
| } | ||||||
|
|
@@ -71,21 +84,36 @@ func (r *Runner) enterAWSCloudProvider(ctx context.Context) (*aws.Provider, erro | |||||
| }, nil | ||||||
| } | ||||||
|
|
||||||
| func (r *Runner) getAccountId(ctx context.Context) (string, error) { | ||||||
| callerIdentityOutput, err := r.awsClient.GetCallerIdentity(ctx) | ||||||
| if err != nil { | ||||||
| return "", clierrors.MessageWithCause(err, "AWS Cloud Provider setup failed, please use aws configure to set up the configuration. More information :https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html") | ||||||
| } | ||||||
|
There was a problem hiding this comment. here, would it help user if we add some detail, like "AWS credential verification failed. Please use |
||||||
|
|
||||||
| if callerIdentityOutput.Account == nil { | ||||||
| return "", clierrors.MessageWithCause(err, "AWS credential verification failed: Account ID is nil.") | ||||||
| } | ||||||
|
|
||||||
| accountID := *callerIdentityOutput.Account | ||||||
| addAccountID, err := prompt.YesOrNoPrompt(fmt.Sprintf(confirmAWSAccountIDPromptFmt, accountID), prompt.ConfirmYes, r.Prompter) | ||||||
| if err != nil { | ||||||
| return "", err | ||||||
| } | ||||||
|
|
||||||
| if !addAccountID { | ||||||
|
There was a problem hiding this comment. Shouldn't this be true so that the user can enter account id? Like the logic here is that if There was a problem hiding this comment. we retrieve the account id using the local config , and in the yes or no prompt ask the user if they want to use the account id from local config, if user selects no then we propmpt to provide the account id. There was a problem hiding this comment. We can have a more meaningful name instead of |
||||||
| accountID, err = r.Prompter.GetTextInput(enterAWSAccountIDPrompt, prompt.TextInputOptions{Placeholder: enterAWSAccountIDPlaceholder}) | ||||||
| if err != nil { | ||||||
| return "", err | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return accountID, nil | ||||||
| } | ||||||
|
|
||||||
| // selectAWSRegion prompts the user to select an AWS region from a list of available regions. | ||||||
| // regions list is retrieved using the locally configured AWS account. | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| func (r *Runner) selectAWSRegion(ctx context.Context) (string, error) { | ||||||
|
There was a problem hiding this comment. just for easier context, can you please add a comment here that it uses local aws config to list regions? |
||||||
| listRegionsOutput, err := r.awsClient.ListRegions(ctx) | ||||||
| if err != nil { | ||||||
| return "", clierrors.MessageWithCause(err, "Listing AWS regions failed.") | ||||||
| } | ||||||
|
|
||||||
This file contains 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
This file contains 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
Oops, something went wrong.
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.
should "default" be a const?
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.
removed the
config.WithSharedConfigProfile