-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
fix(yaml): handle when templates are used as Yaml keys #33361
Draft
guillaumededrie
wants to merge
5
commits into
renovatebot:main
Choose a base branch
from
guillaumededrie:fix/jinja2-delimiters-with-yaml
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+145
−20
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ca2e366
fix(yaml): handle when templates are used as Yaml keys
guillaumededrie 1ad4f56
fixup! fix(yaml): handle when templates are used as Yaml keys
guillaumededrie 83c920a
fixup! fixup! fix(yaml): handle when templates are used as Yaml keys
guillaumededrie f17fb04
fixup! fixup! fixup! fix(yaml): handle when templates are used as Yam…
guillaumededrie 99d4b56
fixup! fixup! fixup! fixup! fix(yaml): handle when templates are used…
guillaumededrie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
lib/modules/manager/docker-compose/__fixtures__/docker-compose.4.yml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
--- | ||
version: "3" | ||
|
||
networks: | ||
{{ network_name }}: | ||
external: true | ||
frontend: | ||
external: true | ||
|
||
services: | ||
web: | ||
image: "node:42.0.0" | ||
networks: | ||
- {{ network_name }} | ||
- frontend | ||
ports: | ||
- "80:8000" | ||
deploy: | ||
replicas: 2 | ||
update_config: | ||
parallelism: 2 | ||
delay: 10s | ||
placement: | ||
{{ placement | indent(8) }} | ||
restart_policy: | ||
condition: on-failure |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
import crypto from 'crypto'; | ||
import type { | ||
CreateNodeOptions, | ||
DocumentOptions, | ||
|
@@ -140,14 +141,25 @@ export function dump(obj: any, opts?: DumpOptions): string { | |
return stringify(obj, opts); | ||
} | ||
|
||
function getShortHash(data: any): string { | ||
return crypto.createHash('sha256').update(data).digest('hex').substring(0, 7); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we've a hash util function, please use that |
||
} | ||
|
||
function massageContent(content: string, options?: YamlOptions): string { | ||
if (options?.removeTemplates) { | ||
return content | ||
.replace(regEx(/\s+{{.+?}}:.+/gs), '') | ||
.replace(regEx(/{{`.+?`}}/gs), '') | ||
.replace(regEx(/{{.+?}}/gs), '') | ||
.replace(regEx(/{%`.+?`%}/gs), '') | ||
.replace(regEx(/{%.+?%}/g), ''); | ||
return ( | ||
content | ||
// NOTE: It seems safe to empty a line that only | ||
// contains a Jinja2 tag entry. | ||
.replace(regEx(/^(\s*)?{{.+?}}$/gm), '') | ||
.replace(regEx(/{{`.+?`}}/gs), '') | ||
// NOTE: In order to keep a proper Yaml syntax before | ||
// the parsing, we're remplacing each of the remaining | ||
// Jinja2 by a hash of the whole matched tag. | ||
.replace(regEx(/{{.+?}}/g), getShortHash) | ||
.replace(regEx(/{%`.+?`%}/gs), '') | ||
.replace(regEx(/{%.+?%}/g), '') | ||
); | ||
} | ||
|
||
return content; | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reduce to minimum and inline