fix: Allow new Terraform

kitten-science · Aug 22, 2024 · ba5dc5c · ba5dc5c
1 parent 7ec3a16
commit ba5dc5c
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 54 deletions.
diff --git a/.github/workflows/infra-deploy.yml b/.github/workflows/infra-deploy.yml
@@ -13,6 +13,10 @@ permissions:
 concurrency:
   group: production
 
+env:
+  # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
+  TERRAFORM_VERSION: "1.8.2"
+
 jobs:
   deploy:
     environment:
@@ -23,9 +27,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
-      - name: Environment Info
-        run: |
-          echo "ref: ${{ github.ref }}"
+      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3
+        with:
+          terraform_version: ${{ env.TERRAFORM_VERSION }}
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4

diff --git a/.github/workflows/infra-test.yml b/.github/workflows/infra-test.yml
@@ -10,6 +10,13 @@ permissions:
   contents: read
   id-token: write
 
+concurrency:
+  group: test
+
+env:
+  # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
+  TERRAFORM_VERSION: "1.8.2"
+
 jobs:
   qa:
     runs-on: ubuntu-22.04
@@ -19,8 +26,7 @@ jobs:
 
       - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3
         with:
-          # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
-          terraform_version: "1.8.2"
+          terraform_version: ${{ env.TERRAFORM_VERSION }}
 
       - name: Format Checkout
         run: terraform fmt -check -diff -recursive terraform

