fix: use field-wise templating for child matrix generators (#11661) #12287

crenshaw-dev · 2023-02-03T17:28:37Z

go-templating over a JSON string makes no sense. There will be tons of syntax conflicts.

This change switches matrix generator templating to use the same field-wise templating strategy as is used for the template field.

I've confirmed that the test fails with the same error message as in #11661 before this change.

…11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

codecov · 2023-02-03T18:22:52Z

Codecov Report

Base: 47.45% // Head: 47.75% // Increases project coverage by +0.29% 🎉

Coverage data is based on head (6c13026) compared to base (e420666).
Patch coverage: 5.26% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #12287      +/-   ##
==========================================
+ Coverage   47.45%   47.75%   +0.29%     
==========================================
  Files         246      246              
  Lines       41883    41933      +50     
==========================================
+ Hits        19877    20025     +148     
+ Misses      20008    19909      -99     
- Partials     1998     1999       +1

Impacted Files	Coverage Δ
applicationset/utils/utils.go	`75.59% <0.00%> (-5.09%)`	⬇️
...licationset/generators/generator_spec_processor.go	`66.29% <50.00%> (+0.29%)`	⬆️
controller/health.go	`78.00% <0.00%> (-10.38%)`	⬇️
server/application/terminal.go	`12.67% <0.00%> (-6.81%)`	⬇️
pkg/apis/application/v1alpha1/repository_types.go	`69.07% <0.00%> (-2.35%)`	⬇️
util/argo/argo.go	`63.83% <0.00%> (-1.64%)`	⬇️
server/server.go	`55.64% <0.00%> (-0.87%)`	⬇️
applicationset/generators/git.go	`86.80% <0.00%> (-0.14%)`	⬇️
reposerver/repository/repository.go	`60.49% <0.00%> (-0.11%)`	⬇️
... and 11 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

ishitasequeira

PR LGTM. Just added a nit for additional information while returning error.

applicationset/utils/utils.go

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

crenshaw-dev · 2023-02-24T15:29:07Z

/cherry-pick release-2.6

ishitasequeira

LGTM!!

ishitasequeira · 2023-03-01T14:37:58Z

@jannfis @leoluz could you take a look as the approver?

crenshaw-dev · 2023-03-08T16:05:17Z

/cherry-pick release-2.5

…12287) * fix: use field-wise templating for child matrix generators (#11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * test shouldn't use go template Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * Update applicationset/utils/utils.go Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

gcp-cherry-pick-bot · 2023-03-08T18:08:32Z

Cherry-pick failed with Merge error 98475bc43039c515de650514d272e42d7b1e4de6 into temp-cherry-pick-5573c8-release-2.5

…12287) (#12771) * fix: use field-wise templating for child matrix generators (#11661) * test shouldn't use go template * Update applicationset/utils/utils.go --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

…12287) * fix: use field-wise templating for child matrix generators (#11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * test shouldn't use go template Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * Update applicationset/utils/utils.go Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

crenshaw-dev · 2023-03-08T18:13:26Z

Manually cherry-picked onto 2.5.

…rom a git file (#12428) (#12490) * fix: use field-wise templating for child matrix generators (#11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * test shouldn't use go template Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * feat: extend List generator with ElementsJsonBase64 Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: proper field name and crd update Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: indentation Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: remove b64 encoding. Based on #12287 Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: generated with codegen Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: reset some of the generated files Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: elementsyaml to cover both yaml and json Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: regenerate code Signed-off-by: laurentiusoica <laurentiu@soica.ro> * Regenerate code Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: update ApplicationSet docs Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: elementsyaml to elementsYaml to be more consistent with other fields Signed-off-by: laurentiusoica <laurentiu@soica.ro> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> Signed-off-by: laurentiusoica <laurentiu@soica.ro> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* fix: use field-wise templating for child matrix generators (#11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * test shouldn't use go template Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * feat: extend List generator with ElementsJsonBase64 Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: proper field name and crd update Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: indentation Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: remove b64 encoding. Based on #12287 Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: generated with codegen Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: reset some of the generated files Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: elementsyaml to cover both yaml and json Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: regenerate code Signed-off-by: laurentiusoica <laurentiu@soica.ro> * Regenerate code Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: update ApplicationSet docs Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: elementsyaml to elementsYaml to be more consistent with other fields Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: preserve field order Signed-off-by: laurentiusoica <laurentiu@soica.ro> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> Signed-off-by: laurentiusoica <laurentiu@soica.ro> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

…11661) (argoproj#12287) * fix: use field-wise templating for child matrix generators (argoproj#11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * test shouldn't use go template Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * Update applicationset/utils/utils.go Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

…rom a git file (argoproj#12428) (argoproj#12490) * fix: use field-wise templating for child matrix generators (argoproj#11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * test shouldn't use go template Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * feat: extend List generator with ElementsJsonBase64 Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: proper field name and crd update Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: indentation Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: remove b64 encoding. Based on argoproj#12287 Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: generated with codegen Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: reset some of the generated files Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: elementsyaml to cover both yaml and json Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: regenerate code Signed-off-by: laurentiusoica <laurentiu@soica.ro> * Regenerate code Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: update ApplicationSet docs Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: elementsyaml to elementsYaml to be more consistent with other fields Signed-off-by: laurentiusoica <laurentiu@soica.ro> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> Signed-off-by: laurentiusoica <laurentiu@soica.ro> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* fix: use field-wise templating for child matrix generators (argoproj#11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * test shouldn't use go template Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * feat: extend List generator with ElementsJsonBase64 Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: proper field name and crd update Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: indentation Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: remove b64 encoding. Based on argoproj#12287 Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: generated with codegen Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: reset some of the generated files Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: elementsyaml to cover both yaml and json Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> * fix: regenerate code Signed-off-by: laurentiusoica <laurentiu@soica.ro> * Regenerate code Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: update ApplicationSet docs Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: elementsyaml to elementsYaml to be more consistent with other fields Signed-off-by: laurentiusoica <laurentiu@soica.ro> * fix: preserve field order Signed-off-by: laurentiusoica <laurentiu@soica.ro> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Laurentiu Soica <laurentiu@soica.ro> Signed-off-by: laurentiusoica <laurentiu@soica.ro> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

fix: use field-wise templating for child matrix generators (argoproj#…

3063296

…11661) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

crenshaw-dev added cherry-pick/2.5 cherry-pick/2.6 labels Feb 3, 2023

test shouldn't use go template

b5bb7b3

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

ishitasequeira self-requested a review February 8, 2023 15:26

crenshaw-dev mentioned this pull request Feb 16, 2023

feat: Accept ElementsYaml for list generator to get dynamic content from a git file (#12428) #12490

Merged

10 tasks

lsoica added a commit to lsoica/argo-cd that referenced this pull request Feb 17, 2023

fix: remove b64 encoding. Based on argoproj#12287

c2c6819

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

ishitasequeira requested changes Feb 20, 2023

View reviewed changes

applicationset/utils/utils.go Outdated Show resolved Hide resolved

crenshaw-dev commented Feb 24, 2023

View reviewed changes

applicationset/utils/utils.go Outdated Show resolved Hide resolved

Update applicationset/utils/utils.go

6c13026

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

ishitasequeira approved these changes Mar 1, 2023

View reviewed changes

pasha-codefresh approved these changes Mar 8, 2023

View reviewed changes

crenshaw-dev merged commit 98475bc into argoproj:master Mar 8, 2023

crenshaw-dev deleted the field-wise-sub-generator-template branch March 8, 2023 18:08

gcp-cherry-pick-bot bot mentioned this pull request Mar 8, 2023

fix: use field-wise templating for child matrix generators (#11661) (cherry-pick #12287) #12771

Merged

crenshaw-dev mentioned this pull request Mar 15, 2023

fix(appset): git files generator in matrix generator produces no params #12881

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: use field-wise templating for child matrix generators (#11661) #12287

fix: use field-wise templating for child matrix generators (#11661) #12287

crenshaw-dev commented Feb 3, 2023

codecov bot commented Feb 3, 2023 •

edited

ishitasequeira left a comment

crenshaw-dev commented Feb 24, 2023 •

edited

ishitasequeira left a comment

ishitasequeira commented Mar 1, 2023

crenshaw-dev commented Mar 8, 2023

gcp-cherry-pick-bot bot commented Mar 8, 2023

crenshaw-dev commented Mar 8, 2023

fix: use field-wise templating for child matrix generators (#11661) #12287

fix: use field-wise templating for child matrix generators (#11661) #12287

Conversation

crenshaw-dev commented Feb 3, 2023

codecov bot commented Feb 3, 2023 • edited

Codecov Report

ishitasequeira left a comment

Choose a reason for hiding this comment

crenshaw-dev commented Feb 24, 2023 • edited

ishitasequeira left a comment

Choose a reason for hiding this comment

ishitasequeira commented Mar 1, 2023

crenshaw-dev commented Mar 8, 2023

gcp-cherry-pick-bot bot commented Mar 8, 2023

crenshaw-dev commented Mar 8, 2023

codecov bot commented Feb 3, 2023 •

edited

crenshaw-dev commented Feb 24, 2023 •

edited