Merge pull request #516 from simonswine/update-terraform-0.11.8

Update terraform 0.11.8

Author: jetstack-bot

.gitlab-ci.yml

@@ -4,7 +4,7 @@ test::tarmak::golang:
   stage: test
   tags:
   - docker
-  image: golang:1.9.5
+  image: golang:1.10.4
   script:
   - rm -rf /go/src/github.com/jetstack
   - mkdir -p /go/src/github.com/jetstack
@@ -47,7 +47,7 @@ release::tarmak::golang:
   stage: release
   tags:
   - docker
-  image: golang:1.9.5
+  image: golang:1.10.4
   only:
   - tags
   script:

CHANGELOG.md

@@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 | Application | Supported versions | Default  |
 |-------------|-------------------:|---------:|
 | Packer      |                    | `1.0.2`  |
-| Terraform   |                    | `0.11.7` |
+| Terraform   |                    | `0.11.8` |
 | Consul      |                    | `1.0.6`  |
 | Vault       |                    | `0.9.5`  |
 | Kubernetes  | `>= 1.7 && < 1.11` | `1.10.6` |

Gopkg.lock

@@ -92,27 +92,35 @@ required = [
 
 [[constraint]]
   name = "github.com/hashicorp/terraform"
-  version = "0.11.7"
+  version = "0.11.8"
+
+[[override]]
+  name = "github.com/hashicorp/go-tfe"
+  version = "=v0.1.2"
 
 [[constraint]]
   name = "github.com/terraform-providers/terraform-provider-aws"
-  version = "1.13.0"
+  version = "1.35.0"
+
+[[override]]
+  name = "github.com/aws/aws-sdk-go"
+  version = "v1.15.31"
 
 [[constraint]]
   name = "github.com/terraform-providers/terraform-provider-random"
-  version = "1.2.0"
+  version = "2.0.0"
 
 [[constraint]]
   name = "github.com/terraform-providers/terraform-provider-tls"
-  version = "1.1.0"
+  version = "1.2.0"
 
 [[constraint]]
   name = "github.com/terraform-providers/terraform-provider-template"
   version = "1.0.0"
 
 [[constraint]]
   name = "github.com/terraform-providers/terraform-provider-openstack"
-  version = "0.1.0"
+  version = "1.9.0"
 
 [[override]]
   name = "github.com/Azure/azure-sdk-for-go"

Gopkg.toml

@@ -1,7 +1,7 @@
 # Copyright Jetstack Ltd. See LICENSE for details.
 PACKAGE_NAME ?= github.com/jetstack/tarmak
 CONTAINER_DIR := /go/src/$(PACKAGE_NAME)
-GO_VERSION := 1.9.5
+GO_VERSION := 1.10.4
 
 BINDIR ?= $(CURDIR)/bin
 PATH   := $(BINDIR):$(PATH)
@@ -21,15 +21,15 @@ GOPATH ?= /tmp/go
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
 	SHASUM := sha256sum -c
-	DEP_URL := https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64
-	DEP_HASH := 31144e465e52ffbc0035248a10ddea61a09bf28b00784fd3fdd9882c8cbb2315
+	DEP_URL := https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64
+	DEP_HASH := 287b08291e14f1fae8ba44374b26a2b12eb941af3497ed0ca649253e21ba2f83
 	GORELEASER_URL := https://github.com/goreleaser/goreleaser/releases/download/v0.77.0/goreleaser_Linux_x86_64.tar.gz
 	GORELEASER_HASH := aae3c5bb76b282e29940f2654b48b13e51f664368c7589d0e86b391b7ef51cc8
 endif
 ifeq ($(UNAME_S),Darwin)
 	SHASUM := shasum -a 256 -c
-	DEP_URL := https://github.com/golang/dep/releases/download/v0.4.1/dep-darwin-amd64
-	DEP_HASH := 1544afdd4d543574ef8eabed343d683f7211202a65380f8b32035d07ce0c45ef
+	DEP_URL := https://github.com/golang/dep/releases/download/v0.5.0/dep-darwin-amd64
+	DEP_HASH := 1a7bdb0d6c31ecba8b3fd213a1170adf707657123e89dff234871af9e0498be2
 	GORELEASER_URL := https://github.com/goreleaser/goreleaser/releases/download/v0.77.0/goreleaser_Darwin_x86_64.tar.gz
 	GORELEASER_HASH := bc6cdf2dfe506f2cce5abceb30da009bfd5bcdb3e52608c536e6c2ceea1f24fe
 endif

Makefile

@@ -4,7 +4,6 @@ package cmd
 import (
 	"os"
 
-	"github.com/hashicorp/go-plugin"
 	"github.com/spf13/cobra"
 
 	"github.com/jetstack/tarmak/pkg/tarmak/utils"
@@ -13,7 +12,6 @@ import (
 
 // ensure plugin clients get closed after subcommand run
 func terraformPassthrough(args []string, f func([]string, <-chan struct{}) int) int {
-	defer plugin.CleanupClients()
 	return f(args, utils.MakeShutdownCh())
 }
 

cmd/tarmak/cmd/terraform.go

@@ -7,6 +7,8 @@ import (
 	"log"
 	"os"
 
+	goPlugin "github.com/hashicorp/go-plugin"
+	backendInit "github.com/hashicorp/terraform/backend/init"
 	"github.com/hashicorp/terraform/command"
 	"github.com/hashicorp/terraform/plugin"
 	"github.com/mitchellh/cli"
@@ -28,6 +30,17 @@ var InternalProviders = map[string]plugin.ProviderFunc{
 	"template": providertemplate.Provider,
 }
 
+// Prepare passthrough environment
+func passthroughPrepare() {
+	// initialise backends
+	backendInit.Init(nil)
+}
+
+func passthroughCleanup() {
+	// cleanup clients
+	goPlugin.CleanupClients()
+}
+
 // create new terraform ui
 func newUI(out io.Writer, err io.Writer) cli.Ui {
 
@@ -114,20 +127,26 @@ func InternalPlugin(args []string) int {
 }
 
 func Plan(args []string, stopCh <-chan struct{}) int {
+	passthroughPrepare()
+	defer passthroughCleanup()
 	c := &command.PlanCommand{
 		Meta: newMeta(newUI(os.Stdout, os.Stderr), stopCh),
 	}
 	return c.Run(args)
 }
 
 func Apply(args []string, stopCh <-chan struct{}) int {
+	passthroughPrepare()
+	defer passthroughCleanup()
 	c := &command.ApplyCommand{
 		Meta: newMeta(newUI(os.Stdout, os.Stderr), stopCh),
 	}
 	return c.Run(args)
 }
 
 func Destroy(args []string, stopCh <-chan struct{}) int {
+	passthroughPrepare()
+	defer passthroughCleanup()
 	c := &command.ApplyCommand{
 		Meta:    newMeta(newUI(os.Stdout, os.Stderr), stopCh),
 		Destroy: true,
@@ -136,20 +155,26 @@ func Destroy(args []string, stopCh <-chan struct{}) int {
 }
 
 func Init(args []string, stopCh <-chan struct{}) int {
+	passthroughPrepare()
+	defer passthroughCleanup()
 	c := &command.InitCommand{
 		Meta: newMeta(newUI(os.Stdout, os.Stderr), stopCh),
 	}
 	return c.Run(args)
 }
 
 func Output(args []string, stopCh <-chan struct{}) int {
+	passthroughPrepare()
+	defer passthroughCleanup()
 	c := &command.OutputCommand{
 		Meta: newMeta(newUI(os.Stdout, os.Stderr), stopCh),
 	}
 	return c.Run(args)
 }
 
 func Unlock(args []string, stopCh <-chan struct{}) int {
+	passthroughPrepare()
+	defer passthroughCleanup()
 	c := &command.UnlockCommand{
 		Meta: newMeta(newUI(os.Stdout, os.Stderr), stopCh),
 	}