Skip to content

Commit dd72769

Browse files
donovm4donovm4
authored
bugfix: removing client_secret_setting_name from root module (#214)
* removing client_secret_setting_name from root module * additional issues addressed
1 parent f6c7a2c commit dd72769

File tree

25 files changed

+147
-88
lines changed

25 files changed

+147
-88
lines changed

‎README.md‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,11 +1905,13 @@ object({
19051905
virtual_path = optional(string, "/")
19061906
})),
19071907
{
1908-
default = {
1909-
physical_path = "site\\wwwroot"
1910-
preload_enabled = false
1911-
virtual_path = "/"
1912-
}
1908+
# Removing default, as provider issue needing workaround has been resolved.
1909+
# https://github.com/hashicorp/terraform-provider-azurerm/issues/16326
1910+
# default = {
1911+
# physical_path = "site\\wwwroot"
1912+
# preload_enabled = false
1913+
# virtual_path = "/"
1914+
# }
19131915
})
19141916
})
19151917
```
@@ -2150,6 +2152,14 @@ Type: `string`
21502152

21512153
Default: `null`
21522154

2155+
### <a name="input_vnet_content_share_enabled"></a> [vnet\_content\_share\_enabled](#input\_vnet\_content\_share\_enabled)
2156+
2157+
Description: Should the traffic for the content share be routed over virtual network enabled? Defaults to `false`.
2158+
2159+
Type: `bool`
2160+
2161+
Default: `false`
2162+
21532163
### <a name="input_vnet_image_pull_enabled"></a> [vnet\_image\_pull\_enabled](#input\_vnet\_image\_pull\_enabled)
21542164

21552165
Description: Should the traffic for the image pull be routed over virtual network enabled? Defaults to `false`.

‎examples/auto_heal_enabled/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource "azurerm_service_plan" "example" {
3636
resource_group_name = azurerm_resource_group.example.name
3737
sku_name = "P1v2"
3838
tags = {
39-
app = "${module.naming.function_app.name_unique}-default"
39+
app = "${module.naming.app_service.name_unique}-default"
4040
}
4141
}
4242
@@ -53,7 +53,7 @@ module "avm_res_web_site" {
5353
5454
kind = "webapp"
5555
location = azurerm_resource_group.example.location
56-
name = "${module.naming.function_app.name_unique}-auto-heal"
56+
name = "${module.naming.app_service.name_unique}-auto-heal"
5757
os_type = azurerm_service_plan.example.os_type
5858
resource_group_name = azurerm_resource_group.example.name
5959
service_plan_resource_id = azurerm_service_plan.example.id

‎examples/auto_heal_enabled/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ resource "azurerm_service_plan" "example" {
3030
resource_group_name = azurerm_resource_group.example.name
3131
sku_name = "P1v2"
3232
tags = {
33-
app = "${module.naming.function_app.name_unique}-default"
33+
app = "${module.naming.app_service.name_unique}-default"
3434
}
3535
}
3636

@@ -47,7 +47,7 @@ module "avm_res_web_site" {
4747

4848
kind = "webapp"
4949
location = azurerm_resource_group.example.location
50-
name = "${module.naming.function_app.name_unique}-auto-heal"
50+
name = "${module.naming.app_service.name_unique}-auto-heal"
5151
os_type = azurerm_service_plan.example.os_type
5252
resource_group_name = azurerm_resource_group.example.name
5353
service_plan_resource_id = azurerm_service_plan.example.id

‎examples/custom_container/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ resource "azurerm_service_plan" "example" {
4444
resource_group_name = azurerm_resource_group.example.name
4545
sku_name = "P1v2"
4646
tags = {
47-
app = "${module.naming.function_app.name_unique}-container"
47+
app = "${module.naming.app_service.name_unique}-container"
4848
}
4949
zone_balancing_enabled = true
5050
}
@@ -67,7 +67,7 @@ module "avm_res_web_site" {
6767
6868
kind = "webapp"
6969
location = azurerm_resource_group.example.location
70-
name = "${module.naming.function_app.name_unique}-container"
70+
name = "${module.naming.app_service.name_unique}-container"
7171
# Uses an existing app service plan
7272
os_type = azurerm_service_plan.example.os_type
7373
resource_group_name = azurerm_resource_group.example.name

‎examples/custom_container/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ resource "azurerm_service_plan" "example" {
3838
resource_group_name = azurerm_resource_group.example.name
3939
sku_name = "P1v2"
4040
tags = {
41-
app = "${module.naming.function_app.name_unique}-container"
41+
app = "${module.naming.app_service.name_unique}-container"
4242
}
4343
zone_balancing_enabled = true
4444
}
@@ -61,7 +61,7 @@ module "avm_res_web_site" {
6161

6262
kind = "webapp"
6363
location = azurerm_resource_group.example.location
64-
name = "${module.naming.function_app.name_unique}-container"
64+
name = "${module.naming.app_service.name_unique}-container"
6565
# Uses an existing app service plan
6666
os_type = azurerm_service_plan.example.os_type
6767
resource_group_name = azurerm_resource_group.example.name

‎examples/ip_restriction/README.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,23 @@ module "avm_res_web_site" {
6767
site_config = {
6868
application_stack = {
6969
dotnet = {
70-
dotnet_version = "8.0"
70+
dotnet_version = "v8.0"
7171
use_custom_runtime = false
7272
use_dotnet_isolated_runtime = true
7373
}
7474
}
7575
ip_restriction = {
76-
test = {
76+
test1 = {
7777
action = "Allow"
7878
name = "PortalAccess"
7979
priority = 1000
8080
service_tag = "AzurePortal"
81+
headers = {
82+
header1 = {
83+
# x_azure_fdid = ["some-value"]
84+
x_fd_health_probe = ["1"]
85+
}
86+
}
8187
}
8288
}
8389
}

‎examples/ip_restriction/main.tf‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,23 @@ module "avm_res_web_site" {
6161
site_config = {
6262
application_stack = {
6363
dotnet = {
64-
dotnet_version = "8.0"
64+
dotnet_version = "v8.0"
6565
use_custom_runtime = false
6666
use_dotnet_isolated_runtime = true
6767
}
6868
}
6969
ip_restriction = {
70-
test = {
70+
test1 = {
7171
action = "Allow"
7272
name = "PortalAccess"
7373
priority = 1000
7474
service_tag = "AzurePortal"
75+
headers = {
76+
header1 = {
77+
# x_azure_fdid = ["some-value"]
78+
x_fd_health_probe = ["1"]
79+
}
80+
}
7581
}
7682
}
7783
}

‎examples/logic_app/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ resource "azurerm_service_plan" "example" {
4444
resource_group_name = azurerm_resource_group.example.name
4545
sku_name = "WS1"
4646
tags = {
47-
app = "${module.naming.function_app.name_unique}-default"
47+
app = module.naming.logic_app_workflow.name_unique
4848
}
4949
}
5050
@@ -98,7 +98,7 @@ module "avm_res_web_site" {
9898
9999
kind = "logicapp"
100100
location = azurerm_resource_group.example.location
101-
name = "${module.naming.logic_app_workflow.name_unique}-logicapp" # Likely to change naming in the future
101+
name = module.naming.logic_app_workflow.name_unique
102102
# Uses an existing app service plan
103103
os_type = azurerm_service_plan.example.os_type
104104
resource_group_name = azurerm_resource_group.example.name

‎examples/logic_app/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ resource "azurerm_service_plan" "example" {
3838
resource_group_name = azurerm_resource_group.example.name
3939
sku_name = "WS1"
4040
tags = {
41-
app = "${module.naming.function_app.name_unique}-default"
41+
app = module.naming.logic_app_workflow.name_unique
4242
}
4343
}
4444

@@ -92,7 +92,7 @@ module "avm_res_web_site" {
9292

9393
kind = "logicapp"
9494
location = azurerm_resource_group.example.location
95-
name = "${module.naming.logic_app_workflow.name_unique}-logicapp" # Likely to change naming in the future
95+
name = module.naming.logic_app_workflow.name_unique
9696
# Uses an existing app service plan
9797
os_type = azurerm_service_plan.example.os_type
9898
resource_group_name = azurerm_resource_group.example.name

‎examples/logs/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource "azurerm_service_plan" "example" {
3636
resource_group_name = azurerm_resource_group.example.name
3737
sku_name = "S1"
3838
tags = {
39-
app = "${module.naming.function_app.name_unique}-logs"
39+
app = "${module.naming.app_service.name_unique}-logs"
4040
}
4141
}
4242
@@ -78,7 +78,7 @@ module "avm_res_web_site" {
7878
7979
kind = "webapp"
8080
location = azurerm_resource_group.example.location
81-
name = "${module.naming.function_app.name_unique}-logs"
81+
name = "${module.naming.app_service.name_unique}-logs"
8282
os_type = azurerm_service_plan.example.os_type
8383
resource_group_name = azurerm_resource_group.example.name
8484
service_plan_resource_id = azurerm_service_plan.example.id

0 commit comments

Comments
 (0)