diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml new file mode 100644 index 0000000..168011c --- /dev/null +++ b/.github/workflows/pr-title.yml @@ -0,0 +1,52 @@ +name: 'Validate PR title' + +on: + pull_request_target: + types: + - opened + - edited + - synchronize + +jobs: + main: + name: Validate PR title + runs-on: ubuntu-latest + steps: + # Please look up the latest version from + # https://github.com/amannn/action-semantic-pull-request/releases + - uses: amannn/action-semantic-pull-request@v3.4.6 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + # Configure which types are allowed. + # Default: https://github.com/commitizen/conventional-commit-types + types: | + fix + feat + docs + ci + chore + # Configure that a scope must always be provided. + requireScope: false + # Configure additional validation for the subject based on a regex. + # This example ensures the subject starts with an uppercase character. + subjectPattern: ^[A-Z].+$ + # If `subjectPattern` is configured, you can use this property to override + # the default error message that is shown when the pattern doesn't match. + # The variables `subject` and `title` can be used within the message. + subjectPatternError: | + The subject "{subject}" found in the pull request title "{title}" + didn't match the configured pattern. Please ensure that the subject + starts with an uppercase character. + # For work-in-progress PRs you can typically use draft pull requests + # from Github. However, private repositories on the free plan don't have + # this option and therefore this action allows you to opt-in to using the + # special "[WIP]" prefix to indicate this state. This will avoid the + # validation of the PR title and the pull request checks remain pending. + # Note that a second check will be reported if this is enabled. + wip: true + # When using "Squash and merge" on a PR with only one commit, GitHub + # will suggest using that commit message instead of the PR title for the + # merge commit, and it's easy to commit this by mistake. Enable this option + # to also validate the commit message for one commit PRs. + validateSingleCommit: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..e8a26ca --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,37 @@ +name: Release + +on: + workflow_dispatch: + push: + branches: + - main + - master + paths: + - '**/*.tpl' + - '**/*.py' + - '**/*.tf' + - '.github/workflows/release.yml' + +jobs: + release: + name: Release + runs-on: ubuntu-latest + # Skip running release workflow on forks + if: github.repository_owner == 'terraform-aws-modules' + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + persist-credentials: false + fetch-depth: 0 + + - name: Release + uses: cycjimmy/semantic-release-action@v2 + with: + semantic_version: 18.0.0 + extra_plugins: | + @semantic-release/changelog@6.0.0 + @semantic-release/git@10.0.0 + conventional-changelog-conventionalcommits@4.6.3 + env: + GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }} diff --git a/.github/workflows/stale-actions.yaml b/.github/workflows/stale-actions.yaml new file mode 100644 index 0000000..c09ae1d --- /dev/null +++ b/.github/workflows/stale-actions.yaml @@ -0,0 +1,32 @@ +name: 'Mark or close stale issues and PRs' +on: + schedule: + - cron: '0 0 * * *' + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v4 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + # Staling issues and PR's + days-before-stale: 30 + stale-issue-label: stale + stale-pr-label: stale + stale-issue-message: | + This issue has been automatically marked as stale because it has been open 30 days + with no activity. Remove stale label or comment or this issue will be closed in 10 days + stale-pr-message: | + This PR has been automatically marked as stale because it has been open 30 days + with no activity. Remove stale label or comment or this PR will be closed in 10 days + # Not stale if have this labels or part of milestone + exempt-issue-labels: bug,wip,on-hold + exempt-pr-labels: bug,wip,on-hold + exempt-all-milestones: true + # Close issue operations + # Label will be automatically removed if the issues are no longer closed nor locked. + days-before-close: 10 + delete-branch: true + close-issue-message: This issue was automatically closed because of stale in 10 days + close-pr-message: This PR was automatically closed because of stale in 10 days diff --git a/.releaserc.json b/.releaserc.json index 7885cfa..66b3eef 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -1,7 +1,9 @@ { "branches": [ - "main" + "main", + "master" ], + "ci": false, "plugins": [ [ "@semantic-release/commit-analyzer", @@ -15,6 +17,29 @@ "preset": "conventionalcommits" } ], - "@semantic-release/github" + [ + "@semantic-release/github", + { + "successComment": "This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version ${nextRelease.version} :tada:", + "labels": false, + "releasedLabels": false + } + ], + [ + "@semantic-release/changelog", + { + "changelogFile": "CHANGELOG.md", + "changelogTitle": "# Changelog\n\nAll notable changes to this project will be documented in this file." + } + ], + [ + "@semantic-release/git", + { + "assets": [ + "CHANGELOG.md" + ], + "message": "chore(release): version ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + } + ] ] } diff --git a/LICENSE b/LICENSE index a58a4f5..d9a10c0 100644 --- a/LICENSE +++ b/LICENSE @@ -174,28 +174,3 @@ of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2022 Clowd Haus, LLC. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index b160cd3..f0e08c1 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,122 @@ Terraform module which creates AWS KMS resources. +[![SWUbanner](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md) + ## Usage -See [`examples`](https://github.com/clowdhaus/terraform-aws-kms/tree/main/examples) directory for working examples to reference: +See [`examples`](https://github.com/terraform-aws-modules/terraform-aws-kms/tree/master/examples) directory for working examples to reference: + +### Service + +Reference usage for EC2 AutoScaling service linked role to launch encrypted EBS volumes: + +```hcl +module "kms" { + source = "terraform-aws-modules/kms/aws" + + description = "EC2 AutoScaling key usage" + key_usage = "ENCRYPT_DECRYPT" + + # Policy + key_administrators = ["arn:aws:iam::012345678901:role/admin"] + key_users = ["arn:aws:iam::012345678901:role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"] + key_service_users = ["arn:aws:iam::012345678901:role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"] + + # Aliases + aliases = ["mycompany/ebs"] + + tags = { + Terraform = "true" + Environment = "dev" + } +} +``` + +### External Key + +Reference usage for external CMK (externally provided encryption material): + +```hcl +module "kms" { + source = "terraform-aws-modules/kms/aws" + + description = "External key example" + key_material_base64 = "Wblj06fduthWggmsT0cLVoIMOkeLbc2kVfMud77i/JY=" + valid_to = "2085-04-12T23:20:50.52Z" + + # Policy + key_owners = ["arn:aws:iam::012345678901:role/owner"] + key_administrators = ["arn:aws:iam::012345678901:role/admin"] + key_users = ["arn:aws:iam::012345678901:role/user"] + key_service_users = ["arn:aws:iam::012345678901:role/ec2-role"] + + # Aliases + aliases = ["mycompany/external"] + aliases_use_name_prefix = true + + # Grants + grants = { + lambda = { + grantee_principal = "arn:aws:iam::012345678901:role/lambda-function" + operations = ["Encrypt", "Decrypt", "GenerateDataKey"] + constraints = { + encryption_context_equals = { + Department = "Finance" + } + } + } + } + + tags = { + Terraform = "true" + Environment = "dev" + } +} +``` + +### Reference + +Reference usage showing available configurations. ```hcl module "kms" { - source = "clowdhaus/kms/aws" + source = "terraform-aws-modules/kms/aws" + + description = "Complete key example showing various configurations available" + deletion_window_in_days = 7 + enable_key_rotation = true + is_enabled = true + key_usage = "ENCRYPT_DECRYPT" + multi_region = false + + # Policy + enable_default_policy = true + key_owners = ["arn:aws:iam::012345678901:role/owner"] + key_administrators = ["arn:aws:iam::012345678901:role/admin"] + key_users = ["arn:aws:iam::012345678901:role/user"] + key_service_users = ["arn:aws:iam::012345678901:role/ec2-role"] + key_symmetric_encryption_users = ["arn:aws:iam::012345678901:role/symmetric-user"] + key_hmac_users = ["arn:aws:iam::012345678901:role/hmac-user"] + key_asymmetric_public_encryption_users = ["arn:aws:iam::012345678901:role/asymmetric-public-user"] + key_asymmetric_sign_verify_users = ["arn:aws:iam::012345678901:role/sign-verify-user"] + + # Aliases + aliases = ["one", "foo/bar"] + aliases_use_name_prefix = true + + # Grants + grants = { + lambda = { + grantee_principal = "arn:aws:iam::012345678901:role/lambda-function" + operations = ["Encrypt", "Decrypt", "GenerateDataKey"] + constraints = { + encryption_context_equals = { + Department = "Finance" + } + } + } + } tags = { Terraform = "true" @@ -19,9 +128,9 @@ module "kms" { ## Examples -Examples codified under the [`examples`](https://github.com/clowdhaus/terraform-aws-kms/tree/main/examples) are intended to give users references for how to use the module(s) as well as testing/validating changes to the source code of the module. If contributing to the project, please be sure to make any appropriate updates to the relevant examples to allow maintainers to test your changes and to keep the examples up to date for users. Thank you! +Examples codified under the [`examples`](https://github.com/terraform-aws-modules/terraform-aws-kms/tree/master/examples) are intended to give users references for how to use the module(s) as well as testing/validating changes to the source code of the module. If contributing to the project, please be sure to make any appropriate updates to the relevant examples to allow maintainers to test your changes and to keep the examples up to date for users. Thank you! -- [Complete](https://github.com/clowdhaus/terraform-aws-kms/tree/main/examples/complete) +- [Complete](https://github.com/terraform-aws-modules/terraform-aws-kms/tree/master/examples/complete) ## Requirements @@ -74,7 +183,7 @@ No modules. | [key\_asymmetric\_sign\_verify\_users](#input\_key\_asymmetric\_sign\_verify\_users) | A list of IAM ARNs for [key asymmetric sign and verify users](https://docs.aws.amazon.com/kms/latest/developerguide/key-policy-default.html#key-policy-users-crypto) | `list(string)` | `[]` | no | | [key\_hmac\_users](#input\_key\_hmac\_users) | A list of IAM ARNs for [key HMAC users](https://docs.aws.amazon.com/kms/latest/developerguide/key-policy-default.html#key-policy-users-crypto) | `list(string)` | `[]` | no | | [key\_material\_base64](#input\_key\_material\_base64) | Base64 encoded 256-bit symmetric encryption key material to import. The CMK is permanently associated with this key material. External key only | `string` | `null` | no | -| [key\_owners](#input\_key\_owners) | A list of IAM ARNs for those who will have full key permissions (`kms:*`). `enable_default_policy` must be `true` to utilize | `list(string)` | `[]` | no | +| [key\_owners](#input\_key\_owners) | A list of IAM ARNs for those who will have full key permissions (`kms:*`) | `list(string)` | `[]` | no | | [key\_service\_users](#input\_key\_service\_users) | A list of IAM ARNs for [key service users](https://docs.aws.amazon.com/kms/latest/developerguide/key-policy-default.html#key-policy-service-integration) | `list(string)` | `[]` | no | | [key\_symmetric\_encryption\_users](#input\_key\_symmetric\_encryption\_users) | A list of IAM ARNs for [key symmetric encryption users](https://docs.aws.amazon.com/kms/latest/developerguide/key-policy-default.html#key-policy-users-crypto) | `list(string)` | `[]` | no | | [key\_usage](#input\_key\_usage) | Specifies the intended use of the key. Valid values: `ENCRYPT_DECRYPT` or `SIGN_VERIFY`. Defaults to `ENCRYPT_DECRYPT` | `string` | `null` | no | @@ -102,4 +211,4 @@ No modules. ## License -Apache-2.0 Licensed. See [LICENSE](https://github.com/clowdhaus/terraform-aws-kms/blob/main/LICENSE). +Apache-2.0 Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-aws-kms/blob/master/LICENSE). diff --git a/examples/complete/README.md b/examples/complete/README.md index 51a9ddb..766a4d9 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -2,7 +2,10 @@ Configuration in this directory creates: -- +- Complete KMS key example with key policy, aliases, and grants +- External KMS key example +- Default KMS key example with default policy +- Disable KMS key example ## Usage @@ -80,4 +83,4 @@ No inputs. | [external\_key\_policy](#output\_external\_key\_policy) | The IAM resource policy set on the key | -Apache-2.0 Licensed. See [LICENSE](https://github.com/clowdhaus/terraform-aws-kms/blob/main/LICENSE). +Apache-2.0 Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-aws-kms/blob/master/LICENSE). diff --git a/examples/complete/main.tf b/examples/complete/main.tf index cf07df3..a0e46be 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -3,14 +3,14 @@ provider "aws" { } locals { - region = "us-east-1" - name = "kms-ex-${replace(basename(path.cwd), "_", "-")}" - me = data.aws_caller_identity.current.arn + region = "us-east-1" + name = "kms-ex-${replace(basename(path.cwd), "_", "-")}" + current_identity = data.aws_caller_identity.current.arn tags = { Name = local.name Example = "complete" - Repository = "https://github.com/clowdhaus/terraform-aws-kms" + Repository = "https://github.com/terraform-aws-modules/terraform-aws-kms" } } @@ -32,14 +32,14 @@ module "kms_complete" { # Policy enable_default_policy = true - key_owners = [local.me] - key_administrators = [local.me] - key_users = [local.me] - key_service_users = [local.me] - key_symmetric_encryption_users = [local.me] - key_hmac_users = [local.me] - key_asymmetric_public_encryption_users = [local.me] - key_asymmetric_sign_verify_users = [local.me] + key_owners = [local.current_identity] + key_administrators = [local.current_identity] + key_users = [local.current_identity] + key_service_users = [local.current_identity] + key_symmetric_encryption_users = [local.current_identity] + key_hmac_users = [local.current_identity] + key_asymmetric_public_encryption_users = [local.current_identity] + key_asymmetric_sign_verify_users = [local.current_identity] # Aliases aliases = ["one", "foo/bar"] diff --git a/main.tf b/main.tf index 39b2e9d..fc03824 100644 --- a/main.tf +++ b/main.tf @@ -61,7 +61,23 @@ data "aws_iam_policy_document" "this" { principals { type = "AWS" - identifiers = coalescelist(var.key_owners, ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"]) + identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] + } + } + } + + # Key owner - all key operations + dynamic "statement" { + for_each = var.enable_default_policy ? [1] : [] + + content { + sid = "KeyOwner" + actions = ["kms:*"] + resources = ["*"] + + principals { + type = "AWS" + identifiers = var.key_owners } } } diff --git a/variables.tf b/variables.tf index 7d112ff..53acfa6 100644 --- a/variables.tf +++ b/variables.tf @@ -93,7 +93,7 @@ variable "enable_default_policy" { } variable "key_owners" { - description = "A list of IAM ARNs for those who will have full key permissions (`kms:*`). `enable_default_policy` must be `true` to utilize" + description = "A list of IAM ARNs for those who will have full key permissions (`kms:*`)" type = list(string) default = [] }