proposal v2.1

api/internal/plugins/loader/loader_test.go

@@ -87,8 +87,12 @@ func TestLoaderWithWorkingDir(t *testing.T) {
 	c := types.EnabledPluginConfig(types.BploLoadFromFileSys)
 	pLdr := NewLoader(c, rmF, fsys)
 	npLdr := pLdr.LoaderWithWorkingDir("/tmp/dummy")
+	require.Equal(t,
+		"",
+		pLdr.Config().FnpLoadingOptions.WorkingDir,
+		"the plugin working dir should not change")
 	require.Equal(t,
 		"/tmp/dummy",
 		npLdr.Config().FnpLoadingOptions.WorkingDir,
-		"plugin working dir is not set correctly")
+		"the plugin working dir is not updated")
 }

api/krusty/fnplugin_test.go

@@ -41,13 +41,19 @@ spec:
 EOF
 `
 
-const krmEchoDotSh = `#!/bin/bash
-
-resourceList=$(cat)
-echo "$resourceList"
+const krmTransformerDotSh = `#!/bin/bash
+cat << EOF
+apiVersion: v1
+kind: Secret
+metadata:
+  name: dummyTransformed
+stringData:
+  foo: bar
+type: Opaque
+EOF
 `
 
-func TestFnExecGenerator(t *testing.T) {
+func TestFnExecGeneratorInBaseOnly(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -93,7 +99,6 @@ spec:
 `)
 
 	m := th.Run(tmpDir.String(), o)
-	assert.NoError(t, err)
 	yml, err := m.AsYaml()
 	assert.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
@@ -132,7 +137,7 @@ spec:
 	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
-func TestFnExecGeneratorInOverlay(t *testing.T) {
+func TestFnExecGeneratorInBaseWithOverlay(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -223,7 +228,7 @@ spec:
 	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
-func TestFnExecTransformer(t *testing.T) {
+func TestFnExecTransformerInBaseOnly(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 
 	th := kusttest_test.MakeHarnessWithFs(t, fSys)
@@ -250,7 +255,7 @@ type: Opaque
 stringData:
   foo: bar
 `)
-	th.WriteF(filepath.Join(base, "krmEcho.sh"), krmEchoDotSh)
+	th.WriteF(filepath.Join(base, "krmEcho.sh"), krmTransformerDotSh)
 
 	assert.NoError(t, os.Chmod(filepath.Join(base, "krmEcho.sh"), 0777))
 	th.WriteF(filepath.Join(base, "krm-echo.yaml"), `
@@ -265,13 +270,67 @@ metadata:
 `)
 
 	m := th.Run(base, o)
-	assert.NoError(t, err)
 	yml, err := m.AsYaml()
 	assert.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
+metadata:
+  name: dummyTransformed
+stringData:
+  foo: bar
+type: Opaque
+`, string(yml))
+	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+}
+
+func TestFnExecTransformerInBaseWithOverlay(t *testing.T) {
+	fSys := filesys.MakeFsOnDisk()
+
+	th := kusttest_test.MakeHarnessWithFs(t, fSys)
+	o := th.MakeOptionsPluginsEnabled()
+	o.PluginConfig.FnpLoadingOptions.EnableExec = true
+
+	tmpDir, err := filesys.NewTmpConfirmedDir()
+	assert.NoError(t, err)
+	base := filepath.Join(tmpDir.String(), "base")
+	assert.NoError(t, fSys.Mkdir(base))
+	th.WriteK(base, `
+resources:
+- secret.yaml
+transformers:
+- krm-echo.yaml
+`)
+	th.WriteF(filepath.Join(base, "secret.yaml"),
+		`
+apiVersion: v1
+kind: Secret
 metadata:
   name: dummy
+type: Opaque
+stringData:
+  foo: bar
+`)
+	th.WriteF(filepath.Join(base, "krmEcho.sh"), krmTransformerDotSh)
+
+	assert.NoError(t, os.Chmod(filepath.Join(base, "krmEcho.sh"), 0777))
+	th.WriteF(filepath.Join(base, "krm-echo.yaml"), `
+apiVersion: examples.config.kubernetes.io/v1beta1
+kind: MyPlugin
+metadata:
+  name: notImportantHere
+  annotations:
+    config.kubernetes.io/function: |
+      exec:
+        path: ./krmEcho.sh
+`)
+
+	m := th.Run(base, o)
+	yml, err := m.AsYaml()
+	assert.NoError(t, err)
+	assert.Equal(t, `apiVersion: v1
+kind: Secret
+metadata:
+  name: dummyTransformed
 stringData:
   foo: bar
 type: Opaque
@@ -312,7 +371,7 @@ type: Opaque
 stringData:
   foo: bar
 `)
-	th.WriteF(filepath.Join(prod, "krmEcho.sh"), krmEchoDotSh)
+	th.WriteF(filepath.Join(prod, "krmEcho.sh"), krmTransformerDotSh)
 
 	assert.NoError(t, os.Chmod(filepath.Join(prod, "krmEcho.sh"), 0777))
 	th.WriteF(filepath.Join(prod, "krm-echo.yaml"), `
@@ -327,13 +386,12 @@ metadata:
 `)
 
 	m := th.Run(prod, o)
-	assert.NoError(t, err)
 	yml, err := m.AsYaml()
 	assert.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
-  name: dummy
+  name: dummyTransformed
 stringData:
   foo: bar
 type: Opaque