Add CMEK support to FAST and controls for CMEK encryption (#3556)
This commit is contained in:
committed by
GitHub
parent
ab0f55216a
commit
cc24046be8
@@ -55,10 +55,6 @@ locals {
|
||||
project_numbers = {
|
||||
for k, v in module.projects : k => v.number
|
||||
}
|
||||
ctx_log_buckets = merge(local.ctx.log_buckets, local.log_buckets)
|
||||
log_buckets = {
|
||||
for key, log_bucket in module.log-buckets : key => log_bucket.id
|
||||
}
|
||||
projects_input = merge(var.projects, local._projects_output)
|
||||
projects_service_agents = merge([
|
||||
for k, v in module.projects : {
|
||||
@@ -150,13 +146,12 @@ module "projects-iam" {
|
||||
}
|
||||
context = merge(local.ctx, {
|
||||
folder_ids = local.ctx.folder_ids
|
||||
kms_keys = local.ctx.kms_keys
|
||||
kms_keys = merge(local.ctx.kms_keys, local.kms_keys)
|
||||
iam_principals = merge(
|
||||
local.ctx_iam_principals,
|
||||
lookup(local.self_sas_iam_emails, each.key, {}),
|
||||
local.projects_service_agents
|
||||
)
|
||||
log_buckets = local.ctx_log_buckets
|
||||
project_ids = merge(
|
||||
local.ctx.project_ids,
|
||||
{ for k, v in module.projects : k => v.project_id }
|
||||
@@ -164,7 +159,6 @@ module "projects-iam" {
|
||||
})
|
||||
factories_config = {
|
||||
# we do anything that can refer to IAM and custom roles in this call
|
||||
observability = try(each.value.factories_config.observability, null)
|
||||
pam_entitlements = try(each.value.factories_config.pam_entitlements, null)
|
||||
}
|
||||
iam = lookup(each.value, "iam", {})
|
||||
|
||||
Reference in New Issue
Block a user