kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 10:15:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6029 from seankhliao/push-zkmktlwmzysm

Browse Source 
Account for delimiters in structured data replacements
This commit is contained in:
Kubernetes Prow Robot
2026-03-19 00:08:31 +05:30
committed by GitHub
parent 4d331ef81a 194aac685f
commit fb91123a1c
2 changed files with 516 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/filters/replacement/replacement.go
View File

@@ -191,7 +191,7 @@ func copyValueToTarget(target *yaml.RNode, value *yaml.RNode, selector *types.Ta
}
// Check if this fieldPath contains structured data access
if err := setValueInStructuredData(target, value, fp, createKind); err == nil {
if err := setValueInStructuredData(target, value, fp, selector.Options); err == nil {
// Successfully handled as structured data
continue
}
@@ -258,7 +258,7 @@ func setFieldValue(options *types.FieldOptions, targetField *yaml.RNode, value *
}
// setValueInStructuredData handles setting values within structured data (JSON/YAML) in scalar fields
func setValueInStructuredData(target *yaml.RNode, value *yaml.RNode, fieldPath string, createKind yaml.Kind) error {
func setValueInStructuredData(target *yaml.RNode, value *yaml.RNode, fieldPath string, options *types.FieldOptions) error {
pathParts := kyaml_utils.SmarterPathSplitter(fieldPath, ".")
if len(pathParts) < 2 {
return fmt.Errorf("not a structured data path")
@@ -309,6 +309,11 @@ func setValueInStructuredData(target *yaml.RNode, value *yaml.RNode, fieldPath s
structuredData := yaml.NewRNode(&parsedNode)
createKind := yaml.Kind(0) // do not create
if options != nil && options.Create {
createKind = value.YNode().Kind
}
// Navigate to the target location within the structured data
targetInStructured, err := structuredData.Pipe(&yaml.PathMatcher{
Path: structuredDataPath,
@@ -329,10 +334,9 @@ func setValueInStructuredData(target *yaml.RNode, value *yaml.RNode, fieldPath s
// Set the value in the structured data
for _, t := range targetFields {
if t.YNode().Kind == yaml.ScalarNode {
t.YNode().Value = value.YNode().Value
} else {
t.SetYNode(value.YNode())
err = setFieldValue(options, t, value)
if err != nil {
return err
}
}

506
api/filters/replacement/replacement_test.go
View File

@@ -5005,6 +5005,512 @@ data:
labels: {app: "my-awesome-app", version: "1.0.0", env: "production"}
spec: {replicas: 3, selector: {matchLabels: {app: "my-awesome-app"}}}`,
},
"replacement yaml substring options prefix": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
prefix:
url: https://example.com/appname/api/endpoint
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.proxy
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.yaml.prefix.url
options:
delimiter: /
index: -1
`,
expected: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
prefix:
url: http://proxy/https://example.com/appname/api/endpoint
`,
},
"replacement yaml substring options first": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
index0:
url: https://example.com/appname/api/endpoint
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.protocol
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.yaml.index0.url
options:
delimiter: /
index: 0
`,
expected: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
index0:
url: git://example.com/appname/api/endpoint
`,
},
"replacement yaml substring options middle": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
index3:
url: https://example.com/appname/api/endpoint
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.app_name
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.yaml.index3.url
options:
delimiter: /
index: 3
`,
expected: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
index3:
url: https://example.com/my-awesome-app/api/endpoint
`,
},
"replacement yaml substring options suffix": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
suffix:
url: https://example.com/appname/api/endpoint
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.app_name
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.yaml.suffix.url
options:
delimiter: /
index: 6
`,
expected: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
suffix:
url: https://example.com/appname/api/endpoint/my-awesome-app
`,
},
"replacement json substring options prefix": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.json: |-
{
"prefix": {
"url": "https://example.com/appname/api/endpoint"
}
}
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.proxy
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.json.prefix.url
options:
delimiter: /
index: -1
`,
expected: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.json: |-
{
"prefix": {
"url": "http://proxy/https://example.com/appname/api/endpoint"
}
}
`,
},
"replacement json substring options first": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.json: |-
{
"index0": {
"url": "https://example.com/appname/api/endpoint"
}
}
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.protocol
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.json.index0.url
options:
delimiter: /
index: 0
`,
expected: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.json: |-
{
"index0": {
"url": "git://example.com/appname/api/endpoint"
}
}
`,
},
"replacement json substring options middle": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.json: |-
{
"index3": {
"url": "https://example.com/appname/api/endpoint"
}
}
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.app_name
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.json.index3.url
options:
delimiter: /
index: 3
`,
expected: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.json: |-
{
"index3": {
"url": "https://example.com/my-awesome-app/api/endpoint"
}
}
`,
},
"replacement json substring options suffix": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.json: |-
{
"suffix": {
"url": "https://example.com/appname/api/endpoint"
}
}
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.app_name
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.json.suffix.url
options:
delimiter: /
index: 6
`,
expected: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
proxy: http://proxy
protocol: "git:"
query: "?foo=bar"
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.json: |-
{
"suffix": {
"url": "https://example.com/appname/api/endpoint/my-awesome-app"
}
}
`,
},
"replacement yaml substring out of bounds": {
input: `apiVersion: v1
kind: ConfigMap
metadata:
name: source-values
data:
app_name: "my-awesome-app"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: target-config
data:
config.yaml: |-
targets:
- url: https://example.com/appname/api/endpoint
`,
replacements: `replacements:
- source:
kind: ConfigMap
name: source-values
fieldPath: data.app_name
targets:
- select:
kind: ConfigMap
name: target-config
fieldPaths:
- data.config\.yaml.targets.1.url
options:
delimiter: /
index: 3
`,
expectedErr: "index 1 specified but only 1 elements found",
},
}
for tn := range testCases {