Use go:embed instead of packr

This is general cleanup that we are doing to all code once they upgrade
to Go 1.16

Signed-off-by: Carolyn Van Slyck <[email protected]>

Author: carolynvs

.gitignore

@@ -1,4 +1,3 @@
 bin
 .cnab
-*-packr.go
 /build/git_askpass.sh

CONTRIBUTING.md

@@ -29,7 +29,3 @@ Here are the most common Makefile tasks
 * `build` builds both the runtime and client.
 * `install` installs the mixin into **~/.porter/mixins**.
 * `test-unit` runs the unit tests.
-* `clean-packr` removes extra packr files that were a side-effect of the build.
-  Normally this is run automatically but if you run into issues with packr,
-  run this command.
-

Makefile

@@ -32,32 +32,21 @@ endif
 REGISTRY ?= $(USER)
 
 .PHONY: build
-build: build-client build-runtime clean-packr
+build: build-client build-runtime
 
-build-runtime: generate
+build-runtime:
 	mkdir -p $(BINDIR)
 	GOARCH=$(RUNTIME_ARCH) GOOS=$(RUNTIME_PLATFORM) $(GO) build -ldflags '$(LDFLAGS)' -o $(BINDIR)/$(MIXIN)-runtime$(FILE_EXT) ./cmd/$(MIXIN)
 
-build-client: generate
+build-client:
 	mkdir -p $(BINDIR)
 	$(GO) build -ldflags '$(LDFLAGS)' -o $(BINDIR)/$(MIXIN)$(FILE_EXT) ./cmd/$(MIXIN)
 
-generate: packr2
-	$(GO) mod tidy
-	$(GO) generate ./...
-
-HAS_PACKR2 := $(shell command -v packr2)
-packr2:
-ifndef HAS_PACKR2
-	$(GO) get -u github.com/gobuffalo/packr/v2/packr2
-endif
-
-xbuild-all: generate
+xbuild-all:
 	$(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):
@@ -87,8 +76,5 @@ install:
 	install $(BINDIR)/$(MIXIN)$(FILE_EXT) $(PORTER_HOME)/mixins/$(MIXIN)/$(MIXIN)$(FILE_EXT)
 	install $(BINDIR)/$(MIXIN)-runtime$(FILE_EXT) $(PORTER_HOME)/mixins/$(MIXIN)/runtimes/$(MIXIN)-runtime$(FILE_EXT)
 
-clean: clean-packr
+clean:
 	-rm -fr bin/
-
-clean-packr: packr2
-	cd pkg/kubernetes && packr2 clean

pkg/kubernetes/kubernetes.go

@@ -1,5 +1,3 @@
-//go:generate packr2
-
 package kubernetes
 
 import (
@@ -11,7 +9,6 @@ import (
 
 	"get.porter.sh/porter/pkg/context"
 	"github.com/ghodss/yaml"
-	"github.com/gobuffalo/packr/v2"
 	"github.com/pkg/errors"
 	"github.com/xeipuuv/gojsonschema"
 )
@@ -22,22 +19,16 @@ const (
 
 type Mixin struct {
 	*context.Context
-	schemas                 *packr.Box
 	KubernetesClientVersion string
 }
 
 func New() *Mixin {
 	return &Mixin{
 		Context:                 context.New(),
-		schemas:                 NewSchemaBox(),
 		KubernetesClientVersion: defaultKubernetesClientVersion,
 	}
 }
 
-func NewSchemaBox() *packr.Box {
-	return packr.New("get.porter.sh/porter/pkg/kubernetes/schema", "./schema")
-}
-
 func (m *Mixin) getCommandFile(commandFile string, w io.Writer) ([]byte, error) {
 	if commandFile == "" {
 		reader := bufio.NewReader(m.In)
@@ -65,10 +56,7 @@ func (m *Mixin) ValidatePayload(b []byte) error {
 	manifestLoader := gojsonschema.NewGoLoader(s)
 
 	// Load the step schema
-	schema, err := m.GetSchema()
-	if err != nil {
-		return err
-	}
+	schema := m.GetSchema()
 	schemaLoader := gojsonschema.NewStringLoader(schema)
 
 	validator, err := gojsonschema.NewSchema(schemaLoader)

pkg/kubernetes/schema.go

@@ -1,29 +1,19 @@
 package kubernetes
 
 import (
+	_ "embed"
 	"fmt"
-
-	packr "github.com/gobuffalo/packr/v2"
 )
 
-func (m *Mixin) PrintSchema() error {
-	schema, err := m.GetSchema()
-	if err != nil {
-		return err
-	}
+//go:embed schema/schema.json
+var schema string
 
+func (m *Mixin) PrintSchema() error {
+	schema := m.GetSchema()
 	fmt.Fprintf(m.Out, schema)
-
 	return nil
 }
 
-func (m *Mixin) GetSchema() (string, error) {
-	t := packr.New("schema", "./schema")
-
-	b, err := t.Find("schema.json")
-	if err != nil {
-		return "", err
-	}
-
-	return string(b), nil
+func (m *Mixin) GetSchema() string {
+	return schema
 }

pkg/kubernetes/schema_test.go

@@ -9,18 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestMixin_GetSchema(t *testing.T) {
-	m := NewTestMixin(t)
-
-	gotSchema, err := m.GetSchema()
-	require.NoError(t, err)
-
-	wantSchema, err := ioutil.ReadFile("./schema/schema.json")
-	require.NoError(t, err)
-
-	assert.Equal(t, string(wantSchema), gotSchema)
-}
-
 func TestMixin_PrintSchema(t *testing.T) {
 	m := NewTestMixin(t)