Merge branch 'main' of github.com:nanlabs/terraform-aws-starter

nanlabs · Nov 14, 2023 · 25e4fbd · 25e4fbd
2 parents 8e79534 + ee517a4
commit 25e4fbd
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 69 deletions.
diff --git a/apps/start-stop-ec2-instances/package-lock.json b/apps/start-stop-ec2-instances/package-lock.json
diff --git a/apps/start-stop-ec2-instances/package.json b/apps/start-stop-ec2-instances/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "aws-lambda": "^1.0.7",
     "aws-sdk": "^2.1380.0",
-    "axios": "^1.3.4",
+    "axios": "^1.6.0",
     "http-errors": "^2.0.0"
   }
 }
diff --git a/live/core/README.md b/live/core/README.md
@@ -15,11 +15,18 @@
 
 ## Prerequisites
 
-✔️ [Terraform](https://www.terraform.io/downloads.html)
+- [Terraform](https://www.terraform.io/downloads.html)
+- [TFswitch](https://tfswitch.warrensbox.com/)
 
 ## Setup
 
-1. Initialize the Terraform working directory:
+1. Switch to the correct Terraform version
+
+```sh
+tfswitch
+```
+
+2. Initialize the Terraform working directory:
 
 ```sh
 terraform init

diff --git a/live/core/backend.tf b/live/core/backend.tf
@@ -15,7 +15,7 @@ module "terraform_state_backend" {
 
   terraform_backend_config_file_path = "."
   terraform_backend_config_file_name = "s3-backend.tf"
-  terraform_state_file               = "${module.label.id}.tfstate"
+  terraform_state_file               = "${module.label.namespace}-${module.label.name}.tfstate"
 
   bucket_enabled   = true
   dynamodb_enabled = true

diff --git a/modules/vpc/docs/MODULE.md b/modules/vpc/docs/MODULE.md
@@ -29,9 +29,7 @@
 | [aws_ssm_parameter.private_subnets](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
 | [aws_ssm_parameter.public_subnets](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
 | [aws_ssm_parameter.vpc_id](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
-| [aws_vpc_endpoint.secrets_manager](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc_endpoint) | resource |
 | [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
-| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
 
 ## Inputs
 

diff --git a/modules/vpc/endpoints.tf b/modules/vpc/endpoints.tf