Skip to content

feat: security management group #106

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
jaredfholgate merged 3 commits into from
Sep 12, 2025
Merged

feat: security management group #106

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
611612b
feat: security management group
jaredfholgate Sep 10, 2025
427a15c
formatting
jaredfholgate Sep 10, 2025
81851d1
fix bicep tests
jaredfholgate Sep 11, 2025
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
18 changes: 15 additions & 3 deletions .github/workflows/end-to-end-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,21 @@ jobs:

$Inputs["apply_approvers"] = @()
$Inputs["root_parent_management_group_id"] = ""
$Inputs["subscription_id_connectivity"] = "${{ vars.ARM_SUBSCRIPTION_ID }}"
$Inputs["subscription_id_identity"] = "${{ vars.ARM_SUBSCRIPTION_ID }}"
$Inputs["subscription_id_management"] = "${{ vars.ARM_SUBSCRIPTION_ID }}"

if($infrastructureAsCode -eq "terraform") {
$Inputs["subscription_ids"] = @{
management = "${{ vars.ARM_SUBSCRIPTION_ID }}"
connectivity = "${{ vars.ARM_SUBSCRIPTION_ID }}"
identity = "${{ vars.ARM_SUBSCRIPTION_ID }}"
security = "${{ vars.ARM_SUBSCRIPTION_ID }}"
}
}

if($infrastructureAsCode -eq "bicep") {
$Inputs["subscription_id_connectivity"] = "${{ vars.ARM_SUBSCRIPTION_ID }}"
$Inputs["subscription_id_identity"] = "${{ vars.ARM_SUBSCRIPTION_ID }}"
$Inputs["subscription_id_management"] = "${{ vars.ARM_SUBSCRIPTION_ID }}"
}

$Inputs["parent_management_group_display_name"] = "Tenant Root Group"
$Inputs["child_management_group_display_name"] = "E2E Test"
Expand Down
3 changes: 2 additions & 1 deletion alz/azuredevops/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ locals {
}

locals {
target_subscriptions = distinct([var.subscription_id_connectivity, var.subscription_id_identity, var.subscription_id_management])
target_subscriptions_legacy = distinct([var.subscription_id_connectivity, var.subscription_id_identity, var.subscription_id_management])
target_subscriptions = length(var.subscription_ids) > 0 ? distinct(values(var.subscription_ids)) : local.target_subscriptions_legacy
}

locals {
Expand Down
36 changes: 27 additions & 9 deletions alz/azuredevops/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,48 @@ variable "root_parent_management_group_id" {
default = ""
}

variable "subscription_ids" {
description = "The list of subscription IDs to deploy the Platform Landing Zones into"
type = map(string)
default = {}
nullable = false
validation {
condition = length(var.subscription_ids) == 0 || alltrue([for id in values(var.subscription_ids) : can(regex("^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$", id))])
error_message = "All subscription IDs must be valid GUIDs"
}
validation {
condition = length(var.subscription_ids) == 0 || alltrue([for id in keys(var.subscription_ids) : contains(["management", "connectivity", "identity", "security"], id)])
error_message = "The keys of the subscription_ids map must be one of 'management', 'connectivity', 'identity' or 'security'"
}
}

variable "subscription_id_connectivity" {
description = "The identifier of the Connectivity Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Connectivity Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_connectivity))
error_message = "The bootstrap subscription ID must be a valid GUID"
condition = var.subscription_id_connectivity == null || can(regex("^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$", var.subscription_id_connectivity))
error_message = "The subscription ID must be a valid GUID"
}
}

variable "subscription_id_identity" {
description = "The identifier of the Identity Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Identity Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_identity))
error_message = "The bootstrap subscription ID must be a valid GUID"
condition = var.subscription_id_identity == null || can(regex("^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$", var.subscription_id_identity))
error_message = "The subscription ID must be a valid GUID"
}
}

variable "subscription_id_management" {
description = "The identifier of the Management Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Management Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_management))
error_message = "The bootstrap subscription ID must be a valid GUID"
condition = var.subscription_id_management == null || can(regex("^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$", var.subscription_id_management))
error_message = "The subscription ID must be a valid GUID"
}
}

Expand Down
3 changes: 2 additions & 1 deletion alz/github/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ locals {
}

