Merge pull request #37 from carolynvs/fix-schema

Fix schema command
getporter · Mar 24, 2020 · 7d39f43 · 7d39f43
2 parents 597a442 + 87a3e4b
commit 7d39f43
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 187 deletions.
diff --git a/Makefile b/Makefile
@@ -51,21 +51,27 @@ ifndef HAS_PACKR2
 	$(GO) get -u github.com/gobuffalo/packr/v2/packr2
 endif
 
-xbuild-all:
+xbuild-all: generate
 	$(foreach OS, $(SUPPORTED_PLATFORMS), \
 		$(foreach ARCH, $(SUPPORTED_ARCHES), \
 				$(MAKE) $(MAKE_OPTS) CLIENT_PLATFORM=$(OS) CLIENT_ARCH=$(ARCH) MIXIN=$(MIXIN) xbuild; \
 		))
+	$(MAKE) clean-packr
 
 xbuild: $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT)
 $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT):
 	mkdir -p $(dir $@)
 	GOOS=$(CLIENT_PLATFORM) GOARCH=$(CLIENT_ARCH) $(XBUILD) -o $@ ./cmd/$(MIXIN)
 
-test: test-unit
+test: test-unit test-integration
 
 test-unit: build
-	$(GO) test ./...
+	$(GO) test ./pkg/...
+
+test-integration: xbuild
+	# Test against the cross-built client binary that we will publish
+	cp $(BINDIR)/$(VERSION)/$(MIXIN)-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT) $(BINDIR)/$(MIXIN)$(FILE_EXT)
+	$(GO) test -tags=integration ./tests/...
 
 publish: bin/porter$(FILE_EXT)
 	# AZURE_STORAGE_CONNECTION_STRING will be used for auth in the following commands
@@ -91,5 +97,8 @@ install:
 	install $(BINDIR)/$(MIXIN)$(FILE_EXT) $(PORTER_HOME)/mixins/$(MIXIN)/$(MIXIN)$(FILE_EXT)
 	install $(BINDIR)/$(MIXIN)-runtime$(FILE_EXT) $(PORTER_HOME)/mixins/$(MIXIN)/$(MIXIN)-runtime$(FILE_EXT)
 
-clean:
+clean: clean-packr
 	-rm -fr bin/
+
+clean-packr: packr2
+	cd pkg/$(MIXIN) && packr2 clean
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -30,7 +30,7 @@ steps:
   displayName: 'Set up the Go workspace'
 
 - script: |
-    make build test
+    make build test-unit
   workingDirectory: '$(modulePath)'
   displayName: 'Unit Test'
 
@@ -39,6 +39,11 @@ steps:
   workingDirectory: '$(modulePath)'
   displayName: 'Cross Compile'
 
+- script: |
+    make test-integration
+  workingDirectory: '$(modulePath)'
+  displayName: 'Integration Test'
+
 - script: |
     AZURE_STORAGE_CONNECTION_STRING=$(AZURE_STORAGE_CONNECTION_STRING) make publish
   workingDirectory: '$(modulePath)'

diff --git a/go.sum b/go.sum
@@ -198,6 +198,7 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/gorm v1.9.11/go.mod h1:bu/pK8szGZ2puuErfU0RwyeNdsf3e6nCX/noXaVxkfw=
@@ -222,6 +223,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
 github.com/kisom/goutils v1.1.0/go.mod h1:+UBTfd78habUYWFbNWTJNG+jNG/i/lGURakr4A/yNRw=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

diff --git a/pkg/terraform/schema.go b/pkg/terraform/schema.go
@@ -16,7 +16,7 @@ func (m *Mixin) PrintSchema() error {
 }
 
 func (m *Mixin) GetSchema() (string, error) {
-	b, err := m.schema.Find("terraform.json")
+	b, err := m.schema.Find("schema.json")
 	if err != nil {
 		return "", err
 	}

diff --git a/pkg/terraform/testdata/schema.json → pkg/terraform/schema/schema.json b/pkg/terraform/testdata/schema.json → pkg/terraform/schema/schema.json
diff --git a/pkg/terraform/schema/terraform.json b/pkg/terraform/schema/terraform.json
diff --git a/pkg/terraform/schema_test.go b/pkg/terraform/schema_test.go
@@ -20,7 +20,7 @@ func TestMixin_PrintSchema(t *testing.T) {
 
 	gotSchema := m.TestContext.GetOutput()
 
-	wantSchema, err := ioutil.ReadFile("testdata/schema.json")
+	wantSchema, err := ioutil.ReadFile("schema/schema.json")
 	require.NoError(t, err)
 
 	assert.Equal(t, string(wantSchema), gotSchema)

diff --git a/pkg/terraform/terraform.go b/pkg/terraform/terraform.go
@@ -1,3 +1,5 @@
+//go:generate packr2
+
 package terraform
 
 import (

diff --git a/tests/schema_integration_test.go b/tests/schema_integration_test.go
@@ -0,0 +1,36 @@
+// +build integration
+
+package tests
+
+import (
+	"bytes"
+	"os"
+	"os/exec"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+// Add a test that checked that the schema was packed into the binary
+// properly. Requires a make clean xbuild-all first.
+func TestSchema(t *testing.T) {
+	schemaBackup := "../pkg/terraform/schema/schema.json.bak"
+	schemaPath := "../pkg/terraform/schema/schema.json"
+
+	defer os.Rename(schemaBackup, schemaPath)
+	err := os.Rename(schemaPath, schemaBackup)
+	require.NoError(t, err, "failed to sabotage the schema.json")
+
+	output := &bytes.Buffer{}
+	cmd := exec.Command("terraform", "schema")
+	cmd.Path = "../bin/mixins/terraform/terraform"
+	cmd.Stdout = output
+	cmd.Stderr = output
+
+	err = cmd.Start()
+	require.NoError(t, err, "failed to start the terraform schema command")
+
+	err = cmd.Wait()
+	t.Log(output)
+	require.NoError(t, err, "terraform schema failed")
+}