Skip to content

Commit

Permalink
Merge branch 'main' into container-group-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
dkuzmenok authored Aug 17, 2022
2 parents c7db950 + 00bafb8 commit 60a4c3b
Show file tree
Hide file tree
Showing 655 changed files with 19,015 additions and 23,037 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/depscheck.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: Vendor Dependencies Check
permissions:
contents: read
on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/gencheck.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: Generation Check
permissions:
contents: read
on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/golint.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: GoLang Linting
permissions:
contents: read
on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/gradually-deprecated.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: Check for new usages of deprecated functionality
permissions:
contents: read
on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/issue-opened.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Issue Opened Triage

permissions:
issues: write

on:
issues:
types: [opened]
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:

jobs:
lock:
permissions:
issues: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v2
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/pull-request-new-commit.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
---
name: Pull Request New Commit

permissions:
pull-requests: write

on:
pull_request:
pull_request_target:
types: [synchronize]

jobs:
Expand All @@ -12,4 +15,4 @@ jobs:
- uses: actions-ecosystem/action-remove-labels@v1
with:
github_token: "${{ secrets.GITHUB_TOKEN }}"
labels: waiting-response
labels: waiting-response
48 changes: 48 additions & 0 deletions .github/workflows/pull-request-reviewed-workflow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
name: "Pull Request Reviewed Workflow"

on:
workflow_run:
workflows:
- "Pull Request Reviewed"
types:
- completed

permissions:
pull-requests: write

jobs:
add-or-remove-waiting-response:
runs-on: ubuntu-latest
outputs:
ghrepo: ${{ steps.env_vars.outputs.ghrepo }}
ghowner: ${{ steps.env_vars.outputs.ghowner }}
prnumber: ${{ steps.env_vars.outputs.prnumber }}
action: ${{ steps.env_vars.outputs.action }}
steps:
- name: Get Artifact
id: get_artifact
continue-on-error: true
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: pull-request-reviewed.yaml

- name: env_vars
id: env_vars
if: steps.get_artifact.outcome == 'success'
run: |
echo "::set-output name=ghrepo::$(cat artifact/ghrepo.txt)"
echo "::set-output name=ghowner::$(cat artifact/ghowner.txt)"
echo "::set-output name=prnumber::$(cat artifact/prnumber.txt)"
echo "::set-output name=action::$(cat artifact/action.txt)"
- name: add waiting-reponse
if: steps.get_artifact.outcome == 'success' && steps.env_vars.outputs.action == 'add-waiting-response'
run: |
curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos${{ steps.env_vars.outputs.ghowner }}/${{ steps.env_vars.outputs.ghrepo }}/issues/${{ steps.env_vars.outputs.prnumber }}/labels" -d '{"labels":["waiting-response"]}'
- name: remove waiting-reponse
if: steps.get_artifact.outcome == 'success' && steps.env_vars.outputs.action == 'remove-waiting-response'
run: |
curl -X DELETE -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos${{ steps.env_vars.outputs.ghowner }}/${{ steps.env_vars.outputs.ghrepo }}/issues/${{ steps.env_vars.outputs.prnumber }}/labels/waiting-response"
34 changes: 22 additions & 12 deletions .github/workflows/pull-request-reviewed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,31 @@ on:
types: [submitted]

permissions:
pull-requests: write
pull-requests: read

