Repository navigation
ssi_all: use triple-brace templating in complex templates - Part 2 - #17623
Conversation
|
Pinging @elastic/security-service-integrations (Team:Security-Service Integrations) |
🚀 Benchmarks reportTo see the full report comment with |
efd6
left a comment
There was a problem hiding this comment.
When I squash the four commits into one and give it the commit message that's proposed (with the PR number added), we don't get exactly what is here. There are some inconsequential YAML and whitespace changes, but there is also a reversion of the ti_cif3 changes. Can you check that?
In cases where git-generate is used, I'd recommend keeping the PR as a single commit so that the state in the PR is essentially as it will be once it's merged.
f71a073 to
6d59d01
Compare
@efd6, the problem was |
efd6
left a comment
There was a problem hiding this comment.
Please use
ssi_all: use triple-brace Mustache templating in ingest pipelines
Fix remaining double-brace Mustache template variables in ingest
pipelines for packages owned by elastic/security-service-integrations.
This is a follow-up to #11314 which addressed most packages but missed
some. Affected packages: admin_by_request_epm,
aws_securityhub, beyondinsight_password_safe, bitsight, cloudflare,
cloudflare_logpush, google_workspace, m365_defender,
microsoft_exchange_online_message_trace, rapid7_insightvm,
sentinel_one, tenable_ot_security, ti_cif3.
Relates: #7641
[git-generate]
for f in $(
(
for p in $(
for f in packages/*/manifest.yml; do
if yq -e 'select(.owner.github == "elastic/security-service-integrations")' "$f" >/dev/null 2>&1; then
dirname "$f"
fi
done
); do
rg -l '(^|[^{])\{\{[^{][ .a-zA-Z0-9_]*[^}]\}\}($|[^}])' -g '*.yml' "$p" || true
done
)|grep "elasticsearch/ingest_pipeline"|sort|uniq
); do
perl -pi -e 's/(?<!\{)(\{\{[^{][ .a-zA-Z0-9_]*[^}]}})(?!\})/{$1}/g' $f
done
for p in $(git diff --name-only HEAD~1|cut -d/ -f1,2|sort|uniq); do
(
cd $p
elastic-package test pipeline -g
elastic-package changelog add \
--description "Use triple-brace Mustache templating when referencing variables in ingest pipelines." \
--type bugfix \
--next patch \
--link https://github.com/elastic/integrations/pull/17623
)>/dev/null 2>&1
done
This does not depend on PCRE and fixes the missing issue number. You can rebase this onto main and use the -conflict flag in git generate when you get to conflicts during the rebase.
Fix remaining double-brace Mustache template variables in ingest pipelines for packages owned by elastic/security-service-integrations. This is a follow-up to elastic#11314 which addressed most packages but missed some. Affected packages: admin_by_request_epm, aws_securityhub, beyondinsight_password_safe, bitsight, cloudflare, cloudflare_logpush, google_workspace, m365_defender, microsoft_exchange_online_message_trace, rapid7_insightvm, sentinel_one, tenable_ot_security, ti_cif3. Relates: elastic#7641 [git-generate] for f in $( ( for p in $( for f in packages/*/manifest.yml; do if yq -e 'select(.owner.github == "elastic/security-service-integrations")' "$f" >/dev/null 2>&1; then dirname "$f" fi done ); do rg -l '(^|[^{])\{\{[^{][ .a-zA-Z0-9_]*[^}]\}\}($|[^}])' -g '*.yml' "$p" || true done )|grep "elasticsearch/ingest_pipeline"|sort|uniq ); do perl -pi -e 's/(?<!\{)(\{\{[^{][ .a-zA-Z0-9_]*[^}]}})(?!\})/{$1}/g' $f done for p in $(git diff --name-only HEAD~1|cut -d/ -f1,2|sort|uniq); do ( cd $p elastic-package test pipeline -g elastic-package changelog add \ --description "Use triple-brace Mustache templating when referencing variables in ingest pipelines." \ --type bugfix \ --next patch \ --link elastic#17623 )>/dev/null 2>&1 done
💚 Build Succeeded
History
cc @kcreddy |
|
Package admin_by_request_epm - 1.1.2 containing this change is available at https://epr.elastic.co/package/admin_by_request_epm/1.1.2/ |
|
Package aws_securityhub - 0.2.1 containing this change is available at https://epr.elastic.co/package/aws_securityhub/0.2.1/ |
|
Package beyondinsight_password_safe - 0.12.3 containing this change is available at https://epr.elastic.co/package/beyondinsight_password_safe/0.12.3/ |
|
Package bitsight - 0.1.1 containing this change is available at https://epr.elastic.co/package/bitsight/0.1.1/ |
|
Package cloudflare - 2.32.1 containing this change is available at https://epr.elastic.co/package/cloudflare/2.32.1/ |
|
Package cloudflare_logpush - 1.43.3 containing this change is available at https://epr.elastic.co/package/cloudflare_logpush/1.43.3/ |
|
Package google_workspace - 3.3.1 containing this change is available at https://epr.elastic.co/package/google_workspace/3.3.1/ |
|
Package m365_defender - 5.10.1 containing this change is available at https://epr.elastic.co/package/m365_defender/5.10.1/ |
|
Package microsoft_exchange_online_message_trace - 2.0.1 containing this change is available at https://epr.elastic.co/package/microsoft_exchange_online_message_trace/2.0.1/ |
|
Package rapid7_insightvm - 2.6.1 containing this change is available at https://epr.elastic.co/package/rapid7_insightvm/2.6.1/ |
|
Package sentinel_one - 2.4.1 containing this change is available at https://epr.elastic.co/package/sentinel_one/2.4.1/ |
|
Package tenable_ot_security - 1.0.1 containing this change is available at https://epr.elastic.co/package/tenable_ot_security/1.0.1/ |
|
Package ti_cif3 - 1.18.2 containing this change is available at https://epr.elastic.co/package/ti_cif3/1.18.2/ |
Proposed commit message
Checklist
changelog.ymlfile.Related issues