Terraform plugin improvements (#485)

Signed-off-by: David Chung <[email protected]>

Author: David Chung

Makefile

@@ -171,3 +171,7 @@ test-full:
 vendor-update:
 	@echo "+ $@"
 	@trash -u
+
+terraform-linux:
+	@echo "+ $@"
+	wget -O tf.zip https://releases.hashicorp.com/terraform/0.9.3/terraform_0.9.3_linux_amd64.zip && unzip tf.zip && mv terraform ./build

circle.yml

@@ -11,7 +11,7 @@ machine:
     GOPATH: "$HOME/.go_workspace"
     WORKDIR: "$GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"
     E2E_CLEANUP: "false"
-    SKIP_TESTS: "docker,etcd"
+    SKIP_TESTS: "docker,etcd,terraform"
     S3_MINIO: "s3bucket"
     S3_BUCKET: "s3bucket/infrakit/build/linux-amd64"
     S3_BUILD_RELEASE: "infrakit-$CIRCLE_BRANCH.tar.gz"

dockerfiles/Dockerfile.build

@@ -1,11 +1,13 @@
 FROM golang:1.8-alpine
 
-RUN apk add --update git make gcc musl-dev
+RUN apk add --update git make gcc musl-dev wget ca-certificates openssl
 RUN go get github.com/rancher/trash
 
 WORKDIR /go/src/github.com/docker/infrakit
+
 VOLUME [ "/go/src/github.com/docker/infrakit/build" ]
-CMD make build-binaries
 
 COPY . ./
 RUN trash  # Force updating the vendored sources per spec; this slows the build but is most correct.
+
+CMD make build-binaries terraform-linux

dockerfiles/Dockerfile.bundle

@@ -1,6 +1,7 @@
 FROM docker:latest
 
-RUN mkdir -p /infrakit/plugins /infrakit/configs /infrakit/logs /infrakit/cli
+
+RUN mkdir -p /infrakit/plugins /infrakit/configs /infrakit/logs /infrakit/cli /infrakit/instance/terraform
 
 VOLUME /infrakit
 
@@ -19,6 +20,8 @@ ENV INFRAKIT_PLAYBOOKS_FILE /infrakit/playbooks
 ENV INFRAKIT_LEADER_FILE /infrakit/leader
 ENV INFRAKIT_STORE_DIR /infrakit/configs
 
+# Default terraform directory
+ENV INFRAKIT_INSTANCE_TERRAFORM_DIR /infrakit/instance/terraform
 
 
 ADD build/* /usr/local/bin/

examples/instance/terraform/apply.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"math/rand"
+	"os"
+	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/infrakit/pkg/util/exec"
+)
+
+func (p *plugin) terraformApply() error {
+	if p.pretend {
+		return nil
+	}
+
+	p.applyLock.Lock()
+	defer p.applyLock.Unlock()
+
+	if p.applying {
+		return nil
+	}
+
+	go func() {
+		for {
+			if err := p.lock.TryLock(); err == nil {
+				defer p.lock.Unlock()
+				doTerraformApply(p.Dir)
+			}
+			log.Debugln("Can't acquire lock, waiting")
+			time.Sleep(time.Duration(int64(rand.NormFloat64())%1000) * time.Millisecond)
+		}
+	}()
+	p.applying = true
+	return nil
+}
+
+func doTerraformApply(dir string) error {
+	log.Infoln(time.Now().Format(time.RFC850) + " Applying plan")
+	command := exec.Command(`terraform apply`).InheritEnvs(true).WithDir(dir)
+	err := command.WithStdout(os.Stdout).WithStderr(os.Stdout).Start()
+	if err != nil {
+		return err
+	}
+	return command.Wait()
+}

examples/instance/terraform/apply_test.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	. "github.com/docker/infrakit/pkg/testing"
+)
+
+func TestRunTerraformApply(t *testing.T) {
+
+	// Run this test locally only if terraform is set up
+	if SkipTests("terraform") {
+		t.SkipNow()
+	}
+
+	dir, err := os.Getwd()
+	require.NoError(t, err)
+	dir = path.Join(dir, "aws-two-tier")
+
+	err = doTerraformApply(dir)
+	require.NoError(t, err)
+}

examples/instance/terraform/main.go

@@ -18,6 +18,14 @@ func mustHaveTerraform() {
 	}
 }
 
+func getDir() string {
+	dir := os.Getenv("INFRAKIT_INSTANCE_TERRAFORM_DIR")
+	if dir != "" {
+		return dir
+	}
+	return os.TempDir()
+}
+
 func main() {
 
 	cmd := &cobra.Command{
@@ -26,7 +34,7 @@ func main() {
 	}
 	name := cmd.Flags().String("name", "instance-terraform", "Plugin name to advertise for discovery")
 	logLevel := cmd.Flags().Int("log", cli.DefaultLogLevel, "Logging level. 0 is least verbose. Max is 5")
-	dir := cmd.Flags().String("dir", os.TempDir(), "Dir for storing plan files")
+	dir := cmd.Flags().String("dir", getDir(), "Dir for storing plan files")
 	cmd.Run = func(c *cobra.Command, args []string) {
 		mustHaveTerraform()