Skip to content

Commit 01f8953

Browse files
authored
bug fix: Slot virtual_application (#141)
* initial commit * chore: repo governance
1 parent 1e34a91 commit 01f8953

8 files changed

Lines changed: 30 additions & 13 deletions

File tree

.github/workflows/linting.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: checkout repository
24-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
2525

2626
- name: check docs
2727
uses: Azure/terraform-azurerm-avm-template/.github/actions/docs-check@main
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: checkout repository
35-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
3636

3737
- name: lint terraform
3838
uses: Azure/terraform-azurerm-avm-template/.github/actions/linting@main
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-latest
4646
steps:
4747
- name: checkout repository
48-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
4949

5050
- name: avmfix
5151
uses: Azure/terraform-azurerm-avm-template/.github/actions/avmfix@main
@@ -54,4 +54,4 @@ jobs:
5454
needs: [docs, terraform, avmfix]
5555
runs-on: ubuntu-latest
5656
steps:
57-
- run: echo "All linting checks passed"
57+
- run: echo "All linting checks passed"

.github/workflows/version-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: github.event.repository.name != 'terraform-azurerm-avm-template'
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
2020
- name: Check version
2121
uses: Azure/terraform-azurerm-avm-template/.github/actions/version-check@main
2222
with:

avm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fi
2727
# Check if we are running in a container
2828
# If we are then just run make directly
2929
if [ -z "$AVM_IN_CONTAINER" ]; then
30-
$CONTAINER_RUNTIME run --pull always --user "$(id -u):$(id -g)" --rm $AZURE_VOLUME -v /etc/passwd:/etc/passwd -v /etc/group:/etc/group -v "$(pwd)":/src -w /src -e GITHUB_REPOSITORY -e ARM_SUBSCRIPTION_ID -e GITHUB_REPOSITORY_OWNER mcr.microsoft.com/azterraform make "$1"
30+
$CONTAINER_RUNTIME run --pull always --user "$(id -u):$(id -g)" --rm $AZURE_VOLUME -v "$(pwd)":/src -w /src -e GITHUB_REPOSITORY -e ARM_SUBSCRIPTION_ID -e GITHUB_REPOSITORY_OWNER mcr.microsoft.com/azterraform make "$1"
3131
else
3232
make "$1"
33-
fi
33+
fi

avm.tflint_module.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugin "terraform" {
66

77
plugin "avm" {
88
enabled = true
9-
version = "0.11.1"
9+
version = "0.11.5"
1010
source = "github.com/Azure/tflint-ruleset-avm"
1111
signing_key = <<-KEY
1212
-----BEGIN PGP PUBLIC KEY BLOCK-----

examples/deployment_slot_with_interfaces/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resource "azurerm_resource_group" "example" {
3232
resource "azurerm_service_plan" "example" {
3333
location = azurerm_resource_group.example.location
3434
name = module.naming.app_service_plan.name_unique
35-
os_type = "Linux"
35+
os_type = "Windows"
3636
resource_group_name = azurerm_resource_group.example.name
3737
sku_name = "P1v2"
3838
tags = {
@@ -87,7 +87,7 @@ module "avm_res_web_site" {
8787
8888
enable_telemetry = var.enable_telemetry
8989
90-
name = "${module.naming.function_app.name_unique}-default"
90+
name = "${module.naming.function_app.name_unique}-slots"
9191
resource_group_name = azurerm_resource_group.example.name
9292
location = azurerm_resource_group.example.location
9393

examples/deployment_slot_with_interfaces/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ resource "azurerm_resource_group" "example" {
2626
resource "azurerm_service_plan" "example" {
2727
location = azurerm_resource_group.example.location
2828
name = module.naming.app_service_plan.name_unique
29-
os_type = "Linux"
29+
os_type = "Windows"
3030
resource_group_name = azurerm_resource_group.example.name
3131
sku_name = "P1v2"
3232
tags = {
@@ -81,7 +81,7 @@ module "avm_res_web_site" {
8181

8282
enable_telemetry = var.enable_telemetry
8383

84-
name = "${module.naming.function_app.name_unique}-default"
84+
name = "${module.naming.function_app.name_unique}-slots"
8585
resource_group_name = azurerm_resource_group.example.name
8686
location = azurerm_resource_group.example.location
8787

main.tf

Whitespace-only changes.

main.web_app_slots.tf

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ resource "azurerm_windows_web_app_slot" "this" {
145145
}
146146
}
147147
dynamic "scm_ip_restriction" {
148-
# one or more scm_ip_restriction blocks
149148
for_each = each.value.site_config.scm_ip_restriction
150149

151150
content {
@@ -168,6 +167,24 @@ resource "azurerm_windows_web_app_slot" "this" {
168167
}
169168
}
170169
}
170+
dynamic "virtual_application" {
171+
for_each = each.value.site_config.virtual_application
172+
173+
content {
174+
physical_path = virtual_application.value.physical_path
175+
preload = virtual_application.value.preload_enabled
176+
virtual_path = virtual_application.value.virtual_path
177+
178+
dynamic "virtual_directory" {
179+
for_each = virtual_application.value.virtual_directory
180+
181+
content {
182+
physical_path = virtual_directory.value.physical_path
183+
virtual_path = virtual_directory.value.virtual_path
184+
}
185+
}
186+
}
187+
}
171188
}
172189
dynamic "auth_settings" {
173190
for_each = each.value.auth_settings

0 commit comments

Comments
 (0)