From a59a5a449d1e866b993e5d1198bb2bb6f209fcdb Mon Sep 17 00:00:00 2001 From: John Engelman Date: Wed, 27 Jan 2016 07:22:07 +0100 Subject: [PATCH] A few doc and JSON fixes from review. --- DOCS.md | 7 +++---- Makefile | 18 +++++++++--------- main.go | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/DOCS.md b/DOCS.md index e2b55bd..7748118 100644 --- a/DOCS.md +++ b/DOCS.md @@ -1,8 +1,8 @@ Use the Terraform plugin to apply the infrastructure configuration contained within the repository. The following parameters are used to configure this plugin: -* `dryRun` - if true, calculates a plan but does __NOT__ apply it. +* `dry_run` - if true, calculates a plan but does __NOT__ apply it. * `remote` - contains the configuration for the Terraform remote state tracking. - * `backend` - the Terrafrom remote state backend to use. + * `backend` - the Terraform remote state backend to use. * `config` - a map of configuration parameters for the remote state backend. Each value is passed as a `-backend-config==` option. * `vars` - a map of variables to pass to the Terraform `plan` and `apply` commands. Each value is passed as a `-var =` option. @@ -11,8 +11,7 @@ The following is a sample Terraform configuration in your .drone.yml file: ```yaml deploy: terraform: - image: objectpartners/drone-terraform:latest - dryRun: false + dry_run: false remote: backend: S3 config: diff --git a/Makefile b/Makefile index 2487852..d1cd996 100644 --- a/Makefile +++ b/Makefile @@ -5,28 +5,28 @@ IMAGE ?= plugins/$(EXECUTABLE) CI_BUILD_NUMBER ?= 0 LDFLAGS = -X "main.buildDate=$(shell date -u '+%Y-%m-%d %H:%M:%S %Z')" - PACKAGES = $(shell go list ./... | grep -v /vendor/) +PACKAGES = $(shell go list ./... | grep -v /vendor/) clean: - go clean -i ./... + go clean -i ./... deps: - go get -t ./... + go get -t ./... fmt: - go fmt $(PACKAGES) + go fmt $(PACKAGES) vet: - go vet $(PACKAGES) + go vet $(PACKAGES) test: - @for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done; + @for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done; docker: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-s -w $(LDFLAGS)' - docker build --rm -t $(IMAGE) . + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-s -w $(LDFLAGS)' + docker build --rm -t $(IMAGE) . $(EXECUTABLE): $(wildcard *.go) - go build -ldflags '-s -w $(LDFLAGS)' + go build -ldflags '-s -w $(LDFLAGS)' build: $(EXECUTABLE) diff --git a/main.go b/main.go index be849c0..54498dc 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( type terraform struct { Remote remote `json:"remote"` - DryRun bool `json:"dryRun"` + DryRun bool `json:"dry_run"` Vars map[string]string `json:"vars"` }