locals {
target_subscriptions = distinct([var.subscription_id_connectivity, var.subscription_id_identity, var.subscription_id_management])
target_subscriptions_legacy = distinct([var.subscription_id_connectivity, var.subscription_id_identity, var.subscription_id_management])
target_subscriptions = length(var.subscription_ids) > 0 ? distinct(values(var.subscription_ids)) : local.target_subscriptions_legacy
}

locals {
Expand Down
30 changes: 24 additions & 6 deletions alz/github/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,47 @@ variable "root_parent_management_group_id" {
default = ""
}

variable "subscription_ids" {
description = "The list of subscription IDs to deploy the Platform Landing Zones into"
type = map(string)
default = {}
nullable = false
validation {
condition = length(var.subscription_ids) == 0 || alltrue([for id in values(var.subscription_ids) : can(regex("^[0-9a-fA-F-]{36}$", id))])
error_message = "All subscription IDs must be valid GUIDs"
}
validation {
condition = length(var.subscription_ids) == 0 || alltrue([for id in keys(var.subscription_ids) : contains(["management", "connectivity", "identity", "security"], id)])
error_message = "The keys of the subscription_ids map must be one of 'management', 'connectivity', 'identity' or 'security'"
}
}

variable "subscription_id_connectivity" {
description = "The identifier of the Connectivity Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Connectivity Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_connectivity))
condition = var.subscription_id_connectivity == null || can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_connectivity))
error_message = "The bootstrap subscription ID must be a valid GUID"
}
}

variable "subscription_id_identity" {
description = "The identifier of the Identity Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Identity Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_identity))
condition = var.subscription_id_identity == null || can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_identity))
error_message = "The bootstrap subscription ID must be a valid GUID"
}
}

variable "subscription_id_management" {
description = "The identifier of the Management Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Management Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_management))
condition = var.subscription_id_management == null || can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_management))
error_message = "The bootstrap subscription ID must be a valid GUID"
}
}
Expand Down
3 changes: 2 additions & 1 deletion alz/local/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ locals {
}

locals {
target_subscriptions = distinct([var.subscription_id_connectivity, var.subscription_id_identity, var.subscription_id_management])
target_subscriptions_legacy = distinct([var.subscription_id_connectivity, var.subscription_id_identity, var.subscription_id_management])
target_subscriptions = length(var.subscription_ids) > 0 ? distinct(values(var.subscription_ids)) : local.target_subscriptions_legacy
}

locals {
Expand Down
30 changes: 24 additions & 6 deletions alz/local/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,47 @@ variable "root_parent_management_group_id" {
default = ""
}

variable "subscription_ids" {
description = "The list of subscription IDs to deploy the Platform Landing Zones into"
type = map(string)
Comment thread
jaredfholgate marked this conversation as resolved.
default = {}
nullable = false
validation {
condition = length(var.subscription_ids) == 0 || alltrue([for id in values(var.subscription_ids) : can(regex("^[0-9a-fA-F-]{36}$", id))])
error_message = "All subscription IDs must be valid GUIDs"
}
validation {
condition = length(var.subscription_ids) == 0 || alltrue([for id in keys(var.subscription_ids) : contains(["management", "connectivity", "identity", "security"], id)])
error_message = "The keys of the subscription_ids map must be one of 'management', 'connectivity', 'identity' or 'security'"
}
}

variable "subscription_id_connectivity" {
description = "The identifier of the Connectivity Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Connectivity Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_connectivity))
condition = var.subscription_id_connectivity == null || can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_connectivity))
error_message = "The bootstrap subscription ID must be a valid GUID"
}
}

variable "subscription_id_identity" {
description = "The identifier of the Identity Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Identity Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_identity))
condition = var.subscription_id_identity == null || can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_identity))
error_message = "The bootstrap subscription ID must be a valid GUID"
}
}

variable "subscription_id_management" {
description = "The identifier of the Management Subscription"
description = "DEPRECATED (use subscription_ids instead): The identifier of the Management Subscription"
type = string
default = null
validation {
condition = can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_management))
condition = var.subscription_id_management == null || can(regex("^[0-9a-fA-F-]{36}$", var.subscription_id_management))
error_message = "The bootstrap subscription ID must be a valid GUID"
}
}
Expand Down
Loading