From 4659c0648e4335d5c6bca479a33a366195387f32 Mon Sep 17 00:00:00 2001 From: Rohith Date: Sat, 1 Oct 2016 23:18:21 +0100 Subject: [PATCH] - updating the makefile --- Makefile | 12 ++++++++++-- vault_resources_test.go | 3 +-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 700a26c..effa198 100644 --- a/Makefile +++ b/Makefile @@ -66,15 +66,23 @@ format: @echo "--> Running go fmt" @go fmt $(PACKAGES) +gofmt: + @echo "--> Running gofmt check" + @gofmt -s -l *.go \ + | grep -q \.go ; if [ $$? -eq 0 ]; then \ + echo "You need to runn the make format, we have file unformatted"; \ + gofmt -s -l *.go; \ + exit 1; \ + fi cover: @echo "--> Running go cover" - godep go list ./... | xargs -n1 go test --cover + @godep go test --cover test: deps @echo "--> Running the tests" go test -v + @$(MAKE) gofmt @$(MAKE) vet - @$(MAKE) cover changelog: release git log $(shell git tag | tail -n1)..HEAD --no-merges --format=%B > changelog diff --git a/vault_resources_test.go b/vault_resources_test.go index 9907c2e..bca10e5 100644 --- a/vault_resources_test.go +++ b/vault_resources_test.go @@ -36,7 +36,6 @@ func TestSetResources(t *testing.T) { assert.Nil(t, items.Set("pki:example-dot-com:common_name=blah.example.com,renew=true")) assert.Nil(t, items.Set("secret:secrets/${ENV}/me:file=filename.test,fmt=yaml")) - assert.NotNil(t, items.Set("secret:")) assert.NotNil(t, items.Set("secret:test:file=filename.test,fmt=")) assert.NotNil(t, items.Set("secret::file=filename.test,fmt=yaml")) @@ -80,7 +79,7 @@ func TestSetEnvironmentResource(t *testing.T) { ResourceText: "secret:secrets/${KUBERNETES_NAMESPACE}/me:file=filename.test,fmt=yaml,common_name=${KUBERNETES_NAMESPACE}.test", ExpectedPath: "secrets/dev/me", Vars: map[string]string{ - "KUBERNETES_NAMESPACE": "dev", + "KUBERNETES_NAMESPACE": "dev", }, }, }