Skip to content

Commit cd03df0

Browse files
committed
Merge branch 'main' into issue-28542/mssql_elastic_pool_ha_replica_count
# Conflicts: # internal/services/mssql/mssql_elasticpool_resource_test.go # website/docs/r/mssql_elasticpool.html.markdown
2 parents 033f40e + bae77b0 commit cd03df0

File tree

19,123 files changed

+310998
-207876
lines changed

Some content is hidden

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

19,123 files changed

+310998
-207876
lines changed

.github/ISSUE_TEMPLATE/Feature_Request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ body:
5757
5858
Are there any other GitHub issues (open or closed) or pull requests that should be linked here? Vendor blog posts or documentation? For example:
5959
60-
* https://azure.microsoft.com/en-us/roadmap/virtual-network-service-endpoint-for-azure-cosmos-db/
60+
* https://azure.microsoft.com/en-us/updates?id=general-availability-azure-cosmos-db-virtual-network-service-endpoint

.github/labeler-issue-triage.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,6 @@ service/management-groups:
221221
service/maps:
222222
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_maps_((.|\n)*)###'
223223

224-
service/mixed-reality:
225-
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_spatial_anchors_account((.|\n)*)###'
226-
227-
service/mobile-network:
228-
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_mobile_network((.|\n)*)###'
229-
230224
service/mongo-cluster:
231225
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_mongo_cluster((.|\n)*)###'
232226

@@ -291,11 +285,14 @@ service/redhatopenshift:
291285
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_redhat_openshift_cluster((.|\n)*)###'
292286

293287
service/redis:
294-
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(redis_cache\W+|redis_cache_access_policy\W+|redis_cache_access_policy_assignment\W+|redis_enterprise_cluster\W+|redis_enterprise_database\W+|redis_firewall_rule\W+|redis_linked_server\W+|resource_deployment_script_azure_cli\W+|resource_deployment_script_azure_power_shell\W+|resource_management_private_link\W+|resource_management_private_link_association\W+|resource_provider_registration\W+)((.|\n)*)###'
288+
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(managed_redis|redis_)((.|\n)*)###'
295289

296290
service/relay:
297291
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_relay_((.|\n)*)###'
298292

293+
service/resource:
294+
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(management_group_template_deployment\W+|management_lock\W+|resource_deployment_script_azure_cli\W+|resource_deployment_script_azure_power_shell\W+|resource_group\W+|resource_group_template_deployment\W+|resource_management_private_link\W+|resource_management_private_link_association\W+|resource_provider_registration\W+|resources|subscription_template_deployment|template_spec_version|tenant_template_deployment)((.|\n)*)###'
295+
299296
service/search:
300297
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_search_s((.|\n)*)###'
301298

@@ -360,4 +357,4 @@ service/vmware:
360357
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(vmware_cluster\W+|vmware_express_route_authorization\W+|vmware_netapp_volume_attachment\W+|vmware_private_cloud\W+|voice_services_communications_gateway\W+|voice_services_communications_gateway_test_line\W+)((.|\n)*)###'
361358

362359
service/workloads:
363-
- '### (|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_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)*)###'
360+
- '### (|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)*)###'

.github/labeler-pull-request-triage.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -369,16 +369,6 @@ service/maps:
369369
- any-glob-to-any-file:
370370
- internal/services/maps/**/*
371371

372-
service/mixed-reality:
373-
- changed-files:
374-
- any-glob-to-any-file:
375-
- internal/services/mixedreality/**/*
376-
377-
service/mobile-network:
378-
- changed-files:
379-
- any-glob-to-any-file:
380-
- internal/services/mobilenetwork/**/*
381-
382372
service/mongo-cluster:
383373
- changed-files:
384374
- any-glob-to-any-file:
@@ -487,6 +477,7 @@ service/redhatopenshift:
487477
service/redis:
488478
- changed-files:
489479
- any-glob-to-any-file:
480+
- internal/services/managedredis/**/*
490481
- internal/services/redis/**/*
491482
- internal/services/redisenterprise/**/*
492483

@@ -495,6 +486,11 @@ service/relay:
495486
- any-glob-to-any-file:
496487
- internal/services/relay/**/*
497488

