Skip to content

Commit f951885

Browse files
committed
chore: (IAC-1196) Ran terraform fmt
1 parent 3486b7d commit f951885

File tree

8 files changed

+46
-46
lines changed

8 files changed

+46
-46
lines changed

modules/aks_node_pool/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ variable "min_nodes" {
8585

8686
variable "node_taints" {
8787
description = "A list of the taints added to new nodes during node pool create and scale. Changing this forces a new resource to be created."
88-
type = list(any)
89-
default = []
88+
type = list(any)
89+
default = []
9090
}
9191

9292
variable "node_labels" {

modules/azure_aks/main.tf

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33

44
# Reference: https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/kubernetes_cluster
55
resource "azurerm_kubernetes_cluster" "aks" {
6-
name = var.aks_cluster_name
7-
location = var.aks_cluster_location
8-
resource_group_name = var.aks_cluster_rg
9-
dns_prefix = var.aks_private_cluster == false || var.aks_cluster_private_dns_zone_id == "" ? var.aks_cluster_dns_prefix : null
10-
dns_prefix_private_cluster = var.aks_private_cluster && var.aks_cluster_private_dns_zone_id != "" ? var.aks_cluster_dns_prefix : null
11-
12-
sku_tier = var.aks_cluster_sku_tier
13-
role_based_access_control_enabled = true
14-
http_application_routing_enabled = false
15-
6+
name = var.aks_cluster_name
7+
location = var.aks_cluster_location
8+
resource_group_name = var.aks_cluster_rg
9+
dns_prefix = var.aks_private_cluster == false || var.aks_cluster_private_dns_zone_id == "" ? var.aks_cluster_dns_prefix : null
10+
dns_prefix_private_cluster = var.aks_private_cluster && var.aks_cluster_private_dns_zone_id != "" ? var.aks_cluster_dns_prefix : null
11+
12+
sku_tier = var.aks_cluster_sku_tier
13+
role_based_access_control_enabled = true
14+
http_application_routing_enabled = false
15+
1616
# https://docs.microsoft.com/en-us/azure/aks/supported-kubernetes-versions
1717
# az aks get-versions --location eastus -o table
18-
kubernetes_version = var.kubernetes_version
19-
api_server_authorized_ip_ranges = var.aks_cluster_endpoint_public_access_cidrs
20-
private_cluster_enabled = var.aks_private_cluster
21-
private_dns_zone_id = var.aks_private_cluster && var.aks_cluster_private_dns_zone_id != "" ? var.aks_cluster_private_dns_zone_id : (var.aks_private_cluster ? "System" : null)
18+
kubernetes_version = var.kubernetes_version
19+
api_server_authorized_ip_ranges = var.aks_cluster_endpoint_public_access_cidrs
20+
private_cluster_enabled = var.aks_private_cluster
21+
private_dns_zone_id = var.aks_private_cluster && var.aks_cluster_private_dns_zone_id != "" ? var.aks_cluster_private_dns_zone_id : (var.aks_private_cluster ? "System" : null)
2222

2323
network_profile {
2424
network_plugin = var.aks_network_plugin
@@ -45,7 +45,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
4545
content {
4646
admin_username = var.aks_cluster_node_admin
4747
ssh_key {
48-
key_data = var.aks_cluster_ssh_public_key
48+
key_data = var.aks_cluster_ssh_public_key
4949
}
5050
}
5151
}
@@ -80,7 +80,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
8080
dynamic "identity" {
8181
for_each = var.aks_uai_id == null ? [] : [1]
8282
content {
83-
type = "UserAssigned"
83+
type = "UserAssigned"
8484
identity_ids = [var.aks_uai_id]
8585
}
8686
}
@@ -108,8 +108,8 @@ resource "azurerm_kubernetes_cluster" "aks" {
108108

109109
}
110110

111-
data "azurerm_public_ip" "cluster_public_ip" {
112-
count = var.cluster_egress_type == "loadBalancer" ? 1 : 0
111+
data "azurerm_public_ip" "cluster_public_ip" {
112+
count = var.cluster_egress_type == "loadBalancer" ? 1 : 0
113113

114114
# effective_outbound_ips is a set of strings, that needs to be converted to a list type
115115
name = split("/", tolist(azurerm_kubernetes_cluster.aks.network_profile[0].load_balancer_profile[0].effective_outbound_ips)[0])[8]

modules/azure_aks/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ variable "aks_dns_service_ip" {
141141
type = string
142142
default = "10.0.0.10"
143143
validation {
144-
condition = var.aks_dns_service_ip != null ? can(regex("^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$",var.aks_dns_service_ip)) : false
144+
condition = var.aks_dns_service_ip != null ? can(regex("^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", var.aks_dns_service_ip)) : false
145145
error_message = "ERROR: aks_dns_service_ip - value must not be null and must be a valid IP address."
146146
}
147147

@@ -220,6 +220,6 @@ variable "cluster_egress_type" {
220220
}
221221

222222
variable "aks_cluster_private_dns_zone_id" {
223-
type = string
223+
type = string
224224
default = ""
225225
}

modules/azurerm_postgresql_flex/main.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ resource "azurerm_postgresql_flexible_server" "flexpsql" {
4949
}
5050

5151
resource "azurerm_postgresql_flexible_server_configuration" "flexpsql" {
52-
for_each = {
53-
for config in var.postgresql_configurations:
54-
config.name => config
52+
for_each = {
53+
for config in var.postgresql_configurations :
54+
config.name => config
5555
}
5656

57-
name = each.value.name
58-
server_id = azurerm_postgresql_flexible_server.flexpsql.id
59-
value = each.value.value
57+
name = each.value.name
58+
server_id = azurerm_postgresql_flexible_server.flexpsql.id
59+
value = each.value.value
6060
}
6161

6262
resource "azurerm_postgresql_flexible_server_firewall_rule" "flexpsql" {

modules/azurerm_vnet/main.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# Sourced and modified from https://github.com/Azure/terraform-azurerm-vnet
55
locals {
66
vnet_name = coalesce(var.name, "${var.prefix}-vnet")
7-
subnets = ( length(var.existing_subnets) == 0
8-
? [ for k, v in azurerm_subnet.subnet[*] :{ for kk, vv in v: kk => {"id": vv.id, "address_prefixes": vv.address_prefixes }}][0]
9-
: [ for k, v in data.azurerm_subnet.subnet[*] :{for kk, vv in v: kk => {"id": vv.id, "address_prefixes": vv.address_prefixes }}][0]
7+
subnets = (length(var.existing_subnets) == 0
8+
? [for k, v in azurerm_subnet.subnet[*] : { for kk, vv in v : kk => { "id" : vv.id, "address_prefixes" : vv.address_prefixes } }][0]
9+
: [for k, v in data.azurerm_subnet.subnet[*] : { for kk, vv in v : kk => { "id" : vv.id, "address_prefixes" : vv.address_prefixes } }][0]
1010
)
1111
}
1212

@@ -35,14 +35,14 @@ data "azurerm_subnet" "subnet" {
3535
}
3636

3737
resource "azurerm_subnet" "subnet" {
38-
for_each = length(var.existing_subnets) == 0 ? var.subnets : {}
39-
name = "${var.prefix}-${each.key}-subnet"
40-
resource_group_name = var.resource_group_name
41-
virtual_network_name = local.vnet_name
42-
address_prefixes = each.value.prefixes
43-
service_endpoints = each.value.service_endpoints
44-
private_endpoint_network_policies_enabled = each.value.private_endpoint_network_policies_enabled
45-
private_link_service_network_policies_enabled = each.value.private_link_service_network_policies_enabled
38+
for_each = length(var.existing_subnets) == 0 ? var.subnets : {}
39+
name = "${var.prefix}-${each.key}-subnet"
40+
resource_group_name = var.resource_group_name
41+
virtual_network_name = local.vnet_name
42+
address_prefixes = each.value.prefixes
43+
service_endpoints = each.value.service_endpoints
44+
private_endpoint_network_policies_enabled = each.value.private_endpoint_network_policies_enabled
45+
private_link_service_network_policies_enabled = each.value.private_link_service_network_policies_enabled
4646
dynamic "delegation" {
4747
for_each = each.value.service_delegations
4848
content {

modules/kubeconfig/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ locals {
2121
cluster_name = var.cluster_name
2222
endpoint = var.endpoint
2323
name = local.service_account_name
24-
ca_crt = base64encode(lookup(data.kubernetes_secret.sa_secret[0].data,"ca.crt", ""))
25-
token = lookup(data.kubernetes_secret.sa_secret[0].data,"token", "")
24+
ca_crt = base64encode(lookup(data.kubernetes_secret.sa_secret[0].data, "ca.crt", ""))
25+
token = lookup(data.kubernetes_secret.sa_secret[0].data, "token", "")
2626
namespace = var.namespace
2727
}) : null
2828
}
@@ -33,7 +33,7 @@ data "kubernetes_secret" "sa_secret" {
3333
name = kubernetes_secret.sa_secret[0].metadata[0].name
3434
namespace = var.namespace
3535
}
36-
36+
3737
depends_on = [kubernetes_secret.sa_secret]
3838
}
3939

@@ -66,7 +66,7 @@ resource "kubernetes_service_account" "kubernetes_sa" {
6666
resource "kubernetes_cluster_role_binding" "kubernetes_crb" {
6767
count = var.create_static_kubeconfig ? 1 : 0
6868
metadata {
69-
name = local.cluster_role_binding_name
69+
name = local.cluster_role_binding_name
7070
}
7171
role_ref {
7272
api_group = "rbac.authorization.k8s.io"

modules/kubeconfig/output.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
output "kube_config" {
5-
value = local_file.kubeconfig.content
5+
value = local_file.kubeconfig.content
66
sensitive = true
77
}

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,8 +756,8 @@ variable "aks_identity" {
756756

757757
variable "aks_cluster_private_dns_zone_id" {
758758
description = "Specify private DNS zone resource ID for AKS private cluster to use."
759-
type = string
760-
default = ""
759+
type = string
760+
default = ""
761761
}
762762

763763
## Message Broker - Azure Service Bus - Experimental

0 commit comments

Comments
 (0)