feat: update tf.checks step name and tf and aws version (#37)

* feat: update tf.checks step name and tf and aws version

* feat: update tf.checks step name and tf and aws version

* feat: update tf.checks step name and tf and aws version

* feat: update tf.checks step name and tf and aws version

---------

Co-authored-by: anmolnagpal <anmol@clouddrove.com>

.github/workflows/automerge.yml

@@ -8,5 +8,5 @@ jobs:
     secrets:
       GITHUB: ${{ secrets.GITHUB }}
     with:
-      tfcheck: 'example / Evaluate Terraform versions (1.5.0, ./_example/public)'
+      tfcheck: 'public / Check code format'
 ...

.github/workflows/tf-checks.yml

@@ -5,7 +5,11 @@ on:
   pull_request:
   workflow_dispatch:
 jobs:
-  example:
+  public:
     uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9
     with:
       working_directory: './_example/public'
+  vpc:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9
+    with:
+      working_directory: './_example/vpc'

.github/workflows/tflint.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
   workflow_dispatch:
 jobs:
-  tflint:
+  tf-lint:
     uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@1.0.9
     secrets:
-      GITHUB: ${{ secrets.GITHUB }}
+      GITHUB: ${{ secrets.GITHUB }}

_example/public/example.tf

@@ -31,7 +31,6 @@ module "sftp" {
   label_order    = ["environment", "name"]
   enable_sftp    = true
   s3_bucket_name = module.s3_bucket.id
-  endpoint_type  = "PUBLIC"
   workflow_details = {
     on_upload = {
       execution_role = "arn:aws:iam::1234567890:role/test-sftp-transfer-role"

_example/public/variables.tf

@@ -1,14 +0,0 @@
-variable "sftp_users" {
-  type = list(object({
-    username = string
-    password = string
-    home_dir = string
-  }))
-  default = []
-}
-
-variable "eip_enabled" {
-  type        = bool
-  description = "Whether to provision and attach an Elastic IP to be used as the SFTP endpoint. An EIP will be provisioned per subnet."
-  default     = false
-}

_example/public/versions.tf

@@ -1,11 +1,11 @@
 # Terraform version
 terraform {
-  required_version = ">= 1.5.0"
+  required_version = ">= 1.6.6"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.9.0"
+      version = ">= 5.31.0"
     }
   }
 }

_example/vpc/example.tf

@@ -120,7 +120,6 @@ module "sftp" {
   label_order            = ["environment", "name"]
   eip_enabled            = false
   s3_bucket_name         = module.s3_bucket.id
-  sftp_users             = var.sftp_users
   subnet_ids             = module.subnets.private_subnet_id
   vpc_id                 = module.vpc.vpc_id
   restricted_home        = true

_example/vpc/variables.tf

@@ -1,31 +0,0 @@
-variable "sftp_users" {
-  type = list(object({
-    username = string
-    password = string
-    home_dir = string
-  }))
-  default = []
-}
-
-variable "eip_enabled" {
-  type        = bool
-  description = "Whether to provision and attach an Elastic IP to be used as the SFTP endpoint. An EIP will be provisioned per subnet."
-  default     = false
-}
-
-
-variable "workflow_details" {
-  type = object({
-    on_upload = object({
-      execution_role = string
-      workflow_id    = string
-    })
-  })
-  description = "Workflow details for triggering the execution on file upload."
-  default = {
-    on_upload = {
-      execution_role = null
-      workflow_id    = null
-    }
-  }
-}

_example/vpc/versions.tf

@@ -1,11 +1,11 @@
 # Terraform version
 terraform {
-  required_version = ">= 1.5.0"
+  required_version = ">= 1.6.6"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.9.0"
+      version = ">= 5.31.0"
     }
   }
 }

main.tf

@@ -22,12 +22,9 @@ module "labels" {
 # LOCALS
 ##----------------------------------------------------------------------------------
 locals {
-  count         = var.enabled
   s3_arn_prefix = "arn:${one(data.aws_partition.default[*].partition)}:s3:::"
   is_vpc        = var.vpc_id != null
 
-  user_names = length(var.sftp_users) > 0 ? [for user in var.sftp_users : user.user_name] : []
-
   user_names_map = length(var.sftp_users) > 0 ? {
     for user in var.sftp_users :
     user.user_name => merge(user, {
@@ -201,7 +198,7 @@ resource "aws_transfer_server" "transfer_server" {
       subnet_ids             = var.subnet_ids
       security_group_ids     = var.vpc_security_group_ids
       vpc_id                 = var.vpc_id
-      address_allocation_ids = var.eip_enabled ? aws_eip.sftp.*.id : var.address_allocation_ids
+      address_allocation_ids = var.eip_enabled ? aws_eip.sftp[*].id : var.address_allocation_ids
     }
   }
   lifecycle {

variables.tf

@@ -155,10 +155,4 @@ variable "workflow_details" {
 variable "enable_workflow" {
   type    = bool
   default = false
-}
-
-variable "endpoint_type" {
-  type        = string
-  default     = "PUBLIC"
-  description = "The type of endpoint that you want your SFTP server connect to. If you connect to a VPC (or VPC_ENDPOINT), your SFTP server isn't accessible over the public internet. If you want to connect your SFTP server via public internet, set PUBLIC. Defaults to PUBLIC"
 }

versions.tf

@@ -1,11 +1,11 @@
 # Terraform version
 terraform {
-  required_version = ">= 1.5.0"
+  required_version = ">= 1.6.6"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.9.0"
+      version = ">= 5.31.0"
     }
   }
 }