Skip to content

Commit 23ebace

Browse files
Merge branch 'main' into list_identity-azurerm_monitor_activity_log_alert
2 parents 3c46cd3 + a74a038 commit 23ebace

3,034 files changed

Lines changed: 58429 additions & 19339 deletions

File tree

Some content is hidden

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

.github/labeler-issue-triage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ service/spring:
330330
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(spring_cloud_accelerator\W+|spring_cloud_active_deployment\W+|spring_cloud_api_portal\W+|spring_cloud_api_portal_custom_domain\W+|spring_cloud_app\W+|spring_cloud_app_cosmosdb_association\W+|spring_cloud_app_dynamics_application_performance_monitoring\W+|spring_cloud_app_mysql_association\W+|spring_cloud_app_redis_association\W+|spring_cloud_application_insights_application_performance_monitoring\W+|spring_cloud_application_live_view\W+|spring_cloud_build_deployment\W+|spring_cloud_build_pack_binding\W+|spring_cloud_builder\W+|spring_cloud_certificate\W+|spring_cloud_configuration_service\W+|spring_cloud_container_deployment\W+|spring_cloud_custom_domain\W+|spring_cloud_customized_accelerator\W+|spring_cloud_dev_tool_portal\W+|spring_cloud_dynatrace_application_performance_monitoring\W+|spring_cloud_elastic_application_performance_monitoring\W+|spring_cloud_gateway\W+|spring_cloud_gateway_custom_domain\W+|spring_cloud_gateway_route_config\W+|spring_cloud_java_deployment\W+|spring_cloud_new_relic_application_performance_monitoring\W+|spring_cloud_service\W+|spring_cloud_storage\W+)((.|\n)*)###'
331331

332332
service/storage:
333-
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(managed_lustre_file_system|storage_account\W+|storage_account_blob_container_sas\W+|storage_account_customer_managed_key\W+|storage_account_local_user\W+|storage_account_network_rules\W+|storage_account_queue_properties\W+|storage_account_sas\W+|storage_account_static_website\W+|storage_blob\W+|storage_blob_inventory_policy\W+|storage_container\W+|storage_container_immutability_policy\W+|storage_containers\W+|storage_data_lake_gen2_filesystem\W+|storage_data_lake_gen2_path\W+|storage_encryption_scope\W+|storage_management_policy\W+|storage_object_replication\W+|storage_queue\W+|storage_share\W+|storage_share_directory\W+|storage_share_file\W+|storage_sync\W+|storage_sync_cloud_endpoint\W+|storage_sync_group\W+|storage_sync_server_endpoint\W+|storage_table\W+|storage_table\W+|storage_table_entities\W+|storage_table_entity\W+)((.|\n)*)###'
333+
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(managed_lustre_file_system|storage_account\W+|storage_account_blob_container_sas\W+|storage_account_customer_managed_key\W+|storage_account_local_user\W+|storage_account_network_rules\W+|storage_account_queue_properties\W+|storage_account_sas\W+|storage_account_static_website\W+|storage_account_table_properties\W+|storage_blob\W+|storage_blob_inventory_policy\W+|storage_container\W+|storage_container_immutability_policy\W+|storage_containers\W+|storage_data_lake_gen2_filesystem\W+|storage_data_lake_gen2_path\W+|storage_encryption_scope\W+|storage_management_policy\W+|storage_object_replication\W+|storage_queue\W+|storage_share\W+|storage_share_directory\W+|storage_share_file\W+|storage_sync\W+|storage_sync_cloud_endpoint\W+|storage_sync_group\W+|storage_sync_server_endpoint\W+|storage_table\W+|storage_table\W+|storage_table_entities\W+|storage_table_entity\W+)((.|\n)*)###'
334334

335335
service/storagemover:
336336
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_storage_mover((.|\n)*)###'
@@ -363,4 +363,4 @@ service/vmware:
363363
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_vmware_((.|\n)*)###'
364364

