From 7924ed5962983c89b8bad365f5767560a878a405 Mon Sep 17 00:00:00 2001
From: James Wells <jwells@dragonheim.net>
Date: Fri, 6 Aug 2021 16:10:01 -0700
Subject: [PATCH] fix: updating Go & Alpine versions

---
 .dockerignore      | 3 ++-
 .gitignore         | 4 ++++
 docker/Dockerfile  | 4 ++--
 tfenv/main.tf      | 4 ++--
 tfenv/terraform.tf | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 37f5fb2..bbf894a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -83,4 +83,5 @@ override.tf.json
 .terraformrc
 terraform.rc
 
-
+# Ignore InSync temporary files
+*.insyncdl
diff --git a/.gitignore b/.gitignore
index e9b499c..29e565f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,11 @@ override.tf.json
 
 # Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
 # example: *tfplan*
+*tfplan*
 
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
+
+# Ignore InSync temporary files
+*.insyncdl
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0c0b7ce..3c809f0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine3.12 as builder
+FROM golang:1.16-alpine3.13 as builder
 
 WORKDIR /gagent
 COPY . .
@@ -12,7 +12,7 @@ RUN go build -o /gagent/bin/gagent gagent/main.go
 RUN strip /gagent/bin/gagent
 
 
-FROM alpine:3.12
+FROM alpine:3.13
 LABEL Name="G'Agent"
 LABEL Maintainer="jwells@dragonheim.net"
 LABEL License="MIT License"
diff --git a/tfenv/main.tf b/tfenv/main.tf
index 6549e0b..cd1a0d3 100644
--- a/tfenv/main.tf
+++ b/tfenv/main.tf
@@ -2,7 +2,7 @@
 module "us-east-1" {
 	source    = "./cluster"
 	region    = "us-east-1"
-	provider_alias = us-west-2
+	provider_alias = "us-east-1"
 	providers = {
 		aws = "aws.us-east-1"
 	}
@@ -11,7 +11,7 @@ module "us-east-1" {
 module "us-west-2" {
 	source    = "./cluster"
 	region    = "us-west-2"
-	provider_alias = us-west-2
+	provider_alias = "us-west-2"
 	providers = {
 		aws = "aws.us-west-2"
 	}
diff --git a/tfenv/terraform.tf b/tfenv/terraform.tf
index 7575a59..5547720 100644
--- a/tfenv/terraform.tf
+++ b/tfenv/terraform.tf
@@ -1,9 +1,9 @@
 terraform {
-	required_version = ">= 0.15.3"
+	required_version = ">= 1.0.0"
 	required_providers {
 	aws = {
 		source  = "hashicorp/aws"
-		version = "~> 3.42.0"
+		version = "~> 3.46.0"
 		}
 	}
 }