From 8ac7689cf1950a7eb280abd2968c61c49cbfd317 Mon Sep 17 00:00:00 2001
From: Sunil Kumar Mohanty <sunil.mohanty@futurice.com>
Date: Sun, 9 May 2021 09:21:46 +0300
Subject: [PATCH] fix subnet variable assignments to VPC module and other
 terraform deprecations

---
 .gitignore                          | 1 +
 aws/wordpress_fargate/cloudfront.tf | 2 +-
 aws/wordpress_fargate/fargate.tf    | 2 +-
 aws/wordpress_fargate/provider.tf   | 3 ---
 aws/wordpress_fargate/vpc.tf        | 4 ++--
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c24aa45..caa343c 100644
--- 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
index f3d9151..19aa233 100644
--- 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
index 438a0f9..63f9015 100644
--- 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
index 27f92b8..2208a96 100644
--- 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
index e517a35..22d9096 100644
--- 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