diff --git a/terraform/README.md b/terraform/README.md
@@ -5,15 +5,15 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | 1.6.6 |
-| <a name="requirement_archive"></a> [archive](#requirement\_archive) | 2.4.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.31.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.8.2 |
+| <a name="requirement_archive"></a> [archive](#requirement\_archive) | 2.4.2 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.60.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.31.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.60.0 |
 
 ## Modules
 
@@ -25,9 +25,9 @@
 
 | Name | Type |
 |------|------|
-| [aws_route53_record.github_validation](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/route53_record) | resource |
-| [aws_route53_record.google_validation](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/route53_record) | resource |
-| [aws_route53_zone.kitten_science](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/route53_zone) | data source |
+| [aws_route53_record.github_validation](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/route53_record) | resource |
+| [aws_route53_record.google_validation](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/route53_record) | resource |
+| [aws_route53_zone.kitten_science](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/route53_zone) | data source |
 
 ## Inputs
 

diff --git a/terraform/modules/kitten-science-website/README.md b/terraform/modules/kitten-science-website/README.md
@@ -5,17 +5,17 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | 1.6.6 |
-| <a name="requirement_archive"></a> [archive](#requirement\_archive) | 2.4.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.31.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.8.2 |
+| <a name="requirement_archive"></a> [archive](#requirement\_archive) | 2.4.2 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.60.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_archive"></a> [archive](#provider\_archive) | 2.4.1 |
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.31.0 |
-| <a name="provider_aws.global"></a> [aws.global](#provider\_aws.global) | 5.31.0 |
+| <a name="provider_archive"></a> [archive](#provider\_archive) | 2.4.2 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.60.0 |
+| <a name="provider_aws.global"></a> [aws.global](#provider\_aws.global) | 5.60.0 |
 
 ## Modules
 
@@ -25,40 +25,40 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_acm_certificate.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/acm_certificate) | resource |
-| [aws_acm_certificate_validation.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/acm_certificate_validation) | resource |
-| [aws_cloudfront_distribution.schema](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/cloudfront_distribution) | resource |
-| [aws_cloudfront_distribution.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/cloudfront_distribution) | resource |
-| [aws_cloudfront_response_headers_policy.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/cloudfront_response_headers_policy) | resource |
-| [aws_iam_policy.lambda_logging](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/iam_policy) | resource |
-| [aws_iam_policy.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/iam_policy) | resource |
-| [aws_iam_role.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/iam_role) | resource |
-| [aws_iam_role.redirect](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/iam_role) | resource |
-| [aws_iam_role_policy_attachment.aws_xray_write_only_access](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/iam_role_policy_attachment) | resource |
-| [aws_iam_role_policy_attachment.lambda_logs](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/iam_role_policy_attachment) | resource |
-| [aws_iam_role_policy_attachment.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/iam_role_policy_attachment) | resource |
-| [aws_lambda_function.redirect](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/lambda_function) | resource |
-| [aws_lambda_permission.edgelambda](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/lambda_permission) | resource |
-| [aws_route53_record.schema](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/route53_record) | resource |
-| [aws_route53_record.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/route53_record) | resource |
-| [aws_route53_record.validation_kitten_science](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/route53_record) | resource |
-| [aws_route53_record.validation_rm_rf](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/route53_record) | resource |
-| [aws_s3_bucket.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/s3_bucket) | resource |
-| [aws_s3_bucket_ownership_controls.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/s3_bucket_ownership_controls) | resource |
-| [aws_s3_bucket_policy.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/s3_bucket_policy) | resource |
-| [aws_s3_bucket_public_access_block.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/s3_bucket_public_access_block) | resource |
-| [aws_s3_bucket_website_configuration.this](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/resources/s3_bucket_website_configuration) | resource |
-| [archive_file.redirect](https://registry.terraform.io/providers/hashicorp/archive/2.4.1/docs/data-sources/file) | data source |
-| [aws_cloudfront_cache_policy.uncached](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/cloudfront_cache_policy) | data source |
-| [aws_cloudfront_origin_request_policy.cors](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/cloudfront_origin_request_policy) | data source |
-| [aws_iam_policy.aws_xray_write_only_access](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/iam_policy) | data source |
-| [aws_iam_policy_document.lambda_logging](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/iam_policy_document) | data source |
-| [aws_iam_policy_document.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/iam_policy_document) | data source |
-| [aws_iam_policy_document.maintainer_assume_role](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/iam_policy_document) | data source |
-| [aws_iam_policy_document.redirect_assume](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/iam_policy_document) | data source |
-| [aws_iam_policy_document.s3_public_read](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/iam_policy_document) | data source |
-| [aws_route53_zone.kitten_science](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/route53_zone) | data source |
-| [aws_route53_zone.rm_rf](https://registry.terraform.io/providers/hashicorp/aws/5.31.0/docs/data-sources/route53_zone) | data source |
+| [aws_acm_certificate.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/acm_certificate) | resource |
+| [aws_acm_certificate_validation.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/acm_certificate_validation) | resource |
+| [aws_cloudfront_distribution.schema](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/cloudfront_distribution) | resource |
+| [aws_cloudfront_distribution.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/cloudfront_distribution) | resource |
+| [aws_cloudfront_response_headers_policy.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/cloudfront_response_headers_policy) | resource |
+| [aws_iam_policy.lambda_logging](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/iam_policy) | resource |
+| [aws_iam_policy.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/iam_policy) | resource |
+| [aws_iam_role.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/iam_role) | resource |
+| [aws_iam_role.redirect](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/iam_role) | resource |
+| [aws_iam_role_policy_attachment.aws_xray_write_only_access](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/iam_role_policy_attachment) | resource |
+| [aws_iam_role_policy_attachment.lambda_logs](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/iam_role_policy_attachment) | resource |
+| [aws_iam_role_policy_attachment.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/iam_role_policy_attachment) | resource |
+| [aws_lambda_function.redirect](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/lambda_function) | resource |
+| [aws_lambda_permission.edgelambda](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/lambda_permission) | resource |
+| [aws_route53_record.schema](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/route53_record) | resource |
+| [aws_route53_record.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/route53_record) | resource |
+| [aws_route53_record.validation_kitten_science](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/route53_record) | resource |
+| [aws_route53_record.validation_rm_rf](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/route53_record) | resource |
+| [aws_s3_bucket.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/s3_bucket) | resource |
+| [aws_s3_bucket_ownership_controls.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/s3_bucket_ownership_controls) | resource |
+| [aws_s3_bucket_policy.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/s3_bucket_policy) | resource |
+| [aws_s3_bucket_public_access_block.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/s3_bucket_public_access_block) | resource |
+| [aws_s3_bucket_website_configuration.this](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/resources/s3_bucket_website_configuration) | resource |
+| [archive_file.redirect](https://registry.terraform.io/providers/hashicorp/archive/2.4.2/docs/data-sources/file) | data source |
+| [aws_cloudfront_cache_policy.uncached](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/cloudfront_cache_policy) | data source |
+| [aws_cloudfront_origin_request_policy.cors](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/cloudfront_origin_request_policy) | data source |
+| [aws_iam_policy.aws_xray_write_only_access](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/iam_policy) | data source |
+| [aws_iam_policy_document.lambda_logging](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/iam_policy_document) | data source |
+| [aws_iam_policy_document.maintainer](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/iam_policy_document) | data source |
+| [aws_iam_policy_document.maintainer_assume_role](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/iam_policy_document) | data source |
+| [aws_iam_policy_document.redirect_assume](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/iam_policy_document) | data source |
+| [aws_iam_policy_document.s3_public_read](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/iam_policy_document) | data source |
+| [aws_route53_zone.kitten_science](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/route53_zone) | data source |
+| [aws_route53_zone.rm_rf](https://registry.terraform.io/providers/hashicorp/aws/5.60.0/docs/data-sources/route53_zone) | data source |
 
 ## Inputs
 

diff --git a/terraform/modules/kitten-science-website/versions.tf b/terraform/modules/kitten-science-website/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "1.8.2"
+  required_version = ">= 1.8.2"
 
   required_providers {
     archive = {

diff --git a/terraform/versions.tf b/terraform/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "1.8.2"
+  required_version = ">= 1.8.2"
 
   required_providers {
     archive = {