Merge pull request #4887 from KnVerey/statik_removal

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/goreleaser@v0.179.0 # 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/funcwrapper/statik.go

@@ -1,14 +0,0 @@
-// Code generated by statik. DO NOT EDIT.
-
-package funcwrapper
-
-import (
-	"github.com/rakyll/statik/fs"
-)
-
-
-func init() {
-	data := "PK\x03\x04\x14\x00\x08\x00\x08\x00\xa8\x89LU\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00	\x00go.mod.srcUT\x05\x00\x01\xad\xf5Fct\xca\xb1\x0e\xc2 \x10\x06\xe0\xb9\xf7\x14\x8c\xba\xfc\x80U\xa3\x8fC+\xe2\x85\xe2U\xae4\xd1\xa77\xc6\xc9\xc1\xf9\xfb\x8a\\\xda\x14M	|'Jb<\xfc\x81\xa8\xc6G\xe3\x1a\xcd\x86\xba\xc4\xcb\xad\x0d\x18\xa5X\x9d\xaf\xbe\xb7\xa3\x0c5\x98\xd5\xc3\xc1Q\xa7\x9c\x14\xf9\xa4`\xb1\xb9\xe9\"\x85_\xd1\x86\x99\xcd\xeap\xc4\xfe\xdf\xc8\xcfP\xa6\xcf9\xa3\xff=_\xf0\xd8\xc1\xd1\x96\xe8\x1d\x00\x00\xff\xffPK\x07\x08`;Y\xf4u\x00\x00\x00\xa1\x00\x00\x00PK\x03\x04\x14\x00\x08\x00\x08\x00\xa8\x89LU\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07\x00	\x00main.goUT\x05\x00\x01\xad\xf5Fc\x94R\xc1n\xe36\x10=\x93_1\xd5\xa1\xa0\n\x87\xda\xfaT\xec\xc2\x87\xc5z\xbd]4	\x8c$\x08\n\x14=\xd0\xd2H&L\x91\xc4\x90\x8a\xe3\x16\xfe\xf7\x82\x92\xec\xd8i\x12d\xaf\xe4\x9b\xf7\xe6\xbdyE\x01_\x9c\xdf\x91n\xd6\x11\xa6\x1f\xa6S\xb8[#\xfc\xd1\xad\x90,F\x0c\xf0\xb9\x8bkGA\xf2\xa2\x80\xdb\xe5\xfc\xcf\x8bK]\xa2\x0dx\xf1\xbdB\x1bu\xad\x91>\xc2g\xaf\xca5^L\xe5\x07\x9epwk\x1d\xa0\xd6\x06a\xab\x8d\x81\x15\x82'Wb\x08X\x81\xb2\x15`\xbb\xc2\xaa\xc2\n\xa2\x03o\xbaF[\x15\x1dI\xce\xbd*7\xaaA\xa8;[nIy\x8f\x14\xa8\xe4\\\xb7\xdeQ\x04\xc1YV\xb71\xe3,s!\xe3\x9ceA7An~\x0bR\xbbb\xd3\x85\xe8Z\xfd\x0f\x16\xca\xeb\xc2\x93{\xd0\x15R\xf6&\x8a0\xb4\xca\xbf\x8d\x89;\x8f\xe1u\xc8f\xa7ZS\xd4\xb6\xa8I\xb5\xb8u\xb4\xc9x\x9eb\xb0\xceh\x1by\xf2\x02\xad\xd2V\xe4\xf0/g\x0f\x8aF\xcf0\x88\xcb/\xce\xd6\xba\xe9H\xad\x0cr\xe6\xe1\xe3\x0c\x0e\xcb\xcbk\xdc\xce\xb1V\x9d\x89s\xf4\xcb\xf1U\xe4\x9c\x0d\xb3\x0bUFG\xbb42\x92]\xe3v|\x14^~\xc3x\x83\xc1uT\xe2\xe11\xcf9\x1b\xe4\x7fG\x93\xe2=\x9f]\x9e~	\xce\x98\xd5f\x02=\xd3B\xa3\xa9\xee\x95\xd1U:\x96\xc8'p\xb6\xc3\x04\xfa\x9c\xe4\\\x87d\xa4\x1a\x98\x06oI\x95\xb3\xb1\x03\x8e\x92\xe41,y\xd8\xf0R\x87\xb8<@\x16\x9d-EJN\xd0\xc97\xfc\xf2\xf2X\x0eH\xe4(\xc5\x9b\x82\xb9R~\x92^\x9e\xac\x8d;&\x877\xfd\xff\x82\\{s\xed*\xbc5\xba\xc43\x11\xf9=b\x1br\xce\x98\xae{\x96\x9ff`\xb5\xe9\xc9\x19a\xec\xc8\xa6g\xce\xd8\x9e3V\xa9\xa8\xee\x95\xe9\xf0T\xf1\x89+\xf9\x88\xda\x8d9\xc8>C\x91\xa5\xa1,\x97\xfd\x9c\xbc\x8d\xa4m#\xde'\xc8\x19K\x88\xd9X\xa1\xb1;\xe2\xec\xa2\x13\xf8\xeb\xef\xd5.\xa28\xee\x96\xbf\x8f\xbc\xc7\xc4	\xb8M\xdf\xc1AA\x8c\xe5\xb8#eC\xed\xa8E\x1aN\x9b\x7fJ\xc0\x9egX)>a\xc4p\x85$\xfb\x92\xee\xb9p\xaf\xbc\x074\x01A\xd7\xd0\xbc\xb2\xc07\xb4H\xa9z\xff\x93?=\xf9\x0c\x9a\x03\x12\xc5\x8f\xe8\xf3\xa1;\xcfj\x00\xfd=\xaf\x92\x7fw\xd2\x97\x9c\x1f9\xac6\x9c\xeds~\xd09\xeb\xf6\xd7G,\xbb\x88\xe2\xe7c\xf7'i \xff\xf4|\xa5\xba\x8drI\xdaFc\x05\x12%~\x17\xe4\xd7G\x1d\xc5\xaf9g{\xbe\xe7\xff\x05\x00\x00\xff\xffPK\x07\x08P\xaa\x84\xd0\x8f\x02\x00\x00\xaa\x05\x00\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\xa8\x89LU`;Y\xf4u\x00\x00\x00\xa1\x00\x00\x00\n\x00	\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00go.mod.srcUT\x05\x00\x01\xad\xf5FcPK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\xa8\x89LUP\xaa\x84\xd0\x8f\x02\x00\x00\xaa\x05\x00\x00\x07\x00	\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\xb6\x00\x00\x00main.goUT\x05\x00\x01\xad\xf5FcPK\x05\x06\x00\x00\x00\x00\x02\x00\x02\x00\x7f\x00\x00\x00\x83\x03\x00\x00\x00\x00"
-		fs.Register(data)
-	}
-	

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
 )