Fix lua preprocessing for pr automations

This still wasn't fully working, added a mirror type so that it looks a lot closer to what users expect

Author: michaeljguarino

pkg/pr/lua.go

@@ -1,6 +1,7 @@
 package pr
 
 import (
+	"encoding/json"
 	"fmt"
 	iofs "io/fs"
 	"os"
@@ -11,7 +12,6 @@ import (
 	"dario.cat/mergo"
 	"github.com/pluralsh/polly/luautils"
 	lua "github.com/yuin/gopher-lua"
-	"k8s.io/apimachinery/pkg/util/json"
 )
 
 func executeLua(spec *PrTemplateSpec, ctx map[string]interface{}) error {
@@ -83,12 +83,12 @@ func merge(spec *PrTemplateSpec, new map[string]interface{}) error {
 		return err
 	}
 
-	newSpec := PrTemplateSpec{}
-	if err := json.Unmarshal(jsonStr, &newSpec); err != nil {
+	newSpec := &PrTemplateSpecMirror{}
+	if err := json.Unmarshal(jsonStr, newSpec); err != nil {
 		return err
 	}
 
-	return mergo.Merge(spec, newSpec, mergo.WithAppendSlice, mergo.WithOverride)
+	return mergo.Merge(spec, newSpec.Convert(), mergo.WithAppendSlice, mergo.WithOverride)
 }
 
 func luaFolder(parent, folder string) (string, error) {

pkg/pr/types.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	console "github.com/pluralsh/console/go/client"
+	"github.com/pluralsh/polly/algorithms"
 	"sigs.k8s.io/yaml"
 )
 
@@ -147,3 +148,78 @@ func BuildContracts(path string) (*PrContracts, error) {
 
 	return pr, err
 }
+
+type PrTemplateSpecMirror struct {
+	Updates *UpdateSpecMirror `json:"updates"`
+	Creates *CreateSpec       `json:"creates"`
+	Deletes *DeleteSpec       `json:"deletes"`
+	Lua     *LuaSpecMirror    `json:"lua"`
+}
+
+func (p *PrTemplateSpecMirror) Convert() *PrTemplateSpec {
+	return &PrTemplateSpec{
+		Updates: p.Updates.Convert(),
+		Creates: p.Creates,
+		Deletes: p.Deletes,
+		Lua:     p.Lua.Convert(),
+	}
+}
+
+type LuaSpecMirror struct {
+	ExternalDir string `json:"externalDir"`
+	External    bool   `json:"external"`
+	Script      string `json:"script"`
+	Folder      string `json:"folder"`
+}
+
+func (p *LuaSpecMirror) Convert() *LuaSpec {
+	if p == nil {
+		return nil
+	}
+	return &LuaSpec{
+		ExternalDir: p.ExternalDir,
+		External:    p.External,
+		Script:      p.Script,
+		Folder:      p.Folder,
+	}
+}
+
+func (p *UpdateSpecMirror) Convert() *UpdateSpec {
+	if p == nil {
+		return nil
+	}
+
+	return &UpdateSpec{
+		Regexes:           p.Regexes,
+		Files:             p.Files,
+		ReplaceTemplate:   p.ReplaceTemplate,
+		Yq:                p.Yq,
+		MatchStrategy:     p.MatchStrategy,
+		RegexReplacements: p.RegexReplacements,
+		YamlOverlays: algorithms.Map(p.YamlOverlays, func(y YamlOverlayMirror) YamlOverlay {
+			return YamlOverlay{
+				File:      y.File,
+				Yaml:      y.Yaml,
+				ListMerge: y.ListMerge,
+				Templated: y.Templated,
+			}
+		}),
+	}
+}
+
+type UpdateSpecMirror struct {
+	Regexes           []string            `json:"regexes"`
+	Files             []string            `json:"files"`
+	ReplaceTemplate   string              `json:"replaceTemplate"`
+	Yq                string              `json:"yq"`
+	MatchStrategy     string              `json:"matchStrategy"`
+	RegexReplacements []RegexReplacement  `json:"regexReplacements"`
+	YamlOverlays      []YamlOverlayMirror `json:"yamlOverlays"`
+}
+
+type YamlOverlayMirror struct {
+	File      string    `json:"file"`
+	Yaml      string    `json:"yaml"`
+	ListMerge ListMerge `json:"listMerge"`
+	Templated bool      `json:"templated"`
+}