Get rid of statik and fix failing tests

Makefile-tools.mk

@@ -47,9 +47,6 @@ $(MYGOBIN)/mdtogo:
 $(MYGOBIN)/addlicense:
 	go install github.com/google/addlicense@latest
 
-$(MYGOBIN)/statik:
-	go install github.com/rakyll/statik@latest
-
 $(MYGOBIN)/goreleaser:
 	go install github.com/goreleaser/[email protected] # https://github.com/kubernetes-sigs/kustomize/issues/4542
 

cmd/pluginator/Makefile

@@ -1,4 +1,4 @@
-.PHONY: statik test all clean generate run
+.PHONY: test all clean generate run
 
 FUNC_WRAPPER_SRC_DIR = funcwrappersrc
 FUNC_WRAPPER_DST_DIR = funcwrapper
@@ -7,22 +7,16 @@ include ../../Makefile-modules.mk
 
 all: test build
 
-test: generate
+test:
 	go test -v ./...
 
-generate: $(MYGOBIN)/statik
-	( \
-		cd internal/krmfunction; \
-		$(MYGOBIN)/statik -src=$(FUNC_WRAPPER_SRC_DIR) -f -p $(FUNC_WRAPPER_DST_DIR) -include=main.go,go.mod.src \
-	)
-
-build: generate
+build:
 	go build -o $(MYGOBIN) main.go
 
-install: generate
+install:
 	go install .
 
-run: generate
+run:
 	go run . $(ARGS)
 
 clean:

cmd/pluginator/go.mod

@@ -3,7 +3,6 @@ module sigs.k8s.io/kustomize/cmd/pluginator/v2
 go 1.19
 
 require (
-	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cobra v1.4.0
 	github.com/stretchr/testify v1.8.0
 	sigs.k8s.io/kustomize/api v0.12.1

cmd/pluginator/go.sum

@@ -93,8 +93,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
-github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=

cmd/pluginator/internal/krmfunction/converter.go

@@ -6,17 +6,18 @@ package krmfunction
 import (
 	"bufio"
 	"bytes"
+	"embed"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
-
-	"github.com/rakyll/statik/fs"
-	// load embedded func wrapper
-	_ "sigs.k8s.io/kustomize/cmd/pluginator/v2/internal/krmfunction/funcwrapper"
 )
 
+//go:embed funcwrappersrc/go.mod.src
+//go:embed funcwrappersrc/main.go
+var fs embed.FS
+
 // Converter is a converter to convert the
 // plugin file to KRM function
 type Converter struct {
@@ -122,11 +123,7 @@ func (c *Converter) prepareWrapper(content string) string {
 // readEmbeddedFile read the file from embedded files with filename
 // name. Return the file content if it's successful.
 func (c *Converter) readEmbeddedFile(name string) (string, error) {
-	statikFS, err := fs.New()
-	if err != nil {
-		return "", err
-	}
-	r, err := statikFS.Open("/" + name)
+	r, err := fs.Open("funcwrappersrc/" + name)
 	if err != nil {
 		return "", err
 	}

cmd/pluginator/internal/krmfunction/converter_test.go

@@ -47,7 +47,7 @@ func (p *plugin) Transform(rm resmap.ResMap) error {
     return nil
   }
   for _, r := range rm.Resources() {
-    if r.IsEmpty() {
+    if r.IsNilOrEmpty() {
       // Don't mutate empty objects?
       continue
     }
@@ -97,23 +97,26 @@ items:
 
 func runKrmFunction(t *testing.T, input []byte, dir string) []byte {
 	t.Helper()
-	cmd := exec.Command("go", "run", ".")
-	ib := bytes.NewReader(input)
-	cmd.Stdin = ib
-	ob := bytes.NewBuffer([]byte{})
-	cmd.Stdout = ob
-	eb := bytes.NewBuffer([]byte{})
-	cmd.Stderr = eb
-	cmd.Dir = dir
-	err := cmd.Run()
-	if !assert.NoErrorf(t, err, "Stdout:\n%s\nStderr:\n%s\n", ob.String(), eb.String()) {
-		t.FailNow()
+	prepareCmd := func(name string, arg ...string) (*exec.Cmd, *bytes.Buffer, *bytes.Buffer) {
+		ob := bytes.NewBuffer([]byte{})
+		eb := bytes.NewBuffer([]byte{})
+		cmd := exec.Command(name, arg...)
+		cmd.Stdout = ob
+		cmd.Stderr = eb
+		cmd.Dir = dir
+		return cmd, ob, eb
 	}
+	cmd, ob, eb := prepareCmd("go", "mod", "tidy")
+	require.NoErrorf(t, cmd.Run(), "Stdout:\n%s\nStderr:\n%s\n", ob.String(), eb.String())
+
+	cmd, ob, eb = prepareCmd("go", "run", ".")
+	cmd.Stdin = bytes.NewReader(input)
+	require.NoErrorf(t, cmd.Run(), "Stdout:\n%s\nStderr:\n%s\n", ob.String(), eb.String())
+
 	return ob.Bytes()
 }
 
 func TestTransformerConverter(t *testing.T) {
-	t.Skip("TODO: fix this test, which was not running in CI and does not pass")
 	dir := t.TempDir()
 
 	err := os.WriteFile(filepath.Join(dir, "Plugin.go"),
@@ -211,7 +214,6 @@ items: []
 }
 
 func TestGeneratorConverter(t *testing.T) {
-	t.Skip("TODO: fix this test, which was not running in CI and does not pass")
 	dir := t.TempDir()
 
 	err := os.WriteFile(filepath.Join(dir, "Plugin.go"),
@@ -231,6 +233,9 @@ items:
   kind: ConfigMap
   metadata:
     name: staging
+    annotations:
+      internal.config.kubernetes.io/generatorBehavior: unspecified
+      internal.config.kubernetes.io/needsHashSuffix: enabled
 functionConfig:
   apiVersion: foo-corp.com/v1
   kind: FulfillmentCenter

cmd/pluginator/internal/krmfunction/funcwrappersrc/go.mod.src

@@ -1,11 +1,11 @@
 module main
 
-go 1.15
+go 1.19
 
 require (
-	github.com/spf13/cobra v1.0.0
-	sigs.k8s.io/kustomize/api v0.6.4
-	sigs.k8s.io/kustomize/kyaml v0.9.3
+	github.com/spf13/cobra v1.4.0
+	sigs.k8s.io/kustomize/api v0.12.1
+	sigs.k8s.io/kustomize/kyaml v0.13.9
 	sigs.k8s.io/yaml v1.2.0
 )