jobs:
add-waiting-response:
if: github.event.review.state != 'approved' && github.actor != github.event.pull_request.user.login
add-or-remove-waiting-response:
runs-on: ubuntu-latest
steps:
- shell: bash
- name: "Set Artifacts for add-waiting-response"
if: github.event.review.state != 'approved' && github.actor != github.event.pull_request.user.login
shell: bash
run: |
curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos${{ github.owner }}/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels" -d '{"labels":["waiting-response"]}'
remove-waiting-response:
if: github.actor == github.event.pull_request.user.login
runs-on: ubuntu-latest
steps:
- uses: actions-ecosystem/action-remove-labels@v1
mkdir -p wr_actions
echo ${{ github.owner }} > wr_actions/ghowner.txt
echo ${{ github.repository }} > wr_actions/ghrepo.txt
echo ${{ github.event.pull_request.number }} > wr_actions/prnumber.txt
echo "add-waiting-response" > wr_actions/action.txt
- name: "Set Artifacts for remove-waiting-response"
if: github.actor == github.event.pull_request.user.login
shell: bash
run: |
mkdir -p wr_actions
echo ${{ github.owner }} > wr_actions/ghowner.txt
echo ${{ github.repository }} > wr_actions/ghrepo.txt
echo ${{ github.event.pull_request.number }} > wr_actions/prnumber.txt
echo "remove-waiting-response" > wr_actions/action.txt
- uses: actions/upload-artifact@v3
with:
github_token: "${{ secrets.GITHUB_TOKEN }}"
labels: waiting-response
name: artifact
path: wr_actions
3 changes: 3 additions & 0 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: "Pull Request Triage"

permissions:
pull-requests: write

on: [pull_request_target]

jobs:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/teamcity-test.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
---
name: TeamCity Config Test

permissions:
contents: read

on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tflint.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
---
name: Terraform Schema Linting

permissions:
contents: read

on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/thirty-two-bit.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
---
name: 32 Bit Build

permissions:
pull-requests: read

on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/unit-test.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
---
name: Unit Tests

permissions:
pull-requests: read

on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/validate-examples.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
---
name: Validate Examples

permissions:
pull-requests: read

on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/website-lint.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
---
name: Website Linting

permissions:
pull-requests: read

on:
pull_request:
types: ['opened', 'synchronize']
Expand Down
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,44 @@
## 3.19.0 (Unreleased)

FEATURES:

* **New Rersource**: `azurerm_eventhub_namespace_schema_group` [GH-17635]
* **New Data Source**: `azurerm_dns_a_record` [GH-17477]
* **New Data Source**: `azurerm_dns_aaaa_record` [GH-17477]
* **New Data Source**: `azurerm_dns_caa_record` [GH-17477]
* **New Data Source**: `azurerm_dns_cname_record` [GH-17477]
* **New Data Source**: `azurerm_dns_mx_record` [GH-17477]
* **New Data Source**: `azurerm_dns_ns_record` [GH-17477]
* **New Data Source**: `azurerm_dns_ptr_record` [GH-17477]
* **New Data Source**: `azurerm_dns_soa_record` [GH-17477]
* **New Data Source**: `azurerm_dns_srv_record` [GH-17477]
* **New Data Source**: `azurerm_dns_txt_record` [GH-17477]

ENHANCEMENTS:

* Dependencies: bump `go-azure-helpers` to `v0.39.0` [GH-17996]
* Dependencies: bump `go-azure-sdk` to `v0.20220815.1092453` [GH-7998]
* updating `dedicated_host_*` to use `hashicorp/go-azure-sdk` [GH-17616]
* Data Source: `azurerm_images` - now uses a logical id [GH-17766]
* Data Source: `azurerm_management_group` - now exports the `management_group_ids`, `all_management_group_ids`, and `all_subscription_ids` attributes [GH-16208]
* `azurerm_active_directory_domain_service` - support for the `kerberos_armoring_enabled` and `kerberos_rc4_encryption_enabled` properties [GH-17853]
* `azurerm_automation_account` - support for the `private_endpoint_connection` property [GH-17934]
* `azurerm_automation_account` - support for the `encryption` block and `local_authentication_enabled` property [GH-17454]
* `azurerm_batch_pool` - support for identity referencees in container registries [GH-17416]
* `azurerm_data_factory_integration_runtime_azure_ssis` - support for the `express_vnet_injection` property [GH-17756]
* `azurerm_firewall_policy_resource` - support for the `private_ranges` and `allow_sql_redirect` properties [GH-17842]
* `azurerm_key_vault` - support for the `public_network_access_enabled` property [GH-17552]
* `azurerm_linux_virtual_machine` - now supports delete Eviction policies [GH-17226]
* `azurerm_linux_virtual_machine_scale_set` - now supports delete Eviction policies [GH-17226]
* `azurerm_mssql_elastic_pool` - support for the `maintenance_configuration_name` property [GH-17790]
* `azurerm_mssql_server` - support `Disabled` for the `minimum_tls_version` property [GH-16595]
* `azurerm_shared_image` - support for the `architecture` property [GH-17250]
* `azurerm_storage_account` - support for the `default_to_oauth_authentication` property [GH-17116]
* `azurerm_shared_image_version` - support for `blob_uri` and `storage_account_id` [GH-17768]
* `azurerm_windows_virtual_machine` - now supports delete Eviction policies [GH-17226]
* `azurerm_windows_virtual_machine_scale_set` - now supports delete Eviction policies [GH-17226]
*
Allow Delete eviction policy on Azure VMs #17226

