Skip to content
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

Jump to bottom

Fix/naming #21

Merged
merged 3 commits into from
Feb 13, 2024
Merged

Fix/naming #21

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
4c126a5
fix: naming correction for resources
d4kverma Feb 9, 2024
9cb0c66
fix: naming correction for resources
d4kverma Feb 13, 2024
cfb994e
fmt run
d4kverma Feb 13, 2024
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
34 changes: 17 additions & 17 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ resource "azurerm_container_registry" "main" {
}

resource "azurerm_container_registry_scope_map" "main" {
for_each = var.scope_map != null ? { for k, v in var.scope_map : k => v if v != null } : {}
for_each = var.enable && var.scope_map != null ? { for k, v in var.scope_map : k => v if v != null } : {}
name = format("%s", each.key)
resource_group_name = var.resource_group_name
container_registry_name = azurerm_container_registry.main[0].name
actions = each.value["actions"]
}

resource "azurerm_container_registry_token" "main" {
for_each = var.scope_map != null ? { for k, v in var.scope_map : k => v if v != null } : {}
for_each = var.enable && var.scope_map != null ? { for k, v in var.scope_map : k => v if v != null } : {}
name = format("%s", "${each.key}-token")
resource_group_name = var.resource_group_name
container_registry_name = azurerm_container_registry.main[0].name
Expand All @@ -109,7 +109,7 @@ resource "azurerm_container_registry_token" "main" {
}

resource "azurerm_container_registry_webhook" "main" {
for_each = var.container_registry_webhooks != null ? { for k, v in var.container_registry_webhooks : k => v if v != null } : {}
for_each = var.enable && var.container_registry_webhooks != null ? { for k, v in var.container_registry_webhooks : k => v if v != null } : {}
name = format("%s", each.key)
resource_group_name = var.resource_group_name
location = var.location
Expand All @@ -132,7 +132,7 @@ resource "azurerm_container_registry_webhook" "main" {
resource "azurerm_key_vault_key" "kvkey" {
depends_on = [azurerm_role_assignment.identity_assigned]
count = var.enable && var.encryption ? 1 : 0
name = format("acr-%s-cmk-key", module.labels.id)
name = format("%s-acr-cmk-key", module.labels.id)
#expiration_date = var.expiration_date
key_vault_id = var.key_vault_id
key_type = "RSA"
Expand Down Expand Up @@ -169,7 +169,7 @@ resource "azurerm_role_assignment" "identity_assigned" {
resource "azurerm_user_assigned_identity" "identity" {
count = var.enable && var.encryption != null ? 1 : 0
location = var.location
name = format("%s-acr-uid", module.labels.id)
name = format("%s-acr-mid", module.labels.id)
resource_group_name = var.resource_group_name
}

Expand All @@ -178,17 +178,17 @@ resource "azurerm_user_assigned_identity" "identity" {
##-----------------------------------------------------------------------------
resource "azurerm_private_endpoint" "pep1" {
count = var.enable && var.enable_private_endpoint ? 1 : 0
name = format("%s-%s-acr-pe", var.container_registry_config.name, module.labels.id)
name = format("%s-acr-pe", module.labels.id)
location = var.location
resource_group_name = var.resource_group_name
subnet_id = var.subnet_id
custom_network_interface_name = format("%s-%s-acr-pe-nic", var.container_registry_config.name, module.labels.id)
custom_network_interface_name = format("%s-acr-pe-nic", module.labels.id)
private_dns_zone_group {
name = format("%s-%s-acr", var.container_registry_config.name, "dns-zone-group")
name = format("%s-acr-dns-zone-group", module.labels.id)
private_dns_zone_ids = var.existing_private_dns_zone == null ? [azurerm_private_dns_zone.dnszone1[0].id] : var.existing_private_dns_zone_id
}
private_service_connection {
name = format("%s-%s-acr", var.container_registry_config.name, "private-link")
name = format("%s-acr-psc", module.labels.id)
is_manual_connection = false
private_connection_resource_id = azurerm_container_registry.main[0].id
subresource_names = ["registry"]
Expand All @@ -214,8 +214,8 @@ provider "azurerm" {
## Locals defined to determine the resource group in which private dns zone must be created or existing private dns zone is present.
##-----------------------------------------------------------------------------
locals {
valid_rg_name = var.existing_private_dns_zone == null ? var.resource_group_name : var.existing_private_dns_zone_resource_group_name
private_dns_zone_name = var.existing_private_dns_zone == null ? azurerm_private_dns_zone.dnszone1[0].name : var.existing_private_dns_zone
valid_rg_name = var.enable_private_endpoint ? var.existing_private_dns_zone == null ? var.resource_group_name : var.existing_private_dns_zone_resource_group_name : null
private_dns_zone_name = var.enable_private_endpoint ? var.existing_private_dns_zone == null ? azurerm_private_dns_zone.dnszone1[0].name : var.existing_private_dns_zone : null
}

##-----------------------------------------------------------------------------
Expand All @@ -235,7 +235,7 @@ resource "azurerm_private_dns_zone" "dnszone1" {
##-----------------------------------------------------------------------------
resource "azurerm_private_dns_zone_virtual_network_link" "vent-link-same-sub" {
count = var.enable && var.enable_private_endpoint && var.diff_sub == false && var.same_vnet == false ? 1 : 0
name = var.existing_private_dns_zone == null ? format("%s-pdz-vnet-link-acr", module.labels.id) : format("%s-pdz-vnet-link-acr-1", module.labels.id)
name = var.existing_private_dns_zone == null ? format("%s-acr-pdz-vnet-link", module.labels.id) : format("%s-acr-pdz-vnet-link-1")
resource_group_name = local.valid_rg_name
private_dns_zone_name = local.private_dns_zone_name
virtual_network_id = var.virtual_network_id
Expand All @@ -250,7 +250,7 @@ resource "azurerm_private_dns_zone_virtual_network_link" "vent-link-same-sub" {
resource "azurerm_private_dns_zone_virtual_network_link" "vent-link-diff_sub" {
provider = azurerm.peer
count = var.enable && var.enable_private_endpoint && var.diff_sub == true ? 1 : 0
name = var.existing_private_dns_zone == null ? format("%s-pdz-vnet-link-acr", module.labels.id) : format("%s-pdz-vnet-link-acr-1", module.labels.id)
name = var.existing_private_dns_zone == null ? format("%s-acr-pdz-vnet-link", module.labels.id) : format("%s-acr-pdz-vnet-link-diif-dns", module.labels.id)
resource_group_name = local.valid_rg_name
private_dns_zone_name = local.private_dns_zone_name
virtual_network_id = var.virtual_network_id
Expand All @@ -263,8 +263,8 @@ resource "azurerm_private_dns_zone_virtual_network_link" "vent-link-diff_sub" {
##-----------------------------------------------------------------------------
resource "azurerm_private_dns_zone_virtual_network_link" "vent-link-multi-subs" {
provider = azurerm.peer
count = var.multi_sub_vnet_link && var.existing_private_dns_zone != null ? 1 : 0
name = format("%s-pdz-vnet-link-acr-1", module.labels.id)
count = var.enable && var.multi_sub_vnet_link && var.existing_private_dns_zone != null ? 1 : 0
name = format("%s-acr-pdz-vnet-link", module.labels.id)
resource_group_name = var.existing_private_dns_zone_resource_group_name
private_dns_zone_name = var.existing_private_dns_zone
virtual_network_id = var.virtual_network_id
Expand All @@ -276,7 +276,7 @@ resource "azurerm_private_dns_zone_virtual_network_link" "vent-link-multi-subs"
##-----------------------------------------------------------------------------
resource "azurerm_private_dns_zone_virtual_network_link" "addon_vent_link" {
count = var.enable && var.addon_vent_link ? 1 : 0
name = format("%s-pdz-vnet-link-acr-addon", module.labels.id)
name = format("%s-acr-pdz-vnet-link-addon", module.labels.id)
resource_group_name = var.addon_resource_group_name
private_dns_zone_name = var.existing_private_dns_zone == null ? azurerm_private_dns_zone.dnszone1[0].name : var.existing_private_dns_zone
virtual_network_id = var.addon_virtual_network_id
Expand All @@ -288,7 +288,7 @@ resource "azurerm_private_dns_zone_virtual_network_link" "addon_vent_link" {
##-----------------------------------------------------------------------------
resource "azurerm_monitor_diagnostic_setting" "acr-diag" {
count = var.enable && var.enable_diagnostic ? 1 : 0
name = lower("acr-${var.container_registry_config.name}-diag")
name = format("%s-acr-nic-diag-log", module.labels.id)
target_resource_id = azurerm_container_registry.main[0].id
storage_account_id = var.storage_account_id
log_analytics_workspace_id = var.log_analytics_workspace_id
Expand Down
2 changes: 1 addition & 1 deletion output.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ output "container_registry_private_dns_zone_domain" {
}

output "private_dns_zone_id" {
value = azurerm_private_dns_zone.dnszone1[0].id
value = var.enable_private_endpoint ? azurerm_private_dns_zone.dnszone1[0].id : null
description = "ID of private dns zone. To be used when there is existing dns zone and id is to be passed in private endpoint dns configuration group."
}
2 changes: 1 addition & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ variable "repository" {

variable "label_order" {
type = list(any)
default = []
default = ["name", "environment"]
description = "Label order, e.g. sequence of application name and environment `name`,`environment`,'attribute' [`webserver`,`qa`,`devops`,`public`,] ."
}

Expand Down
Loading