Skip to content

Commit ddb0bfd

Browse files
oZakarioZakari
authored
Merge branch 'main' into add-accelerator-config
2 parents 600fd62 + 36a8d8e commit ddb0bfd

6 files changed

Lines changed: 82 additions & 85 deletions

File tree

‎.github/workflows/end-to-end-test.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ jobs:
7979

8080
runs-on: ${{ matrix.operatingSystem }}-latest
8181
steps:
82-
- name: Show env
83-
run: env | sort
84-
8582
- name: Checkout Bootstrap Modules
8683
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8784
with:

‎alz/azuredevops/variables.tf‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -290,45 +290,45 @@ variable "module_folder_path_relative" {
290290
}
291291

292292
variable "resource_names" {
293-
type = map(string)
293+
type = object({
294+
resource_group_state = optional(string, "rg-{{service_name}}-{{environment_name}}-state-{{azure_location}}-{{postfix_number}}")
295+
resource_group_identity = optional(string, "rg-{{service_name}}-{{environment_name}}-identity-{{azure_location}}-{{postfix_number}}")
296+
resource_group_agents = optional(string, "rg-{{service_name}}-{{environment_name}}-agents-{{azure_location}}-{{postfix_number}}")
297+
resource_group_network = optional(string, "rg-{{service_name}}-{{environment_name}}-network-{{azure_location}}-{{postfix_number}}")
298+
user_assigned_managed_identity_plan = optional(string, "id-{{service_name}}-{{environment_name}}-{{azure_location}}-plan-{{postfix_number}}")
299+
user_assigned_managed_identity_apply = optional(string, "id-{{service_name}}-{{environment_name}}-{{azure_location}}-apply-{{postfix_number}}")
300+
user_assigned_managed_identity_federated_credentials_plan = optional(string, "id-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-plan")
301+
user_assigned_managed_identity_federated_credentials_apply = optional(string, "id-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-apply")
302+
storage_account = optional(string, "sto{{service_name_short}}{{environment_name_short}}{{azure_location_short}}{{postfix_number}}{{random_string}}")
303+
storage_container = optional(string, "{{environment_name}}-tfstate")
304+
container_instance_01 = optional(string, "aci-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
305+
container_instance_02 = optional(string, "aci-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number_plus_1}}")
306+
container_instance_managed_identity = optional(string, "id-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-aci")
307+
agent_01 = optional(string, "agent-{{service_name}}-{{environment_name}}-{{postfix_number}}")
308+
agent_02 = optional(string, "agent-{{service_name}}-{{environment_name}}-{{postfix_number_plus_1}}")
309+
version_control_system_repository = optional(string, "{{service_name}}-{{environment_name}}")
310+
version_control_system_repository_templates = optional(string, "{{service_name}}-{{environment_name}}-templates")
311+
version_control_system_service_connection_plan = optional(string, "sc-{{service_name}}-{{environment_name}}-plan")
312+
version_control_system_service_connection_apply = optional(string, "sc-{{service_name}}-{{environment_name}}-apply")
313+
version_control_system_environment_plan = optional(string, "{{service_name}}-{{environment_name}}-plan")
314+
version_control_system_environment_apply = optional(string, "{{service_name}}-{{environment_name}}-apply")
315+
version_control_system_variable_group = optional(string, "{{service_name}}-{{environment_name}}")
316+
version_control_system_agent_pool = optional(string, "{{service_name}}-{{environment_name}}")
317+
version_control_system_group = optional(string, "{{service_name}}-{{environment_name}}-approvers")
318+
version_control_system_pipeline_name_ci = optional(string, "01 Azure Landing Zones Continuous Integration")
319+
version_control_system_pipeline_name_cd = optional(string, "02 Azure Landing Zones Continuous Delivery")
320+
virtual_network = optional(string, "vnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
321+
public_ip = optional(string, "pip-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
322+
nat_gateway = optional(string, "nat-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
323+
subnet_container_instances = optional(string, "subnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-aci")
324+
subnet_private_endpoints = optional(string, "subnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-pe")
325+
storage_account_private_endpoint = optional(string, "pe-{{service_name}}-{{environment_name}}-{{azure_location}}-sto-{{postfix_number}}")
326+
container_registry = optional(string, "acr{{service_name}}{{environment_name}}{{azure_location_short}}{{postfix_number}}{{random_string}}")
327+
container_registry_private_endpoint = optional(string, "pe-{{service_name}}-{{environment_name}}-{{azure_location}}-acr-{{postfix_number}}")
328+
container_image_name = optional(string, "azure-devops-agent")
329+
})
294330
description = "Overrides for resource names"
295-
default = {
296-
resource_group_state = "rg-{{service_name}}-{{environment_name}}-state-{{azure_location}}-{{postfix_number}}"
297-
resource_group_identity = "rg-{{service_name}}-{{environment_name}}-identity-{{azure_location}}-{{postfix_number}}"
298-
resource_group_agents = "rg-{{service_name}}-{{environment_name}}-agents-{{azure_location}}-{{postfix_number}}"
299-
resource_group_network = "rg-{{service_name}}-{{environment_name}}-network-{{azure_location}}-{{postfix_number}}"
300-
user_assigned_managed_identity_plan = "id-{{service_name}}-{{environment_name}}-{{azure_location}}-plan-{{postfix_number}}"
301-
user_assigned_managed_identity_apply = "id-{{service_name}}-{{environment_name}}-{{azure_location}}-apply-{{postfix_number}}"
302-
user_assigned_managed_identity_federated_credentials_plan = "id-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-plan"
303-
user_assigned_managed_identity_federated_credentials_apply = "id-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-apply"
304-
storage_account = "sto{{service_name_short}}{{environment_name_short}}{{azure_location_short}}{{postfix_number}}{{random_string}}"
305-
storage_container = "{{environment_name}}-tfstate"
306-
container_instance_01 = "aci-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
307-
container_instance_02 = "aci-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number_plus_1}}"
308-
container_instance_managed_identity = "id-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-aci"
309-
agent_01 = "agent-{{service_name}}-{{environment_name}}-{{postfix_number}}"
310-
agent_02 = "agent-{{service_name}}-{{environment_name}}-{{postfix_number_plus_1}}"
311-
version_control_system_repository = "{{service_name}}-{{environment_name}}"
312-
version_control_system_repository_templates = "{{service_name}}-{{environment_name}}-templates"
313-
version_control_system_service_connection_plan = "sc-{{service_name}}-{{environment_name}}-plan"
314-
version_control_system_service_connection_apply = "sc-{{service_name}}-{{environment_name}}-apply"
315-
version_control_system_environment_plan = "{{service_name}}-{{environment_name}}-plan"
316-
version_control_system_environment_apply = "{{service_name}}-{{environment_name}}-apply"
317-
version_control_system_variable_group = "{{service_name}}-{{environment_name}}"
318-
version_control_system_agent_pool = "{{service_name}}-{{environment_name}}"
319-
version_control_system_group = "{{service_name}}-{{environment_name}}-approvers"
320-
version_control_system_pipeline_name_ci = "01 Azure Landing Zones Continuous Integration"
321-
version_control_system_pipeline_name_cd = "02 Azure Landing Zones Continuous Delivery"
322-
virtual_network = "vnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
323-
public_ip = "pip-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
324-
nat_gateway = "nat-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
325-
subnet_container_instances = "subnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-aci"
326-
subnet_private_endpoints = "subnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-pe"
327-
storage_account_private_endpoint = "pe-{{service_name}}-{{environment_name}}-{{azure_location}}-sto-{{postfix_number}}"
328-
container_registry = "acr{{service_name}}{{environment_name}}{{azure_location_short}}{{postfix_number}}{{random_string}}"
329-
container_registry_private_endpoint = "pe-{{service_name}}-{{environment_name}}-{{azure_location}}-acr-{{postfix_number}}"
330-
container_image_name = "azure-devops-agent"
331-
}
331+
default = {}
332332
}
333333

334334
variable "agent_name_environment_variable" {

‎alz/github/variables.tf‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -259,39 +259,39 @@ variable "module_folder_path_relative" {
259259
}
260260

261261
variable "resource_names" {
262-
type = map(string)
262+
type = object({
263+
resource_group_state = optional(string, "rg-{{service_name}}-{{environment_name}}-state-{{azure_location}}-{{postfix_number}}")
264+
resource_group_identity = optional(string, "rg-{{service_name}}-{{environment_name}}-identity-{{azure_location}}-{{postfix_number}}")
265+
resource_group_agents = optional(string, "rg-{{service_name}}-{{environment_name}}-agents-{{azure_location}}-{{postfix_number}}")
266+
resource_group_network = optional(string, "rg-{{service_name}}-{{environment_name}}-network-{{azure_location}}-{{postfix_number}}")
267+
user_assigned_managed_identity_plan = optional(string, "id-{{service_name}}-{{environment_name}}-{{azure_location}}-plan-{{postfix_number}}")
268+
user_assigned_managed_identity_apply = optional(string, "id-{{service_name}}-{{environment_name}}-{{azure_location}}-apply-{{postfix_number}}")
269+
user_assigned_managed_identity_federated_credentials_prefix = optional(string, "{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
270+
storage_account = optional(string, "sto{{service_name_short}}{{environment_name_short}}{{azure_location_short}}{{postfix_number}}{{random_string}}")
271+
storage_container = optional(string, "{{environment_name}}-tfstate")
272+
container_instance_01 = optional(string, "aci-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
273+
container_instance_02 = optional(string, "aci-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number_plus_1}}")
274+
container_instance_managed_identity = optional(string, "id-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-aci")
275+
runner_01 = optional(string, "runner-{{service_name}}-{{environment_name}}-{{postfix_number}}")
276+
runner_02 = optional(string, "runner-{{service_name}}-{{environment_name}}-{{postfix_number_plus_1}}")
277+
version_control_system_repository = optional(string, "{{service_name}}-{{environment_name}}")
278+
version_control_system_repository_templates = optional(string, "{{service_name}}-{{environment_name}}-templates")
279+
version_control_system_environment_plan = optional(string, "{{service_name}}-{{environment_name}}-plan")
280+
version_control_system_environment_apply = optional(string, "{{service_name}}-{{environment_name}}-apply")
281+
version_control_system_team = optional(string, "{{service_name}}-{{environment_name}}-approvers")
282+
version_control_system_runner_group = optional(string, "{{service_name}}-{{environment_name}}")
283+
virtual_network = optional(string, "vnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
284+
public_ip = optional(string, "pip-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
285+
nat_gateway = optional(string, "nat-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}")
286+
subnet_container_instances = optional(string, "subnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-aci")
287+
subnet_private_endpoints = optional(string, "subnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-pe")
288+
storage_account_private_endpoint = optional(string, "pe-{{service_name}}-{{environment_name}}-{{azure_location}}-sto-{{postfix_number}}")
289+
container_registry = optional(string, "acr{{service_name}}{{environment_name}}{{azure_location_short}}{{postfix_number}}{{random_string}}")
290+
container_registry_private_endpoint = optional(string, "pe-{{service_name}}-{{environment_name}}-{{azure_location}}-acr-{{postfix_number}}")
291+
container_image_name = optional(string, "github-runner")
292+
})
263293
description = "Overrides for resource names"
264-
default = {
265-
resource_group_state = "rg-{{service_name}}-{{environment_name}}-state-{{azure_location}}-{{postfix_number}}"
266-
resource_group_identity = "rg-{{service_name}}-{{environment_name}}-identity-{{azure_location}}-{{postfix_number}}"
267-
resource_group_agents = "rg-{{service_name}}-{{environment_name}}-agents-{{azure_location}}-{{postfix_number}}"
268-
resource_group_network = "rg-{{service_name}}-{{environment_name}}-network-{{azure_location}}-{{postfix_number}}"
269-
user_assigned_managed_identity_plan = "id-{{service_name}}-{{environment_name}}-{{azure_location}}-plan-{{postfix_number}}"
270-
user_assigned_managed_identity_apply = "id-{{service_name}}-{{environment_name}}-{{azure_location}}-apply-{{postfix_number}}"
271-
user_assigned_managed_identity_federated_credentials_prefix = "{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
272-
storage_account = "sto{{service_name_short}}{{environment_name_short}}{{azure_location_short}}{{postfix_number}}{{random_string}}"
273-
storage_container = "{{environment_name}}-tfstate"
274-
container_instance_01 = "aci-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
275-
container_instance_02 = "aci-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number_plus_1}}"
276-
container_instance_managed_identity = "id-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-aci"
277-
runner_01 = "runner-{{service_name}}-{{environment_name}}-{{postfix_number}}"
278-
runner_02 = "runner-{{service_name}}-{{environment_name}}-{{postfix_number_plus_1}}"
279-
version_control_system_repository = "{{service_name}}-{{environment_name}}"
280-
version_control_system_repository_templates = "{{service_name}}-{{environment_name}}-templates"
281-
version_control_system_environment_plan = "{{service_name}}-{{environment_name}}-plan"
282-
version_control_system_environment_apply = "{{service_name}}-{{environment_name}}-apply"
283-
version_control_system_team = "{{service_name}}-{{environment_name}}-approvers"
284-
version_control_system_runner_group = "{{service_name}}-{{environment_name}}"
285-
virtual_network = "vnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
286-
public_ip = "pip-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
287-
nat_gateway = "nat-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}"
288-
subnet_container_instances = "subnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-aci"
289-
subnet_private_endpoints = "subnet-{{service_name}}-{{environment_name}}-{{azure_location}}-{{postfix_number}}-pe"
290-
storage_account_private_endpoint = "pe-{{service_name}}-{{environment_name}}-{{azure_location}}-sto-{{postfix_number}}"
291-
container_registry = "acr{{service_name}}{{environment_name}}{{azure_location_short}}{{postfix_number}}{{random_string}}"
292-
container_registry_private_endpoint = "pe-{{service_name}}-{{environment_name}}-{{azure_location}}-acr-{{postfix_number}}"
293-
container_image_name = "github-runner"
294-
}
294+
default = {}
295295
}
296296

297297
variable "runner_container_image_repository" {

0 commit comments

Comments
 (0)