Change factories_config type in FAST and project/vpc factory modules, add YAML schema validation (#3728)
* stage 0 * stage 1 * networking * security * pf stage * tfdoc * align schemas * inventory * fix observability * pf module * pf module budgets * align fast stages * align project subfactories * tfdoc * schema validation * add missing schemas * Fix observability types --------- Co-authored-by: Julio Castillo <jccb@google.com>
This commit is contained in:
committed by
GitHub
parent
bf3f7a555a
commit
fb21f6aaf8
@@ -19,10 +19,10 @@
|
||||
locals {
|
||||
# project data from folders tree
|
||||
_folder_projects_raw = {
|
||||
for f in try(fileset(local._folders_path, "**/*.yaml"), []) :
|
||||
for f in try(fileset(local.paths.folders, "**/*.yaml"), []) :
|
||||
trimsuffix(f, ".yaml") => merge(
|
||||
{ parent = dirname(f) == "." ? null : "$folder_ids:${dirname(f)}" },
|
||||
yamldecode(file("${local._folders_path}/${f}"))
|
||||
yamldecode(file("${local.paths.folders}/${f}"))
|
||||
) if !endswith(f, "/.config.yaml")
|
||||
}
|
||||
_projects_input = {
|
||||
@@ -32,16 +32,13 @@ locals {
|
||||
v
|
||||
)
|
||||
}
|
||||
_projects_path = try(
|
||||
pathexpand(var.factories_config.projects), null
|
||||
)
|
||||
_projects_raw = {
|
||||
for f in try(fileset(local._projects_path, "**/*.yaml"), []) :
|
||||
trimsuffix(f, ".yaml") => yamldecode(file("${local._projects_path}/${f}"))
|
||||
for f in try(fileset(local.paths.projects, "**/*.yaml"), []) :
|
||||
trimsuffix(f, ".yaml") => yamldecode(file("${local.paths.projects}/${f}"))
|
||||
if !endswith(f, ".config.yaml")
|
||||
}
|
||||
_templates_path = try(
|
||||
pathexpand(var.factories_config.project_templates), null
|
||||
pathexpand(local.paths.project_templates), null
|
||||
)
|
||||
_templates_raw = {
|
||||
for f in try(fileset(local._templates_path, "**/*.yaml"), []) :
|
||||
@@ -121,12 +118,11 @@ module "projects" {
|
||||
})
|
||||
default_service_account = try(each.value.default_service_account, "keep")
|
||||
factories_config = {
|
||||
custom_roles = try(each.value.factories_config.custom_roles, null)
|
||||
org_policies = try(each.value.factories_config.org_policies, null)
|
||||
observability = try(each.value.factories_config.observability, null)
|
||||
quotas = try(each.value.factories_config.quotas, null)
|
||||
scc_sha_custom_modules = try(each.value.factories_config.scc_sha_custom_modules, null)
|
||||
tags = try(each.value.factories_config.tags, null)
|
||||
for k, v in each.value.factories_config : k => try(pathexpand(
|
||||
var.factories_config.basepath == null || startswith(v, "/") || startswith(v, ".")
|
||||
? v :
|
||||
"${var.factories_config.basepath}/${v}"
|
||||
), null)
|
||||
}
|
||||
kms_autokeys = try(each.value.kms.autokeys, {})
|
||||
labels = merge(
|
||||
|
||||
Reference in New Issue
Block a user