Remove obsolete variable and update ci

Flaconi · Oct 2, 2024 · f81af09 · f81af09
1 parent 67e5afb
commit f81af09
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -11,10 +11,10 @@ TF_MODULES  = $(sort $(dir $(wildcard $(CURRENT_DIR)modules/*/)))
 # -------------------------------------------------------------------------------------------------
 # Container versions
 # -------------------------------------------------------------------------------------------------
-TF_VERSION      = 1.0.11
-TFDOCS_VERSION  = 0.16.0-0.31
-FL_VERSION      = 0.4
-JL_VERSION      = 1.6.0-0.5
+TF_VERSION      = 1.5.7
+TFDOCS_VERSION  = 0.16.0-0.34
+FL_VERSION      = latest-0.8
+JL_VERSION      = 1.6.0-0.14
 
 
 # -------------------------------------------------------------------------------------------------

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5 |
 
 <!-- TFDOCS_PROVIDER_END -->
 
@@ -26,7 +26,8 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5 |
 
 <!-- TFDOCS_REQUIREMENTS_END -->
 
@@ -45,14 +46,6 @@ Type: `string`
 
 The following input variables are optional (have default values):
 
-### <a name="input_account_assume_role"></a> [account\_assume\_role](#input\_account\_assume\_role)
-
-Description: A name of assume role used in the AWS account to execute terraform.
-
-Type: `string`
-
-Default: `"ASSUME-ATLANTIS"`
-
 ### <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name)
 
 Description: The name of the OpenSearch cluster.

diff --git a/variables.tf b/variables.tf
@@ -1,9 +1,3 @@
-variable "account_assume_role" {
-  description = "A name of assume role used in the AWS account to execute terraform."
-  type        = string
-  default     = "ASSUME-ATLANTIS"
-}
-
 variable "cluster_name" {
   description = "The name of the OpenSearch cluster."
   type        = string

diff --git a/versions.tf b/versions.tf
@@ -1,3 +1,9 @@
 terraform {
-  required_version = "~> 1.0"
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 5"
+    }
+  }
+  required_version = ">= 1.0"
 }