Skip to content
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.

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

fix(cli): mfa code is not requested when $AWS_PROFILE is used #32313

Merged
merged 2 commits into from
Nov 28, 2024

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Nov 27, 2024

We only passed in the mfaCode function if we got a profile from --profile, not when configured using $AWS_PROFILE.

Reduce a miss in the duplicated code by moving the clientConfig to a single initialization point.

Fixes #32312.

Unfortunately this cannot be unit tested (I cannot mock the function that I need to mock), nor integ tested because it needs human input. I'm open to ideas.

In the mean time, tested manually.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

We only passed in the `mfaCode` function if we got a profile
from `--profile`, not when configured using `$AWS_PROFILE`.

Fixes #32312.
@rix0rrr rix0rrr requested a review from a team as a code owner November 27, 2024 17:03
@aws-cdk-automation aws-cdk-automation requested a review from a team November 27, 2024 17:03
@github-actions github-actions bot added bug This issue is a bug. p0 labels Nov 27, 2024
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Nov 27, 2024
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

@aws-cdk-automation aws-cdk-automation added the pr/needs-cli-test-run This PR needs CLI tests run against it. label Nov 27, 2024
Copy link

codecov bot commented Nov 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.19%. Comparing base (f271168) to head (38d45f6).

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #32313   +/-   ##
=======================================
  Coverage   78.19%   78.19%           
=======================================
  Files         105      105           
  Lines        7176     7177    +1     
  Branches     1318     1318           
=======================================
+ Hits         5611     5612    +1     
  Misses       1377     1377           
  Partials      188      188           
Flag Coverage Δ
suite.unit 78.19% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
packages/aws-cdk 78.19% <100.00%> (+<0.01%) ⬆️

@github-actions github-actions bot added the effort/small Small work item – less than a day of effort label Nov 28, 2024
@rix0rrr rix0rrr added pr-linter/exempt-test The PR linter will not require test changes pr-linter/exempt-integ-test The PR linter will not require integ test changes labels Nov 28, 2024
@rix0rrr rix0rrr changed the title fix: MFA code is not requested when $AWS_PROFILE is used fix(cli): MFA code is not requested when $AWS_PROFILE is used Nov 28, 2024
@rix0rrr rix0rrr changed the title fix(cli): MFA code is not requested when $AWS_PROFILE is used fix(cli): mfa code is not requested when $AWS_PROFILE is used Nov 28, 2024
@rix0rrr rix0rrr added the pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested label Nov 28, 2024
@aws-cdk-automation aws-cdk-automation dismissed their stale review November 28, 2024 08:57

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@aws-cdk-automation aws-cdk-automation added pr/needs-maintainer-review This PR needs a review from a Core Team Member and removed pr/needs-cli-test-run This PR needs CLI tests run against it. labels Nov 28, 2024
Copy link
Contributor

mergify bot commented Nov 28, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Nov 28, 2024
Copy link
Contributor

mergify bot commented Nov 28, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 38d45f6
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit 6458439 into main Nov 28, 2024
20 of 21 checks passed
Copy link
Contributor

mergify bot commented Nov 28, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot deleted the huijbers/mfa-when-profile branch November 28, 2024 10:03
Copy link

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug This issue is a bug. contribution/core This is a PR that came from AWS. effort/small Small work item – less than a day of effort p0 pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested pr-linter/exempt-integ-test The PR linter will not require integ test changes pr-linter/exempt-test The PR linter will not require test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CLI: Not prompting for MFA code with AWS_PROFILE envar after CDK v2.167.0 / SDK v3
3 participants