Skip to content

CCM-23022: Fix TF Drift on kms key policy #251

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.

Sign up for GitHub

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

Merged
karlmcgi merged 3 commits into from
Aug 21, 2026
+3 −159
Merged

CCM-23022: Fix TF Drift on kms key policy #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a475b5
CCM-23022: Replacing data resource call with assume role name without…
karlmcgi Aug 19, 2026
8747ba3
CCM-22639: Removing deprecated combine pr action and function
karlmcgi Aug 19, 2026
d847401
CCM-23022: Adding logic to check for tag value and evaluate to true i…
karlmcgi Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions .github/actions/combine-dependabot-prs/action.yaml
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions .github/actions/combine-dependabot-prs/combine-dependabot-prs.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion infrastructure/terraform/modules/aws-backup-source/kms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ data "aws_iam_policy_document" "backup_key_policy" {
sid = "EnableIAMUserPermissions"
principals {
type = "AWS"
identifiers = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root", data.aws_caller_identity.current.arn]
identifiers = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root", "arn:aws:sts::${data.aws_caller_identity.current.account_id}:assumed-role/GitHub_Deploy/*"]
}
actions = ["kms:*"]
resources = ["*"]
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/terraform/modules/s3bucket/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ locals {
lifecycle_rules = [for lifecycle_rule in var.lifecycle_rules : merge(local.lifecycle_rule_defaults, lifecycle_rule)]

notification_event_defaults = {
eventbridge = false

# Check for value of tag in lower case, compare to string "true" and if true, enable eventbridge notifications
eventbridge = lower(lookup(var.default_tags, "NHSE-Enable-S3-Backup-Acct", "")) == "true"
lambda_function = {}
queue = {}
topic = {}
Expand Down
Loading