489+
service/resource:
490+
- changed-files:
491+
- any-glob-to-any-file:
492+
- internal/services/resource/**/*
493+
498494
service/search:
499495
- changed-files:
500496
- any-glob-to-any-file:

.github/workflows/add-waiting-response-on-fail.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Add waiting-response on failures
33

44
on:
55
workflow_run:
6-
workflows: ['Check for new usages of deprecated functionality', 'GoLang Linting', 'Website Linting', 'Generation Check', 'Validate Examples', 'Unit Tests', 'Terraform Schema Linting', '32 Bit Build', 'Provider Tests', 'Vendor Dependencies Check']
6+
workflows: ['Check for new usages of deprecated functionality', 'GoLang Linting', 'Website Linting', 'Generation Check', 'Validate Examples', 'Unit Tests', 'Terraform Schema Linting', 'Provider Tests', 'Vendor Dependencies Check']
77
types: [completed]
88

99
permissions:

.github/workflows/breaking-change-detection.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@ jobs:
2323
runs-on: custom-linux-small
2424
steps:
2525
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
26+
- uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
2727
with:
2828
go-version-file: ./.go-version
2929
- run: bash ./scripts/run-breaking-change-detection.sh
30+
- name: Guidance on failure
31+
if: failure()
32+
run: |
33+
echo "::error::Breaking Schema Changes detected."
34+
echo ""
35+
echo "Your changes contain breaking schema changes (e.g. removing or renaming"
36+
echo "a property, changing a property type, or making an optional property required)."
37+
echo "Breaking changes must be gated behind the appropriate feature flag (e.g. features.FivePointOh())."
38+
echo "Please review the breaking changes guide: contributing/topics/guide-breaking-changes.md"

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
go-version: ${{ steps.get-go-version.outputs.go-version }}
3232
steps:
3333
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
34+
- uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
3535
with:
3636
go-version-file: 'go.mod'
3737
- name: Detect Go version
@@ -123,6 +123,8 @@ jobs:
123123
- get-go-version
124124
- set-product-version
125125
runs-on: custom-ubuntu-22.04-medium
126+
if: github.repository_owner == 'hashicorp'
127+
timeout-minutes: 30
126128
strategy:
127129
fail-fast: true
128130
# Verify expected Artifacts list for a workflow run.
@@ -184,4 +186,4 @@ jobs:
184186
echo "### What's next?" >> "$GITHUB_STEP_SUMMARY"
185187
echo "#### For a release branch (see \`.release/ci.hcl\`)" >> $GITHUB_STEP_SUMMARY
186188
echo "After this \`build\` workflow run completes succesfully, you can expect the CRT \`prepare\` workflow to begin momentarily." >> "$GITHUB_STEP_SUMMARY"
187-
echo "To find the \`prepare\` workflow run, [view the checks for this commit]($github_dot_com/$owner_with_name/commits/$ref)" >> "$GITHUB_STEP_SUMMARY"
189+
echo "To find the \`prepare\` workflow run, [view the checks for this commit]($github_dot_com/$owner_with_name/commits/$ref)" >> "$GITHUB_STEP_SUMMARY"
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: 'Close PRs With Failing CI'
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '0 6 * * MON,WED,FRI'
6+
7+
permissions:
8+
issues: write
9+
pull-requests: write
10+
checks: read
11+
statuses: read
12+
13+
jobs:
14+
close-failing-ci-prs:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18+
- name: Process PRs with failing CI
19+
run: ./scripts/close-failing-ci-prs.sh -o "${{ github.repository_owner }}" -r "${{ github.event.repository.name }}" -t "${{ secrets.GITHUB_TOKEN }}" -l
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: 'Close Inactive Draft PRs'
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '0 6 * * MON'
6+
7+
permissions:
8+
issues: write
9+
pull-requests: write
10+
11+
jobs:
12+
stale-draft-prs:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
- name: Process stale draft PRs
17+
run: ./scripts/close-inactive-draft-prs.sh -o "${{ github.repository_owner }}" -r "${{ github.event.repository.name }}" -t "${{ secrets.GITHUB_TOKEN }}"
18+

