Merge remote-tracking branch 'origin/master' into fast-dev

modules/project-factory/budgets.tf

@@ -50,6 +50,7 @@ module "billing-budgets" {
       for v in local.budget_project_sets :
       v.budget => "projects/${local.outputs_projects[v.project].number}"...
     }
+    project_numbers = local.ctx_project_numbers
   })
   factories_config = {
     budgets_data_path = var.factories_config.budgets.data

modules/project-factory/projects.tf

@@ -48,7 +48,7 @@ locals {
     trimsuffix(f, ".yaml") => yamldecode(file("${local._templates_path}/${f}"))
   }
   ctx_project_ids     = merge(local.ctx.project_ids, local.project_ids)
-  ctx_project_numbers = merge(local.ctx.project_ids, local.project_numbers)
+  ctx_project_numbers = merge(local.ctx.project_numbers, local.project_numbers)
   project_ids = {
     for k, v in module.projects : k => v.project_id
   }

modules/project-factory/variables.tf

@@ -27,6 +27,7 @@ variable "context" {
     log_buckets           = optional(map(string), {})
     notification_channels = optional(map(string), {})
     project_ids           = optional(map(string), {})
+    project_numbers       = optional(map(string), {})
     tag_values            = optional(map(string), {})
     vpc_host_projects     = optional(map(string), {})
     vpc_sc_perimeters     = optional(map(string), {})