Skip to content

Deprecate snake case json for PrTemplate object #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaeljguarino merged 1 commit into from
Dec 10, 2025
Merged

Deprecate snake case json for PrTemplate object #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/pr/lua.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ func merge(spec *PrTemplateSpec, new map[string]interface{}) error {
return err
}

newSpec := &PrTemplateSpecMirror{}
newSpec := &PrTemplateSpec{}
if err := json.Unmarshal(jsonStr, newSpec); err != nil {
return err
}

return mergo.Merge(spec, newSpec.Convert(), mergo.WithAppendSlice, mergo.WithOverride)
return mergo.Merge(spec, newSpec, mergo.WithAppendSlice, mergo.WithOverride)
}

func luaFolder(parent, folder string) (string, error) {
Expand Down
86 changes: 6 additions & 80 deletions pkg/pr/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"strings"

console "github.com/pluralsh/console/go/client"
"github.com/pluralsh/polly/algorithms"
"sigs.k8s.io/yaml"
)

Expand All @@ -25,7 +24,7 @@ type PrTemplateSpec struct {
}

type LuaSpec struct {
ExternalDir string `json:"external_dir"`
ExternalDir string `json:"externalDir"`
External bool `json:"external"`
Script string `json:"script"`
Folder string `json:"folder"`
Expand All @@ -34,11 +33,11 @@ type LuaSpec struct {
type UpdateSpec struct {
Regexes []string `json:"regexes"`
Files []string `json:"files"`
ReplaceTemplate string `json:"replace_template"`
ReplaceTemplate string `json:"replaceTemplate"`
Yq string `json:"yq"`
MatchStrategy string `json:"match_strategy"`
RegexReplacements []RegexReplacement `json:"regex_replacements"`
YamlOverlays []YamlOverlay `json:"yaml_overlays"`
MatchStrategy string `json:"matchStrategy"`
RegexReplacements []RegexReplacement `json:"regexReplacements"`
YamlOverlays []YamlOverlay `json:"yamlOverlays"`
}

type ListMerge string
Expand Down Expand Up @@ -67,7 +66,7 @@ const (
type YamlOverlay struct {
File string `json:"file"`
Yaml string `json:"yaml"`
ListMerge ListMerge `json:"list_merge"`
ListMerge ListMerge `json:"listMerge"`
Templated bool `json:"templated"`
}

Expand Down Expand Up @@ -148,76 +147,3 @@ 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 {
if p == nil {
return nil
}
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(y)
}),
}
}

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"`
}
Loading