From 556aec4a9f7577a639d0c70e99d7f734cd348204 Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Mon, 4 Apr 2022 15:29:03 +0530 Subject: [PATCH 01/10] update github-action --- .github/workflows/terraform.yml | 128 +++++++--------- LICENSE | 222 +++++++++++++++++++++++++--- README.yaml | 6 +- _example/example.tf | 8 +- versions.tf => _example/versions.tf | 2 +- main.tf | 23 +++ variables.tf | 48 ++++++ 7 files changed, 336 insertions(+), 101 deletions(-) rename versions.tf => _example/versions.tf (80%) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 6694812..dc4a481 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -1,60 +1,46 @@ -name: 'Terraform GitHub Actions' +name: static-checks + on: pull_request: - branches: - - master jobs: - fmt: - name: 'terraform fmt' + versionExtract: + name: Get min/max versions runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 - - - name: 'Terraform Format' - uses: 'clouddrove/github-actions@v7.0' - with: - actions_subcommand: 'fmt' - validate: - name: 'terraform validate' - runs-on: ubuntu-latest steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 + - name: Checkout + uses: actions/checkout@v2 - - name: 'Configure AWS Credentials' - uses: clouddrove/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }} - aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} - aws-region: us-east-2 + - name: Terraform min/max versions + id: minMax + uses: clowdhaus/terraform-min-max@main + outputs: + minVersion: ${{ steps.minMax.outputs.minVersion }} + maxVersion: ${{ steps.minMax.outputs.maxVersion }} - - name: 'Terraform init' - uses: 'clouddrove/github-actions@v7.0' - with: - actions_subcommand: 'init' - tf_actions_working_dir: ./_example - - name: 'Terraform validate' - uses: 'clouddrove/github-actions@v7.0' - with: - actions_subcommand: 'validate' - tf_actions_working_dir: ./_example - - plan: - name: 'terraform plan' + versionEvaluate: + name: Evaluate Terraform versions runs-on: ubuntu-latest + needs: versionExtract + strategy: + fail-fast: false + matrix: + version: + - ${{ needs.versionExtract.outputs.minVersion }} + - ${{ needs.versionExtract.outputs.maxVersion }} + directory: + - _example/ + steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 + - name: Checkout + uses: actions/checkout@v2 - - name: 'Terraform init' - uses: 'clouddrove/github-actions@v7.0' + - name: Install Terraform v${{ matrix.version }} + uses: hashicorp/setup-terraform@v1 with: - actions_subcommand: 'init' - tf_actions_working_dir: ./_example + terraform_version: ${{ matrix.version }} - name: 'Configure AWS Credentials' uses: clouddrove/configure-aws-credentials@v1 @@ -63,39 +49,35 @@ jobs: aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} aws-region: us-east-2 - - name: 'Terraform plan' - uses: 'clouddrove/github-actions@v7.0' - with: - actions_subcommand: 'plan' - tf_actions_working_dir: ./_example + - name: Init & validate v${{ matrix.version }} + run: | + cd ${{ matrix.directory }} + terraform init + terraform validate + terraform plan -input=false -no-color - pre-commit: - name: 'Pre-Commit' - needs: - - fmt - - plan - - validate + - name: tflint + uses: reviewdog/action-tflint@master + with: + github_token: ${{ secrets.GITHUB }} + working_directory: ${{ matrix.directory }} + fail_on_error: 'true' + filter_mode: 'nofilter' + flags: '--module' + format: + name: Check code format runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 - - - name: 'Install Tflint' - run: | - curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash + needs: versionExtract - - name: 'Pre-Commit 🔎' - uses: pre-commit/action@v2.0.3 - continue-on-error: true + steps: + - name: Checkout + uses: actions/checkout@v2 - - name: 'Slack Notification' - uses: clouddrove/action-slack@v2 + - name: Install Terraform v${{ needs.versionExtract.outputs.maxVersion }} + uses: hashicorp/setup-terraform@v1 with: - status: ${{ job.status }} - fields: repo,author - author_name: 'CloudDrove' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required - if: always() + terraform_version: ${{ needs.versionExtract.outputs.maxVersion }} + + - name: Check Terraform format changes + run: terraform fmt --recursive \ No newline at end of file diff --git a/LICENSE b/LICENSE index 55beef5..261c073 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,201 @@ -MIT License - -Copyright (c) 2021 Cloud Drove - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + 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 2021 CloudDrove Inc. + + 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. \ No newline at end of file diff --git a/README.yaml b/README.yaml index 9457304..d31a453 100644 --- a/README.yaml +++ b/README.yaml @@ -8,7 +8,7 @@ name : Terraform AWS Iam User # License of this project -license: "MIT" +license: "APACHE" # Canonical GitHub repo github_repo: clouddrove/terraform-aws-iam-user @@ -16,10 +16,10 @@ github_repo: clouddrove/terraform-aws-iam-user # Badges to display badges: - name: "Terraform" - image: "https://img.shields.io/badge/Terraform-v0.15-green" + image: "https://img.shields.io/badge/Terraform-v1.1.7-green" url: "https://www.terraform.io" - name: "Licence" - image: "https://img.shields.io/badge/License-MIT-blue.svg" + image: "https://img.shields.io/badge/License-APACHE-blue.svg" url: "LICENSE.md" # description of this project diff --git a/_example/example.tf b/_example/example.tf index 3df5d2e..3a409a5 100644 --- a/_example/example.tf +++ b/_example/example.tf @@ -9,9 +9,11 @@ module "iam-user" { environment = "test" label_order = ["name", "environment"] - policy_enabled = true - policy = data.aws_iam_policy_document.default.json - pgp_key = "" + policy_enabled = true + policy = data.aws_iam_policy_document.default.json + pgp_key = "" + password_length = 20 + password_reset_required = true } data "aws_iam_policy_document" "default" { diff --git a/versions.tf b/_example/versions.tf similarity index 80% rename from versions.tf rename to _example/versions.tf index 46e9063..2683fac 100644 --- a/versions.tf +++ b/_example/versions.tf @@ -1,6 +1,6 @@ # Terraform version terraform { - required_version = ">= 0.12.0" + required_version = ">= 0.14.0" required_providers { aws = { diff --git a/main.tf b/main.tf index 310a1f7..289ad78 100644 --- a/main.tf +++ b/main.tf @@ -54,3 +54,26 @@ resource "aws_iam_user_policy_attachment" "default" { user = aws_iam_user.default.*.name[0] policy_arn = var.policy_arn } + +resource "aws_iam_user_group_membership" "default" { + count = var.enabled ? 1 : 0 + user = aws_iam_user.default[count.index].name + groups = var.groups + depends_on = [aws_iam_user.default] +} + +resource "aws_iam_user_login_profile" "default" { + count = var.create_user && var.create_iam_user_login_profile ? 1 : 0 + + user = aws_iam_user.default[0].name + password_length = var.password_length + password_reset_required = var.password_reset_required +} + +resource "aws_iam_user_ssh_key" "default" { + count = var.create_user && var.upload_iam_user_ssh_key ? 1 : 0 + + username = aws_iam_user.default[0].name + encoding = var.ssh_key_encoding + public_key = var.ssh_public_key +} \ No newline at end of file diff --git a/variables.tf b/variables.tf index e2ab5da..48d96c0 100644 --- a/variables.tf +++ b/variables.tf @@ -105,3 +105,51 @@ variable "policy_arn" { description = "The ARN of the policy you want to apply." sensitive = true } + +variable "groups" { + type = list(string) + description = "(Optional) List of IAM groups to add the User to." + default = [] +} + +variable "create_user" { + description = "Whether to create the IAM user" + type = bool + default = true +} + +variable "create_iam_user_login_profile" { + description = "Whether to create IAM user login profile" + type = bool + default = true +} + +variable "password_reset_required" { + description = "Whether the user should be forced to reset the generated password on first login." + type = bool + default = true +} + +variable "password_length" { + description = "The length of the generated password" + type = number + default = 20 +} + +variable "upload_iam_user_ssh_key" { + description = "Whether to upload a public ssh key to the IAM user" + type = bool + default = false +} +variable "ssh_key_encoding" { + description = "Specifies the public key encoding format to use in the response. To retrieve the public key in ssh-rsa format, use SSH. To retrieve the public key in PEM format, use PEM" + type = string + default = "SSH" +} + +variable "ssh_public_key" { + description = "The SSH public key. The public key must be encoded in ssh-rsa format or PEM format" + type = string + default = "" +} + From 8082cbb22497533528580b2cefed0b1d09e65daf Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Mon, 4 Apr 2022 15:40:16 +0530 Subject: [PATCH 02/10] update github-action --- .github/workflows/terraform.yml | 128 ++++++++++++++++++-------------- README.yaml | 16 ++-- 2 files changed, 82 insertions(+), 62 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index dc4a481..6694812 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -1,46 +1,60 @@ -name: static-checks - +name: 'Terraform GitHub Actions' on: pull_request: + branches: + - master jobs: - versionExtract: - name: Get min/max versions + fmt: + name: 'terraform fmt' runs-on: ubuntu-latest + steps: + - name: 'Checkout' + uses: actions/checkout@v2.3.4 + + - name: 'Terraform Format' + uses: 'clouddrove/github-actions@v7.0' + with: + actions_subcommand: 'fmt' + validate: + name: 'terraform validate' + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - name: 'Checkout' + uses: actions/checkout@v2.3.4 - - name: Terraform min/max versions - id: minMax - uses: clowdhaus/terraform-min-max@main - outputs: - minVersion: ${{ steps.minMax.outputs.minVersion }} - maxVersion: ${{ steps.minMax.outputs.maxVersion }} + - name: 'Configure AWS Credentials' + uses: clouddrove/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }} + aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} + aws-region: us-east-2 + - name: 'Terraform init' + uses: 'clouddrove/github-actions@v7.0' + with: + actions_subcommand: 'init' + tf_actions_working_dir: ./_example - versionEvaluate: - name: Evaluate Terraform versions - runs-on: ubuntu-latest - needs: versionExtract - strategy: - fail-fast: false - matrix: - version: - - ${{ needs.versionExtract.outputs.minVersion }} - - ${{ needs.versionExtract.outputs.maxVersion }} - directory: - - _example/ + - name: 'Terraform validate' + uses: 'clouddrove/github-actions@v7.0' + with: + actions_subcommand: 'validate' + tf_actions_working_dir: ./_example + plan: + name: 'terraform plan' + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - name: 'Checkout' + uses: actions/checkout@v2.3.4 - - name: Install Terraform v${{ matrix.version }} - uses: hashicorp/setup-terraform@v1 + - name: 'Terraform init' + uses: 'clouddrove/github-actions@v7.0' with: - terraform_version: ${{ matrix.version }} + actions_subcommand: 'init' + tf_actions_working_dir: ./_example - name: 'Configure AWS Credentials' uses: clouddrove/configure-aws-credentials@v1 @@ -49,35 +63,39 @@ jobs: aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} aws-region: us-east-2 - - name: Init & validate v${{ matrix.version }} - run: | - cd ${{ matrix.directory }} - terraform init - terraform validate - terraform plan -input=false -no-color - - - name: tflint - uses: reviewdog/action-tflint@master + - name: 'Terraform plan' + uses: 'clouddrove/github-actions@v7.0' with: - github_token: ${{ secrets.GITHUB }} - working_directory: ${{ matrix.directory }} - fail_on_error: 'true' - filter_mode: 'nofilter' - flags: '--module' + actions_subcommand: 'plan' + tf_actions_working_dir: ./_example - format: - name: Check code format - runs-on: ubuntu-latest - needs: versionExtract + pre-commit: + name: 'Pre-Commit' + needs: + - fmt + - plan + - validate + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - name: 'Checkout' + uses: actions/checkout@v2.3.4 - - name: Install Terraform v${{ needs.versionExtract.outputs.maxVersion }} - uses: hashicorp/setup-terraform@v1 - with: - terraform_version: ${{ needs.versionExtract.outputs.maxVersion }} + - name: 'Install Tflint' + run: | + curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash - - name: Check Terraform format changes - run: terraform fmt --recursive \ No newline at end of file + - name: 'Pre-Commit 🔎' + uses: pre-commit/action@v2.0.3 + continue-on-error: true + + - name: 'Slack Notification' + uses: clouddrove/action-slack@v2 + with: + status: ${{ job.status }} + fields: repo,author + author_name: 'CloudDrove' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required + if: always() diff --git a/README.yaml b/README.yaml index d31a453..89df28c 100644 --- a/README.yaml +++ b/README.yaml @@ -37,13 +37,15 @@ usage : |- Here is an example of how you can use this module in your inventory structure: ```hcl module "iam-user" { - source = "clouddrove/iam-user/aws" - version = "0.15.0" - name = "iam-user" - environment = "test" - label_order = ["name","environment"] - policy_enabled = true - policy = data.aws_iam_policy_document.default.json + source = "clouddrove/iam-user/aws" + version = "0.15.0" + name = "iam-user" + environment = "test" + label_order = ["name","environment"] + policy_enabled = true + policy = data.aws_iam_policy_document.default.json + password_length = 20 + password_reset_required = true } data "aws_iam_policy_document" "default" { From f80f8dcb573be67daa868b6fa8f0219ad237a285 Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Mon, 4 Apr 2022 15:52:37 +0530 Subject: [PATCH 03/10] update github-action --- .github/tfsec.yml | 25 +++++++++++++++++++++++++ README.yaml | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 .github/tfsec.yml diff --git a/.github/tfsec.yml b/.github/tfsec.yml new file mode 100644 index 0000000..20cde2d --- /dev/null +++ b/.github/tfsec.yml @@ -0,0 +1,25 @@ +name: tfsec +on: + pull_request: + +jobs: + tfsec: + name: tfsec sarif report + runs-on: ubuntu-latest + + steps: + - name: Clone repo + uses: actions/checkout@master + + - name: tfsec + uses: aquasecurity/tfsec-sarif-action@v0.1.0 + with: + sarif_file: tfsec.sarif + working_directory: _example + full_repo_scan: true + + - name: Upload SARIF file + uses: github/codeql-action/upload-sarif@v1 + with: + # Path to SARIF file relative to the root of the repository + sarif_file: tfsec.sarif \ No newline at end of file diff --git a/README.yaml b/README.yaml index 89df28c..2ad20d5 100644 --- a/README.yaml +++ b/README.yaml @@ -21,7 +21,12 @@ badges: - name: "Licence" image: "https://img.shields.io/badge/License-APACHE-blue.svg" url: "LICENSE.md" - + - name: "tfsec" + image: "https://github.com/clouddrove/terraform-aws-iam-user/actions/workflows/tfsec.yml/badge.svg" + url: "https://github.com/clouddrove/terraform-aws-iam-user/actions/workflows/tfsec.yml" + - name: "static-checks" + image: "https://github.com/clouddrove/terraform-aws-iam-user/actions/workflows/terraform.yml/badge.svg" + url: "https://github.com/clouddrove/terraform-aws-iam-user/actions/workflows/terraform.yml" # description of this project description: |- Terraform module to create Iam user resource on AWS. From 00e948106563bebdba1ff0f4096f86818aaa824b Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Mon, 4 Apr 2022 16:07:45 +0530 Subject: [PATCH 04/10] update github-action --- outputs.tf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/outputs.tf b/outputs.tf index f5841a5..d9724da 100644 --- a/outputs.tf +++ b/outputs.tf @@ -25,3 +25,9 @@ output "tags" { value = module.labels.tags description = "A mapping of tags to assign to the resource." } + +output "groups" { + value = var.groups + description = "List of IAM groups the users were added to." +} + From e18c0430a083a5ba667e1faeddde83858f07db8d Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Mon, 4 Apr 2022 16:09:48 +0530 Subject: [PATCH 05/10] update github-action --- outputs.tf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/outputs.tf b/outputs.tf index d9724da..60d71f8 100644 --- a/outputs.tf +++ b/outputs.tf @@ -26,8 +26,4 @@ output "tags" { description = "A mapping of tags to assign to the resource." } -output "groups" { - value = var.groups - description = "List of IAM groups the users were added to." -} From 54148f2dbf33823710029bb4272b2beeb87982d3 Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Mon, 4 Apr 2022 18:29:49 +0530 Subject: [PATCH 06/10] update github-action --- .github/{ => workflows}/tfsec.yml | 0 outputs.tf | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename .github/{ => workflows}/tfsec.yml (100%) diff --git a/.github/tfsec.yml b/.github/workflows/tfsec.yml similarity index 100% rename from .github/tfsec.yml rename to .github/workflows/tfsec.yml diff --git a/outputs.tf b/outputs.tf index 60d71f8..b626704 100644 --- a/outputs.tf +++ b/outputs.tf @@ -24,6 +24,4 @@ output "secret" { output "tags" { value = module.labels.tags description = "A mapping of tags to assign to the resource." -} - - +} \ No newline at end of file From 1ca60ac71971475a1bbbb062a6faf7c856c147b9 Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Tue, 5 Apr 2022 13:51:03 +0530 Subject: [PATCH 07/10] update github-action --- .github/workflows/terraform.yml | 128 ++++++++++++++------------------ main.tf | 17 ++--- 2 files changed, 61 insertions(+), 84 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 6694812..dc4a481 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -1,60 +1,46 @@ -name: 'Terraform GitHub Actions' +name: static-checks + on: pull_request: - branches: - - master jobs: - fmt: - name: 'terraform fmt' + versionExtract: + name: Get min/max versions runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 - - - name: 'Terraform Format' - uses: 'clouddrove/github-actions@v7.0' - with: - actions_subcommand: 'fmt' - validate: - name: 'terraform validate' - runs-on: ubuntu-latest steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 + - name: Checkout + uses: actions/checkout@v2 - - name: 'Configure AWS Credentials' - uses: clouddrove/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }} - aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} - aws-region: us-east-2 + - name: Terraform min/max versions + id: minMax + uses: clowdhaus/terraform-min-max@main + outputs: + minVersion: ${{ steps.minMax.outputs.minVersion }} + maxVersion: ${{ steps.minMax.outputs.maxVersion }} - - name: 'Terraform init' - uses: 'clouddrove/github-actions@v7.0' - with: - actions_subcommand: 'init' - tf_actions_working_dir: ./_example - - name: 'Terraform validate' - uses: 'clouddrove/github-actions@v7.0' - with: - actions_subcommand: 'validate' - tf_actions_working_dir: ./_example - - plan: - name: 'terraform plan' + versionEvaluate: + name: Evaluate Terraform versions runs-on: ubuntu-latest + needs: versionExtract + strategy: + fail-fast: false + matrix: + version: + - ${{ needs.versionExtract.outputs.minVersion }} + - ${{ needs.versionExtract.outputs.maxVersion }} + directory: + - _example/ + steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 + - name: Checkout + uses: actions/checkout@v2 - - name: 'Terraform init' - uses: 'clouddrove/github-actions@v7.0' + - name: Install Terraform v${{ matrix.version }} + uses: hashicorp/setup-terraform@v1 with: - actions_subcommand: 'init' - tf_actions_working_dir: ./_example + terraform_version: ${{ matrix.version }} - name: 'Configure AWS Credentials' uses: clouddrove/configure-aws-credentials@v1 @@ -63,39 +49,35 @@ jobs: aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} aws-region: us-east-2 - - name: 'Terraform plan' - uses: 'clouddrove/github-actions@v7.0' - with: - actions_subcommand: 'plan' - tf_actions_working_dir: ./_example + - name: Init & validate v${{ matrix.version }} + run: | + cd ${{ matrix.directory }} + terraform init + terraform validate + terraform plan -input=false -no-color - pre-commit: - name: 'Pre-Commit' - needs: - - fmt - - plan - - validate + - name: tflint + uses: reviewdog/action-tflint@master + with: + github_token: ${{ secrets.GITHUB }} + working_directory: ${{ matrix.directory }} + fail_on_error: 'true' + filter_mode: 'nofilter' + flags: '--module' + format: + name: Check code format runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@v2.3.4 - - - name: 'Install Tflint' - run: | - curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash + needs: versionExtract - - name: 'Pre-Commit 🔎' - uses: pre-commit/action@v2.0.3 - continue-on-error: true + steps: + - name: Checkout + uses: actions/checkout@v2 - - name: 'Slack Notification' - uses: clouddrove/action-slack@v2 + - name: Install Terraform v${{ needs.versionExtract.outputs.maxVersion }} + uses: hashicorp/setup-terraform@v1 with: - status: ${{ job.status }} - fields: repo,author - author_name: 'CloudDrove' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required - if: always() + terraform_version: ${{ needs.versionExtract.outputs.maxVersion }} + + - name: Check Terraform format changes + run: terraform fmt --recursive \ No newline at end of file diff --git a/main.tf b/main.tf index 289ad78..bc1bd84 100644 --- a/main.tf +++ b/main.tf @@ -33,46 +33,41 @@ resource "aws_iam_user" "default" { } resource "aws_iam_access_key" "default" { - count = var.enabled ? 1 : 0 - + count = var.enabled ? 1 : 0 user = aws_iam_user.default.*.name[0] pgp_key = var.pgp_key status = var.status } resource "aws_iam_user_policy" "default" { - count = var.enabled && var.policy_enabled && var.policy_arn == "" ? 1 : 0 - + count = var.enabled && var.policy_enabled && var.policy_arn == "" ? 1 : 0 name = format("%s-policy", module.labels.id) user = aws_iam_user.default.*.name[0] policy = var.policy } resource "aws_iam_user_policy_attachment" "default" { - count = var.enabled && var.policy_enabled && var.policy_arn != "" ? 1 : 0 - + count = var.enabled && var.policy_enabled && var.policy_arn != "" ? 1 : 0 user = aws_iam_user.default.*.name[0] policy_arn = var.policy_arn } resource "aws_iam_user_group_membership" "default" { - count = var.enabled ? 1 : 0 + count = var.enabled && length(var.groups) > 0 ? 1 : 0 user = aws_iam_user.default[count.index].name groups = var.groups depends_on = [aws_iam_user.default] } resource "aws_iam_user_login_profile" "default" { - count = var.create_user && var.create_iam_user_login_profile ? 1 : 0 - + count = var.create_user && var.create_iam_user_login_profile ? 1 : 0 user = aws_iam_user.default[0].name password_length = var.password_length password_reset_required = var.password_reset_required } resource "aws_iam_user_ssh_key" "default" { - count = var.create_user && var.upload_iam_user_ssh_key ? 1 : 0 - + count = var.create_user && var.upload_iam_user_ssh_key ? 1 : 0 username = aws_iam_user.default[0].name encoding = var.ssh_key_encoding public_key = var.ssh_public_key From 78fa73181ad5a06c1d3200ce925f88caca78351f Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Tue, 5 Apr 2022 15:07:13 +0530 Subject: [PATCH 08/10] update github-action --- .github/workflows/terraform.yml | 127 ++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 55 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index dc4a481..8406ae7 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -1,46 +1,60 @@ -name: static-checks - +name: 'Terraform GitHub Actions' on: pull_request: + branches: + - master jobs: - versionExtract: - name: Get min/max versions + fmt: + name: 'terraform fmt' runs-on: ubuntu-latest + steps: + - name: 'Checkout' + uses: actions/checkout@v2.3.4 + + - name: 'Terraform Format' + uses: 'clouddrove/github-actions@v7.0' + with: + actions_subcommand: 'fmt' + validate: + name: 'terraform validate' + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - name: 'Checkout' + uses: actions/checkout@v2.3.4 + + - name: 'Configure AWS Credentials' + uses: clouddrove/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }} + aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} + aws-region: us-east-2 - - name: Terraform min/max versions - id: minMax - uses: clowdhaus/terraform-min-max@main - outputs: - minVersion: ${{ steps.minMax.outputs.minVersion }} - maxVersion: ${{ steps.minMax.outputs.maxVersion }} + - name: 'Terraform init' + uses: 'clouddrove/github-actions@v7.0' + with: + actions_subcommand: 'init' + tf_actions_working_dir: ./_example + - name: 'Terraform validate' + uses: 'clouddrove/github-actions@v7.0' + with: + actions_subcommand: 'validate' + tf_actions_working_dir: ./_example - versionEvaluate: - name: Evaluate Terraform versions + plan: + name: 'terraform plan' runs-on: ubuntu-latest - needs: versionExtract - strategy: - fail-fast: false - matrix: - version: - - ${{ needs.versionExtract.outputs.minVersion }} - - ${{ needs.versionExtract.outputs.maxVersion }} - directory: - - _example/ - steps: - - name: Checkout - uses: actions/checkout@v2 + - name: 'Checkout' + uses: actions/checkout@v2.3.4 - - name: Install Terraform v${{ matrix.version }} - uses: hashicorp/setup-terraform@v1 + - name: 'Terraform init' + uses: 'clouddrove/github-actions@v7.0' with: - terraform_version: ${{ matrix.version }} + actions_subcommand: 'init' + tf_actions_working_dir: ./_example - name: 'Configure AWS Credentials' uses: clouddrove/configure-aws-credentials@v1 @@ -49,35 +63,38 @@ jobs: aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }} aws-region: us-east-2 - - name: Init & validate v${{ matrix.version }} - run: | - cd ${{ matrix.directory }} - terraform init - terraform validate - terraform plan -input=false -no-color - - - name: tflint - uses: reviewdog/action-tflint@master + - name: 'Terraform plan' + uses: 'clouddrove/github-actions@v7.0' with: - github_token: ${{ secrets.GITHUB }} - working_directory: ${{ matrix.directory }} - fail_on_error: 'true' - filter_mode: 'nofilter' - flags: '--module' + actions_subcommand: 'plan' + tf_actions_working_dir: ./_example - format: - name: Check code format - runs-on: ubuntu-latest - needs: versionExtract + pre-commit: + name: 'Pre-Commit' + needs: + - fmt + - plan + - validate + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - name: 'Checkout' + uses: actions/checkout@v2.3.4 - - name: Install Terraform v${{ needs.versionExtract.outputs.maxVersion }} - uses: hashicorp/setup-terraform@v1 - with: - terraform_version: ${{ needs.versionExtract.outputs.maxVersion }} + - name: 'Install Tflint' + run: | + curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash + - name: 'Pre-Commit 🔎' + uses: pre-commit/action@v2.0.3 + continue-on-error: true - - name: Check Terraform format changes - run: terraform fmt --recursive \ No newline at end of file + - name: 'Slack Notification' + uses: clouddrove/action-slack@v2 + with: + status: ${{ job.status }} + fields: repo,author + author_name: 'CloudDrove' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required + if: always() \ No newline at end of file From 3dda746fe16a16a20cce444d1487400e5dbcf330 Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Wed, 6 Apr 2022 19:00:01 +0530 Subject: [PATCH 09/10] update github-action --- .github/workflows/readme.yml | 4 ++-- variables.tf | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index 26ad95d..e541fdf 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -18,7 +18,7 @@ jobs: python-version: '3.x' - name: 'create readme' - uses: 'clouddrove/github-actions@v7.0' + uses: 'clouddrove/github-actions@v9.0.1' with: actions_subcommand: 'readme' github_token: '${{ secrets.GITHUB}}' @@ -35,7 +35,7 @@ jobs: continue-on-error: true - name: 'push readme' - uses: 'clouddrove/github-actions@v7.0' + uses: 'clouddrove/github-actions@v9.0.1' continue-on-error: true with: actions_subcommand: 'push' diff --git a/variables.tf b/variables.tf index 48d96c0..a966fd7 100644 --- a/variables.tf +++ b/variables.tf @@ -108,48 +108,48 @@ variable "policy_arn" { variable "groups" { type = list(string) - description = "(Optional) List of IAM groups to add the User to." default = [] + description = "(Optional) List of IAM groups to add the User to." } variable "create_user" { - description = "Whether to create the IAM user" type = bool default = true + description = "Whether to create the IAM user" } variable "create_iam_user_login_profile" { - description = "Whether to create IAM user login profile" type = bool default = true + description = "Whether to create IAM user login profile" } variable "password_reset_required" { - description = "Whether the user should be forced to reset the generated password on first login." type = bool default = true + description = "Whether the user should be forced to reset the generated password on first login." } variable "password_length" { - description = "The length of the generated password" type = number default = 20 + description = "The length of the generated password" } variable "upload_iam_user_ssh_key" { - description = "Whether to upload a public ssh key to the IAM user" type = bool default = false + description = "Whether to upload a public ssh key to the IAM user" } variable "ssh_key_encoding" { - description = "Specifies the public key encoding format to use in the response. To retrieve the public key in ssh-rsa format, use SSH. To retrieve the public key in PEM format, use PEM" type = string default = "SSH" + description = "Specifies the public key encoding format to use in the response. To retrieve the public key in ssh-rsa format, use SSH. To retrieve the public key in PEM format, use PEM" } variable "ssh_public_key" { - description = "The SSH public key. The public key must be encoded in ssh-rsa format or PEM format" type = string default = "" + description = "The SSH public key. The public key must be encoded in ssh-rsa format or PEM format" } From dcf2017ec50d939d8536debc6f304a7b879a2cf8 Mon Sep 17 00:00:00 2001 From: theprashantyadav Date: Wed, 6 Apr 2022 19:13:36 +0530 Subject: [PATCH 10/10] update github-action --- README.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.yaml b/README.yaml index 2ad20d5..0e13bac 100644 --- a/README.yaml +++ b/README.yaml @@ -26,7 +26,7 @@ badges: url: "https://github.com/clouddrove/terraform-aws-iam-user/actions/workflows/tfsec.yml" - name: "static-checks" image: "https://github.com/clouddrove/terraform-aws-iam-user/actions/workflows/terraform.yml/badge.svg" - url: "https://github.com/clouddrove/terraform-aws-iam-user/actions/workflows/terraform.yml" + url: "https://github.com/clouddrove/terraform-aws-iam-user/actions/workflows/terraform.yml" # description of this project description: |- Terraform module to create Iam user resource on AWS.