Merge pull request #28 from sunilkumarmohanty/fix-subnets

fix subnet variable assignments to VPC module and other terraform deprecations
futurice · May 9, 2021 · c191f7b · c191f7b
2 parents 818250f + 8ac7689
commit c191f7b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@
 .env
 .ssh
 **/node_modules/
+.terraform.lock.hcl
diff --git a/aws/wordpress_fargate/cloudfront.tf b/aws/wordpress_fargate/cloudfront.tf
@@ -8,7 +8,7 @@ module "acm" {
   tags        = var.tags
 
   providers = {
-    aws = "aws.us_east_1" # cloudfront needs acm certificate to be from "us-east-1" region
+    aws = aws.us_east_1 # cloudfront needs acm certificate to be from "us-east-1" region
   }
 }
 

diff --git a/aws/wordpress_fargate/fargate.tf b/aws/wordpress_fargate/fargate.tf
@@ -142,7 +142,7 @@ resource "aws_ecs_service" "this" {
   }
 
   lifecycle {
-    ignore_changes = ["desired_count"]
+    ignore_changes = [desired_count]
   }
 
 }

diff --git a/aws/wordpress_fargate/provider.tf b/aws/wordpress_fargate/provider.tf
@@ -1,5 +1,4 @@
 provider "aws" {
-  version = "~> 2.0"
 }
 
 terraform {
@@ -12,9 +11,7 @@ terraform {
 provider "aws" {
   alias   = "us_east_1"
   region  = "us-east-1"
-  version = "~> 2.0"
 }
 
 provider "random" {
-  version = "~> 2.2"
 }
diff --git a/aws/wordpress_fargate/vpc.tf b/aws/wordpress_fargate/vpc.tf
@@ -3,8 +3,8 @@ module "vpc" {
   name                   = "${var.prefix}-${var.environment}"
   cidr                   = var.vpc_cidr
   azs                    = data.aws_availability_zones.this.names
-  private_subnets        = var.public_subnet_cidrs
-  public_subnets         = var.private_subnet_cidrs
+  private_subnets        = var.private_subnet_cidrs
+  public_subnets         = var.public_subnet_cidrs
   enable_nat_gateway     = true
   single_nat_gateway     = false
   one_nat_gateway_per_az = false
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ @@
     .env
     .ssh
     **/node_modules/
+    .terraform.lock.hcl