365365
service/workloads:
366-
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(chaos_studio_|container_connected_registry\W+|container_registry_cache_rule\W+|container_registry_credential_set\W+|container_registry_task\W+|container_registry_task_schedule_run_now\W+|container_registry_token_password\W+|kubernetes_cluster_deployment_safeguard\W+|kubernetes_cluster_extension\W+|kubernetes_cluster_trusted_access_role_binding\W+|kubernetes_fleet_manager\W+|kubernetes_fleet_member\W+|kubernetes_fleet_update_run\W+|kubernetes_fleet_update_strategy\W+|kubernetes_flux_configuration\W+|kubernetes_node_pool_snapshot\W+|workloads_sap_)((.|\n)*)###'
366+
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(chaos_studio_|container_connected_registry\W+|container_registry_cache_rule\W+|container_registry_credential_set\W+|container_registry_task\W+|container_registry_task_schedule_run_now\W+|container_registry_token_password\W+|kubernetes_automatic_cluster\W+|kubernetes_cluster_deployment_safeguard\W+|kubernetes_cluster_extension\W+|kubernetes_cluster_trusted_access_role_binding\W+|kubernetes_fleet_manager\W+|kubernetes_fleet_member\W+|kubernetes_fleet_update_run\W+|kubernetes_fleet_update_strategy\W+|kubernetes_flux_configuration\W+|kubernetes_node_pool_snapshot\W+|workloads_sap_)((.|\n)*)###'

.github/workflows/pr-validation.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,13 @@ jobs:
331331
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
332332
with:
333333
go-version-file: ./.go-version
334-
- uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9
334+
- uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9
335335
with:
336-
version: 'v2.4.0'
337-
install-mode: 'goinstall'
338-
args: -v ./...
336+
version: 'v2.12.2'
337+
# Use the default 'binary' install mode: it downloads the pre-built
338+
# release binary instead of compiling golangci-lint from source
339+
# (goinstall), which is significantly faster for a pinned version.
340+
args: ./...
339341
- name: Guidance on failure
340342
if: failure()
341343
run: |

.github/workflows/teamcity-remove-label-on-commit.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
name: TeamCity Remove Label on Commit
33

44
on:
5-
pull_request:
5+
pull_request_target:
66
types: [synchronize]
77

88
permissions:
99
contents: read
1010
pull-requests: write
11+
issues: write
1112

1213
jobs:
1314
apply-outdated-label:

.github/workflows/teamcity-run-tests-on-comment.yaml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
111111
- name: Cache tctest binary
112112
id: cache-tctest
113-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
113+
uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
114114
with:
115115
path: ~/go/bin/tctest
116116
key: tctest-${{ runner.os }}-${{ steps.tctest-version.outputs.version }}
@@ -150,18 +150,21 @@ jobs:
150150
# Initialize default values
151151
beta=false
152152
service=""
153+
queue=false
153154
154155
# Parse flags using getopts
155156
# Convert FLAGS_STRING to array for getopts
156157
eval set -- $FLAGS_STRING
157158
158-
while getopts ":bs:" opt; do
159+
while getopts ":bqs:" opt; do
159160
case "$opt" in
160161
b) beta=true ;;
162+
q) queue=true ;;
161163
s) service="$OPTARG" ;;
162164
*)
163-
echo "Usage: /test [-b] [-s service_name]"
165+
echo "Usage: /test [-b] [-q] [-s service_name]"
164166
echo " -b: Test beta version"
167+
echo " -q: Add the build to the top of the queue"
165168
echo " -s: Specify service name"
166169
exit 1
167170
;;
@@ -171,18 +174,24 @@ jobs:
171174
echo "Running tctest for PR #${PR_NUMBER}"
172175
echo "PR commit SHA: ${PR_SHA}"
173176
echo "Beta version: ${beta}"
177+
echo "Queue priority: ${queue}"
174178
echo "Service: ${service:-all}"
175179
180+
queue_flag=""
181+
if [ "$queue" = true ]; then
182+
queue_flag="-q"
183+
fi
184+
176185
# Run tctest with parsed flags
177186
if [ "$service" != "" ]; then
178-
tctest pr ${PR_NUMBER} -c --reappend-split-character --service "$service" --properties "TRACKING_ID=${PR_SHA}"
187+
tctest pr ${PR_NUMBER} -c ${queue_flag} --reappend-split-character --service "$service" --properties "TRACKING_ID=${PR_SHA}"
179188
if [ "$beta" = true ]; then
180-
tctest pr ${PR_NUMBER} -c --reappend-split-character --service "$service" --buildtypeid TF_AzureRM_AZURERM_BETA_VERSION_SERVICE_PUBLIC --properties "TRACKING_ID=${PR_SHA}"
189+
tctest pr ${PR_NUMBER} -c ${queue_flag} --reappend-split-character --service "$service" --buildtypeid TF_AzureRM_AZURERM_BETA_VERSION_SERVICE_PUBLIC --properties "TRACKING_ID=${PR_SHA}"
181190
fi
182191
else
183-
tctest pr ${PR_NUMBER} -c --reappend-split-character --properties "TRACKING_ID=${PR_SHA}"
192+
tctest pr ${PR_NUMBER} -c ${queue_flag} --reappend-split-character --properties "TRACKING_ID=${PR_SHA}"
184193
if [ "$beta" = true ]; then
185-
tctest pr ${PR_NUMBER} -c --reappend-split-character --buildtypeid TF_AzureRM_AZURERM_BETA_VERSION_SERVICE_PUBLIC --properties "TRACKING_ID=${PR_SHA}"
194+
tctest pr ${PR_NUMBER} -c ${queue_flag} --reappend-split-character --buildtypeid TF_AzureRM_AZURERM_BETA_VERSION_SERVICE_PUBLIC --properties "TRACKING_ID=${PR_SHA}"
186195
fi
187196
fi
188197

