From 69a69c4969d64875fe9299dd37cb75ac6e5cd71f Mon Sep 17 00:00:00 2001 From: cshea15 Date: Tue, 3 Oct 2023 17:08:46 -0400 Subject: [PATCH] fixed files on feedback --- quickstart/201-azfw-with-avzones/main.tf | 14 +++++++------- quickstart/201-azfw-with-avzones/readme.md | 12 ++++++------ quickstart/201-azfw-with-avzones/variables.tf | 4 +++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/quickstart/201-azfw-with-avzones/main.tf b/quickstart/201-azfw-with-avzones/main.tf index f2ba30f8..f6f26cf9 100644 --- a/quickstart/201-azfw-with-avzones/main.tf +++ b/quickstart/201-azfw-with-avzones/main.tf @@ -30,7 +30,7 @@ resource "azurerm_public_ip" "pip_azfw" { resource_group_name = azurerm_resource_group.rg.name allocation_method = "Static" sku = "Standard" - zones = [ "1", "2", "3" ] + zones = ["1", "2", "3"] } resource "azurerm_storage_account" "sa" { @@ -221,11 +221,11 @@ resource "azurerm_firewall_policy_rule_collection_group" "prcg" { priority = 200 action = "Allow" rule { - name = "netRule1" - protocols = ["TCP"] - source_addresses = ["10.10.1.0/24"] - destination_addresses = [ "*" ] - destination_ports = ["8000", "8999"] + name = "netRule1" + protocols = ["TCP"] + source_addresses = ["10.10.1.0/24"] + destination_addresses = ["*"] + destination_ports = ["8000", "8999"] } } } @@ -254,7 +254,7 @@ resource "azurerm_route_table" "rt" { name = "azfwDefaultRoute" address_prefix = "0.0.0.0/0" next_hop_type = "VirtualAppliance" - next_hop_in_ip_address = "10.10.0.4" + next_hop_in_ip_address = azurerm_firewall.fw.ip_configuration[0].private_ip_address } } diff --git a/quickstart/201-azfw-with-avzones/readme.md b/quickstart/201-azfw-with-avzones/readme.md index 3100d5d3..dc098439 100644 --- a/quickstart/201-azfw-with-avzones/readme.md +++ b/quickstart/201-azfw-with-avzones/readme.md @@ -26,16 +26,16 @@ A user-defined route points network traffic from the ServersSubnet subnet throug - [azurerm_storage_account](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/storage_account) - [random_password](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password) - [random_pet](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet) -- [random_string](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string)} +- [random_string](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) ## Variables | Name | Description | Default value | |-|-|-| -| `resource_group_location` | location for your resources | eastus | -| `firewall_sku_tier` | Sku size for your Firewall and Firewall Policy | Premium | -| `resource_group_name_prefix` | Prefix for your resource group | rg | -| `virtual_machine_size` | Sku size for your jump and workload vms | Standard_D2_v3 | -| `admin_username` | admin username for the jump and workload vms | azureuser | +| `resource_group_location` | Location of the resource group | eastus | +| `firewall_sku_tier` | SKU size for your Firewall and Firewall Policy. Possible values: Standard, Premium | Premium | +| `resource_group_name_prefix` | Prefix of the resource group name that's combined with a random ID so that name is unique in your Azure subscription. | rg | +| `virtual_machine_size` | SKU size for your jump and workload VMs | Standard_D2_v3 | +| `admin_username` | THe admin username for the jump and workload VMs | azureuser | ## Example \ No newline at end of file diff --git a/quickstart/201-azfw-with-avzones/variables.tf b/quickstart/201-azfw-with-avzones/variables.tf index a855798d..11c23c95 100644 --- a/quickstart/201-azfw-with-avzones/variables.tf +++ b/quickstart/201-azfw-with-avzones/variables.tf @@ -27,5 +27,7 @@ variable "virtual_machine_size" { } variable "admin_username" { - default = "azureuser" + type = string + description = "value of the admin username." + default = "azureuser" } \ No newline at end of file