upgrading terraform and tflint versions, and dependent plugins (#4330)

pytorch · Jun 28, 2023 · 5edde5f · 5edde5f
1 parent 3dad4ad
commit 5edde5f
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 22 deletions.
diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml
@@ -26,7 +26,8 @@ jobs:
     - name: Install Terraform
       uses: hashicorp/setup-terraform@v2
       with:
-          terraform_version: 1.2.9
+        terraform_version: 1.5.1
+        terraform_wrapper: false
 
     - name: Show version
       run: tflint --version

diff --git a/terraform-aws-github-runner/.tflint.hcl b/terraform-aws-github-runner/.tflint.hcl
@@ -5,7 +5,7 @@ plugin "terraform" {
 
 plugin "aws" {
   enabled = true
-  version = "0.17.0"
+  version = "0.23.1"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 

diff --git a/terraform-aws-github-runner/main.tf b/terraform-aws-github-runner/main.tf
@@ -1,8 +1,14 @@
 terraform {
-  required_version = ">= 1.2"
+  required_version = ">= 1.5"
   required_providers {
-    random = "~> 3.4"
-    aws = "~> 4.3"
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 3.4.2"
+    }
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.5"
+    }
   }
 }
 

diff --git a/terraform-aws-github-runner/modules/download-lambda/.tflint.hcl b/terraform-aws-github-runner/modules/download-lambda/.tflint.hcl
@@ -5,7 +5,7 @@ plugin "terraform" {
 
 plugin "aws" {
   enabled = true
-  version = "0.17.0"
+  version = "0.23.1"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 

diff --git a/terraform-aws-github-runner/modules/download-lambda/main.tf b/terraform-aws-github-runner/modules/download-lambda/main.tf
@@ -1,7 +1,10 @@
 terraform {
-  required_version = ">= 1.2"
+  required_version = ">= 1.5"
   required_providers {
-    null = "~> 3.1"
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 3.2.1"
+    }
   }
 }
 

diff --git a/terraform-aws-github-runner/modules/runner-binaries-syncer/.tflint.hcl b/terraform-aws-github-runner/modules/runner-binaries-syncer/.tflint.hcl
@@ -5,7 +5,7 @@ plugin "terraform" {
 
 plugin "aws" {
   enabled = true
-  version = "0.17.0"
+  version = "0.23.1"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 

diff --git a/terraform-aws-github-runner/modules/runner-binaries-syncer/main.tf b/terraform-aws-github-runner/modules/runner-binaries-syncer/main.tf
@@ -1,7 +1,10 @@
 terraform {
-  required_version = ">= 1.2"
+  required_version = ">= 1.5"
   required_providers {
-    aws = "~> 4.3"
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.5"
+    }
   }
 }
 

diff --git a/terraform-aws-github-runner/modules/runners-instances/main.tf b/terraform-aws-github-runner/modules/runners-instances/main.tf
@@ -1,7 +1,10 @@
 terraform {
-  required_version = ">= 1.2"
+  required_version = ">= 1.5"
   required_providers {
-    aws = "~> 4.3"
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.5"
+    }
   }
 }
 

diff --git a/terraform-aws-github-runner/modules/runners/.tflint.hcl b/terraform-aws-github-runner/modules/runners/.tflint.hcl
@@ -5,7 +5,7 @@ plugin "terraform" {
 
 plugin "aws" {
   enabled = true
-  version = "0.17.0"
+  version = "0.23.1"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 

diff --git a/terraform-aws-github-runner/modules/runners/main.tf b/terraform-aws-github-runner/modules/runners/main.tf
@@ -1,7 +1,10 @@
 terraform {
-  required_version = ">= 1.2"
+  required_version = ">= 1.5"
   required_providers {
-    aws = "~> 4.3"
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.5"
+    }
   }
 }
 

diff --git a/terraform-aws-github-runner/modules/setup-iam-permissions/.tflint.hcl b/terraform-aws-github-runner/modules/setup-iam-permissions/.tflint.hcl
@@ -5,7 +5,7 @@ plugin "terraform" {
 
 plugin "aws" {
   enabled = true
-  version = "0.17.0"
+  version = "0.23.1"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 

diff --git a/terraform-aws-github-runner/modules/setup-iam-permissions/main.tf b/terraform-aws-github-runner/modules/setup-iam-permissions/main.tf
@@ -1,7 +1,10 @@
 terraform {
-  required_version = ">= 1.2"
+  required_version = ">= 1.5"
   required_providers {
-    aws = "~> 4.3"
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.5"
+    }
   }
 }
 

diff --git a/terraform-aws-github-runner/modules/webhook/.tflint.hcl b/terraform-aws-github-runner/modules/webhook/.tflint.hcl
@@ -5,7 +5,7 @@ plugin "terraform" {
 
 plugin "aws" {
   enabled = true
-  version = "0.17.0"
+  version = "0.23.1"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 

diff --git a/terraform-aws-github-runner/modules/webhook/main.tf b/terraform-aws-github-runner/modules/webhook/main.tf
@@ -1,7 +1,10 @@
 terraform {
-  required_version = ">= 1.2"
+  required_version = ">= 1.5"
   required_providers {
-    aws = "~> 4.3"
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.5"
+    }
   }
 }