BUG FIXES:

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/gofrs/uuid v4.0.0+incompatible
github.com/google/go-cmp v0.5.8
github.com/google/uuid v1.1.2
github.com/hashicorp/go-azure-helpers v0.37.0
github.com/hashicorp/go-azure-sdk v0.20220809.1122626
github.com/hashicorp/go-azure-helpers v0.39.0
github.com/hashicorp/go-azure-sdk v0.20220815.1092453
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/go-version v1.6.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg=
github.com/hashicorp/go-azure-helpers v0.37.0 h1:6UOoQ9esE4MJ4wHJr21qU81IJQ9zsXQ9FbANYUbeE4U=
github.com/hashicorp/go-azure-helpers v0.37.0/go.mod h1:gcutZ/Hf/O7YN9M3UIvyZ9l0Rxv7Yrc9x5sSfM9cuSw=
github.com/hashicorp/go-azure-sdk v0.20220809.1122626 h1:HEl1iGprDRxZyqsIrfCYKZhDHF2rt4djYy2pyi/glmM=
github.com/hashicorp/go-azure-sdk v0.20220809.1122626/go.mod h1:yjQPw8DCOtQR8E8+FNaTxF6yz+tyQGkDNiVAGCNoLOo=
github.com/hashicorp/go-azure-helpers v0.39.0 h1:gwA0bM5y72/zN5qRuqFue6qgTVP3+gRSlX6k8KCmkGo=
github.com/hashicorp/go-azure-helpers v0.39.0/go.mod h1:gcutZ/Hf/O7YN9M3UIvyZ9l0Rxv7Yrc9x5sSfM9cuSw=
github.com/hashicorp/go-azure-sdk v0.20220815.1092453 h1:MfhuaqchMELBWNWmkJWnQHDF9wRQVf2VyL1gwaR90aI=
github.com/hashicorp/go-azure-sdk v0.20220815.1092453/go.mod h1:yjQPw8DCOtQR8E8+FNaTxF6yz+tyQGkDNiVAGCNoLOo=
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
Expand Down
10 changes: 9 additions & 1 deletion internal/provider/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,15 @@ func TestResourcesSupportCustomTimeouts(t *testing.T) {
if resource.Timeouts.Read == nil {
t.Fatalf("Resource %q doesn't define a Read timeout", resourceName)
} else if *resource.Timeouts.Read > 5*time.Minute {
t.Fatalf("Read timeouts shouldn't be more than 5 minutes, this indicates a bug which needs to be fixed")
exceptionResources := map[string]bool{
// The key vault item resources have longer read timeout for mitigating issue: https://github.com/hashicorp/terraform-provider-azurerm/issues/11059.
"azurerm_key_vault_key": true,
"azurerm_key_vault_secret": true,
"azurerm_key_vault_certificate": true,
}
if !exceptionResources[resourceName] {
t.Fatalf("Read timeouts shouldn't be more than 5 minutes, this indicates a bug which needs to be fixed")
}
}

// Optional
Expand Down
Loading

0 comments on commit 60a4c3b

Please sign in to comment.