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): assume role calls are skipping the proxy #32291

Merged
merged 3 commits into from
Nov 27, 2024

Conversation

otaviomacedo
Copy link
Contributor

@otaviomacedo otaviomacedo commented Nov 26, 2024

STSClientConfig and NodeHttpHandlerOptions are different types, but all have optional properties only. That means that a call like this:

const credentials = await fromTemporaryCredentials({
  masterCredentials: mainCredentials.credentials,
  params: {
    RoleArn: roleArn,
    ExternalId: externalId,
    RoleSessionName: `aws-cdk-${safeUsername()}`,
    ...additionalOptions,
    TransitiveTagKeys: additionalOptions?.Tags ? additionalOptions.Tags.map((t) => t.Key!) : undefined,
  },
  clientConfig: {
    region,
    ...this.requestHandler, // type NodeHttpHandlerOptions
  },
})();

compiles just fine, when the intention was to write:

fromTemporaryCredentials({
  ...
  clientConfig: {
    region,
    requestHandler: this.requestHandler, // type NodeHttpHandlerOptions
  },
});

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

@github-actions github-actions bot added the p2 label Nov 26, 2024
@aws-cdk-automation aws-cdk-automation requested a review from a team November 26, 2024 15:51
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Nov 26, 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 26, 2024
@otaviomacedo otaviomacedo marked this pull request as ready for review November 26, 2024 16:14
@otaviomacedo otaviomacedo requested a review from a team as a code owner November 26, 2024 16:14
@otaviomacedo otaviomacedo added the pr-linter/exempt-test The PR linter will not require test changes label Nov 26, 2024
Copy link

codecov bot commented Nov 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.46%. Comparing base (deeb2ad) to head (60d6cbe).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #32291   +/-   ##
=======================================
  Coverage   77.46%   77.46%           
=======================================
  Files         105      105           
  Lines        7168     7168           
  Branches     1314     1314           
=======================================
  Hits         5553     5553           
  Misses       1433     1433           
  Partials      182      182           
Flag Coverage Δ
suite.unit 77.46% <ø> (ø)

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

Components Coverage Δ
packages/aws-cdk 77.46% <ø> (ø)

@pahud pahud added p1 and removed p2 labels Nov 26, 2024
@rix0rrr rix0rrr added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Nov 26, 2024
@aws-cdk-automation
Copy link
Collaborator

➡️ PR build request submitted to test-main-pipeline ⬅️

A maintainer must now check the pipeline and add the pr-linter/cli-integ-tested label once the pipeline succeeds.

@otaviomacedo otaviomacedo added the pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested label Nov 27, 2024
@aws-cdk-automation aws-cdk-automation dismissed their stale review November 27, 2024 07:51

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

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

mergify bot commented Nov 27, 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: 60d6cbe
  • 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 6c0f74e into main Nov 27, 2024
16 of 17 checks passed
Copy link
Contributor

mergify bot commented Nov 27, 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 otaviom/fix-assume-role branch November 27, 2024 08:24
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 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
contribution/core This is a PR that came from AWS. p1 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.

4 participants