Skip to content

CRASM - 4247 ME report uploads and scoped S3 retention - #1710

Merged
rapidray12 merged 2 commits into
developfrom
cd_S3_TechOps
Nov 10, 2026
Merged

rapidray12 merged 2 commits into
developfrom
cd_S3_TechOps

Conversation

@cduhn17

@cduhn17 cduhn17 commented Nov 6, 2026 •

Copy link
Copy Markdown
Collaborator

🗣 Description

Add upload access for the two supplied ME instance roles to five report prefixes in cisa-was-reports:

cybex_scorecard/

cyhy_ad-hoc_notifications/

cyhy_vs_reports/

https_reports/

trustymail_reports/

Require HTTPS and SSE-KMS encryption using the approved customer managed key.

Enable 14-day expiration for these prefixes, with noncurrent-version, incomplete-upload, and delete-marker cleanup.

Preserve the existing HTTPS-only bucket policy. Leave ownership, ACLs, default encryption, and was_reports/ and capacity/ behavior unchanged.

Keep analyst download access independent of ME uploads.

Validation: Terraform 1.0.7 formatting and validation, 15 local mocked checks, and all applicable pre-commit checks passed. Test tooling remains outside the repository.

💭 Motivation and context

VS report requests currently depend on TechOps retrieving copies, which can delay customer inquiries and responses. This change establishes ME report uploads and the two-week temporary storage described in the ticket and supporting email while preserving existing WAS operations.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All future TODOs are captured in issues, which are referenced in code comments.
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
  • AI was used for research and/or understanding purposes while creating this pull request.
    AI was used to generate code in this PR (either fully or in part).
    I attest that I understand the AI-generated code and its functionality.
    I am comfortable answering questions about the implementation of the AI-generated code.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.
  • Create a pre-release (necessary if and only if the pre-release version was bumped).

✅ Pre-merge checklist

  • Revert dependencies to default branches.
  • Finalize version.

✅ Post-merge checklist

  • Create a release (necessary if and only if the version was bumped).

@rapidray12 rapidray12 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed in a group meetng

@rapidray12
rapidray12 merged commit d3e7155 into develop Nov 10, 2026
22 checks passed
@rapidray12
rapidray12 deleted the cd_S3_TechOps branch November 10, 2026 15:37

This branch was successfully deployed

2 active deployments
staging — 96f387da Deployed Nov 9, 2026 by cduhn17 via staging #1047
integration — 96f387da Deployed Nov 9, 2026 by cduhn17 via integration #1047
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants