Skip to content

Commit f1b3ef3

Browse files
arnaudlharnaudlh
authored
Merge branch 'main' into feat/cdn_frontdoor
2 parents 5015ca1 + cf4f9d3 commit f1b3ef3

File tree

69 files changed

+1289
-346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1289
-346
lines changed

‎.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
# Drafts your next Release notes as Pull Requests are merged into "master"
14-
- uses: release-drafter/release-drafter@v5
14+
- uses: release-drafter/release-drafter@v6
1515
#with:
1616
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
1717
# config-name: my-config.yml

‎.github/workflows/standalone-scenarios-additional.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"config_files": [
33
"cognitive_services/100-cognitive-services-account",
4+
"cognitive_services/101-cognitive-services-account-managed-identity",
45
"compute/batch/batch_certificate/100-batch-certificate - path",
56
"compute/batch/batch_job/100-batch-job - quotas",
67
"compute/batch/batch_pool/100-batch-pool - quotas",

‎.github/workflows/standalone-scenarios.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"messaging/eventgrid/101-simple-eventgrid-topic-private-endpoint",
7474
"messaging/eventgrid/102-eventgrid_subscription",
7575
"messaging/eventgrid/200-simple-eventgrid-domain-topic",
76+
"messaging/eventgrid/300-simple-eventgrid-system-topic",
7677
"messaging/servicebus/100-servicebus-services",
7778
"messaging/servicebus/200-servicebus-privatelink",
7879
"messaging/web_pubsub/100-simple-web-pubsub",
@@ -119,6 +120,7 @@
119120
"storage_accounts/107-storage-account-management-policy",
120121
"storage_accounts/109-storage-account-advanced-options-cmk",
121122
"storage_accounts/110-file-share-with-acl",
123+
"storage_accounts/112-storage-account-with-defender",
122124
"storage_container/101-storage_container",
123125
"synapse_analytics/100-synapse",
124126
"synapse_analytics/101-synapse-sparkpool",

‎cognitive_service.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,19 @@ module "cognitive_services_account" {
44

55
client_config = local.client_config
66
global_settings = local.global_settings
7+
base_tags = local.global_settings.inherit_tags
8+
resource_group = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group_key, each.value.resource_group.key)]
79
resource_group_name = local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].name
810
location = lookup(each.value, "region", null) == null ? local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location : local.global_settings.regions[each.value.region]
911
settings = each.value
12+
resource_groups = local.combined_objects_resource_groups
13+
vnets = local.combined_objects_networking
14+
private_endpoints = try(each.value.private_endpoints, {})
15+
private_dns = local.combined_objects_private_dns
16+
diagnostics = local.combined_diagnostics
17+
diagnostic_profiles = try(each.value.diagnostic_profiles, {})
18+
19+
managed_identities = local.combined_objects_managed_identities
1020
}
1121

1222
output "cognitive_services_account" {

‎compute_virtual_machines.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module "virtual_machines" {
1414
module.storage_account_blobs,
1515
time_sleep.azurerm_role_assignment_for[0]
1616
]
17-
17+
1818
for_each = local.compute.virtual_machines
1919

2020
application_security_groups = local.combined_objects_application_security_groups

‎compute_virtual_machines_scale_sets.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module "virtual_machine_scale_sets" {
1515
module.proximity_placement_groups,
1616
time_sleep.azurerm_role_assignment_for[0]
1717
]
18-
18+
1919
for_each = local.compute.virtual_machine_scale_sets
2020

2121
availability_sets = local.combined_objects_availability_sets

‎databricks_access_connectors.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ module "databricks_access_connectors" {
22
source = "./modules/analytics/databricks_access_connector"
33
for_each = local.database.databricks_access_connectors
44

5-
client_config = local.client_config
6-
global_settings = local.global_settings
7-
name = each.value.name
8-
settings = each.value
9-
resource_groups = local.combined_objects_resource_groups
10-
base_tags = local.global_settings.inherit_tags
5+
client_config = local.client_config
6+
global_settings = local.global_settings
7+
name = each.value.name
8+
settings = each.value
9+
resource_groups = local.combined_objects_resource_groups
10+
base_tags = local.global_settings.inherit_tags
1111
remote_objects = {
1212
managed_identities = local.combined_objects_managed_identities
1313
}

‎eventgrid.tf

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,42 @@ module "eventgrid_domain_topic" {
7777
output "eventgrid_domain_topic" {
7878
value = module.eventgrid_domain_topic
7979
}
80+
81+
module "eventgrid_system_topic" {
82+
source = "./modules/messaging/eventgrid/eventgrid_system_topic"
83+
for_each = local.messaging.eventgrid_system_topic
84+
85+
global_settings = local.global_settings
86+
client_config = local.client_config
87+
settings = each.value
88+
base_tags = try(local.global_settings.inherit_tags, false) ? try(local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].tags, {}) : {}
89+
90+
location = can(local.global_settings.regions[each.value.region]) ? local.global_settings.regions[each.value.region] : local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][try(each.value.resource_group.key, each.value.resource_group_key)].location
91+
92+
remote_objects = local.remote_objects
93+
}
94+
output "eventgrid_system_topic" {
95+
value = module.eventgrid_system_topic
96+
}
97+
module "eventgrid_system_event_subscription" {
98+
source = "./modules/messaging/eventgrid/eventgrid_system_event_subscription"
99+
for_each = local.messaging.eventgrid_system_event_subscription
100+
101+
global_settings = local.global_settings
102+
client_config = local.client_config
103+
settings = each.value
104+
105+
remote_objects = merge(
106+
local.remote_objects,
107+
{
108+
functions = local.combined_objects_function_apps,
109+
eventhubs = local.combined_objects_event_hubs,
110+
eventgrid_system_topics = local.combined_objects_eventgrid_system_topics,
111+
hybrid_connections = local.combined_objects_relay_hybrid_connection,
112+
storage_account_queues = local.combined_objects_storage_account_queues
113+
}
114+
)
115+
}
116+
output "eventgrid_system_event_subscription" {
117+
value = module.eventgrid_system_event_subscription
118+
}

‎examples/azuread/107-azuread-application-with-single-page-application/configuration.tfvars

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ azuread_applications = {
5151
id = "d4c3605a-b327-35c5-f04d-77f7fcdd4995"
5252
type = "Admin"
5353
value = "app"
54+
},
55+
{
56+
admin_consent_description = "Allow to administer app2."
57+
admin_consent_display_name = "Administer app2"
58+
enabled = true
59+
type = "Admin"
60+
value = "app2"
5461
}
5562
]
5663
}

‎examples/cognitive_services/101-cognitive-services-account-managed-identity/configuration.tfvars

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
global_settings = {
2+
default_region = "region1"
3+
regions = {
4+
region1 = "westus"
5+
}
6+
random_length = 5
7+
}
8+
9+
resource_groups = {
10+
test-rg = {
11+
name = "rg-cognitive-test"
12+
}
13+
}
14+
15+
managed_identities = {
16+
cognitive_msi = {
17+
name = "cognitive-msi"
18+
resource_group_key = "test-rg"
19+
}
20+
}
21+
22+
cognitive_services_account = {
23+
test_account-1 = {
24+
resource_group = {
25+
# accepts either id or key to get resource group id
26+
# id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroup1"
27+
# lz_key = "examples"
28+
key = "test-rg"
29+
}
30+
name = "cs-test-1"
31+
kind = "OpenAI"
32+
sku_name = "S0"
33+
public_network_access_enabled = true
34+
35+
identity = {
36+
type = "SystemAssigned, UserAssigned" // Can be "SystemAssigned, UserAssigned" or "SystemAssigned" or "UserAssigned"
37+
key = "cognitive_msi" // A must with "SystemAssigned, UserAssigned" and "UserAssigned"
38+
}
39+
40+
tags = {
41+
env = "test"
42+
}
43+
# custom_subdomain_name = "cs-test-1"
44+
# network_acls = {
45+
# default_action = "Allow"
46+
# ip_rules = ["10.10.10.0/16"]
47+
# }
48+
}
49+
test_account-2 = {
50+
resource_group = {
51+
# accepts either id or key to get resource group id
52+
# id = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroup1"
53+
# lz_key = "examples"
54+
key = "test-rg"
55+
}
56+
name = "cs-test-2"
57+
kind = "QnAMaker"
58+
sku_name = "F0"
59+
60+
identity = {
61+
type = "SystemAssigned"
62+
}
63+
64+
tags = {
65+
env = "test"
66+
}
67+
qna_runtime_endpoint = "https://cs-alz-caf-test-2.azurewebsites.net"
68+
69+
}
70+
}
71+

‎examples/compute/kubernetes_services/101-single-cluster/aks.tfvars

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ aks_clusters = {
1818
resource_group_key = "aks_re1"
1919
os_type = "Linux"
2020

21+
cost_analysis_enabled = true
22+
2123
identity = {
2224
type = "SystemAssigned"
2325
}

‎examples/messaging/eventgrid/300-simple-eventgrid-system-topic/configuration.tfvars

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
global_settings = {
2+
default_region = "region1"
3+
regions = {
4+
region1 = "southeastasia"
5+
}
6+
}
7+
8+
resource_groups = {
9+
evg_examples = {
10+
name = "eventgrid"
11+
region = "region1"
12+
}
13+
}
14+
15+
storage_accounts = {
16+
sa1 = {
17+
name = "0665ba08d3ae"
18+
resource_group_key = "evg_examples"
19+
account_kind = "BlobStorage"
20+
account_tier = "Standard"
21+
# account_replication_type = "LRS"
22+
containers = {
23+
dev = {
24+
name = "random"
25+
}
26+
}
27+
}
28+
}
29+
30+
eventgrid_system_topic = {
31+
egt1 = {
32+
name = "egt1"
33+
resource_group = {
34+
key = "evg_examples"
35+
}
36+
region = "region1"
37+
38+
# topic_type can be one of these, more resource types can be supported
39+
# Microsoft.AppConfiguration.ConfigurationStores
40+
# Microsoft.Communication.CommunicationServices
41+
# Microsoft.ContainerRegistry.Registries
42+
# Microsoft.Devices.IoTHubs
43+
# Microsoft.EventGrid.Domains
44+
# Microsoft.EventGrid.Topics
45+
# Microsoft.Eventhub.Namespaces
46+
# Microsoft.KeyVault.vaults
47+
# Microsoft.MachineLearningServices.Workspaces
48+
# Microsoft.Maps.Accounts
49+
# Microsoft.Media.MediaServices
50+
# Microsoft.Resources.ResourceGroups
51+
# Microsoft.Resources.Subscriptions
52+
# Microsoft.ServiceBus.Namespaces
53+
# Microsoft.SignalRService.SignalR
54+
# Microsoft.Storage.StorageAccounts
55+
# Microsoft.Web.ServerFarms
56+
# Microsoft.Web.Sites
57+
topic_type = "Microsoft.Storage.StorageAccounts"
58+
59+
source_resource = {
60+
type = "storage_accounts"
61+
key = "sa1"
62+
}
63+
}
64+
}

0 commit comments

Comments
 (0)