Merge pull request #219 (Update to TerraForm v0.9.4)

Update to TerraForm v0.9.4

Dockerfile

@@ -1,13 +1,13 @@
 FROM golang:alpine
 
-ENV TERRAFORM_VERSION=0.8.8-coreos.1
+ENV TERRAFORM_VERSION=0.9.4
 
 RUN apk add --update git bash make
 
 RUN go get github.com/coreos/bcrypt-tool
 
 WORKDIR $GOPATH/src/github.com/hashicorp/terraform
-RUN git clone https://github.com/coreos/terraform.git ./ && \
+RUN git clone https://github.com/hashicorp/terraform.git ./ && \
     git checkout v${TERRAFORM_VERSION} && \
     go run scripts/generate-plugins.go && \
     XC_ARCH=amd64 XC_OS=linux ./scripts/build.sh

Jenkinsfile

@@ -6,7 +6,7 @@
 pipeline {
   agent {
     docker {
-      image 'quay.io/coreos/tectonic-builder:v1.6'
+      image 'quay.io/coreos/tectonic-builder:v1.7'
       label 'worker'
     }
   }

README.md

@@ -36,7 +36,7 @@ At a high level, using the installer follows the workflow below. See each platfo
 
 **Install Terraform**
 
-This project is built on Terraform and requires version 0.8.8. Download and install an [official Terraform binary](https://releases.hashicorp.com/terraform/0.8.8/) for your OS or use your favorite package manager.
+This project is built on Terraform and requires version 0.9.4. Download and install an [official Terraform binary](https://releases.hashicorp.com/terraform/0.8.8/) for your OS or use your favorite package manager.
 
 **Choose your platform**
 

config.tf

@@ -8,7 +8,7 @@ EOF
 }
 
 terraform {
-  required_version = "= 0.8.8"
+  required_version = ">= 0.9.4"
 }
 
 variable "tectonic_container_images" {

installer/glide.yaml

@@ -1,7 +1,7 @@
 package: github.com/coreos/tectonic-installer/installer
 import:
 - package: github.com/aws/aws-sdk-go
-  version: v1.6.25
+  version: v1.8.13
   subpackages:
   - aws
   - aws/credentials
@@ -204,7 +204,7 @@ import:
   - parser
   - scanner
 - package: github.com/hashicorp/terraform
-  version: 403a86dc557fae52f8e39676b11e1e4356b7d1a2
+  version: 277bbf65d1141207dbb30485bf124b1dba08f80f
   subpackages:
   - config
   - config/module
@@ -226,6 +226,6 @@ import:
 - package: github.com/mitchellh/mapstructure
   version: 281073eb9eb092240d33ef253c404f1cca550309
 - package: github.com/coreos/terraform-provider-matchbox

-  version: dd045535c826b7e2e0daeddc6b8d4b2cc81f9dd0
+  version: 4c66aa75b60489a4220730d70b0446e25b0c9a0a
   subpackages:
   - matchbox

installer/scripts/release/common.env.sh

@@ -22,5 +22,5 @@ MATCHBOX_RELEASE_URL="https://github.com/coreos/matchbox/releases/download/${MAT
 MATCHBOX_ARCHIVE_TOP_DIR="matchbox-${MATCHBOX_RELEASE_VERSION}-linux-amd64"
 
 TERRAFORM_BIN_TMP_DIR="$TMP_DIR/terraform-bin"
-TERRAFORM_BIN_VERSION=0.8.8
+TERRAFORM_BIN_VERSION=0.9.4
 TERRAFORM_BIN_BASE_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_BIN_VERSION}/terraform_${TERRAFORM_BIN_VERSION}"

installer/server/terraform/plugin.go

@@ -4,24 +4,16 @@ import (
 	"bytes"
 	gtemplate "text/template"
 
-	"github.com/coreos/tectonic-installer/installer/server/terraform/plugins/aws"
-	"github.com/coreos/tectonic-installer/installer/server/terraform/plugins/local"
-	"github.com/coreos/tectonic-installer/installer/server/terraform/plugins/template"
-
 	log "github.com/Sirupsen/logrus"
 	"github.com/coreos/terraform-provider-matchbox/matchbox"
 	"github.com/hashicorp/terraform/plugin"
 	"github.com/kardianos/osext"
+
+	"github.com/coreos/tectonic-installer/installer/server/terraform/plugins/aws"
 )
 
 var plugins = map[string]*plugin.ServeOpts{
-	// https://github.com/hashicorp/terraform/pull/12757 (bf8d932)
-	"local": {ProviderFunc: local.Provider},
-
-	// https://github.com/hashicorp/terraform/pull/13652 (7a6759e)
-	"template": {ProviderFunc: template.Provider},
-
-	// https://github.com/hashicorp/terraform/pull/13574 (9245819)
+	// https://github.com/hashicorp/terraform/pull/13574 (82bda74)
 	"aws": {ProviderFunc: aws.Provider},
 
 	// https://github.com/coreos/terraform-provider-matchbox (glide)

installer/server/terraform/plugins/aws/auth_helpers.go

@@ -30,7 +30,7 @@ func GetAccountInfo(iamconn *iam.IAM, stsconn *sts.STS, authProviderName string)
 		setOptionalEndpoint(cfg)
 		sess, err := session.NewSession(cfg)
 		if err != nil {
-			return "", "", errwrap.Wrapf("Error creating AWS session: %s", err)
+			return "", "", errwrap.Wrapf("Error creating AWS session: {{err}}", err)
 		}
 
 		metadataClient := ec2metadata.New(sess)
@@ -134,7 +134,7 @@ func GetCredentials(c *Config) (*awsCredentials.Credentials, error) {
 			if usedEndpoint == "" {
 				usedEndpoint = "default location"
 			}
-			log.Printf("[WARN] Ignoring AWS metadata API endpoint at %s "+
+			log.Printf("[INFO] Ignoring AWS metadata API endpoint at %s "+
 				"as it doesn't return any instance-id", usedEndpoint)
 		}
 	}