From 3392557b772e86f791cecceebc2bdf35c45fe7e3 Mon Sep 17 00:00:00 2001 From: Archit Chopra Date: Mon, 2 Oct 2023 23:59:35 +0530 Subject: [PATCH 1/3] fix: Update workflows tag --- .github/workflows/auto_assignee.yml | 2 +- .github/workflows/changelog.yml | 2 +- .github/workflows/readme.yml | 4 ++-- .github/workflows/tf-checks.yml | 6 +++--- .github/workflows/tflint.yml | 2 +- .github/workflows/tfsec.yml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml index a07d2fa..88ebb73 100644 --- a/.github/workflows/auto_assignee.yml +++ b/.github/workflows/auto_assignee.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: jobs: assignee: - uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@master + uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.0.6 secrets: GITHUB: ${{ secrets.GITHUB }} with: diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 4b735f5..e4b9dd4 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: jobs: changelog: - uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@master + uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.0.6 secrets: inherit with: branch: 'master' \ No newline at end of file diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index 2ff513e..afe4741 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -17,7 +17,7 @@ jobs: python-version: '3.x' - name: 'create readme' - uses: 'clouddrove/github-actions@v9.0.2' + uses: 'clouddrove/github-actions@9.0.3' with: actions_subcommand: 'readme' github_token: '${{ secrets.GITHUB }}' @@ -34,7 +34,7 @@ jobs: continue-on-error: true - name: 'push readme' - uses: 'clouddrove/github-actions@v9.0.2' + uses: 'clouddrove/github-actions@9.0.3' continue-on-error: true with: actions_subcommand: 'push' diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml index 902ad7c..50707ab 100644 --- a/.github/workflows/tf-checks.yml +++ b/.github/workflows/tf-checks.yml @@ -6,15 +6,15 @@ on: workflow_dispatch: jobs: tf-checks-generate-certificate-dns-example: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.6 with: working_directory: './_example/generate-certificate-dns/' tf-checks-generate-certificate-email-example: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.6 with: working_directory: './_example/generate-certificate-email/' tf-checks-import-certificate-example: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.6 with: working_directory: './_example/import-certificate/' diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml index ee98182..40a35b2 100644 --- a/.github/workflows/tflint.yml +++ b/.github/workflows/tflint.yml @@ -6,6 +6,6 @@ on: workflow_dispatch: jobs: tf-lint: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@master + uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@1.0.6 secrets: GITHUB: ${{ secrets.GITHUB }} \ No newline at end of file diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml index 9aaf588..cf75492 100644 --- a/.github/workflows/tfsec.yml +++ b/.github/workflows/tfsec.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: jobs: tfsec: - uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@master + uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.0.6 secrets: inherit with: working_directory: '.' \ No newline at end of file From 6d7d59b8d6b70ba59ac5f86f4ee09d050101d29d Mon Sep 17 00:00:00 2001 From: Deepak Verma Date: Wed, 4 Oct 2023 15:29:41 +0530 Subject: [PATCH 2/3] fix: remove default variable --- _example/generate-certificate-dns/example.tf | 4 +--- variables.tf | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/_example/generate-certificate-dns/example.tf b/_example/generate-certificate-dns/example.tf index 79b4723..f5e9541 100644 --- a/_example/generate-certificate-dns/example.tf +++ b/_example/generate-certificate-dns/example.tf @@ -12,7 +12,5 @@ module "acm" { environment = "test" domain_name = "clouddrove.com" - subject_alternative_names = ["www.clouddrove.com"] - validation_method = "DNS" - enable_dns_validation = false + subject_alternative_names = ["*.${var.domain}", "www.${var.domain}"] } diff --git a/variables.tf b/variables.tf index 578fb66..2e269c5 100644 --- a/variables.tf +++ b/variables.tf @@ -46,7 +46,7 @@ variable "subject_alternative_names" { variable "validation_method" { type = string - default = "" + default = "DNS" description = "Which method to use for validation, DNS or EMAIL." } From 6077e2da9991e184b1209efde33b1daa21b52b49 Mon Sep 17 00:00:00 2001 From: Deepak Verma Date: Wed, 4 Oct 2023 15:43:32 +0530 Subject: [PATCH 3/3] tf check error fixed --- _example/generate-certificate-dns/example.tf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_example/generate-certificate-dns/example.tf b/_example/generate-certificate-dns/example.tf index f5e9541..9f38d4b 100644 --- a/_example/generate-certificate-dns/example.tf +++ b/_example/generate-certificate-dns/example.tf @@ -2,6 +2,10 @@ provider "aws" { region = "eu-west-1" } +locals { + domain = "clouddrove.com" +} + ##----------------------------------------------------------------------------- ## acm Module call with DNS. ##----------------------------------------------------------------------------- @@ -12,5 +16,5 @@ module "acm" { environment = "test" domain_name = "clouddrove.com" - subject_alternative_names = ["*.${var.domain}", "www.${var.domain}"] + subject_alternative_names = ["*.${local.domain}", "www.${local.domain}"] }