.github/workflows/teamcity-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
25-
- uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5
25+
- uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
2626
with:
2727
distribution: zulu
2828
java-version: 17
2929
java-package: jdk
30-
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
30+
- uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
3131
with:
3232
path: ~/.m2/repository
3333
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.golangci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ linters:
1919
- ineffassign
2020
- misspell
2121
- nilerr
22-
- prealloc
2322
- predeclared
2423
- reassign
2524
- staticcheck
@@ -62,6 +61,7 @@ linters:
6261
- legacy
6362
- std-error-handling
6463
paths:
64+
- vendor$
6565
- internal/services/.*/.*_gen.go$
6666
- /sdk/
6767
- third_party$
@@ -78,6 +78,7 @@ formatters:
7878
exclusions:
7979
generated: lax
8080
paths:
81+
- vendor$
8182
- internal/services/.*/.*_gen.go$
8283
- /sdk/
8384
- third_party$

.teamcity/scripts/post_github_comment.sh

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,34 @@ set_testing_label() {
8383
}
8484

8585
# Fetch test results for this build from the TeamCity REST API
86-
TEST_RESULTS=$(curl -s \
86+
TEAMCITY_ERROR=""
87+
RAW_TEST_RESULTS_JSON=$(curl -sS -f \
8788
-H "Authorization: Bearer $TEAMCITY_TOKEN" \
8889
-H "Accept: application/json" \
89-
"%teamcity.serverUrl%/app/rest/testOccurrences?locator=build:(id:$BUILD_ID),count:100000&fields=testOccurrence(name,status,duration)" \
90-
| jq -r '.testOccurrence[]
90+
"%teamcity.serverUrl%/app/rest/testOccurrences?locator=build:(id:$BUILD_ID),count:100000&fields=testOccurrence(name,status,duration)")
91+
92+
if [ $? -ne 0 ] || [ -z "$RAW_TEST_RESULTS_JSON" ]; then
93+
TEAMCITY_ERROR="Failed to fetch test results from TeamCity for build $BUILD_ID."
94+
TEST_RESULTS=""
95+
else
96+
TEST_RESULTS=$(echo "$RAW_TEST_RESULTS_JSON" | jq -r '(.testOccurrence // [])[]
9197
| select(.status == "SUCCESS" or .status == "FAILURE")
9298
| "\(.name)|\(if .status == "SUCCESS" then "PASS" else "FAIL" end)|\((.duration // 0) / 1000)|"')
9399

100+
if [ $? -ne 0 ]; then
101+
TEAMCITY_ERROR="Failed to parse TeamCity test results for build $BUILD_ID."
102+
TEST_RESULTS=""
103+
fi
104+
fi
105+
94106
PASS_COUNT=$(echo "$TEST_RESULTS" | awk -F'|' '{if($2=="PASS") print}' | wc -l | tr -d ' ')
95107
FAIL_COUNT=$(echo "$TEST_RESULTS" | awk -F'|' '{if($2=="FAIL") print}' | wc -l | tr -d ' ')
96108
TOTAL=$((PASS_COUNT + FAIL_COUNT))
97109

98110
# Fetch main branch test results early to identify new failures for comment marking
99111
NEW_FAILURES=""
100112
MAIN_TEST_RESULTS=""
101-
if [ "$FAIL_COUNT" -gt 0 ]; then
113+
if [ -z "$TEAMCITY_ERROR" ] && [ "$FAIL_COUNT" -gt 0 ]; then
102114
echo "Fetching main branch test results for comparison..."
103115

104116
# Get the latest successful build on main branch
@@ -146,7 +158,16 @@ BUILD_HOURS=$((BUILD_DURATION / 3600))
146158
BUILD_MINUTES=$(((BUILD_DURATION % 3600) / 60))
147159
BUILD_SECONDS=$((BUILD_DURATION % 60))
148160

149-
COMMENT="Build: [$BUILD_ID](%teamcity.serverUrl%/viewLog.html?buildId=$BUILD_ID)
161+
if [ -n "$TEAMCITY_ERROR" ]; then
162+
COMMENT="Build: [$BUILD_ID](%teamcity.serverUrl%/viewLog.html?buildId=$BUILD_ID)
163+
PR: #$PR_NUMBER
164+
165+
**TeamCity Error:** $TEAMCITY_ERROR
166+
167+
Unable to collect test details for this run. Please check TeamCity build logs.
168+
"
169+
else
170+
COMMENT="Build: [$BUILD_ID](%teamcity.serverUrl%/viewLog.html?buildId=$BUILD_ID)
150171
PR: #$PR_NUMBER
151172
152173
**Total:** $TOTAL
@@ -188,15 +209,16 @@ $1 == "" { next }
188209
}
189210
')
190211

191-
COMMENT+="$TABLE_ROWS"
212+
COMMENT+="$TABLE_ROWS"
192213

193-
COMMENT+="</table>
214+
COMMENT+="</table>
194215
</details>
195216
"
217+
fi
196218

197219
# Fetch PR author if there are failures
198220
AUTHOR_MESSAGE=""
199-
if [ "$FAIL_COUNT" -gt 0 ]; then
221+
if [ -z "$TEAMCITY_ERROR" ] && [ "$FAIL_COUNT" -gt 0 ]; then
200222
PR_AUTHOR=$(github_api_request "/pulls/${PR_NUMBER}" \
201223
| jq -r '.user.login')
202224

@@ -280,9 +302,14 @@ curl -s -X POST \
280302
"https://api.github.com/repos/$GITHUB_REPO/issues/${PR_NUMBER}/comments" \
281303
-d "{\"body\": $(jq -Rs . <<< "$COMMENT")}"
282304

283-
if APPLY_TESTING_LABELS_ENABLED; then
305+
if [ "$APPLY_TESTING_LABELS_ENABLED" = "true" ]; then
284306
echo "Applying labels..."
285307

308+
if [ -n "$TEAMCITY_ERROR" ]; then
309+
echo "Skipping label application due to TeamCity error"
310+
exit 0
311+
fi
312+
286313
# If no failures, apply teamcity-passed label
287314
if [ "$FAIL_COUNT" -eq 0 ]; then
288315
echo "No test failures detected"

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 4.80.0 (July 02, 2026)
2+
3+
ENHANCEMENTS:
4+
5+
* dependencies: `go-azure-sdk` - update to `v0.20260629.1154953` ([#32691](https://github.com/hashicorp/terraform-provider-azurerm/issues/32691))
6+
* dependencies: `managedhsm` - update to API version `2026-02-01` ([#32377](https://github.com/hashicorp/terraform-provider-azurerm/issues/32377))
7+
* `azurerm_cdn_frontdoor_custom_domain` - add basic validation for the `host_name` property ([#32349](https://github.com/hashicorp/terraform-provider-azurerm/issues/32349))
8+
* `azurerm_cdn_frontdoor_custom_domain` - improve validation for additional `host_name` constraints when `tls.certificate_type` is `ManagedCertificate` ([#32349](https://github.com/hashicorp/terraform-provider-azurerm/issues/32349))
9+
10+
BUG FIXES:
11+
12+
* `azurerm_machine_learning_datastore_fileshare` - fix 5.0 migration bug for the `storage_fileshare_id` property ([#32586](https://github.com/hashicorp/terraform-provider-azurerm/issues/32586))
13+
114
## 4.79.0 (June 25, 2026)
215

316
FEATURES:

examples/app-service-certificate/stored-in-keyvault/main.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ resource "azurerm_resource_group" "example" {
1313
}
1414

1515
resource "azurerm_key_vault" "example" {
16-
name = "${var.prefix}-key-vault"
17-
resource_group_name = azurerm_resource_group.example.name
18-
location = azurerm_resource_group.example.location
19-
tenant_id = data.azurerm_client_config.current.tenant_id
16+
name = "${var.prefix}-key-vault"
17+
resource_group_name = azurerm_resource_group.example.name
18+
location = azurerm_resource_group.example.location
19+
tenant_id = data.azurerm_client_config.current.tenant_id
20+
rbac_authorization_enabled = false
2021

2122
sku_name = "standard"
2223
}

0 commit comments

Comments
 (0)