Repository navigation
[aws] Add mandatory tags to system test terraform (backport #20698) - #20973
Merged
brijesh-elastic merged 2 commits intoSep 8, 2026
Conversation
The observability-ci account SCP now denies resource creation without the division/org/team/project tags, breaking the 11 SQS-based data stream system tests and redshift. (cherry picked from commit ecadef5)
brijesh-elastic
added
Integration:aws
|
Pinging @elastic/security-service-integrations (Team:Security-Service Integrations) |
Merged
1 of 5 tasks
|
🟢 Reviewed the latest commits 0a8c759 — nothing new beyond already posted comments.
🤖 AI-Generated Review | Vera Review Bot - v0.3.0 | 📚 Knowledge base: integration-skills
|
5 tasks
Contributor
|
/test |
Contributor
|
✅ Package owners are in sync with |
Contributor
🚀 Benchmarks reportPackage
|
| Data stream | Previous EPS | New EPS | Diff (%) | Result |
|---|---|---|---|---|
guardduty |
1865.67 | 949.67 | -916 (-49.1%) | 💔 |
s3access |
6060.61 | 5128.21 | -932.4 (-15.38%) | 💔 |
vpcflow |
7751.94 | 6289.31 | -1462.63 (-18.87%) | 💔 |
waf |
8771.93 | 6944.44 | -1827.49 (-20.83%) | 💔 |
cloudtrail |
3322.26 | 1721.17 | -1601.09 (-48.19%) | 💔 |
ec2_logs |
90909.09 | 47619.05 | -43290.04 (-47.62%) | 💔 |
elb_logs |
903.34 | 557.41 | -345.93 (-38.29%) | 💔 |
emr_logs |
37037.04 | 27027.03 | -10010.01 (-27.03%) | 💔 |
To see the full report comment with /test benchmark fullreport
💚 Build Succeeded
History
|
5 tasks done
MichaelKatsoulis
approved these changes
Sep 3, 2026
kcreddy
approved these changes
Sep 3, 2026
5 tasks
shmsr
approved these changes
Sep 8, 2026
Contributor
|
Tick the box to add this pull request to the merge queue (same as
|
brijesh-elastic
merged commit Sep 8, 2026
0a059d1
into
elastic:backport-aws-6.x
8 of 9 checks passed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What
Backport of #20698 to
backport-aws-6.x. Adds the four mandatory Elastic tags(
division,org,team,project) to the providerdefault_tagsblock ofthe 12
packages/awsTerraform deploy configs that were missing them:apigateway_logs,cloudfront_logs,cloudtrail,ec2_logs,elb_logs,emr_logs,firewall_logs,redshift,route53_resolver_logs,s3access,vpcflow,wafWhy
The SCP on the
observability-ciaccount nowdenies resource creation unless those four tags are present in the create
request. On
backport-aws-6.xthe configs only set CI metadata(
environment,repo,branch,build,created_date), so system tests failat deploy time with an unhealthy Terraform deployer:
#20698 fixed this on
mainand explicitly called out that the activebackport-aws-*branches "run the same system tests against the same accountand will keep failing until this is backported." This PR is that backport.
Changes
division,org,team,projectto thedefault_tagsof the 12 tfconfigs. Values match what was merged on
mainin [aws] Add mandatory tags to system test terraform #20698 (CloudTrail keepsteam = "security-service-integrations"; the rest useobs-ds-hosted-services).precedent of [aws] Add mandatory tags to system test terraform #20698 (and Fix race condition in AWS S3 system tests #17341, feat: update integrations-aws-package team tag #12025, Add tags for aws package resources #8214).
Testing
packages/aws, on a supported 8.x stack (e.g.elastic-package stack up -d --version 8.19.4):elastic-package test system --data-streams cloudtrail -v(and other AWS data streams) now provision cleanly instead of failing with the SCP AccessDenied.Related