Skip to content

Commit 0328cbf

Browse files
lonegunmanblonegunmanb
committed
fix incorrect expression
1 parent 2f89634 commit 0328cbf

2 files changed

Lines changed: 16 additions & 24 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ No modules.
238238
| [azurerm_log_analytics_solution.main](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/log_analytics_solution) | resource |
239239
| [azurerm_log_analytics_workspace.main](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/log_analytics_workspace) | resource |
240240
| [azurerm_role_assignment.acr](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource |
241+
| [azurerm_role_assignment.application_gateway_byo_vnet_network_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource |
241242
| [azurerm_role_assignment.application_gateway_existing_vnet_network_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource |
242-
| [azurerm_role_assignment.application_gateway_new_vnet_network_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource |
243243
| [azurerm_role_assignment.application_gateway_resource_group_reader](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource |
244244
| [azurerm_role_assignment.existing_application_gateway_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource |
245245
| [azurerm_role_assignment.network_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource |

‎locals.tf‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,19 @@ locals {
55
# - null
66
# - patch, but then neither the kubernetes_version nor orchestrator_version must specify a patch number, where orchestrator_version may be also null
77
# - rapid/stable/node-image, but then the kubernetes_version and the orchestrator_version must be null
8-
automatic_channel_upgrade_check = var.automatic_channel_upgrade == null ? true : (
9-
(contains([
10-
"patch"
11-
], var.automatic_channel_upgrade) && can(regex("^[0-9]{1,}\\.[0-9]{1,}$", var.kubernetes_version)) && (can(regex("^[0-9]{1,}\\.[0-9]{1,}$", var.orchestrator_version)) || var.orchestrator_version == null)) ||
12-
(contains([
13-
"rapid", "stable", "node-image"
14-
], var.automatic_channel_upgrade) && var.kubernetes_version == null && var.orchestrator_version == null)
8+
automatic_channel_upgrade_check = var.automatic_channel_upgrade == null ? true : (
9+
(contains(["patch"], var.automatic_channel_upgrade) && can(regex("^[0-9]{1,}\\.[0-9]{1,}$", var.kubernetes_version)) && (can(regex("^[0-9]{1,}\\.[0-9]{1,}$", var.orchestrator_version)) || var.orchestrator_version == null)) ||
10+
(contains(["rapid", "stable", "node-image"], var.automatic_channel_upgrade) && var.kubernetes_version == null && var.orchestrator_version == null)
1511
)
1612
# Abstract the decision whether to create an Analytics Workspace or not.
17-
create_analytics_solution = var.log_analytics_workspace_enabled && var.log_analytics_solution == null
18-
create_analytics_workspace = var.log_analytics_workspace_enabled && var.log_analytics_workspace == null
19-
default_nodepool_subnet_segments = try(split("/", var.vnet_subnet_id), [])
13+
create_analytics_solution = var.log_analytics_workspace_enabled && var.log_analytics_solution == null
14+
create_analytics_workspace = var.log_analytics_workspace_enabled && var.log_analytics_workspace == null
15+
default_nodepool_subnet_segments = try(split("/", var.vnet_subnet_id), [])
2016
# Application Gateway ID: /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/applicationGateways/myGateway1
21-
existing_application_gateway_for_ingress_id = try(var.brown_field_application_gateway_for_ingress.id, null)
22-
existing_application_gateway_resource_group_for_ingress = var.brown_field_application_gateway_for_ingress == null ? null : local.existing_application_gateway_segments_for_ingress[4]
23-
existing_application_gateway_segments_for_ingress = var.brown_field_application_gateway_for_ingress == null ? null : split("/", local.existing_application_gateway_for_ingress_id)
24-
existing_application_gateway_subnet_resource_group_name = try(local.existing_application_gateway_subnet_segments[4], null)
17+
existing_application_gateway_for_ingress_id = try(var.brown_field_application_gateway_for_ingress.id, null)
18+
existing_application_gateway_resource_group_for_ingress = var.brown_field_application_gateway_for_ingress == null ? null : local.existing_application_gateway_segments_for_ingress[4]
19+
existing_application_gateway_segments_for_ingress = var.brown_field_application_gateway_for_ingress == null ? null : split("/", local.existing_application_gateway_for_ingress_id)
20+
existing_application_gateway_subnet_resource_group_name = try(local.existing_application_gateway_subnet_segments[4], null)
2521
# Subnet ID: /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/virtualNetworks/myvnet1/subnets/mysubnet1
2622
existing_application_gateway_subnet_segments = try(split("/", var.brown_field_application_gateway_for_ingress.subnet_id), [])
2723
existing_application_gateway_subnet_subscription_id_for_ingress = try(local.existing_application_gateway_subnet_segments[2], null)
@@ -31,7 +27,7 @@ locals {
3127
# Abstract the decision whether to use an Analytics Workspace supplied via vars, provision one ourselves or leave it null.
3228
# This guarantees that local.log_analytics_workspace will contain a valid `id` and `name` IFF log_analytics_workspace_enabled
3329
# is set to `true`.
34-
log_analytics_workspace = var.log_analytics_workspace_enabled ? (
30+
log_analytics_workspace = var.log_analytics_workspace_enabled ? (
3531
# The Log Analytics Workspace should be enabled:
3632
var.log_analytics_workspace == null ? {
3733
# `log_analytics_workspace_enabled` is `true` but `log_analytics_workspace` was not supplied.
@@ -42,9 +38,9 @@ locals {
4238
resource_group_name = local.azurerm_log_analytics_workspace_resource_group_name
4339
} : {
4440
# `log_analytics_workspace` is supplied. Let's use that.
45-
id = var.log_analytics_workspace.id
46-
name = var.log_analytics_workspace.name
47-
location = var.log_analytics_workspace.location
41+
id = var.log_analytics_workspace.id
42+
name = var.log_analytics_workspace.name
43+
location = var.log_analytics_workspace.location
4844
# `azurerm_log_analytics_workspace`'s id format: /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.OperationalInsights/workspaces/workspace1
4945
resource_group_name = split("/", var.log_analytics_workspace.id)[4]
5046
}
@@ -56,10 +52,6 @@ locals {
5652
]
5753
], [var.vnet_subnet_id]))
5854
query_datasource_for_log_analytics_workspace_location = var.log_analytics_workspace_enabled && (var.log_analytics_workspace != null ? var.log_analytics_workspace.location == null : false)
59-
subnet_ids = toset([
60-
for id in local.potential_subnet_ids : idif id != null
61-
])
55+
subnet_ids = toset([for id in local.potential_subnet_ids : id if id != null])
6256
use_brown_field_gw_for_ingress = var.brown_field_application_gateway_for_ingress != null
63-
use_green_field_gw_for_ingress = var.green_field_application_gateway_for_ingress != null
6457
}
65-

0 commit comments

Comments
 (0)
⚡