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.

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

Jump to bottom

feat(iam): support NotPrincipal in policy statements #4077

Merged
merged 2 commits into from
Sep 16, 2019
Merged

feat(iam): support NotPrincipal in policy statements #4077

merged 2 commits into from
Sep 16, 2019

Conversation

rmorris1218
Copy link
Contributor

@rmorris1218 rmorris1218 commented Sep 13, 2019 •
edited

Added support for NotPrincipal IAM Policy statement elements.

Closes #4075

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

@mergify
Copy link
Contributor

mergify bot commented Sep 13, 2019

Thanks so much for taking the time to contribute to the AWS CDK ❤️

We will shortly assign someone to review this pull request and help get it
merged. In the meantime, please take a minute to make sure you follow this
checklist:

  • PR title type(scope): text
    • type: fix, feat, refactor go into CHANGELOG, chore is hidden
    • scope: name of module without aws- or cdk- prefix or postfix (e.g. s3 instead of aws-s3-deployment)
    • text: use all lower-case, do not end with a period, do not include issue refs
  • PR Description
    • Rationale: describe rationale of change and approach taken
    • Issues: indicate issues fixed via: fixes #xxx or closes #xxx
    • Breaking?: last paragraph: BREAKING CHANGE: <describe what changed + link for details>
  • Testing
    • Unit test added. Prefer to add a new test rather than modify existing tests
    • CLI or init templates change? Re-run/add CLI integration tests
  • Documentation
    • README: update module README to describe new features
    • API docs: public APIs must be documented. Copy from official AWS docs when possible
    • Design: for significant features, follow design process

@rmorris1218
feat(iam): add support for notprincipal policy statement element
18ff433 
Added support for NotPrincipal IAM Policy statement elements.
@rmorris1218 rmorris1218 changed the title feat(aws-iam): add support for notprincipal policy statement element feat(iam): add support for notprincipal policy statement element Sep 14, 2019
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

eladb
eladb previously requested changes Sep 14, 2019
View reviewed changes
packages/@aws-cdk/aws-iam/lib/policy-statement.ts
@@ -70,6 +72,17 @@ export class PolicyStatement {
}
}

public addNotPrincipals(...notPrincipals: IPrincipal[]) {
if (Object.keys(notPrincipals).length > 0 && Object.keys(this.principal).length > 0) {
throw new Error(`Cannot add 'NotPrincipals' to policy statement if 'Principals' have been added`);
Copy link
Contributor

Choose a reason for hiding this comment

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

Probably worth putting this check when we render (toStatementJson) so it applies both ways.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, good point. I added the reverse check to AddPrincipals and refactored the test to check for both errors.

This follows convention with the other elements with a Not*. toStatementJson will then pull out the empty values if these exclusivity checks work. Thoughts?

@mergify mergify bot dismissed eladb’s stale review September 14, 2019 14:25

Pull request has been modified.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@rix0rrr rix0rrr changed the title feat(iam): add support for notprincipal policy statement element feat(iam): support NotPrincipal in policy statements Sep 16, 2019
@eladb eladb self-assigned this Sep 16, 2019
@eladb eladb merged commit 9945d9e into aws:master Sep 16, 2019
eladb pushed a commit that referenced this pull request Sep 23, 2019
@rmorris1218
feat(iam): support NotPrincipal in policy statements (#4077)
af48c61 
* feat(iam): add support for notprincipal policy statement element

Added support for NotPrincipal IAM Policy statement elements.

* add exclusivity check to addPrincipal, refactor tests to check for both exclusive errors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rix0rrr rix0rrr rix0rrr approved these changes

@eladb eladb eladb left review comments

Assignees

@eladb eladb

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add NotPrincipal Support for IAM PolicyStatement
4 participants
@rmorris1218 @aws-cdk-automation @rix0rrr @eladb