Skip to content

chore: allow copilot env init fallback to default credentials #5202

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
mergify merged 3 commits into from
Aug 21, 2023
Merged

chore: allow copilot env init fallback to default credentials #5202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a37acbf
allow fallback to default creds, write test
Aug 17, 2023
5bb716d
reduce copied code in tests
Aug 21, 2023
ac2eef1
Merge branch 'mainline' into aiden/env-init-default-credentials
mergify[bot] Aug 21, 2023
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
9 changes: 8 additions & 1 deletion internal/pkg/cli/env_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,15 @@ func (o *initEnvOpts) askEnvSession() error {

selCreds, err := o.selCreds()
if err != nil {
return err
errRetrieveCreds := err
sess, err := o.sessProvider.Default()
Comment thread
CaptainCarpensir marked this conversation as resolved.
if err != nil {
return errors.Join(errRetrieveCreds, fmt.Errorf("falling back on default credentials: %w", err))
Copy link
Copy Markdown
Contributor

@Lou1415926 Lou1415926 Aug 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noice! It is a good call to include errRetrieveCreds in this case 👍🏼 !

}
o.sess = sess
return nil
}

sess, err := selCreds.Creds(fmt.Sprintf(fmtEnvInitCredsPrompt, color.HighlightUserInput(o.name)), envInitCredsHelpPrompt)
if err != nil {
return fmt.Errorf("select creds: %w", err)
Expand Down
21 changes: 20 additions & 1 deletion internal/pkg/cli/env_init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@ func TestInitEnvOpts_Ask(t *testing.T) {
inAdjustVPCVars adjustVPCVars
inInternalALBSubnets []string

setupMocks func(mocks initEnvMocks)
getMockCredsSelector func() (credsSelector, error)
setupMocks func(mocks initEnvMocks)

wantedError error
}{
Expand Down Expand Up @@ -416,6 +417,21 @@ func TestInitEnvOpts_Ask(t *testing.T) {
m.selCreds.EXPECT().Creds("Which credentials would you like to use to create test?", gomock.Any()).Return(mockSession, nil)
},
},
"should fallback on default session if credentials cant be found": {
inAppName: mockApp,
inEnv: mockEnv,
inDefault: true,
getMockCredsSelector: func() (credsSelector, error) {
return nil, mockErr
},
setupMocks: func(m initEnvMocks) {
m.sessProvider.EXPECT().Default().Return(&session.Session{
Config: &aws.Config{
Region: aws.String("us-west-2"),
},
}, nil)
},
},
"should prompt for region if user configuration does not have one": {
inAppName: mockApp,
inEnv: mockEnv,
Expand Down Expand Up @@ -923,6 +939,9 @@ func TestInitEnvOpts_Ask(t *testing.T) {
sessProvider: mocks.sessProvider,
selVPC: mocks.selVPC,
selCreds: func() (credsSelector, error) {
if tc.getMockCredsSelector != nil {
return tc.getMockCredsSelector()
}
return mocks.selCreds, nil
},
ec2Client: mocks.ec2Client,
Expand Down