Skip to content

Commit 74e87f3

Browse files
donovm4donovm4
authored
custom domain app service name logic; additional_login_parameters to map of string; (#158)
1 parent 2ca4341 commit 74e87f3

26 files changed

Lines changed: 81 additions & 53 deletions

File tree

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ Type:
300300

301301
```hcl
302302
map(object({
303-
additional_login_parameters = optional(list(string))
303+
additional_login_parameters = optional(map(string))
304304
allowed_external_redirect_urls = optional(list(string))
305305
default_provider = optional(string)
306306
enabled = optional(bool, false)
@@ -314,36 +314,36 @@ map(object({
314314
allowed_audiences = optional(list(string))
315315
client_secret = optional(string)
316316
client_secret_setting_name = optional(string)
317-
})))
317+
})), {})
318318
facebook = optional(map(object({
319319
app_id = optional(string)
320320
app_secret = optional(string)
321321
app_secret_setting_name = optional(string)
322322
oauth_scopes = optional(list(string))
323-
})))
323+
})), {})
324324
github = optional(map(object({
325325
client_id = optional(string)
326326
client_secret = optional(string)
327327
client_secret_setting_name = optional(string)
328328
oauth_scopes = optional(list(string))
329-
})))
329+
})), {})
330330
google = optional(map(object({
331331
client_id = optional(string)
332332
client_secret = optional(string)
333333
client_secret_setting_name = optional(string)
334334
oauth_scopes = optional(list(string))
335-
})))
335+
})), {})
336336
microsoft = optional(map(object({
337337
client_id = optional(string)
338338
client_secret = optional(string)
339339
client_secret_setting_name = optional(string)
340340
oauth_scopes = optional(list(string))
341-
})))
341+
})), {})
342342
twitter = optional(map(object({
343343
consumer_key = optional(string)
344344
consumer_secret = optional(string)
345345
consumer_secret_setting_name = optional(string)
346-
})))
346+
})), {})
347347
}))
348348
```
349349

‎avm.tflint_module.hcl‎

Lines changed: 5 additions & 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.5"
9+
version = "0.13.0"
1010
source = "github.com/Azure/tflint-ruleset-avm"
1111
signing_key = <<-KEY
1212
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -191,3 +191,7 @@ rule "tags" {
191191
rule "provider_modtm_version" {
192192
enabled = false
193193
}
194+
195+
rule "valid_template_interpolation" {
196+
enabled = true
197+
}

‎examples/auto_heal_enabled/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module "avm_res_web_site" {
4444
source = "../../"
4545
4646
# source = "Azure/avm-res-web-site/azurerm"
47-
# version = "0.14.1"
47+
# version = "0.14.2"
4848
4949
enable_telemetry = var.enable_telemetry
5050

‎examples/auto_heal_enabled/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ module "avm_res_web_site" {
3838
source = "../../"
3939

4040
# source = "Azure/avm-res-web-site/azurerm"
41-
# version = "0.14.1"
41+
# version = "0.14.2"
4242

4343
enable_telemetry = var.enable_telemetry
4444

‎examples/basic_auth/README.md‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module "avm_res_web_site" {
5858
source = "../../"
5959
6060
# source = "Azure/avm-res-web-site/azurerm"
61-
# version = "0.14.1"
61+
# version = "0.14.2"
6262
6363
enable_telemetry = var.enable_telemetry
6464
@@ -82,7 +82,19 @@ module "avm_res_web_site" {
8282
8383
# May require additional configuration for the authentication settings by use of App Registration
8484
85-
/*
85+
# /*
86+
87+
auth_settings = {
88+
sso = {
89+
enabled = true
90+
active_directory = {
91+
aad = {
92+
client_id = "000000-000000-000000-000000"
93+
client_secret_setting_name = "SSO_CLIENT_SECRET"
94+
}
95+
}
96+
}
97+
}
8698
8799
auth_settings_v2 = {
88100
setting1 = {
@@ -103,7 +115,7 @@ module "avm_res_web_site" {
103115
}
104116
}
105117
106-
*/
118+
# */
107119
108120
}
109121
```

‎examples/basic_auth/main.tf‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module "avm_res_web_site" {
5151
source = "../../"
5252

5353
# source = "Azure/avm-res-web-site/azurerm"
54-
# version = "0.14.1"
54+
# version = "0.14.2"
5555

5656
enable_telemetry = var.enable_telemetry
5757

@@ -75,7 +75,19 @@ module "avm_res_web_site" {
7575

7676
# May require additional configuration for the authentication settings by use of App Registration
7777

78-
/*
78+
# /*
79+
80+
auth_settings = {
81+
sso = {
82+
enabled = true
83+
active_directory = {
84+
aad = {
85+
client_id = "000000-000000-000000-000000"
86+
client_secret_setting_name = "SSO_CLIENT_SECRET"
87+
}
88+
}
89+
}
90+
}
7991

8092
auth_settings_v2 = {
8193
setting1 = {
@@ -96,6 +108,6 @@ module "avm_res_web_site" {
96108
}
97109
}
98110

99-
*/
111+
# */
100112

101113
}

‎examples/custom_domain/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ module "avm_res_web_site" {
7070
source = "../../"
7171
7272
# source = "Azure/avm-res-web-site/azurerm"
73-
# version = "0.14.1"
73+
# version = "0.14.2"
7474
7575
enable_telemetry = var.enable_telemetry
7676
@@ -164,7 +164,7 @@ module "avm_res_web_site" {
164164
qa = {
165165
slot_as_target = true
166166
167-
zone_resource_group_name = "rg-personal-domain"
167+
zone_resource_group_name = "<zone_resource_group_name>"
168168
169169
create_txt_records = true
170170
txt_name = "asuid.${module.naming.function_app.name_unique}-qa"

‎examples/custom_domain/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ module "avm_res_web_site" {
6666
source = "../../"
6767

6868
# source = "Azure/avm-res-web-site/azurerm"
69-
# version = "0.14.1"
69+
# version = "0.14.2"
7070

7171
enable_telemetry = var.enable_telemetry
7272

@@ -160,7 +160,7 @@ module "avm_res_web_site" {
160160
qa = {
161161
slot_as_target = true
162162
163-
zone_resource_group_name = "rg-personal-domain"
163+
zone_resource_group_name = "<zone_resource_group_name>"
164164
165165
create_txt_records = true
166166
txt_name = "asuid.${module.naming.function_app.name_unique}-qa"
@@ -195,4 +195,4 @@ module "avm_res_web_site" {
195195
environment = "dev-tf"
196196
}
197197

198-
}
198+
}

‎examples/default/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module "avm_res_web_site" {
5757
source = "../../"
5858
5959
# source = "Azure/avm-res-web-site/azurerm"
60-
# version = "0.14.1"
60+
# version = "0.14.2"
6161
6262
enable_telemetry = var.enable_telemetry
6363
@@ -78,7 +78,7 @@ module "avm_res_web_site" {
7878
7979
tags = {
8080
module = "Azure/avm-res-web-site/azurerm"
81-
version = "0.14.1"
81+
version = "0.14.2"
8282
}
8383
8484
}

‎examples/default/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module "avm_res_web_site" {
5151
source = "../../"
5252

5353
# source = "Azure/avm-res-web-site/azurerm"
54-
# version = "0.14.1"
54+
# version = "0.14.2"
5555

5656
enable_telemetry = var.enable_telemetry
5757

@@ -72,7 +72,7 @@ module "avm_res_web_site" {
7272

7373
tags = {
7474
module = "Azure/avm-res-web-site/azurerm"
75-
version = "0.14.1"
75+
version = "0.14.2"
7676
}
7777

7878
}

0 commit comments

Comments
 (0)