.github/workflows/comment-failure.yaml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,46 @@ on:
44
# This file is reused, and called from other workflows
55
workflow_call:
66

7+
permissions:
8+
pull-requests: write
9+
710
jobs:
811
comment-failure:
912
runs-on: ubuntu-latest
1013
steps:
1114
- name: Get run url
12-
if: failure()
1315
run: |
1416
echo "gha_url=https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" >> $GITHUB_ENV
1517
- name: Send build failure comment
16-
if: failure()
1718
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
1819
with:
1920
result-encoding: string
2021
script: |
22+
const workflowName = '${{ github.workflow }}';
23+
24+
const guidance = {
25+
'Vendor Dependencies Check': 'Do not modify files in the `vendor/` directory directly. Instead, update dependencies in `go.mod` and run `go mod vendor` to sync the vendor directory. Then run `make depscheck` locally to verify.',
26+
'Website Linting': 'Run `make website-lint` and `make document-validate` locally to check your documentation files under `website/` for formatting or validation issues.',
27+
'Generation Check': 'Run `make generate` locally to regenerate any auto-generated code, then commit the resulting changes.',
28+
'GoLang Linting': 'Run the Go linter locally with `golangci-lint run -v ./internal/...` and fix any reported issues.',
29+
'Terraform Schema Linting': 'Run `make tflint` locally and fix any Terraform schema issues in your resource or data source definitions.',
30+
'Unit Tests': 'Run `make test` locally to reproduce and fix the failing unit tests.',
31+
'ShellCheck Scripts': 'Run `make shellcheck` locally to check shell scripts for issues and fix any warnings or errors.',
32+
'Validate Examples': 'Run `make validate-examples` locally to check that your example Terraform configurations under `examples/` are valid.',
33+
34+
};
35+
36+
let body = `<b>Build failure: ${workflowName}</b>\n\nThis pull request contains a build failure in the <b>${workflowName}</b> check which needs to be addressed [here](${{ env.gha_url }}).`;
37+
38+
if (guidance[workflowName]) {
39+
body += `\n\n<b>How to fix:</b> ${guidance[workflowName]}`;
40+
}
41+
42+
body += `\n\nFor more information, please refer to our [Contributing Guide](https://github.com/${{ github.repository }}/blob/main/contributing/README.md).`;
43+
2144
github.rest.issues.createComment({
22-
issue_number: ${{ github.event.number }},
23-
owner: context.repo.owner,
24-
repo: context.repo.repo,
25-
body: '<b>Build failure</b> \n\n This pull request contains a build failure which needs addressed [here](${{ env.gha_url}}) .'
26-
})
45+
issue_number: ${{ github.event.number }},
46+
owner: context.repo.owner,
47+
repo: context.repo.repo,
48+
body: body
49+
})

.github/workflows/depscheck.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Vendor Dependencies Check
33

44
permissions:
55
contents: read
6+
pull-requests: write
67

78
on:
89
pull_request:
@@ -17,14 +18,24 @@ jobs:
1718
runs-on: ubuntu-latest
1819
steps:
1920
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20-
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
21+
- uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
2122
with:
2223
go-version-file: ./.go-version
2324
- run: bash scripts/gogetcookie.sh
2425
- run: make depscheck
26+
- name: Guidance on failure
27+
if: failure()
28+
run: |
29+
echo "::error::Vendor Dependencies Check failed."
30+
echo ""
31+
echo "Do not modify files in the vendor/ directory directly."
32+
echo "Instead, update dependencies in go.mod and run 'go mod tidy && go mod vendor' to sync the vendor directory."
33+
echo "Then run 'make depscheck' locally to verify before pushing."
2534
save-artifacts-on-fail:
26-
if: ${{ needs.depscheck.result }} == 'failure'
35+
needs: depscheck
36+
if: ${{ failure() }}
2737
uses: ./.github/workflows/save-artifacts.yaml
2838
comment-on-fail:
29-
if: ${{ needs.depscheck.result }} == 'failure'
39+
needs: depscheck
40+
if: ${{ failure() }}
3041
uses: ./.github/workflows/comment-failure.yaml

0 commit comments

Comments
 (0)