From 89d7258402cb5ee1bd0323f50154bc28579d066e Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 22 Aug 2018 17:23:25 +0200
Subject: [PATCH] MON-293 optimize pipeline

---
 bitbucket-pipelines.yml     | 11 -----------
 main.tf.ci                  |  7 -------
 scripts/01_update_output.sh |  1 -
 scripts/03_update_module.sh |  1 -
 scripts/99_terraform.sh     |  7 +++++++
 terraform.tfvars.ci         |  6 ------
 6 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 main.tf.ci
 create mode 100755 scripts/99_terraform.sh
 delete mode 100644 terraform.tfvars.ci

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index fbab30c..40a6653 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -2,17 +2,6 @@ image: hashicorp/terraform:full
 
 pipelines:
   default:
-    - step:
-        name: Terraform format
-        script:
-          - terraform fmt -write=false -diff -check
-    - step:
-        name: Terraform validate
-        script:
-          - mv main.tf.ci main.tf
-          - mv terraform.tfvars.ci terraform.tfvars
-          - terraform init
-          - terraform validate
     - step:
         name: Check auto update
         script:
diff --git a/main.tf.ci b/main.tf.ci
deleted file mode 100644
index a2d1b10..0000000
--- a/main.tf.ci
+++ /dev/null
@@ -1,7 +0,0 @@
-variable "aws_region" {}
-
-provider "aws" {
-  version = "1.2.0"
-
-  region = "${var.aws_region}"
-}
diff --git a/scripts/01_update_output.sh b/scripts/01_update_output.sh
index a5fe989..70ee7e5 100755
--- a/scripts/01_update_output.sh
+++ b/scripts/01_update_output.sh
@@ -19,4 +19,3 @@ EOF
     done
     cd - >> /dev/null
 done
-terraform fmt "$(get_scope $1)"
diff --git a/scripts/03_update_module.sh b/scripts/03_update_module.sh
index e4415b3..6d4f1be 100755
--- a/scripts/03_update_module.sh
+++ b/scripts/03_update_module.sh
@@ -21,4 +21,3 @@ EOF
     fi
     cd - >> /dev/null
 done
-terraform fmt "$(get_scope $1)"
diff --git a/scripts/99_terraform.sh b/scripts/99_terraform.sh
new file mode 100755
index 0000000..65abd0c
--- /dev/null
+++ b/scripts/99_terraform.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -xueo pipefail
+
+source "$(dirname $0)/utils.sh"
+goto_root
+
+terraform fmt
diff --git a/terraform.tfvars.ci b/terraform.tfvars.ci
deleted file mode 100644
index 9aa2075..0000000
--- a/terraform.tfvars.ci
+++ /dev/null
@@ -1,6 +0,0 @@
-aws_region="eu-west-1"
-region="eu-west-1"
-env="test"
-hno_escalation_group="abc"
-ho_escalation_group="abc"
-