From df6b751cfdf8cd3fb79b278f189d77dd54d14453 Mon Sep 17 00:00:00 2001 From: "John Scott (Azure)" Date: Thu, 16 Nov 2023 16:02:51 -0800 Subject: [PATCH] Correct spelling across repo --- modules/policyDefAssignment/managementGroup/locals.tf | 2 +- modules/policyDefAssignment/managementGroup/outputs.tf | 2 +- modules/policyDefAssignment/resource/locals.tf | 2 +- modules/policyDefAssignment/resource/outputs.tf | 2 +- modules/policyDefAssignment/resourceGroup/locals.tf | 2 +- modules/policyDefAssignment/resourceGroup/outputs.tf | 2 +- modules/policyDefAssignment/subscription/locals.tf | 2 +- modules/policyDefAssignment/subscription/outputs.tf | 2 +- modules/policyExemption/managmentGroup/variables.tf | 6 +++--- modules/policyExemption/resource/variables.tf | 6 +++--- modules/policyExemption/resourceGroup/variables.tf | 6 +++--- modules/policyExemption/subscription/variables.tf | 6 +++--- modules/policyInitiative/README.md | 4 ++-- modules/policyInitiative/locals.tf | 2 +- modules/policyInitiative/variables.tf | 2 +- modules/policySetAssignment/managementGroup/locals.tf | 4 ++-- modules/policySetAssignment/resource/locals.tf | 2 +- modules/policySetAssignment/resourceGroup/locals.tf | 2 +- modules/policySetAssignment/subscription/locals.tf | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/policyDefAssignment/managementGroup/locals.tf b/modules/policyDefAssignment/managementGroup/locals.tf index c21b87e..1a218b0 100644 --- a/modules/policyDefAssignment/managementGroup/locals.tf +++ b/modules/policyDefAssignment/managementGroup/locals.tf @@ -23,7 +23,7 @@ locals { # determine if a managed identity should be created with this assignment identity_type = length(try(coalescelist(var.role_definition_ids, lookup(jsondecode(var.definition.policy_rule).then.details, "roleDefinitionIds", [])), [])) > 0 ? var.identity_ids != null ? { type = "UserAssigned" } : { type = "SystemAssigned" } : {} - # try to use policy definition roles if explicit roles are ommitted + # try to use policy definition roles if explicit roles are omitted role_definition_ids = var.skip_role_assignment == false ? try(coalescelist(var.role_definition_ids, lookup(jsondecode(var.definition.policy_rule).then.details, "roleDefinitionIds", [])), []) : [] # policy assignment scope will be used if omitted diff --git a/modules/policyDefAssignment/managementGroup/outputs.tf b/modules/policyDefAssignment/managementGroup/outputs.tf index 60b2227..47141b0 100644 --- a/modules/policyDefAssignment/managementGroup/outputs.tf +++ b/modules/policyDefAssignment/managementGroup/outputs.tf @@ -18,6 +18,6 @@ output "remediation_id" { } output "role_definition_ids" { - description = "The List of Role Defenition Ids assignable to the managed identity" + description = "The List of Role Definition Ids assignable to the managed identity" value = local.role_definition_ids } diff --git a/modules/policyDefAssignment/resource/locals.tf b/modules/policyDefAssignment/resource/locals.tf index b6807cb..0128e14 100644 --- a/modules/policyDefAssignment/resource/locals.tf +++ b/modules/policyDefAssignment/resource/locals.tf @@ -23,7 +23,7 @@ locals { # determine if a managed identity should be created with this assignment identity_type = length(try(coalescelist(var.role_definition_ids, lookup(jsondecode(var.definition.policy_rule).then.details, "roleDefinitionIds", [])), [])) > 0 ? var.identity_ids != null ? { type = "UserAssigned" } : { type = "SystemAssigned" } : {} - # try to use policy definition roles if explicit roles are ommitted + # try to use policy definition roles if explicit roles are omitted role_definition_ids = var.skip_role_assignment == false ? try(coalescelist(var.role_definition_ids, lookup(jsondecode(var.definition.policy_rule).then.details, "roleDefinitionIds", [])), []) : [] # policy assignment scope will be used if omitted diff --git a/modules/policyDefAssignment/resource/outputs.tf b/modules/policyDefAssignment/resource/outputs.tf index 82bcfa0..516382d 100644 --- a/modules/policyDefAssignment/resource/outputs.tf +++ b/modules/policyDefAssignment/resource/outputs.tf @@ -18,6 +18,6 @@ output "remediation_id" { } output "role_definition_ids" { - description = "The List of Role Defenition Ids assignable to the managed identity" + description = "The List of Role Definition Ids assignable to the managed identity" value = local.role_definition_ids } diff --git a/modules/policyDefAssignment/resourceGroup/locals.tf b/modules/policyDefAssignment/resourceGroup/locals.tf index ae53d27..30dd74f 100644 --- a/modules/policyDefAssignment/resourceGroup/locals.tf +++ b/modules/policyDefAssignment/resourceGroup/locals.tf @@ -23,7 +23,7 @@ locals { # determine if a managed identity should be created with this assignment identity_type = length(try(coalescelist(var.role_definition_ids, lookup(jsondecode(var.definition.policy_rule).then.details, "roleDefinitionIds", [])), [])) > 0 ? var.identity_ids != null ? { type = "UserAssigned" } : { type = "SystemAssigned" } : {} - # try to use policy definition roles if explicit roles are ommitted + # try to use policy definition roles if explicit roles are omitted role_definition_ids = var.skip_role_assignment == false ? try(coalescelist(var.role_definition_ids, lookup(jsondecode(var.definition.policy_rule).then.details, "roleDefinitionIds", [])), []) : [] # policy assignment scope will be used if omitted diff --git a/modules/policyDefAssignment/resourceGroup/outputs.tf b/modules/policyDefAssignment/resourceGroup/outputs.tf index 612b899..e3586e9 100644 --- a/modules/policyDefAssignment/resourceGroup/outputs.tf +++ b/modules/policyDefAssignment/resourceGroup/outputs.tf @@ -18,6 +18,6 @@ output "remediation_id" { } output "role_definition_ids" { - description = "The List of Role Defenition Ids assignable to the managed identity" + description = "The List of Role Definition Ids assignable to the managed identity" value = local.role_definition_ids } diff --git a/modules/policyDefAssignment/subscription/locals.tf b/modules/policyDefAssignment/subscription/locals.tf index d2c0b86..a157055 100644 --- a/modules/policyDefAssignment/subscription/locals.tf +++ b/modules/policyDefAssignment/subscription/locals.tf @@ -23,7 +23,7 @@ locals { # determine if a managed identity should be created with this assignment identity_type = length(try(coalescelist(var.role_definition_ids, lookup(jsondecode(var.definition.policy_rule).then.details, "roleDefinitionIds", [])), [])) > 0 ? var.identity_ids != null ? { type = "UserAssigned" } : { type = "SystemAssigned" } : {} - # try to use policy definition roles if explicit roles are ommitted + # try to use policy definition roles if explicit roles are omitted role_definition_ids = var.skip_role_assignment == false ? try(coalescelist(var.role_definition_ids, lookup(jsondecode(var.definition.policy_rule).then.details, "roleDefinitionIds", [])), []) : [] # policy assignment scope will be used if omitted diff --git a/modules/policyDefAssignment/subscription/outputs.tf b/modules/policyDefAssignment/subscription/outputs.tf index df9672d..4f487b0 100644 --- a/modules/policyDefAssignment/subscription/outputs.tf +++ b/modules/policyDefAssignment/subscription/outputs.tf @@ -18,6 +18,6 @@ output "remediation_id" { } output "role_definition_ids" { - description = "The List of Role Defenition Ids assignable to the managed identity" + description = "The List of Role Definition Ids assignable to the managed identity" value = local.role_definition_ids } diff --git a/modules/policyExemption/managmentGroup/variables.tf b/modules/policyExemption/managmentGroup/variables.tf index 0f7a90a..257ff7d 100644 --- a/modules/policyExemption/managmentGroup/variables.tf +++ b/modules/policyExemption/managmentGroup/variables.tf @@ -28,13 +28,13 @@ variable "policy_assignment_id" { variable "policy_definition_reference_ids" { type = list(string) - description = "The optional policy definition reference ID list when the associated policy assignment is an assignment of a policy set definition. Ommit to exempt all member definitions" + description = "The optional policy definition reference ID list when the associated policy assignment is an assignment of a policy set definition. Omit to exempt all member definitions" default = [] } variable "member_definition_names" { type = list(string) - description = "Generate the definition reference Ids from the member definition names when 'policy_definition_reference_ids' are unknown. Ommit to exempt all member definitions" + description = "Generate the definition reference Ids from the member definition names when 'policy_definition_reference_ids' are unknown. Omit to exempt all member definitions" default = [] } @@ -59,4 +59,4 @@ variable "metadata" { type = any description = "Optional policy exemption metadata. For example but not limited to; requestedBy, approvedBy, approvedOn, ticketRef, etc" default = null -} \ No newline at end of file +} diff --git a/modules/policyExemption/resource/variables.tf b/modules/policyExemption/resource/variables.tf index 0f7a90a..257ff7d 100644 --- a/modules/policyExemption/resource/variables.tf +++ b/modules/policyExemption/resource/variables.tf @@ -28,13 +28,13 @@ variable "policy_assignment_id" { variable "policy_definition_reference_ids" { type = list(string) - description = "The optional policy definition reference ID list when the associated policy assignment is an assignment of a policy set definition. Ommit to exempt all member definitions" + description = "The optional policy definition reference ID list when the associated policy assignment is an assignment of a policy set definition. Omit to exempt all member definitions" default = [] } variable "member_definition_names" { type = list(string) - description = "Generate the definition reference Ids from the member definition names when 'policy_definition_reference_ids' are unknown. Ommit to exempt all member definitions" + description = "Generate the definition reference Ids from the member definition names when 'policy_definition_reference_ids' are unknown. Omit to exempt all member definitions" default = [] } @@ -59,4 +59,4 @@ variable "metadata" { type = any description = "Optional policy exemption metadata. For example but not limited to; requestedBy, approvedBy, approvedOn, ticketRef, etc" default = null -} \ No newline at end of file +} diff --git a/modules/policyExemption/resourceGroup/variables.tf b/modules/policyExemption/resourceGroup/variables.tf index 0f7a90a..257ff7d 100644 --- a/modules/policyExemption/resourceGroup/variables.tf +++ b/modules/policyExemption/resourceGroup/variables.tf @@ -28,13 +28,13 @@ variable "policy_assignment_id" { variable "policy_definition_reference_ids" { type = list(string) - description = "The optional policy definition reference ID list when the associated policy assignment is an assignment of a policy set definition. Ommit to exempt all member definitions" + description = "The optional policy definition reference ID list when the associated policy assignment is an assignment of a policy set definition. Omit to exempt all member definitions" default = [] } variable "member_definition_names" { type = list(string) - description = "Generate the definition reference Ids from the member definition names when 'policy_definition_reference_ids' are unknown. Ommit to exempt all member definitions" + description = "Generate the definition reference Ids from the member definition names when 'policy_definition_reference_ids' are unknown. Omit to exempt all member definitions" default = [] } @@ -59,4 +59,4 @@ variable "metadata" { type = any description = "Optional policy exemption metadata. For example but not limited to; requestedBy, approvedBy, approvedOn, ticketRef, etc" default = null -} \ No newline at end of file +} diff --git a/modules/policyExemption/subscription/variables.tf b/modules/policyExemption/subscription/variables.tf index 0f7a90a..257ff7d 100644 --- a/modules/policyExemption/subscription/variables.tf +++ b/modules/policyExemption/subscription/variables.tf @@ -28,13 +28,13 @@ variable "policy_assignment_id" { variable "policy_definition_reference_ids" { type = list(string) - description = "The optional policy definition reference ID list when the associated policy assignment is an assignment of a policy set definition. Ommit to exempt all member definitions" + description = "The optional policy definition reference ID list when the associated policy assignment is an assignment of a policy set definition. Omit to exempt all member definitions" default = [] } variable "member_definition_names" { type = list(string) - description = "Generate the definition reference Ids from the member definition names when 'policy_definition_reference_ids' are unknown. Ommit to exempt all member definitions" + description = "Generate the definition reference Ids from the member definition names when 'policy_definition_reference_ids' are unknown. Omit to exempt all member definitions" default = [] } @@ -59,4 +59,4 @@ variable "metadata" { type = any description = "Optional policy exemption metadata. For example but not limited to; requestedBy, approvedBy, approvedOn, ticketRef, etc" default = null -} \ No newline at end of file +} diff --git a/modules/policyInitiative/README.md b/modules/policyInitiative/README.md index ca1ba8e..4a5abb5 100644 --- a/modules/policyInitiative/README.md +++ b/modules/policyInitiative/README.md @@ -30,7 +30,7 @@ No modules. | [initiative\_name](#input\_initiative\_name) | Policy initiative name. Changing this forces a new resource to be created | `string` | n/a | yes | | [initiative\_version](#input\_initiative\_version) | The version for this initiative, defaults to 1.0.0 | `string` | `"1.0.0"` | no | | [management\_group\_id](#input\_management\_group\_id) | The management group scope at which the initiative will be defined. Defaults to current Subscription if omitted. Changing this forces a new resource to be created. Note: if you are using azurerm\_management\_group to assign a value to management\_group\_id, be sure to use name or group\_id attribute, but not id. | `string` | `null` | no | -| [member\_definitions](#input\_member\_definitions) | Policy Defenition resource nodes that will be members of this initiative | `any` | n/a | yes | +| [member\_definitions](#input\_member\_definitions) | Policy Definition resource nodes that will be members of this initiative | `any` | n/a | yes | | [merge\_effects](#input\_merge\_effects) | Should the module merge all member definition effects? Defauls to true | `bool` | `true` | no | | [merge\_parameters](#input\_merge\_parameters) | Should the module merge all member definition parameters? Defauls to true | `bool` | `true` | no | @@ -44,4 +44,4 @@ No modules. | [name](#output\_name) | The name of the Policy Set Definition | | [parameters](#output\_parameters) | The combined parameters of the Policy Set Definition | | [role\_definition\_ids](#output\_role\_definition\_ids) | Role definition IDs for remediation | - \ No newline at end of file + diff --git a/modules/policyInitiative/locals.tf b/modules/policyInitiative/locals.tf index 5005252..7cade82 100644 --- a/modules/policyInitiative/locals.tf +++ b/modules/policyInitiative/locals.tf @@ -2,7 +2,7 @@ # Licensed under the MIT License. locals { - # colate all definition parameters into a single object + # collate all definition parameters into a single object member_parameters = { for d in var.member_definitions : d.name => try(jsondecode(d.parameters), {}) diff --git a/modules/policyInitiative/variables.tf b/modules/policyInitiative/variables.tf index 36ca0b6..f98d756 100644 --- a/modules/policyInitiative/variables.tf +++ b/modules/policyInitiative/variables.tf @@ -52,7 +52,7 @@ variable "initiative_version" { variable "member_definitions" { type = any - description = "Policy Defenition resource nodes that will be members of this initiative" + description = "Policy Definition resource nodes that will be members of this initiative" } variable "initiative_metadata" { diff --git a/modules/policySetAssignment/managementGroup/locals.tf b/modules/policySetAssignment/managementGroup/locals.tf index f564474..35319ac 100644 --- a/modules/policySetAssignment/managementGroup/locals.tf +++ b/modules/policySetAssignment/managementGroup/locals.tf @@ -26,7 +26,7 @@ locals { # determine if a managed identity should be created with this assignment identity_type = length(try(coalescelist(var.role_definition_ids, try(var.initiative.role_definition_ids, [])), [])) > 0 ? length(var.identity_ids) > 0 ? { type = "UserAssigned" } : { type = "SystemAssigned" } : {} - # try to use policy definition roles if explicit roles are ommitted + # try to use policy definition roles if explicit roles are omitted role_definition_ids = var.skip_role_assignment == false && try(values(local.identity_type)[0], "") == "SystemAssigned" ? try(coalescelist(var.role_definition_ids, try(var.initiative.role_definition_ids, [])), []) : [] # assignment location is required when identity is specified @@ -45,4 +45,4 @@ locals { remediation_tasks = try( azurerm_management_group_policy_remediation.rem, {}) -} \ No newline at end of file +} diff --git a/modules/policySetAssignment/resource/locals.tf b/modules/policySetAssignment/resource/locals.tf index 6bdd99b..9f5dbde 100644 --- a/modules/policySetAssignment/resource/locals.tf +++ b/modules/policySetAssignment/resource/locals.tf @@ -26,7 +26,7 @@ locals { # determine if a managed identity should be created with this assignment identity_type = length(try(coalescelist(var.role_definition_ids, try(var.initiative.role_definition_ids, [])), [])) > 0 ? length(var.identity_ids) > 0 ? { type = "UserAssigned" } : { type = "SystemAssigned" } : {} - # try to use policy definition roles if explicit roles are ommitted + # try to use policy definition roles if explicit roles are omitted role_definition_ids = var.skip_role_assignment == false && try(values(local.identity_type)[0], "") == "SystemAssigned" ? try(coalescelist(var.role_definition_ids, try(var.initiative.role_definition_ids, [])), []) : [] # assignment location is required when identity is specified diff --git a/modules/policySetAssignment/resourceGroup/locals.tf b/modules/policySetAssignment/resourceGroup/locals.tf index 3bb2ad1..2aceb21 100644 --- a/modules/policySetAssignment/resourceGroup/locals.tf +++ b/modules/policySetAssignment/resourceGroup/locals.tf @@ -26,7 +26,7 @@ locals { # determine if a managed identity should be created with this assignment identity_type = length(try(coalescelist(var.role_definition_ids, try(var.initiative.role_definition_ids, [])), [])) > 0 ? length(var.identity_ids) > 0 ? { type = "UserAssigned" } : { type = "SystemAssigned" } : {} - # try to use policy definition roles if explicit roles are ommitted + # try to use policy definition roles if explicit roles are omitted role_definition_ids = var.skip_role_assignment == false && try(values(local.identity_type)[0], "") == "SystemAssigned" ? try(coalescelist(var.role_definition_ids, try(var.initiative.role_definition_ids, [])), []) : [] # assignment location is required when identity is specified diff --git a/modules/policySetAssignment/subscription/locals.tf b/modules/policySetAssignment/subscription/locals.tf index 57265d7..4b42333 100644 --- a/modules/policySetAssignment/subscription/locals.tf +++ b/modules/policySetAssignment/subscription/locals.tf @@ -26,7 +26,7 @@ locals { # determine if a managed identity should be created with this assignment identity_type = length(try(coalescelist(var.role_definition_ids, try(var.initiative.role_definition_ids, [])), [])) > 0 ? length(var.identity_ids) > 0 ? { type = "UserAssigned" } : { type = "SystemAssigned" } : {} - # try to use policy definition roles if explicit roles are ommitted + # try to use policy definition roles if explicit roles are omitted role_definition_ids = var.skip_role_assignment == false && try(values(local.identity_type)[0], "") == "SystemAssigned" ? try(coalescelist(var.role_definition_ids, try(var.initiative.role_definition_ids, [])), []) : [] # assignment location is required when identity is specified