ssi_all: use triple-brace templating in complex templates#11314
ssi_all: use triple-brace templating in complex templates#11314efd6 merged 1 commit intoelastic:mainfrom
Conversation
This is a second pass at replacing double brace template marks with triple brace
marks. It addresses more complex uses that the sed rewrite did not find by using
PCRE via perl.
[git-generate]
for f in $(
(
for p in $(
yq 'select(.owner.github == "elastic/security-service-integrations")|.name' packages/**/manifest.yml \
| grep -v -- '---'
); do
rg -l -g '*.yml' "[^{]\{\{[^{][ .a-zA-Z0-9_]*[^}]}}[^}]" packages/$p
done
)|grep -v "cloudflare"|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#11314
)>/dev/null 2>&1
done
410ae7b to
c43a37b
Compare
🚀 Benchmarks reportTo see the full report comment with |
💚 Build Succeeded
History
cc @efd6 |
|
|
Pinging @elastic/security-service-integrations (Team:Security-Service Integrations) |
|
Package cisco_umbrella - 1.26.2 containing this change is available at https://epr.elastic.co/search?package=cisco_umbrella |
|
Package crowdstrike - 1.42.2 containing this change is available at https://epr.elastic.co/search?package=crowdstrike |
|
Package falco - 1.0.2 containing this change is available at https://epr.elastic.co/search?package=falco |
|
Package forcepoint_web - 1.9.1 containing this change is available at https://epr.elastic.co/search?package=forcepoint_web |
|
Package gigamon - 1.0.1 containing this change is available at https://epr.elastic.co/search?package=gigamon |
|
Package github - 1.29.3 containing this change is available at https://epr.elastic.co/search?package=github |
|
Package keycloak - 1.23.2 containing this change is available at https://epr.elastic.co/search?package=keycloak |
|
Package mimecast - 1.27.2 containing this change is available at https://epr.elastic.co/search?package=mimecast |
|
Package netskope - 1.20.2 containing this change is available at https://epr.elastic.co/search?package=netskope |
|
Package okta - 2.12.2 containing this change is available at https://epr.elastic.co/search?package=okta |
|
Package opencanary - 0.1.3 containing this change is available at https://epr.elastic.co/search?package=opencanary |
|
Package qualys_vmdr - 5.2.1 containing this change is available at https://epr.elastic.co/search?package=qualys_vmdr |
|
Package slack - 1.21.2 containing this change is available at https://epr.elastic.co/search?package=slack |
|
Package symantec_endpoint - 2.16.1 containing this change is available at https://epr.elastic.co/search?package=symantec_endpoint |
|
Package sysdig - 0.1.1 containing this change is available at https://epr.elastic.co/search?package=sysdig |
|
Package thycotic_ss - 1.8.1 containing this change is available at https://epr.elastic.co/search?package=thycotic_ss |
|
Package ti_abusech - 2.3.5 containing this change is available at https://epr.elastic.co/search?package=ti_abusech |
|
Package ti_custom - 0.1.3 containing this change is available at https://epr.elastic.co/search?package=ti_custom |
|
Package ti_cybersixgill - 1.30.5 containing this change is available at https://epr.elastic.co/search?package=ti_cybersixgill |
|
Package ti_maltiverse - 1.2.5 containing this change is available at https://epr.elastic.co/search?package=ti_maltiverse |
|
Package ti_misp - 1.35.5 containing this change is available at https://epr.elastic.co/search?package=ti_misp |
|
Package zoom - 1.20.1 containing this change is available at https://epr.elastic.co/search?package=zoom |
) This is a second pass at replacing double brace template marks with triple brace marks. It addresses more complex uses that the sed rewrite did not find by using PCRE via perl. [git-generate] for f in $( ( for p in $( yq 'select(.owner.github == "elastic/security-service-integrations")|.name' packages/**/manifest.yml \ | grep -v -- '---' ); do rg -l -g '*.yml' "[^{]\{\{[^{][ .a-zA-Z0-9_]*[^}]}}[^}]" packages/$p done )|grep -v "cloudflare"|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#11314 )>/dev/null 2>&1 done
) This is a second pass at replacing double brace template marks with triple brace marks. It addresses more complex uses that the sed rewrite did not find by using PCRE via perl. [git-generate] for f in $( ( for p in $( yq 'select(.owner.github == "elastic/security-service-integrations")|.name' packages/**/manifest.yml \ | grep -v -- '---' ); do rg -l -g '*.yml' "[^{]\{\{[^{][ .a-zA-Z0-9_]*[^}]}}[^}]" packages/$p done )|grep -v "cloudflare"|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#11314 )>/dev/null 2>&1 done
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
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
…7623) 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 #17623 )>/dev/null 2>&1 done
Proposed commit message
Checklist
changelog.ymlfile.Author's Checklist
How to test this PR locally
Related issues
Screenshots