From 7f58c1c6096ed736a1728bb0556de77e55ffabce Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 22 Aug 2018 14:15:29 -0700
Subject: [PATCH 01/24] bump version from 0.11.7 to 0.11.8

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c3a7264..6d8cae2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apk -U add \
     openssh-client && \
     rm -rf /var/cache/apk/*
 
-ENV TERRAFORM_VERSION 0.11.7
+ENV TERRAFORM_VERSION 0.11.8
 RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -O terraform.zip && \
   unzip terraform.zip -d /bin && \
   rm -f terraform.zip

From 8e91594500061d19f92ae012aa736f6c4da1455c Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 22 Aug 2018 14:16:26 -0700
Subject: [PATCH 02/24] add AWS profile

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 6d8cae2..3348435 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,8 @@ RUN apk -U add \
     rm -rf /var/cache/apk/*
 
 ENV TERRAFORM_VERSION 0.11.8
+ENV AWS_PROFILE drone-testing
+
 RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -O terraform.zip && \
   unzip terraform.zip -d /bin && \
   rm -f terraform.zip

From 1084a408953ac022c32b6e8d3dbd23b7e5a9f064 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Fri, 24 Aug 2018 09:23:24 -0700
Subject: [PATCH 03/24] generate a profile file if necessary

---
 plugin.go    | 9 +++++++++
 terraform.go | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/plugin.go b/plugin.go
index 7887143..1557d4e 100644
--- a/plugin.go
+++ b/plugin.go
@@ -58,8 +58,17 @@ type (
 
 // Exec executes the plugin
 func (p Plugin) Exec() error {
+
+	if len(os.Getenv("AWS_ACCESS_KEY_ID")) > 0 {
+		profileErr := installProfile(os.Getenv("AWS_PROFILE"), os.Getenv("AWS_ACCESS_KEY_ID"), os.Getenv("AWS_SECRET_ACCESS_KEY"))
+
+		if profileErr != nil {
+			return profileErr
+		}
+	}
 	// Install specified version of terraform
 	if p.Terraform.Version != "" {
+
 		err := installTerraform(p.Terraform.Version)
 
 		if err != nil {
diff --git a/terraform.go b/terraform.go
index 519fced..b3c3805 100644
--- a/terraform.go
+++ b/terraform.go
@@ -4,6 +4,7 @@ import (
 	"archive/zip"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -16,6 +17,13 @@ type (
 	}
 )
 
+func installProfile(profileName string, profileKey string, profileSecret string) error {
+	os.Mkdir(os.Getenv("HOME")+"/.aws", 0700)
+	myconf := []byte("[" + profileName + "]\naws_access_key_id = " + profileKey + "\naws_secret_access_key = " + profileSecret + "\n")
+	err := ioutil.WriteFile(os.Getenv("HOME")+"/.aws/credentials", myconf, 0644)
+	return err
+}
+
 func installTerraform(version string) error {
 	err := downloadTerraform(version)
 	if err != nil {

From 797a0dd6ec33a2dcd745ba87282fb264ad69aad9 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Fri, 24 Aug 2018 11:59:09 -0700
Subject: [PATCH 04/24] add in the k8s plugin

---
 Dockerfile | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3348435..5b08677 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,10 @@
+#################################################################################################
 # Docker image for the Drone Terraform plugin
 #
-#     docker build -t jmccann/drone-terraform:latest .
+
+
+#################################################################################################
+#   Build the Go binary
 FROM golang:1.10-alpine AS builder
 COPY ./*.go ./src/
 COPY ./vendor/ ./src/
@@ -8,11 +12,36 @@ RUN set -ex \
     && cd ./src \
     && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo -o /go/bin/drone-terraform
 
+
+#################################################################################################
+#   Build the Terraform plugin
+FROM golang:1.10-alpine AS tfbuilder
+
+RUN apk -U add \
+    ca-certificates \
+    git \
+    bash \
+    wget \
+    rm -rf /var/cache/apk/*
+
+RUN mkdir -p /go/src/github.com/sl1pm4t \
+    && cd /go/src/github.com/sl1pm4t \
+    && git clone https://github.com/sl1pm4t/terraform-provider-kubernetes.git \
+    && cd ./terraform-provider-kubernetes \
+    && go get -v \
+    && GOOS=linux GOARCH=amd64 go build -v -o /go/bin/terraform-provider-kubernetes \
+    && ls -al /go/bin/terraform-provider-kubernetes
+
+#################################################################################################
+# Build the actual container  
 FROM alpine:3.7
 
 RUN apk -U add \
     ca-certificates \
     git \
+    ansible \
+    jq \
+    bash \
     wget \
     openssh-client && \
     rm -rf /var/cache/apk/*
@@ -24,5 +53,14 @@ RUN wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraf
   unzip terraform.zip -d /bin && \
   rm -f terraform.zip
 
+RUN wget -P /usr/local/bin/ https://amazon-eks.s3-us-west-2.amazonaws.com/1.10.3/2018-07-26/bin/linux/amd64/aws-iam-authenticator && \
+    chmod +x /usr/local/bin/aws-iam-authenticator
+
+RUN wget -P /usr/local/bin/ https://amazon-eks.s3-us-west-2.amazonaws.com/1.10.3/2018-07-26/bin/linux/amd64/kubectl && \
+    chmod +x /usr/local/bin/kubectl
+
+RUN mkdir -p /root/.terraform.d/plugins/
+
+COPY --from=tfbuilder /go/bin/terraform-provider-kubernetes /root/.terraform.d/plugins/
 COPY --from=builder /go/bin/drone-terraform /bin/
 ENTRYPOINT ["/bin/drone-terraform"]

From b9807b4647b8ef62f51c97901ea9f9b3f616af96 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Fri, 24 Aug 2018 12:30:25 -0700
Subject: [PATCH 05/24] add the github private key option

---
 plugin.go    | 10 ++++++++++
 terraform.go | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/plugin.go b/plugin.go
index 1557d4e..ae23059 100644
--- a/plugin.go
+++ b/plugin.go
@@ -59,6 +59,16 @@ type (
 // Exec executes the plugin
 func (p Plugin) Exec() error {
 
+	// Install a Github SSH key
+	if len(os.Getenv("GITHUB_PRIVATE_SSH_KEY")) > 0 {
+		sshconfErr := installGithubSsh(os.Getenv("GITHUB_PRIVATE_SSH_KEY"))
+
+		if sshconfErr != nil {
+			return sshconfErr
+		}
+	}
+
+	// Install an AWS profile if env var is set
 	if len(os.Getenv("AWS_ACCESS_KEY_ID")) > 0 {
 		profileErr := installProfile(os.Getenv("AWS_PROFILE"), os.Getenv("AWS_ACCESS_KEY_ID"), os.Getenv("AWS_SECRET_ACCESS_KEY"))
 
diff --git a/terraform.go b/terraform.go
index b3c3805..1eaae79 100644
--- a/terraform.go
+++ b/terraform.go
@@ -17,6 +17,21 @@ type (
 	}
 )
 
+func installGithubSsh(githubSshPrivate string) error {
+	os.Mkdir(os.Getenv("HOME")+"/.aws", 0700)
+	myconf := []byte("Host github.com\n    StrictHostKeyChecking no\n    UserKnownHostsFile=/dev/null\n")
+	err := ioutil.WriteFile(os.Getenv("HOME")+"/.ssh/conf", myconf, 0644)
+	if err != nil {
+		return err
+	}
+	mykey := []byte(githubSshPrivate)
+	err2 := ioutil.WriteFile(os.Getenv("HOME")+"/.ssh/id_rsa", mykey, 0600)
+	if err2 != nil {
+		return err2
+	}
+	return nil
+}
+
 func installProfile(profileName string, profileKey string, profileSecret string) error {
 	os.Mkdir(os.Getenv("HOME")+"/.aws", 0700)
 	myconf := []byte("[" + profileName + "]\naws_access_key_id = " + profileKey + "\naws_secret_access_key = " + profileSecret + "\n")

From 18c67ad3e533593fe484e9a6b2b08ffb91342b4b Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Fri, 24 Aug 2018 12:37:29 -0700
Subject: [PATCH 06/24] docs

---
 DOCS.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/DOCS.md b/DOCS.md
index 5ed9ddf..41aac93 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -181,6 +181,17 @@ pipeline:
 +     - plan-destroy
 +     - destroy
 ```
+# Environment variables
+
+- GITHUB_PRIVATE_SSH_KEY
+  If this environment variable is set, ~/.ssh/id_rsa will be set.
+  Please be sure to include the "-----BEGIN RSA PRIVATE KEY-----" and end lines for a valid key
+
+- AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
+  If this environment variable is set a ~/.aws/credentials file will be added with the name of the AWS_PROFILE
+
+- AWS_PROFILE (default: `drone-testing`)
+  If a profile is created, it will be set to this name
 
 # Parameter Reference
 

From bb61be4abf920286b565227791bb182ef43a3a68 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 5 Sep 2018 09:37:35 -0700
Subject: [PATCH 07/24] setup a pem key if required for builds

---
 plugin.go    | 14 ++++++++++++++
 terraform.go |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/plugin.go b/plugin.go
index ae23059..319067f 100644
--- a/plugin.go
+++ b/plugin.go
@@ -59,6 +59,20 @@ type (
 // Exec executes the plugin
 func (p Plugin) Exec() error {
 
+	// Install a extra PEM key if required
+	if len(os.Getenv("PEM_NAME")) > 0 {
+		value, exists := os.LookupEnv("PEM_CONTENTS")
+		if !exists {
+			value = "-----BEGIN RSA PRIVATE KEY-----\n\n-----END RSA PRIVATE KEY-----\n"
+		}
+		err := installExtraPem(os.Getenv("PEM_NAME"), value)
+
+		if err != nil {
+			return err
+		}
+	}
+
+
 	// Install a Github SSH key
 	if len(os.Getenv("GITHUB_PRIVATE_SSH_KEY")) > 0 {
 		sshconfErr := installGithubSsh(os.Getenv("GITHUB_PRIVATE_SSH_KEY"))
diff --git a/terraform.go b/terraform.go
index 1eaae79..e9e4fed 100644
--- a/terraform.go
+++ b/terraform.go
@@ -17,6 +17,14 @@ type (
 	}
 )
 
+func installExtraPem(pemName string, pemContents string) error {
+	err := ioutil.WriteFile(os.Getenv("HOME")+"/.ssh/"+pemName, []byte(pemContents), 0600)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func installGithubSsh(githubSshPrivate string) error {
 	os.Mkdir(os.Getenv("HOME")+"/.aws", 0700)
 	myconf := []byte("Host github.com\n    StrictHostKeyChecking no\n    UserKnownHostsFile=/dev/null\n")

From 91edcd0c27d1170dc9466cfdd987135c797a38e2 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 5 Sep 2018 10:31:58 -0700
Subject: [PATCH 08/24] update docs

---
 DOCS.md   | 13 +++++++++++++
 plugin.go |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/DOCS.md b/DOCS.md
index 41aac93..38ad943 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -183,6 +183,13 @@ pipeline:
 ```
 # Environment variables
 
+- PEM_NAME
+  If this environment variable is set, a file called ~/.ssh/<PEM_NAME> will be created
+
+- PEM_CONTENTS
+  If this environment variable is set, the contents will be put in ~/.ssh/<PEM_NAME>
+  Please be sure to include the "-----BEGIN RSA PRIVATE KEY-----" and end lines for a valid key
+
 - GITHUB_PRIVATE_SSH_KEY
   If this environment variable is set, ~/.ssh/id_rsa will be set.
   Please be sure to include the "-----BEGIN RSA PRIVATE KEY-----" and end lines for a valid key
@@ -235,3 +242,9 @@ root_dir
 
 parallelism
 : The number of concurrent operations as Terraform walks its graph.
+
+# Testing Locally
+
+```
+docker run -e PEM_NAME=my.pem -w /root/test -v `pwd`:/root quay.io/agari/agari-drone-terraform 
+```
diff --git a/plugin.go b/plugin.go
index 319067f..a9f94c7 100644
--- a/plugin.go
+++ b/plugin.go
@@ -61,6 +61,7 @@ func (p Plugin) Exec() error {
 
 	// Install a extra PEM key if required
 	if len(os.Getenv("PEM_NAME")) > 0 {
+		fmt.Println("--- Setting a pem file")
 		value, exists := os.LookupEnv("PEM_CONTENTS")
 		if !exists {
 			value = "-----BEGIN RSA PRIVATE KEY-----\n\n-----END RSA PRIVATE KEY-----\n"
@@ -72,9 +73,9 @@ func (p Plugin) Exec() error {
 		}
 	}
 
-
 	// Install a Github SSH key
 	if len(os.Getenv("GITHUB_PRIVATE_SSH_KEY")) > 0 {
+		fmt.Println("--- Setting a Github key")
 		sshconfErr := installGithubSsh(os.Getenv("GITHUB_PRIVATE_SSH_KEY"))
 
 		if sshconfErr != nil {
@@ -83,6 +84,7 @@ func (p Plugin) Exec() error {
 	}
 
 	// Install an AWS profile if env var is set
+	fmt.Println("--- Setting an AWS profile")
 	if len(os.Getenv("AWS_ACCESS_KEY_ID")) > 0 {
 		profileErr := installProfile(os.Getenv("AWS_PROFILE"), os.Getenv("AWS_ACCESS_KEY_ID"), os.Getenv("AWS_SECRET_ACCESS_KEY"))
 

From 46258fbd801f242d979c15bbf925e3e36251c33d Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 5 Sep 2018 10:58:35 -0700
Subject: [PATCH 09/24] ensure dir exists

---
 plugin.go    | 6 +++---
 terraform.go | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugin.go b/plugin.go
index a9f94c7..4f7f7a8 100644
--- a/plugin.go
+++ b/plugin.go
@@ -61,7 +61,7 @@ func (p Plugin) Exec() error {
 
 	// Install a extra PEM key if required
 	if len(os.Getenv("PEM_NAME")) > 0 {
-		fmt.Println("--- Setting a pem file")
+		fmt.Println("--- Setting a pem file ---")
 		value, exists := os.LookupEnv("PEM_CONTENTS")
 		if !exists {
 			value = "-----BEGIN RSA PRIVATE KEY-----\n\n-----END RSA PRIVATE KEY-----\n"
@@ -75,7 +75,7 @@ func (p Plugin) Exec() error {
 
 	// Install a Github SSH key
 	if len(os.Getenv("GITHUB_PRIVATE_SSH_KEY")) > 0 {
-		fmt.Println("--- Setting a Github key")
+		fmt.Println("--- Setting a Github key ---")
 		sshconfErr := installGithubSsh(os.Getenv("GITHUB_PRIVATE_SSH_KEY"))
 
 		if sshconfErr != nil {
@@ -84,7 +84,7 @@ func (p Plugin) Exec() error {
 	}
 
 	// Install an AWS profile if env var is set
-	fmt.Println("--- Setting an AWS profile")
+	fmt.Println("--- Setting an AWS profile ---")
 	if len(os.Getenv("AWS_ACCESS_KEY_ID")) > 0 {
 		profileErr := installProfile(os.Getenv("AWS_PROFILE"), os.Getenv("AWS_ACCESS_KEY_ID"), os.Getenv("AWS_SECRET_ACCESS_KEY"))
 
diff --git a/terraform.go b/terraform.go
index e9e4fed..7d47c2e 100644
--- a/terraform.go
+++ b/terraform.go
@@ -18,6 +18,7 @@ type (
 )
 
 func installExtraPem(pemName string, pemContents string) error {
+	os.Mkdir(os.Getenv("HOME")+"/.ssh", 0700)
 	err := ioutil.WriteFile(os.Getenv("HOME")+"/.ssh/"+pemName, []byte(pemContents), 0600)
 	if err != nil {
 		return err

From 930c4abc4651f78620956d6a910e205267e3e549 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 19 Sep 2018 10:10:19 -0700
Subject: [PATCH 10/24] add github ssh key

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 5b08677..7494740 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,6 +61,11 @@ RUN wget -P /usr/local/bin/ https://amazon-eks.s3-us-west-2.amazonaws.com/1.10.3
 
 RUN mkdir -p /root/.terraform.d/plugins/
 
+# Ensure we have github key in known hosts
+RUN mkdir /root/.ssh && chmod 700 /root/.ssh
+RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
+
+
 COPY --from=tfbuilder /go/bin/terraform-provider-kubernetes /root/.terraform.d/plugins/
 COPY --from=builder /go/bin/drone-terraform /bin/
 ENTRYPOINT ["/bin/drone-terraform"]

From 307edbef7d07f22b2611d11399c7b77b3a349bfe Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 19 Sep 2018 10:23:41 -0700
Subject: [PATCH 11/24] rename

---
 CHANGELOG.md       |  2 +-
 DOCS.md            | 34 +++++++++++++++++-----------------
 README.md          | 10 +++++-----
 vendor/vendor.json |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c040f..ab82373 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ See [DOCS.md](DOCS.md) for more info and examples.
 * Update embedded TF to `0.10.8`
 
 ## 4.0-0.10.7 (2017-10-20)
-* Persist state locking config (https://github.com/jmccann/drone-terraform/pull/55)
+* Persist state locking config (https://github.com/quay.io/agari/agari-drone-terraform/pull/55)
 * Update embedded TF to `0.10.7`
 
 ## 4.0-0.10.3 (2017-09-06)
diff --git a/DOCS.md b/DOCS.md
index 38ad943..78c2870 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -3,9 +3,9 @@ date: 2016-01-01T00:00:00+00:00
 title: Terraform
 author: jmccann
 tags: [ infrastructure, build tool ]
-repo: jmccann/drone-terraform
+repo: quay.io/agari/agari-drone-terraform
 logo: terraform.svg
-image: jmccann/drone-terraform
+image: quay.io/agari/agari-drone-terraform
 ---
 
 The Terraform plugin applies the infrastructure configuration contained within the repository. The below pipeline configuration demonstrates simple usage which will run a `validate`, `plan` and `apply`:
@@ -13,7 +13,7 @@ The Terraform plugin applies the infrastructure configuration contained within t
 ```yaml
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 ```
 
 Example configuration passing `vars` to terraform commands:
@@ -21,7 +21,7 @@ Example configuration passing `vars` to terraform commands:
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   vars:
 +     app_name: my-project
 +     app_version: 1.0.0
@@ -32,7 +32,7 @@ Example of explicitly specifying `actions` to perform a dry run.
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   actions:
 +     - validate
 +     - plan
@@ -47,7 +47,7 @@ for more details.
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   secrets:
 +     - source: terraform_secret
 +       target: tf_var_my_secret
@@ -58,12 +58,12 @@ pipeline:
 ```diff
 pipeline:
   terraform_1:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   environment:
 +     TF_VAR_MY_SECRET: ${TERRAFORM_SECRET}
 
   terraform_2:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
     plan: false
 +   sensitive: true
 +   vars:
@@ -78,7 +78,7 @@ what command is actually being ran.
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   sensitive: true
 ```
 
@@ -89,7 +89,7 @@ specified instead of using the embedded version that is included.
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   tf_version: 0.10.3
 ```
 
@@ -100,7 +100,7 @@ specified in a `.tf` file.  You can then pass additional options via the `.drone
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   init_options:
 +     backend-config:
 +       - "bucket=my-terraform-config-bucket"
@@ -116,7 +116,7 @@ CA Certificate.  You can inject your CA Certificate into the plugin by using
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   ca_cert: |
 +     -----BEGIN CERTIFICATE-----
 +     asdfsadf
@@ -133,7 +133,7 @@ See [the discussion](https://github.com/hashicorp/terraform/issues/1275) in the
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   role_arn_to_assume: arn:aws:iam::account-of-role-to-assume:role/name-of-role
 ```
 
@@ -144,7 +144,7 @@ and you want to use different drone configurations to apply different environmen
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   root_dir: some/path/here
 ```
 
@@ -155,7 +155,7 @@ all resources will be planned/applied against as the default behavior.
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   targets:
 +     - aws_security_group.generic_sg
 +     - aws_security_group.app_sg
@@ -167,7 +167,7 @@ If you want to change Terraform's default parallelism (currently equal to 10) th
 ```diff
 pipeline:
   terraform:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   parallelism: 2
 ```
 
@@ -176,7 +176,7 @@ Destroying the service can be done by specifying `plan-destroy` and `destroy` ac
 ```yaml
 pipeline:
   destroy:
-    image: jmccann/drone-terraform:5
+    image: quay.io/agari/agari-drone-terraform:5
 +   actions:
 +     - plan-destroy
 +     - destroy
diff --git a/README.md b/README.md
index b5e4368..3ac404a 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # drone-terraform
 
-[![Build Status](http://beta.drone.io/api/badges/jmccann/drone-terraform/status.svg)](http://beta.drone.io/jmccann/drone-terraform)
+[![Build Status](http://beta.drone.io/api/badges/quay.io/agari/agari-drone-terraform/status.svg)](http://beta.drone.io/quay.io/agari/agari-drone-terraform)
 
 Drone plugin to execute Terraform plan and apply. For the usage information and
-a listing of the available options please take a look at [the docs](https://github.com/jmccann/drone-terraform/blob/master/DOCS.md).
+a listing of the available options please take a look at [the docs](https://github.com/quay.io/agari/agari-drone-terraform/blob/master/DOCS.md).
 
 ## Build
 
@@ -20,7 +20,7 @@ Build the docker image with the following commands:
 
 ```
 CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo
-docker build --rm=true -t jmccann/drone-terraform .
+docker build --rm=true -t quay.io/agari/agari-drone-terraform .
 ```
 
 Please note incorrectly building the image for the correct x64 linux and with
@@ -39,9 +39,9 @@ Execute from the working directory:
 docker run --rm \
   -v $(pwd):$(pwd) \
   -w $(pwd) \
-  jmccann/drone-terraform:latest --plan
+  quay.io/agari/agari-drone-terraform:latest --plan
 ```
 
 ## Drone 0.4
 
-Legacy `drone-terraform` plugin exists @ `jmccann/drone-terraform:0.4`
+Legacy `drone-terraform` plugin exists @ `quay.io/agari/agari-drone-terraform:0.4`
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 3c62460..ac78daa 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -181,5 +181,5 @@
 			"revisionTime": "2016-10-06T02:47:49Z"
 		}
 	],
-	"rootPath": "github.com/jmccann/drone-terraform"
+	"rootPath": "github.com/quay.io/agari/agari-drone-terraform"
 }

From b8842bf4bab2b2284069c3f89127fd5ad82b2c7d Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Mon, 24 Sep 2018 12:24:44 -0700
Subject: [PATCH 12/24] allow the outpath to be a variable passed in

---
 DOCS.md        | 12 ++++++++++++
 main.go        |  6 ++++++
 plugin.go      |  9 ++++++++-
 plugin_test.go | 11 +++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/DOCS.md b/DOCS.md
index 78c2870..93c63e8 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -171,6 +171,18 @@ pipeline:
 +   parallelism: 2
 ```
 
+You may want to specify the out directory of the plan file so you can pass it to builds further down the pipeline
+If you want to change Terraform's default outfile (currently plan.tfout in the cwd) then set the `plan_path` parameter.
+
+```diff
+pipeline:
+  terraform:
+    image: quay.io/agari/agari-drone-terraform:5
++   plan_path: /tmp/a.out
+```
+
+Destroying the service can be done by specifying `plan-destroy` and `destroy` actions. Keep in mind that Fastly won't allow a service with active version be destroyed. Use `force_destroy` option in the service definition for terraform to handle it.
+
 Destroying the service can be done by specifying `plan-destroy` and `destroy` actions. Keep in mind that Fastly won't allow a service with active version be destroyed. Use `force_destroy` option in the service definition for terraform to handle it.
 
 ```yaml
diff --git a/main.go b/main.go
index ce00fba..cf5707d 100644
--- a/main.go
+++ b/main.go
@@ -48,6 +48,11 @@ func main() {
 			Usage:  "The number of concurrent operations as Terraform walks its graph",
 			EnvVar: "PLUGIN_PARALLELISM",
 		},
+		cli.StringFlag{
+			Name:   "plan_path",
+			Usage:  "The absolute path to save the outfile eg: /tmp/myplan.tfout",
+			EnvVar: "PLAN_PATH",
+		},
 		cli.StringFlag{
 			Name:   "netrc.machine",
 			Usage:  "netrc machine",
@@ -146,6 +151,7 @@ func run(c *cli.Context) error {
 			RoleARN:     c.String("role_arn_to_assume"),
 			RootDir:     c.String("root_dir"),
 			Parallelism: c.Int("parallelism"),
+			PlanPath:    c.String("plan_path"),
 			Targets:     c.StringSlice("targets"),
 			VarFiles:    c.StringSlice("var_files"),
 		},
diff --git a/plugin.go b/plugin.go
index 4f7f7a8..786a1b2 100644
--- a/plugin.go
+++ b/plugin.go
@@ -28,6 +28,7 @@ type (
 		Cacert      string
 		Sensitive   bool
 		RoleARN     string
+		PlanPath    string
 		RootDir     string
 		Parallelism int
 		Targets     []string
@@ -277,7 +278,11 @@ func tfApply(config Config) *exec.Cmd {
 	if config.InitOptions.LockTimeout != "" {
 		args = append(args, fmt.Sprintf("-lock-timeout=%s", config.InitOptions.LockTimeout))
 	}
-	args = append(args, "plan.tfout")
+	if config.PlanPath != "" {
+		args = append(args, config.PlanPath)
+	} else {
+		args = append(args, "plan.tfout")
+	}
 	return exec.Command(
 		"terraform",
 		args...,
@@ -316,6 +321,8 @@ func tfPlan(config Config, destroy bool) *exec.Cmd {
 
 	if destroy {
 		args = append(args, "-destroy")
+	} else if config.PlanPath != "" {
+		args = append(args, fmt.Sprintf("-out=%s", config.PlanPath))
 	} else {
 		args = append(args, "-out=plan.tfout")
 	}
diff --git a/plugin_test.go b/plugin_test.go
index 7cdd349..1f95cbd 100644
--- a/plugin_test.go
+++ b/plugin_test.go
@@ -43,6 +43,11 @@ func TestPlugin(t *testing.T) {
 					args{config: Config{}},
 					exec.Command("terraform", "apply", "plan.tfout"),
 				},
+				{
+					"with path",
+					args{config: Config{PlanPath: "/tmp/a.tfout"}},
+					exec.Command("terraform", "apply", "/tmp/a.tfout"),
+				},
 				{
 					"with parallelism",
 					args{config: Config{Parallelism: 5}},
@@ -123,6 +128,12 @@ func TestPlugin(t *testing.T) {
 					false,
 					exec.Command("terraform", "plan", "-out=plan.tfout"),
 				},
+				{
+					"with path",
+					args{config: Config{PlanPath: "/tmp/a.tfout"}},
+					false,
+					exec.Command("terraform", "plan", "-out=/tmp/a.tfout"),
+				},
 				{
 					"destroy",
 					args{config: Config{}},

From 7a16c355ad4487dd3092053fd4afd8469ca29194 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Mon, 24 Sep 2018 13:00:32 -0700
Subject: [PATCH 13/24] add some debug

---
 plugin.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin.go b/plugin.go
index 786a1b2..dead0b3 100644
--- a/plugin.go
+++ b/plugin.go
@@ -62,7 +62,6 @@ func (p Plugin) Exec() error {
 
 	// Install a extra PEM key if required
 	if len(os.Getenv("PEM_NAME")) > 0 {
-		fmt.Println("--- Setting a pem file ---")
 		value, exists := os.LookupEnv("PEM_CONTENTS")
 		if !exists {
 			value = "-----BEGIN RSA PRIVATE KEY-----\n\n-----END RSA PRIVATE KEY-----\n"
@@ -76,7 +75,6 @@ func (p Plugin) Exec() error {
 
 	// Install a Github SSH key
 	if len(os.Getenv("GITHUB_PRIVATE_SSH_KEY")) > 0 {
-		fmt.Println("--- Setting a Github key ---")
 		sshconfErr := installGithubSsh(os.Getenv("GITHUB_PRIVATE_SSH_KEY"))
 
 		if sshconfErr != nil {
@@ -85,7 +83,6 @@ func (p Plugin) Exec() error {
 	}
 
 	// Install an AWS profile if env var is set
-	fmt.Println("--- Setting an AWS profile ---")
 	if len(os.Getenv("AWS_ACCESS_KEY_ID")) > 0 {
 		profileErr := installProfile(os.Getenv("AWS_PROFILE"), os.Getenv("AWS_ACCESS_KEY_ID"), os.Getenv("AWS_SECRET_ACCESS_KEY"))
 
@@ -279,8 +276,11 @@ func tfApply(config Config) *exec.Cmd {
 		args = append(args, fmt.Sprintf("-lock-timeout=%s", config.InitOptions.LockTimeout))
 	}
 	if config.PlanPath != "" {
+		fmt.Println("--- Setting an outpath---")
 		args = append(args, config.PlanPath)
 	} else {
+		fmt.Println("--- borked ---")
+		fmt.Println(config.PlanPath)
 		args = append(args, "plan.tfout")
 	}
 	return exec.Command(

From 9e1718b5c5d76aa8fd9e7ec87cdcccfaa4ba653b Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Mon, 24 Sep 2018 13:10:31 -0700
Subject: [PATCH 14/24] try matching to see if it is actually passed as env var

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index cf5707d..cb9c691 100644
--- a/main.go
+++ b/main.go
@@ -51,7 +51,7 @@ func main() {
 		cli.StringFlag{
 			Name:   "plan_path",
 			Usage:  "The absolute path to save the outfile eg: /tmp/myplan.tfout",
-			EnvVar: "PLAN_PATH",
+			EnvVar: "PLUGIN_PLAN_PATH",
 		},
 		cli.StringFlag{
 			Name:   "netrc.machine",

From 7205b6190fea4af9c1a0b7d5b8dd19eec467a36b Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Mon, 24 Sep 2018 14:14:01 -0700
Subject: [PATCH 15/24] tagging the build fixed the issue

---
 main.go        | 12 ++++++------
 plugin.go      | 18 ++++++++++--------
 plugin_test.go |  4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/main.go b/main.go
index cb9c691..62347f0 100644
--- a/main.go
+++ b/main.go
@@ -38,6 +38,11 @@ func main() {
 			Name:  "env-file",
 			Usage: "source env file",
 		},
+		cli.StringFlag{
+			Name:   "planfile",
+			Usage:  "The absolute path to save the outfile eg: /tmp/myplan.tfout",
+			EnvVar: "PLUGIN_PLANFILE",
+		},
 		cli.StringFlag{
 			Name:   "init_options",
 			Usage:  "options for the init command. See https://www.terraform.io/docs/commands/init.html",
@@ -48,11 +53,6 @@ func main() {
 			Usage:  "The number of concurrent operations as Terraform walks its graph",
 			EnvVar: "PLUGIN_PARALLELISM",
 		},
-		cli.StringFlag{
-			Name:   "plan_path",
-			Usage:  "The absolute path to save the outfile eg: /tmp/myplan.tfout",
-			EnvVar: "PLUGIN_PLAN_PATH",
-		},
 		cli.StringFlag{
 			Name:   "netrc.machine",
 			Usage:  "netrc machine",
@@ -151,7 +151,7 @@ func run(c *cli.Context) error {
 			RoleARN:     c.String("role_arn_to_assume"),
 			RootDir:     c.String("root_dir"),
 			Parallelism: c.Int("parallelism"),
-			PlanPath:    c.String("plan_path"),
+			Planfile:    c.String("planfile"),
 			Targets:     c.StringSlice("targets"),
 			VarFiles:    c.StringSlice("var_files"),
 		},
diff --git a/plugin.go b/plugin.go
index dead0b3..7d7d5fc 100644
--- a/plugin.go
+++ b/plugin.go
@@ -28,7 +28,7 @@ type (
 		Cacert      string
 		Sensitive   bool
 		RoleARN     string
-		PlanPath    string
+		Planfile    string
 		RootDir     string
 		Parallelism int
 		Targets     []string
@@ -275,12 +275,9 @@ func tfApply(config Config) *exec.Cmd {
 	if config.InitOptions.LockTimeout != "" {
 		args = append(args, fmt.Sprintf("-lock-timeout=%s", config.InitOptions.LockTimeout))
 	}
-	if config.PlanPath != "" {
-		fmt.Println("--- Setting an outpath---")
-		args = append(args, config.PlanPath)
+	if config.Planfile != "" {
+		args = append(args, config.Planfile)
 	} else {
-		fmt.Println("--- borked ---")
-		fmt.Println(config.PlanPath)
 		args = append(args, "plan.tfout")
 	}
 	return exec.Command(
@@ -319,10 +316,15 @@ func tfPlan(config Config, destroy bool) *exec.Cmd {
 		"plan",
 	}
 
+	logrus.WithFields(logrus.Fields{
+		"Config.Parallelism": config.Parallelism,
+		"Config.Planfile":    config.Planfile,
+	}).Info("Configuration")
+
 	if destroy {
 		args = append(args, "-destroy")
-	} else if config.PlanPath != "" {
-		args = append(args, fmt.Sprintf("-out=%s", config.PlanPath))
+	} else if config.Planfile != "" {
+		args = append(args, fmt.Sprintf("-out=%s", config.Planfile))
 	} else {
 		args = append(args, "-out=plan.tfout")
 	}
diff --git a/plugin_test.go b/plugin_test.go
index 1f95cbd..431bb7f 100644
--- a/plugin_test.go
+++ b/plugin_test.go
@@ -45,7 +45,7 @@ func TestPlugin(t *testing.T) {
 				},
 				{
 					"with path",
-					args{config: Config{PlanPath: "/tmp/a.tfout"}},
+					args{config: Config{Planfile: "/tmp/a.tfout"}},
 					exec.Command("terraform", "apply", "/tmp/a.tfout"),
 				},
 				{
@@ -130,7 +130,7 @@ func TestPlugin(t *testing.T) {
 				},
 				{
 					"with path",
-					args{config: Config{PlanPath: "/tmp/a.tfout"}},
+					args{config: Config{Planfile: "/tmp/a.tfout"}},
 					false,
 					exec.Command("terraform", "plan", "-out=/tmp/a.tfout"),
 				},

From 098a917a0b117b7d8d73a6510be12e3b88dea8be Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Mon, 24 Sep 2018 15:58:40 -0700
Subject: [PATCH 16/24] setup show

---
 DOCS.md        |  5 ++++-
 main.go        |  8 +++++++-
 plugin.go      | 19 ++++++++++++++++++-
 plugin_test.go | 28 ++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/DOCS.md b/DOCS.md
index 93c63e8..5344204 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -8,7 +8,7 @@ logo: terraform.svg
 image: quay.io/agari/agari-drone-terraform
 ---
 
-The Terraform plugin applies the infrastructure configuration contained within the repository. The below pipeline configuration demonstrates simple usage which will run a `validate`, `plan` and `apply`:
+The Terraform plugin applies the infrastructure configuration contained within the repository. The below pipeline configuration demonstrates simple usage which will run a `validate`, `show`, `plan` and `apply`:
 
 ```yaml
 pipeline:
@@ -33,9 +33,12 @@ Example of explicitly specifying `actions` to perform a dry run.
 pipeline:
   terraform:
     image: quay.io/agari/agari-drone-terraform:5
+    planfile: "../planshare.out"
+    difffile: "../diff.out"
 +   actions:
 +     - validate
 +     - plan
++     - show
 ```
 
 Example configuration passing secrets to terraform.  Please read
diff --git a/main.go b/main.go
index 62347f0..966c474 100644
--- a/main.go
+++ b/main.go
@@ -27,7 +27,7 @@ func main() {
 			Name:   "actions",
 			Usage:  "a list of actions to have terraform perform",
 			EnvVar: "PLUGIN_ACTIONS",
-			Value:  &cli.StringSlice{"validate", "plan", "apply"},
+			Value:  &cli.StringSlice{"validate", "plan", "show", "apply"},
 		},
 		cli.StringFlag{
 			Name:   "ca_cert",
@@ -43,6 +43,11 @@ func main() {
 			Usage:  "The absolute path to save the outfile eg: /tmp/myplan.tfout",
 			EnvVar: "PLUGIN_PLANFILE",
 		},
+		cli.StringFlag{
+			Name:   "difffile",
+			Usage:  "The absolute path to save the diff file to eg: /tmp/myplan.diff",
+			EnvVar: "PLUGIN_DIFFFILE",
+		},
 		cli.StringFlag{
 			Name:   "init_options",
 			Usage:  "options for the init command. See https://www.terraform.io/docs/commands/init.html",
@@ -152,6 +157,7 @@ func run(c *cli.Context) error {
 			RootDir:     c.String("root_dir"),
 			Parallelism: c.Int("parallelism"),
 			Planfile:    c.String("planfile"),
+			Difffile:    c.String("difffile"),
 			Targets:     c.StringSlice("targets"),
 			VarFiles:    c.StringSlice("var_files"),
 		},
diff --git a/plugin.go b/plugin.go
index 7d7d5fc..bc47394 100644
--- a/plugin.go
+++ b/plugin.go
@@ -29,6 +29,7 @@ type (
 		Sensitive   bool
 		RoleARN     string
 		Planfile    string
+		Difffile    string
 		RootDir     string
 		Parallelism int
 		Targets     []string
@@ -135,10 +136,12 @@ func (p Plugin) Exec() error {
 			commands = append(commands, tfPlan(p.Config, true))
 		case "apply":
 			commands = append(commands, tfApply(p.Config))
+		case "show":
+			commands = append(commands, tfShow(p.Config))
 		case "destroy":
 			commands = append(commands, tfDestroy(p.Config))
 		default:
-			return fmt.Errorf("valid actions are: validate, plan, apply, plan-destroy, destroy.  You provided %s", action)
+			return fmt.Errorf("valid actions are: validate, plan, show, apply, plan-destroy, destroy.  You provided %s", action)
 		}
 	}
 
@@ -259,6 +262,20 @@ func trace(cmd *exec.Cmd) {
 	fmt.Println("$", strings.Join(cmd.Args, " "))
 }
 
+func tfShow(config Config) *exec.Cmd {
+	args := []string{
+		"show",
+		"-no-color",
+	}
+	if config.Difffile != "" {
+		args = append(args, config.Difffile)
+	}
+	return exec.Command(
+		"terraform",
+		args...,
+	)
+}
+
 func tfApply(config Config) *exec.Cmd {
 	args := []string{
 		"apply",
diff --git a/plugin_test.go b/plugin_test.go
index 431bb7f..d005bcc 100644
--- a/plugin_test.go
+++ b/plugin_test.go
@@ -27,6 +27,34 @@ func TestPlugin(t *testing.T) {
 		})
 	})
 
+	g.Describe("tfShow", func() {
+		g.It("Should return correct apply commands given the arguments", func() {
+			type args struct {
+				config Config
+			}
+
+			tests := []struct {
+				name string
+				args args
+				want *exec.Cmd
+			}{
+				{
+					"default",
+					args{config: Config{}},
+					exec.Command("terraform", "show", "-no-color"),
+				},
+				{
+					"with planfile",
+					args{config: Config{Difffile: "/tmp/plan.tfout"}},
+					exec.Command("terraform", "show", "-no-color", "/tmp/plan.tfout"),
+				},
+			}
+			for _, tt := range tests {
+				g.Assert(tfShow(tt.args.config)).Equal(tt.want)
+			}
+		})
+	})
+
 	g.Describe("tfApply", func() {
 		g.It("Should return correct apply commands given the arguments", func() {
 			type args struct {

From 1c81b306d53cda3164e60de9502af1a0f0dd0ae7 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Mon, 24 Sep 2018 16:12:35 -0700
Subject: [PATCH 17/24] setup diff

---
 plugin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.go b/plugin.go
index bc47394..e143d0e 100644
--- a/plugin.go
+++ b/plugin.go
@@ -268,7 +268,7 @@ func tfShow(config Config) *exec.Cmd {
 		"-no-color",
 	}
 	if config.Difffile != "" {
-		args = append(args, config.Difffile)
+		args = append(args, config.Planfile)
 	}
 	return exec.Command(
 		"terraform",

From b0f6e999a055f419fb931db24c6d899f0b91cd34 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 26 Sep 2018 08:04:34 -0700
Subject: [PATCH 18/24] change commands to a struct with outfile and get tests
 to pass

---
 plugin.go      | 67 ++++++++++++++++++++++++++++++--------------------
 plugin_test.go | 18 +++++++-------
 2 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/plugin.go b/plugin.go
index e143d0e..7a9760a 100644
--- a/plugin.go
+++ b/plugin.go
@@ -56,6 +56,11 @@ type (
 		Netrc     Netrc
 		Terraform Terraform
 	}
+
+	TfCommand struct {
+		Tfcmd *exec.Cmd
+		Ofile string
+	}
 )
 
 // Exec executes the plugin
@@ -111,17 +116,17 @@ func (p Plugin) Exec() error {
 		return err
 	}
 
-	var commands []*exec.Cmd
+	var commands []TfCommand
 
-	commands = append(commands, exec.Command("terraform", "version"))
+	commands = append(commands, TfCommand{Tfcmd: exec.Command("terraform", "version")})
 
 	CopyTfEnv()
 
 	if p.Config.Cacert != "" {
-		commands = append(commands, installCaCert(p.Config.Cacert))
+		commands = append(commands, TfCommand{Tfcmd: installCaCert(p.Config.Cacert)})
 	}
 
-	commands = append(commands, deleteCache())
+	commands = append(commands, TfCommand{Tfcmd: deleteCache()})
 	commands = append(commands, initCommand(p.Config.InitOptions))
 	commands = append(commands, getModules())
 
@@ -145,25 +150,25 @@ func (p Plugin) Exec() error {
 		}
 	}
 
-	commands = append(commands, deleteCache())
+	commands = append(commands, TfCommand{Tfcmd: deleteCache()})
 
 	for _, c := range commands {
-		if c.Dir == "" {
+		if c.Tfcmd.Dir == "" {
 			wd, err := os.Getwd()
 			if err == nil {
-				c.Dir = wd
+				c.Tfcmd.Dir = wd
 			}
 		}
 		if p.Config.RootDir != "" {
-			c.Dir = c.Dir + "/" + p.Config.RootDir
+			c.Tfcmd.Dir = c.Tfcmd.Dir + "/" + p.Config.RootDir
 		}
-		c.Stdout = os.Stdout
-		c.Stderr = os.Stderr
+		c.Tfcmd.Stdout = os.Stdout
+		c.Tfcmd.Stderr = os.Stderr
 		if !p.Config.Sensitive {
-			trace(c)
+			trace(c.Tfcmd)
 		}
 
-		err := c.Run()
+		err := c.Tfcmd.Run()
 		if err != nil {
 			logrus.WithFields(logrus.Fields{
 				"error": err,
@@ -216,14 +221,15 @@ func deleteCache() *exec.Cmd {
 	)
 }
 
-func getModules() *exec.Cmd {
-	return exec.Command(
+func getModules() TfCommand {
+	cmd := exec.Command(
 		"terraform",
 		"get",
 	)
+	return (TfCommand{Tfcmd: cmd})
 }
 
-func initCommand(config InitOptions) *exec.Cmd {
+func initCommand(config InitOptions) TfCommand {
 	args := []string{
 		"init",
 	}
@@ -245,10 +251,11 @@ func initCommand(config InitOptions) *exec.Cmd {
 	// Fail Terraform execution on prompt
 	args = append(args, "-input=false")
 
-	return exec.Command(
+	cmd := exec.Command(
 		"terraform",
 		args...,
 	)
+	return (TfCommand{Tfcmd: cmd})
 }
 
 func installCaCert(cacert string) *exec.Cmd {
@@ -262,7 +269,7 @@ func trace(cmd *exec.Cmd) {
 	fmt.Println("$", strings.Join(cmd.Args, " "))
 }
 
-func tfShow(config Config) *exec.Cmd {
+func tfShow(config Config) TfCommand {
 	args := []string{
 		"show",
 		"-no-color",
@@ -270,13 +277,17 @@ func tfShow(config Config) *exec.Cmd {
 	if config.Difffile != "" {
 		args = append(args, config.Planfile)
 	}
-	return exec.Command(
+
+	cmd := exec.Command(
 		"terraform",
 		args...,
 	)
+
+	return (TfCommand{Tfcmd: cmd})
+
 }
 
-func tfApply(config Config) *exec.Cmd {
+func tfApply(config Config) TfCommand {
 	args := []string{
 		"apply",
 	}
@@ -297,13 +308,14 @@ func tfApply(config Config) *exec.Cmd {
 	} else {
 		args = append(args, "plan.tfout")
 	}
-	return exec.Command(
+	cmd := exec.Command(
 		"terraform",
 		args...,
 	)
+	return (TfCommand{Tfcmd: cmd})
 }
 
-func tfDestroy(config Config) *exec.Cmd {
+func tfDestroy(config Config) TfCommand {
 	args := []string{
 		"destroy",
 	}
@@ -322,13 +334,14 @@ func tfDestroy(config Config) *exec.Cmd {
 		args = append(args, fmt.Sprintf("-lock-timeout=%s", config.InitOptions.LockTimeout))
 	}
 	args = append(args, "-force")
-	return exec.Command(
+	cmd := exec.Command(
 		"terraform",
 		args...,
 	)
+	return (TfCommand{Tfcmd: cmd})
 }
 
-func tfPlan(config Config, destroy bool) *exec.Cmd {
+func tfPlan(config Config, destroy bool) TfCommand {
 	args := []string{
 		"plan",
 	}
@@ -360,13 +373,14 @@ func tfPlan(config Config, destroy bool) *exec.Cmd {
 	if config.InitOptions.LockTimeout != "" {
 		args = append(args, fmt.Sprintf("-lock-timeout=%s", config.InitOptions.LockTimeout))
 	}
-	return exec.Command(
+	cmd := exec.Command(
 		"terraform",
 		args...,
 	)
+	return (TfCommand{Tfcmd: cmd})
 }
 
-func tfValidate(config Config) *exec.Cmd {
+func tfValidate(config Config) TfCommand {
 	args := []string{
 		"validate",
 	}
@@ -376,10 +390,11 @@ func tfValidate(config Config) *exec.Cmd {
 	for k, v := range config.Vars {
 		args = append(args, "-var", fmt.Sprintf("%s=%s", k, v))
 	}
-	return exec.Command(
+	cmd := exec.Command(
 		"terraform",
 		args...,
 	)
+	return (TfCommand{Tfcmd: cmd})
 }
 
 func vars(vs map[string]string) []string {
diff --git a/plugin_test.go b/plugin_test.go
index d005bcc..ecbea1c 100644
--- a/plugin_test.go
+++ b/plugin_test.go
@@ -43,14 +43,14 @@ func TestPlugin(t *testing.T) {
 					args{config: Config{}},
 					exec.Command("terraform", "show", "-no-color"),
 				},
-				{
-					"with planfile",
-					args{config: Config{Difffile: "/tmp/plan.tfout"}},
-					exec.Command("terraform", "show", "-no-color", "/tmp/plan.tfout"),
-				},
+				//	{
+				//		"with planfile",
+				//		args{config: Config{Difffile: "/tmp/plan.tfout"}},
+				//		exec.Command("terraform", "show", "-no-color", "/tmp/plan.tfout"),
+				//	},
 			}
 			for _, tt := range tests {
-				g.Assert(tfShow(tt.args.config)).Equal(tt.want)
+				g.Assert(tfShow(tt.args.config).Tfcmd).Equal(tt.want)
 			}
 		})
 	})
@@ -89,7 +89,7 @@ func TestPlugin(t *testing.T) {
 			}
 
 			for _, tt := range tests {
-				g.Assert(tfApply(tt.args.config)).Equal(tt.want)
+				g.Assert(tfApply(tt.args.config).Tfcmd).Equal(tt.want)
 			}
 		})
 	})
@@ -133,7 +133,7 @@ func TestPlugin(t *testing.T) {
 			}
 
 			for _, tt := range tests {
-				g.Assert(tfDestroy(tt.args.config)).Equal(tt.want)
+				g.Assert(tfDestroy(tt.args.config).Tfcmd).Equal(tt.want)
 			}
 		})
 	})
@@ -183,7 +183,7 @@ func TestPlugin(t *testing.T) {
 			}
 
 			for _, tt := range tests {
-				g.Assert(tfPlan(tt.args.config, tt.destroy)).Equal(tt.want)
+				g.Assert(tfPlan(tt.args.config, tt.destroy).Tfcmd).Equal(tt.want)
 			}
 		})
 	})

From afa89168b3fca4a706b24763e8085aec973931dd Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 26 Sep 2018 08:08:11 -0700
Subject: [PATCH 19/24] fix tests for tfShow function

---
 plugin_test.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugin_test.go b/plugin_test.go
index ecbea1c..46f9077 100644
--- a/plugin_test.go
+++ b/plugin_test.go
@@ -43,11 +43,11 @@ func TestPlugin(t *testing.T) {
 					args{config: Config{}},
 					exec.Command("terraform", "show", "-no-color"),
 				},
-				//	{
-				//		"with planfile",
-				//		args{config: Config{Difffile: "/tmp/plan.tfout"}},
-				//		exec.Command("terraform", "show", "-no-color", "/tmp/plan.tfout"),
-				//	},
+				{
+					"with planfile",
+					args{config: Config{Planfile: "/tmp/plan.tfout", Difffile: "/tmp/plan.diff"}},
+					exec.Command("terraform", "show", "-no-color", "/tmp/plan.tfout"),
+				},
 			}
 			for _, tt := range tests {
 				g.Assert(tfShow(tt.args.config).Tfcmd).Equal(tt.want)

From dd9987c2bc022ff11fe1b1dffcdc8449bfbaac5b Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 26 Sep 2018 08:19:37 -0700
Subject: [PATCH 20/24] pass the ofile

---
 plugin.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin.go b/plugin.go
index 7a9760a..5866e35 100644
--- a/plugin.go
+++ b/plugin.go
@@ -274,6 +274,7 @@ func tfShow(config Config) TfCommand {
 		"show",
 		"-no-color",
 	}
+	ofile := config.Difffile
 	if config.Difffile != "" {
 		args = append(args, config.Planfile)
 	}
@@ -283,7 +284,7 @@ func tfShow(config Config) TfCommand {
 		args...,
 	)
 
-	return (TfCommand{Tfcmd: cmd})
+	return (TfCommand{Tfcmd: cmd, Ofile: ofile})
 
 }
 

From bb6f162247e68c0b3bfe6f6d0f1f2af3b5ad27ca Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 26 Sep 2018 08:55:59 -0700
Subject: [PATCH 21/24] redirect stdout

---
 plugin.go | 49 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/plugin.go b/plugin.go
index 5866e35..fcdaf3f 100644
--- a/plugin.go
+++ b/plugin.go
@@ -1,7 +1,9 @@
 package main
 
 import (
+	"bufio"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -162,19 +164,44 @@ func (p Plugin) Exec() error {
 		if p.Config.RootDir != "" {
 			c.Tfcmd.Dir = c.Tfcmd.Dir + "/" + p.Config.RootDir
 		}
-		c.Tfcmd.Stdout = os.Stdout
-		c.Tfcmd.Stderr = os.Stderr
-		if !p.Config.Sensitive {
-			trace(c.Tfcmd)
-		}
 
-		err := c.Tfcmd.Run()
-		if err != nil {
-			logrus.WithFields(logrus.Fields{
-				"error": err,
-			}).Fatal("Failed to execute a command")
+		if c.Ofile == "" {
+			c.Tfcmd.Stdout = os.Stdout
+			c.Tfcmd.Stderr = os.Stderr
+			if !p.Config.Sensitive {
+				trace(c.Tfcmd)
+			}
+
+			err := c.Tfcmd.Run()
+			if err != nil {
+				logrus.WithFields(logrus.Fields{
+					"error": err,
+				}).Fatal("Failed to execute a command")
+			}
+		} else {
+			// open the out file for writing
+			outfile, err := os.Create(c.Ofile)
+			if err != nil {
+				panic(err)
+			}
+			defer outfile.Close()
+
+			stdoutPipe, err := c.Tfcmd.StdoutPipe()
+			if err != nil {
+				panic(err)
+			}
+
+			writer := bufio.NewWriter(outfile)
+
+			err = c.Tfcmd.Start()
+			if err != nil {
+				panic(err)
+			}
+
+			go io.Copy(writer, stdoutPipe)
+			c.Tfcmd.Wait()
+
 		}
-		logrus.Debug("Command completed successfully")
 	}
 
 	return nil

From 41e9485057da398a98d1c34b70d27ffe4e172b98 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 26 Sep 2018 09:32:21 -0700
Subject: [PATCH 22/24] use combined output

---
 plugin.go | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/plugin.go b/plugin.go
index fcdaf3f..a4ab5a3 100644
--- a/plugin.go
+++ b/plugin.go
@@ -1,9 +1,7 @@
 package main
 
 import (
-	"bufio"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -179,27 +177,20 @@ func (p Plugin) Exec() error {
 				}).Fatal("Failed to execute a command")
 			}
 		} else {
-			// open the out file for writing
-			outfile, err := os.Create(c.Ofile)
-			if err != nil {
-				panic(err)
-			}
-			defer outfile.Close()
+			logrus.WithFields(logrus.Fields{
+				"file":    c.Ofile,
+				"command": strings.Join(c.Tfcmd.Args, " "),
+			}).Info("Command")
 
-			stdoutPipe, err := c.Tfcmd.StdoutPipe()
+			out, err := c.Tfcmd.CombinedOutput()
 			if err != nil {
-				panic(err)
-			}
-
-			writer := bufio.NewWriter(outfile)
-
-			err = c.Tfcmd.Start()
-			if err != nil {
-				panic(err)
+				logrus.WithFields(logrus.Fields{
+					"command": strings.Join(c.Tfcmd.Args, " "),
+					"error":   err,
+				}).Fatal("Failed to execute a command")
 			}
-
-			go io.Copy(writer, stdoutPipe)
-			c.Tfcmd.Wait()
+			f, _ := os.Create(c.Ofile)
+			f.Write(out)
 
 		}
 	}

From 9f3b054c6360239457c2adb36e04c0fa77765fcc Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 26 Sep 2018 09:41:55 -0700
Subject: [PATCH 23/24] close file

---
 plugin.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugin.go b/plugin.go
index a4ab5a3..4e091e7 100644
--- a/plugin.go
+++ b/plugin.go
@@ -189,8 +189,15 @@ func (p Plugin) Exec() error {
 					"error":   err,
 				}).Fatal("Failed to execute a command")
 			}
-			f, _ := os.Create(c.Ofile)
+			f, outferr := os.Create(c.Ofile)
+			if outferr != nil {
+				logrus.WithFields(logrus.Fields{
+					"command": strings.Join(c.Tfcmd.Args, " "),
+					"error":   outferr,
+				}).Fatal("Failed to write file")
+			}
 			f.Write(out)
+			f.Close()
 
 		}
 	}

From b03bd99110f5fd7dc620c6327374fec8edec15c9 Mon Sep 17 00:00:00 2001
From: Chris Mague <github@mague.com>
Date: Wed, 26 Sep 2018 09:55:16 -0700
Subject: [PATCH 24/24] more verbose logging

---
 plugin.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugin.go b/plugin.go
index 4e091e7..a7928af 100644
--- a/plugin.go
+++ b/plugin.go
@@ -197,6 +197,11 @@ func (p Plugin) Exec() error {
 				}).Fatal("Failed to write file")
 			}
 			f.Write(out)
+			f.Sync()
+			logrus.WithFields(logrus.Fields{
+				"file":      c.Ofile,
+				"contenets": string(out),
+			}).Info("Logging output")
 			f.Close()
 
 		}