From 9fcd0f3fb2ccd3895ca4af625c24a2888130ca9d Mon Sep 17 00:00:00 2001 From: Dennis Eikelenboom Date: Wed, 29 Sep 2021 08:48:01 -0700 Subject: [PATCH] apply terraform fmt --- quickstart/101-machine-learning/compute.tf | 10 ++--- quickstart/101-machine-learning/workspace.tf | 12 +++--- .../compute.tf | 8 ++-- .../network.tf | 24 ++++++------ .../workspace.tf | 38 +++++++++---------- .../compute.tf | 10 ++--- .../workspace.tf | 36 +++++++++--------- 7 files changed, 69 insertions(+), 69 deletions(-) diff --git a/quickstart/101-machine-learning/compute.tf b/quickstart/101-machine-learning/compute.tf index d8ec709a..3d75fdd4 100644 --- a/quickstart/101-machine-learning/compute.tf +++ b/quickstart/101-machine-learning/compute.tf @@ -1,9 +1,9 @@ # Generate random string for unique compute instance name resource "random_string" "ci_prefix" { - length = 8 - upper = false + length = 8 + upper = false special = false - number = false + number = false } # Compute instance @@ -21,7 +21,7 @@ resource "azurerm_machine_learning_compute_cluster" "compute" { machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id vm_priority = "Dedicated" vm_size = "STANDARD_DS2_V2" - + identity { type = "SystemAssigned" } @@ -31,5 +31,5 @@ resource "azurerm_machine_learning_compute_cluster" "compute" { max_node_count = 3 scale_down_nodes_after_idle_duration = "PT15M" # 15 minutes } - + } \ No newline at end of file diff --git a/quickstart/101-machine-learning/workspace.tf b/quickstart/101-machine-learning/workspace.tf index 95f4e978..0b018893 100644 --- a/quickstart/101-machine-learning/workspace.tf +++ b/quickstart/101-machine-learning/workspace.tf @@ -24,11 +24,11 @@ resource "azurerm_storage_account" "default" { } resource "azurerm_container_registry" "default" { - name = "cr${var.name}${var.environment}" - location = azurerm_resource_group.default.location - resource_group_name = azurerm_resource_group.default.name - sku = "Premium" - admin_enabled = true + name = "cr${var.name}${var.environment}" + location = azurerm_resource_group.default.location + resource_group_name = azurerm_resource_group.default.name + sku = "Premium" + admin_enabled = true } # Machine Learning workspace @@ -40,7 +40,7 @@ resource "azurerm_machine_learning_workspace" "default" { key_vault_id = azurerm_key_vault.default.id storage_account_id = azurerm_storage_account.default.id container_registry_id = azurerm_container_registry.default.id - + identity { type = "SystemAssigned" } diff --git a/quickstart/201-machine-learning-moderately-secure/compute.tf b/quickstart/201-machine-learning-moderately-secure/compute.tf index ee2983b1..e5be7fbb 100644 --- a/quickstart/201-machine-learning-moderately-secure/compute.tf +++ b/quickstart/201-machine-learning-moderately-secure/compute.tf @@ -1,9 +1,9 @@ # Generate random string for unique compute instance name resource "random_string" "ci_prefix" { - length = 8 - upper = false + length = 8 + upper = false special = false - number = false + number = false } # Compute instance @@ -27,7 +27,7 @@ resource "azurerm_machine_learning_compute_cluster" "compute" { vm_priority = "Dedicated" vm_size = "STANDARD_DS2_V2" subnet_resource_id = azurerm_subnet.snet-training.id - + identity { type = "SystemAssigned" } diff --git a/quickstart/201-machine-learning-moderately-secure/network.tf b/quickstart/201-machine-learning-moderately-secure/network.tf index c1751545..0e56d74d 100644 --- a/quickstart/201-machine-learning-moderately-secure/network.tf +++ b/quickstart/201-machine-learning-moderately-secure/network.tf @@ -7,26 +7,26 @@ resource "azurerm_virtual_network" "default" { } resource "azurerm_subnet" "snet-training" { - name = "snet-training" - resource_group_name = azurerm_resource_group.default.name - virtual_network_name = azurerm_virtual_network.default.name - address_prefixes = var.training_subnet_address_space + name = "snet-training" + resource_group_name = azurerm_resource_group.default.name + virtual_network_name = azurerm_virtual_network.default.name + address_prefixes = var.training_subnet_address_space enforce_private_link_endpoint_network_policies = true } resource "azurerm_subnet" "snet-aks" { - name = "snet-aks" - resource_group_name = azurerm_resource_group.default.name - virtual_network_name = azurerm_virtual_network.default.name - address_prefixes = var.aks_subnet_address_space + name = "snet-aks" + resource_group_name = azurerm_resource_group.default.name + virtual_network_name = azurerm_virtual_network.default.name + address_prefixes = var.aks_subnet_address_space enforce_private_link_endpoint_network_policies = true } resource "azurerm_subnet" "snet-workspace" { - name = "snet-workspace" - resource_group_name = azurerm_resource_group.default.name - virtual_network_name = azurerm_virtual_network.default.name - address_prefixes = var.ml_subnet_address_space + name = "snet-workspace" + resource_group_name = azurerm_resource_group.default.name + virtual_network_name = azurerm_virtual_network.default.name + address_prefixes = var.ml_subnet_address_space enforce_private_link_endpoint_network_policies = true } diff --git a/quickstart/201-machine-learning-moderately-secure/workspace.tf b/quickstart/201-machine-learning-moderately-secure/workspace.tf index a39982e9..34b24334 100644 --- a/quickstart/201-machine-learning-moderately-secure/workspace.tf +++ b/quickstart/201-machine-learning-moderately-secure/workspace.tf @@ -13,10 +13,10 @@ resource "azurerm_key_vault" "default" { tenant_id = data.azurerm_client_config.current.tenant_id sku_name = "premium" purge_protection_enabled = true - + network_acls { default_action = "Deny" - bypass = "AzureServices" + bypass = "AzureServices" } } @@ -29,20 +29,20 @@ resource "azurerm_storage_account" "default" { network_rules { default_action = "Deny" - bypass = ["AzureServices"] + bypass = ["AzureServices"] } } resource "azurerm_container_registry" "default" { - name = "cr${var.name}${var.environment}" - location = azurerm_resource_group.default.location - resource_group_name = azurerm_resource_group.default.name - sku = "Premium" - admin_enabled = true + name = "cr${var.name}${var.environment}" + location = azurerm_resource_group.default.location + resource_group_name = azurerm_resource_group.default.name + sku = "Premium" + admin_enabled = true network_rule_set { default_action = "Deny" - } + } public_network_access_enabled = false } @@ -55,15 +55,15 @@ resource "azurerm_machine_learning_workspace" "default" { key_vault_id = azurerm_key_vault.default.id storage_account_id = azurerm_storage_account.default.id container_registry_id = azurerm_container_registry.default.id - + identity { type = "SystemAssigned" } - + # Args of use when using an Azure Private Link configuration public_network_access_enabled = false - image_build_compute_name = var.image_build_compute_name - + image_build_compute_name = var.image_build_compute_name + } # Private endpoints @@ -81,7 +81,7 @@ resource "azurerm_private_endpoint" "kv_ple" { private_service_connection { name = "psc-${var.name}-kv" private_connection_resource_id = azurerm_key_vault.default.id - subresource_names = [ "vault" ] + subresource_names = ["vault"] is_manual_connection = false } } @@ -100,7 +100,7 @@ resource "azurerm_private_endpoint" "st_ple_blob" { private_service_connection { name = "psc-${var.name}-st" private_connection_resource_id = azurerm_storage_account.default.id - subresource_names = [ "blob" ] + subresource_names = ["blob"] is_manual_connection = false } } @@ -119,7 +119,7 @@ resource "azurerm_private_endpoint" "storage_ple_file" { private_service_connection { name = "psc-${var.name}-st" private_connection_resource_id = azurerm_storage_account.default.id - subresource_names = [ "file" ] + subresource_names = ["file"] is_manual_connection = false } } @@ -138,7 +138,7 @@ resource "azurerm_private_endpoint" "cr_ple" { private_service_connection { name = "psc-${var.name}-cr" private_connection_resource_id = azurerm_container_registry.default.id - subresource_names = [ "registry" ] + subresource_names = ["registry"] is_manual_connection = false } } @@ -157,7 +157,7 @@ resource "azurerm_private_endpoint" "mlw_ple" { private_service_connection { name = "psc-${var.name}-mlw" private_connection_resource_id = azurerm_machine_learning_workspace.default.id - subresource_names = [ "amlworkspace" ] + subresource_names = ["amlworkspace"] is_manual_connection = false } } @@ -165,7 +165,7 @@ resource "azurerm_private_endpoint" "mlw_ple" { # Compute cluster for image building required since the workspace is behind a vnet. # For more details, see https://docs.microsoft.com/en-us/azure/machine-learning/tutorial-create-secure-workspace#configure-image-builds. resource "azurerm_machine_learning_compute_cluster" "image-builder" { - name = "${var.image_build_compute_name}" + name = var.image_build_compute_name location = azurerm_resource_group.default.location vm_priority = "LowPriority" vm_size = "Standard_DS2_v2" diff --git a/quickstart/202-machine-learning-moderately-secure-existing-VNet/compute.tf b/quickstart/202-machine-learning-moderately-secure-existing-VNet/compute.tf index 026c21a1..ae11470b 100644 --- a/quickstart/202-machine-learning-moderately-secure-existing-VNet/compute.tf +++ b/quickstart/202-machine-learning-moderately-secure-existing-VNet/compute.tf @@ -1,9 +1,9 @@ # Generate random string for unique compute instance name resource "random_string" "ci_prefix" { - length = 8 - upper = false + length = 8 + upper = false special = false - number = false + number = false } # Compute instance @@ -27,7 +27,7 @@ resource "azurerm_machine_learning_compute_cluster" "compute" { vm_priority = "Dedicated" vm_size = "STANDARD_DS2_V2" subnet_resource_id = var.training_subnet_resource_id - + identity { type = "SystemAssigned" } @@ -37,5 +37,5 @@ resource "azurerm_machine_learning_compute_cluster" "compute" { max_node_count = 3 scale_down_nodes_after_idle_duration = "PT15M" # 15 minutes } - + } \ No newline at end of file diff --git a/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf b/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf index 56bf85ba..dae223a1 100644 --- a/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf +++ b/quickstart/202-machine-learning-moderately-secure-existing-VNet/workspace.tf @@ -13,10 +13,10 @@ resource "azurerm_key_vault" "default" { tenant_id = data.azurerm_client_config.current.tenant_id sku_name = "premium" purge_protection_enabled = true - + network_acls { default_action = "Deny" - bypass = "AzureServices" + bypass = "AzureServices" } } @@ -29,20 +29,20 @@ resource "azurerm_storage_account" "default" { network_rules { default_action = "Deny" - bypass = ["AzureServices"] + bypass = ["AzureServices"] } } resource "azurerm_container_registry" "default" { - name = "cr${var.name}${var.environment}" - location = azurerm_resource_group.default.location - resource_group_name = azurerm_resource_group.default.name - sku = "Premium" - admin_enabled = true + name = "cr${var.name}${var.environment}" + location = azurerm_resource_group.default.location + resource_group_name = azurerm_resource_group.default.name + sku = "Premium" + admin_enabled = true network_rule_set { default_action = "Deny" - } + } public_network_access_enabled = false } @@ -59,10 +59,10 @@ resource "azurerm_machine_learning_workspace" "default" { identity { type = "SystemAssigned" } - + # Args of use when using an Azure Private Link configuration public_network_access_enabled = false - image_build_compute_name = var.image_build_compute_name + image_build_compute_name = var.image_build_compute_name } # Private endpoints @@ -80,7 +80,7 @@ resource "azurerm_private_endpoint" "kv_ple" { private_service_connection { name = "psc-${var.name}-kv" private_connection_resource_id = azurerm_key_vault.default.id - subresource_names = [ "vault" ] + subresource_names = ["vault"] is_manual_connection = false } } @@ -99,7 +99,7 @@ resource "azurerm_private_endpoint" "st_ple_blob" { private_service_connection { name = "psc-${var.name}-st" private_connection_resource_id = azurerm_storage_account.default.id - subresource_names = [ "blob" ] + subresource_names = ["blob"] is_manual_connection = false } } @@ -118,7 +118,7 @@ resource "azurerm_private_endpoint" "storage_ple_file" { private_service_connection { name = "psc-${var.name}-st" private_connection_resource_id = azurerm_storage_account.default.id - subresource_names = [ "file" ] + subresource_names = ["file"] is_manual_connection = false } } @@ -137,7 +137,7 @@ resource "azurerm_private_endpoint" "cr_ple" { private_service_connection { name = "psc-${var.name}-cr" private_connection_resource_id = azurerm_container_registry.default.id - subresource_names = [ "registry" ] + subresource_names = ["registry"] is_manual_connection = false } } @@ -149,7 +149,7 @@ resource "azurerm_private_endpoint" "mlw_ple" { subnet_id = var.ml_subnet_resource_id private_dns_zone_group { - name = "private-dns-zone-group" + name = "private-dns-zone-group" private_dns_zone_ids = [ var.privatelink_api_azureml_ms_resource_id, var.privatelink_notebooks_azure_net_resource_id @@ -159,7 +159,7 @@ resource "azurerm_private_endpoint" "mlw_ple" { private_service_connection { name = "psc-${var.name}-mlw" private_connection_resource_id = azurerm_machine_learning_workspace.default.id - subresource_names = [ "amlworkspace" ] + subresource_names = ["amlworkspace"] is_manual_connection = false } } @@ -167,7 +167,7 @@ resource "azurerm_private_endpoint" "mlw_ple" { # Compute cluster for image building required since the workspace is behind a vnet. # For more details, see https://docs.microsoft.com/en-us/azure/machine-learning/tutorial-create-secure-workspace#configure-image-builds. resource "azurerm_machine_learning_compute_cluster" "image-builder" { - name = "${var.image_build_compute_name}" + name = var.image_build_compute_name location = azurerm_resource_group.default.location vm_priority = "LowPriority" vm_size = "Standard_DS2_v2"