Skip to content

refactor: gate access to environment SDK behind new class#31904

Merged
mergify[bot] merged 11 commits intomainfrom
huijbers/gate-access-to-creds
Nov 1, 2024
Merged

refactor: gate access to environment SDK behind new class#31904
mergify[bot] merged 11 commits intomainfrom
huijbers/gate-access-to-creds

Conversation

@rix0rrr
Copy link
Copy Markdown
Contributor

@rix0rrr rix0rrr commented Oct 25, 2024

Previously there were methods on the Deployments class that made it possible to directly get an SDK from the SdkProvider for a particular environment. Calling these methods made it possible to get an SDK without thinking of assuming roles to go into a different account.

This PR introduces a new class, EnvironmentAccess, with a couple of public methods that are the only ones allowed to obtain SDKs with credentials. It has the methods:

  • accessStackForStackOperations(stack)
  • accessStackForLookup(stack)
  • accessStackForReading(stack)

These will always respect the role information on the stack.

Ideally there would have been similar methods for assets as well, but the cdk-assets library is entirely handling asset roles itself, and it's not in the scope of this PR to change that. That keeps on using a plain SdkProvider. Hotswap deployments will also just use CLI credentials and not assume role, so that also keeps on using an SdkProvider.

All other uses have moved to EnvironmentAccess.


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

Previously there were methods on the `Deployments` class that made it
possible to directly get an SDK from the `SdkProvider` for a particular
environment. Calling these methods made it possible to get an SDK
without thinking of assuming roles to go into a different account.

This PR introduces a new class, `EnvironmentAccess`, with a couple of
public methods that are the only ones allowed to obtain SDKs with
credentials. It has the methods:

- accessStackForStackOperations(stack)
- accessStackForLookup(stack)
- accessStackForReading(stack)

These will always respect the role information on the stack.

Ideally there would have been similar methods for assets as well, but
the `cdk-assets` library is entirely handling asset roles itself, and
it's not in the scope of this PR to change that. That keeps on using a
plain `SdkProvider`. Hotswap deployments will also just use CLI
credentials and not assume role, so that also keeps on using an
`SdkProvider`.

All other uses have moved to `EnvironmentAccess`.
@github-actions github-actions bot added the p2 label Oct 25, 2024
@aws-cdk-automation aws-cdk-automation requested a review from a team October 25, 2024 13:49
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Oct 25, 2024
Copy link
Copy Markdown
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 Oct 25, 2024
Copy link
Copy Markdown
Contributor

@mrgrain mrgrain left a comment

Choose a reason for hiding this comment

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

Looks great. My main issue is with the now seemingly required call of env.replacePlaceholders() by the caller. That is equally non obvious as the problem we were are trying to fix.

});
}

export type StringWithoutPlaceholders = Branded<string, 'NoPlaceholders'>; No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
export type StringWithoutPlaceholders = Branded<string, 'NoPlaceholders'>;
export type StringWithoutPlaceholders = Branded<string, 'NoPlaceholders'>;

return value as A;
}

type TypeUnderlyingBrand<A> = A extends Branded<infer T, any> ? T : never; No newline at end of file
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
type TypeUnderlyingBrand<A> = A extends Branded<infer T, any> ? T : never;
type TypeUnderlyingBrand<A> = A extends Branded<infer T, any> ? T : never;

* @default - Role specified on stack, otherwise current
*/
readonly roleArn?: string;
readonly roleArn?: StringWithoutPlaceholders;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe add a note how to convert a string to StringWithoutPlaceholders.

@aws-cdk-automation
Copy link
Copy Markdown
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.

@rix0rrr rix0rrr added the pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested label Oct 31, 2024
@aws-cdk-automation aws-cdk-automation dismissed their stale review October 31, 2024 16:13

✅ 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 Oct 31, 2024
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Oct 31, 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
Copy link
Copy Markdown
Contributor

mergify bot commented Nov 1, 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
Copy Markdown
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 1280632
  • 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 4e715b8 into main Nov 1, 2024
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Nov 1, 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/gate-access-to-creds branch November 1, 2024 10:43
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Nov 1, 2024

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 1, 2024
@rix0rrr rix0rrr self-assigned this Nov 6, 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. p2 pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants