Merge pull request #48 from SadriG91/master

upgraded to TF 0.14 and updated dependencies
added default packer_ami to variables

.gitattributes

@@ -0,0 +1 @@
+*.* text eol=lf

.github/workflows/main.yml

@@ -14,9 +14,8 @@ jobs:
       with: { go-version: 1.14 }
 
     - name: Install Terraform
-      run: |
-        curl -sL https://releases.hashicorp.com/terraform/0.12.21/terraform_0.12.21_linux_amd64.zip -o terraform.zip
-        sudo unzip terraform.zip -d /usr/bin && rm -f terraform.zip
+      uses: hashicorp/setup-terraform@v1 
+      with: { terraform_version: 0.14.9 }
 
     - name: Install Taskfile
       run: curl -sL https://taskfile.dev/install.sh | sh

Taskfile.yml

@@ -40,7 +40,7 @@ tasks:
         cd $d
         echo "${BOLD}$PWD:${NORM}"
 
-        if ! terraform fmt -check=true -list=false -recursive=false; then
+        if ! terraform fmt -check=true -list=false -recursive=true; then
           echo "  ✗ terraform fmt" && exit 1
         else
           echo "  √ terraform fmt"

examples/basic/main.tf

@@ -1,10 +1,9 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
 }
 
 provider "aws" {
-  version = ">= 2.17"
-  region  = "${var.region}"
+  region = var.region
 }
 
 data "aws_vpc" "main" {
@@ -17,7 +16,7 @@ data "aws_subnet_ids" "main" {
 
 module "postgres" {
   source  = "telia-oss/rds-cluster/aws"
-  version = "3.0.0"
+  version = "4.0.0"
 
   name_prefix = var.name_prefix
   username    = "superuser"

examples/basic/variables.tf

@@ -4,7 +4,8 @@ variable "name_prefix" {
 }
 
 variable "packer_ami" {
-  type = string
+  type    = string
+  default = "ami-063d4ab14480ac177"
 }
 
 variable "concourse_admin_password" {

examples/basic/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.0"
+    }
+  }
+  required_version = ">= 0.14"
+}

modules/atc/main.tf

@@ -57,7 +57,7 @@ resource "aws_autoscaling_attachment" "internal_lb" {
 
 module "atc" {
   source  = "telia-oss/asg/aws"
-  version = "3.2.0"
+  version = "4.0.0"
 
   name_prefix          = "${var.name_prefix}-atc"
   user_data_base64     = data.template_cloudinit_config.atc.rendered
@@ -225,9 +225,9 @@ resource "aws_route53_record" "main" {
 
 module "external_lb" {
   source  = "telia-oss/loadbalancer/aws"
-  version = "3.0.0"
+  version = "4.0.0"
 
-  name_prefix = "${var.name_prefix}"
+  name_prefix = var.name_prefix
   vpc_id      = var.vpc_id
   subnet_ids  = var.public_subnet_ids
   type        = "application"
@@ -281,9 +281,9 @@ resource "aws_lb_target_group" "external" {
 
 module "internal_lb" {
   source  = "telia-oss/loadbalancer/aws"
-  version = "3.0.0"
+  version = "4.0.0"
 
-  name_prefix = "${var.name_prefix}"
+  name_prefix = var.name_prefix
   vpc_id      = var.vpc_id
   subnet_ids  = var.private_subnet_ids
   type        = "network"

modules/atc/versions.tf

@@ -1,4 +1,4 @@
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
 }

modules/dashboard/main.tf

@@ -9,7 +9,7 @@ locals {
       "AWS/NATGateway",
       "BytesInFromDestination",
       "NatGatewayId",
-      "${id}",
+      id,
       {
         stat    = "Average"
         id      = "nat-${i + 1}-inbound"
@@ -23,7 +23,7 @@ locals {
       "AWS/NATGateway",
       "BytesInFromSource",
       "NatGatewayId",
-      "${id}",
+      id,
       {
         stat    = "Average"
         id      = "nat-${i + 1}-outbound"

modules/dashboard/versions.tf

@@ -1,4 +1,4 @@
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.14"
 }

modules/worker/main.tf

@@ -34,7 +34,7 @@ resource "aws_security_group_rule" "atc_ingress_garden" {
 
 module "worker" {
   source  = "telia-oss/asg/aws"
-  version = "3.2.0"
+  version = "4.0.0"
 
   name_prefix          = "${var.name_prefix}-worker"
   user_data_base64     = data.template_cloudinit_config.worker.rendered