Merge pull request #7 from SmartColumbusOS/common-512

Common#512 Run terraform 0.12upgrade on repo

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared"]
+	path = shared
+	url = [email protected]:SmartColumbusOS/scos-tf-backends.git

Jenkinsfile

@@ -1,5 +1,5 @@
 library(
-    identifier: 'pipeline-lib@4.6.1',
+    identifier: 'pipeline-lib@4.8.0',
     retriever: modernSCM([$class: 'GitSCMSource',
                           remote: 'https://github.com/SmartColumbusOS/pipeline-lib',
                           credentialsId: 'jenkins-github-user'])
@@ -26,25 +26,22 @@ node ('infrastructure') {
         }
 
         doStageIfMergedToMaster('Deploy to Staging') {
-            def environment = 'staging'
-            deployTo(environment: environment)
-            scos.applyAndPushGitHubTag(environment)
+            deployTo(environment: 'staging')
+            scos.applyAndPushGitHubTag('staging')
         }
 
         doStageIfRelease('Deploy to Production') {
-            def environment = 'prod'
-            deployTo(environment: environment)
-            scos.applyAndPushGitHubTag(environment)
+            deployTo(environment: 'prod')
+            scos.applyAndPushGitHubTag('prod')
         }
     }
 }
 
 def deployTo(params = [:]) {
     def environment = params.get('environment')
-    if (environment == null) throw new IllegalArgumentException("environment must be specified")
 
     def terraform = scos.terraform(environment)
-    sh "terraform init && terraform workspace new ${environment}"
+    terraform.init()
     terraform.plan(terraform.defaultVarFile)
     terraform.apply()
 }

main.tf

@@ -1,27 +1,27 @@
 provider "aws" {
-  version = "1.39"
-  region  = "${var.region}"
+  version = "~> 3.0"
+  region  = var.region
 
   assume_role {
-    role_arn = "${var.role_arn}"
+    role_arn = var.role_arn
   }
 }
 
 data "terraform_remote_state" "env_remote_state" {
   backend   = "s3"
-  workspace = "${terraform.workspace}"
+  workspace = terraform.workspace
 
-  config {
-    bucket   = "${var.alm_state_bucket_name}"
+  config = {
+    bucket   = var.alm_state_bucket_name
     key      = "operating-system"
     region   = "us-east-2"
-    role_arn = "${var.alm_role_arn}"
+    role_arn = var.alm_role_arn
   }
 }
 
 resource "local_file" "kubeconfig" {
   filename = "${path.module}/outputs/kubeconfig"
-  content  = "${data.terraform_remote_state.env_remote_state.eks_cluster_kubeconfig}"
+  content  = data.terraform_remote_state.env_remote_state.outputs.eks_cluster_kubeconfig
 }
 
 resource "local_file" "helm_vars" {
@@ -34,6 +34,7 @@ services:
 - hostname: "iam-master.${var.alm_dns_zone}"
   name: ldap
 EOF
+
 }
 
 resource "null_resource" "helm_deploy" {
@@ -49,12 +50,13 @@ helm repo update
 helm upgrade --install external-services scdp/external-services --namespace=external-services \
   --values ${local_file.helm_vars.filename}
 EOF
+
   }
 
-  triggers {
+  triggers = {
     # Triggers a list of values that, when changed, will cause the resource to be recreated
     # ${uuid()} will always be different thus always executing above local-exec
-    hack_that_always_forces_null_resources_to_execute = "${uuid()}"
+    hack_that_always_forces_null_resources_to_execute = uuid()
   }
 }
 
@@ -81,3 +83,4 @@ variable "alm_state_bucket_name" {
 variable "alm_dns_zone" {
   description = "DNS zone for alm"
 }
+

versions.tf

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