Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 33d0c8b
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 14:32:05 2021 +0000

    Updated host_pool docs to add guidance on usage of new resource

commit ebe31dc
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 14:30:02 2021 +0000

    docs for new resource

commit acc17e6
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 14:06:37 2021 +0000

    Remove old docs

commit b3f8a7b
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 13:51:45 2021 +0000

    Fixed Acc Test issue

    Because the expiration_date value is set to be relative to execution time this is expected to generate a continual diff. This is beneficial as it ensures that a valid token is always available for registration activities downstream.

commit defb851
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 13:24:37 2021 +0000

    fix panic in acceptance test

commit f7f4db3
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 13:00:53 2021 +0000

    Fix naming issue

commit ed06e99
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 12:57:46 2021 +0000

    Fix static check error

commit e3d2bb5
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 12:53:47 2021 +0000

    Removed testing comments

commit 214dda2
Author: Andy.McCullough <[email protected]>
Date:   Mon Nov 15 12:51:37 2021 +0000

    New Provider - azurerm_virtual_desktop_host_pool_registration_info

commit baa8d11
Merge: f59d172 f5f4260
Author: amccullough84 <[email protected]>
Date:   Mon Nov 15 10:19:44 2021 +0000

    Merge branch 'hashicorp:main' into fix-dv-hp-regtoken

commit f5f4260
Merge: 470d180 020905f
Author: Tom Harvey <[email protected]>
Date:   Mon Nov 15 10:43:51 2021 +0100

    Merge pull request hashicorp#14182 from hashicorp/f/go-1.17

    build: updating to use Go 1.17.3

commit 020905f
Author: tombuildsstuff <[email protected]>
Date:   Mon Nov 15 09:38:46 2021 +0100

    build: updating to use Go 1.17.3

commit 470d180
Author: Tom Harvey <[email protected]>
Date:   Mon Nov 15 09:25:41 2021 +0100

    updating to include hashicorp#14083

commit dc05e90
Merge: 8b67f3b 61ed4e7
Author: Tom Harvey <[email protected]>
Date:   Mon Nov 15 09:24:30 2021 +0100

    Merge pull request hashicorp#14083 from magodo/upgrade_storage_account_sdk_to_2021_04_01

    Upgrade storage sdk to 2021-04-01

commit 8b67f3b
Author: kt <[email protected]>
Date:   Sun Nov 14 11:13:32 2021 -0800

    CHANGELOG.md for hashicorp#14160

commit 6bba7b9
Author: lonegunmanb <[email protected]>
Date:   Mon Nov 15 03:10:36 2021 +0800

    Fix hashicorp#14152 by adding lock to avoid parallel race error on service side (hashicorp#14160)

    As hashicorp#14152 described, when create multiple azurerm_network_watcher_flow_log with same network_security_group_id, the service side would complain a "AnotherOperationInProgress".

    This patch add an internal lock on nsg id to avoid this issue.

    AccTest (The failed test also failed on main branch so I guess it's ok for this patch):

commit 1c3cbbf
Author: kt <[email protected]>
Date:   Sun Nov 14 10:56:36 2021 -0800

    CHANGELOG.md for hashicorp#14120

commit 42e8c2a
Author: xuzhang3 <[email protected]>
Date:   Mon Nov 15 02:55:03 2021 +0800

    azurerm_machine_learning_workspace - encryption block (hashicorp#14120)

    Support Customer-managed key data encryption

commit a1fa302
Author: WS <[email protected]>
Date:   Fri Nov 12 21:31:17 2021 -0700

    Updating to include hashicorp#14003

commit 8bc0344
Author: WS <[email protected]>
Date:   Fri Nov 12 21:19:14 2021 -0700

    merge hashicorp#14003

    * Initial check-in

    * Add ovmss sku spilt func

    * update recoveryservices and add documentation

    * update vendor

    * go mod vendor

    * update test case to remove depricated field

    * Remove support for extensions

    * Add note to documentation about extension support

    * Split Capacity out of sku_name

    * Update sku parsing due to spliting out capacity

    * Fix comment format

    * Add retry logic

    * Update error message for create retry

    * Added case for unretryable in retry else case

    * Update website/docs/r/orchestrated_virtual_machine_scale_set.html.markdown

    Co-authored-by: kt <[email protected]>

    * Update website/docs/r/orchestrated_virtual_machine_scale_set.html.markdown

    Co-authored-by: kt <[email protected]>

    * Make instances optional and computed

    * Update err msg to match main

    * Change field name to termination_notification

    * Add TODO note for 3.0

    Co-authored-by: kt <[email protected]>

commit 7266d2d
Author: WS <[email protected]>
Date:   Fri Nov 12 21:15:31 2021 -0700

    Corrected version of compute API

commit d8452c2
Author: kt <[email protected]>
Date:   Fri Nov 12 14:07:51 2021 -0800

    CHANGELOG.md for 314174

commit 82a4cf8
Author: WS <[email protected]>
Date:   Fri Nov 12 15:06:11 2021 -0700

    Splitting SDK upgrade and OVMSS work into two PR's (hashicorp#14174)

    Co-authored-by: kt <[email protected]>

commit bf14645
Author: Matthew Frahry <[email protected]>
Date:   Fri Nov 12 13:41:38 2021 -0800

    Update changelog for hashicorp#14165

commit e4805f2
Author: lonegunmanb <[email protected]>
Date:   Sat Nov 13 05:40:28 2021 +0800

    `windows_virtual_machine_scale_set`/`linux_virtual_machine_scale_set` - `source_image_reference.offer` and `source_image_reference.publisher` are now ForceNew hashicorp#14165)

commit 65b6749
Author: Matthew Frahry <[email protected]>
Date:   Fri Nov 12 11:24:21 2021 -0800

    vmware - regen embedded sdk (hashicorp#14133)

commit 6964085
Merge: 6ed425d 431afb5
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 19:30:14 2021 +0100

    Merge pull request hashicorp#14170 from hashicorp/f/linting

    datalakestore: fixing linting issues

commit 431afb5
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 19:06:43 2021 +0100

    internal/acceptance: round 2

commit 6ed425d
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 18:51:59 2021 +0100

    updating to include hashicorp#14150

commit bf7f88e
Merge: 3072fa8 853d95e
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 18:51:27 2021 +0100

    Merge pull request hashicorp#14150 from hashicorp/pandora-signalr-regen

    signalr - regenerate embedded sdk

commit 3072fa8
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 18:47:56 2021 +0100

    updating to include hashicorp#14135

commit de31e75
Merge: e43775d ef67b84
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 18:47:27 2021 +0100

    Merge pull request hashicorp#14135 from hashicorp/pandora-va-regen

    video_analyzer - embedded sdk regen

commit e43775d
Author: catriona-m <[email protected]>
Date:   Fri Nov 12 15:18:43 2021 +0000

    azurerm_api_management - refactoring remaining api_management resources to use parsers (hashicorp#14148)

    * refactoring api_management to use parsers

    * refactoring api_management to use parsers

commit e579802
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 15:40:56 2021 +0100

    d/data_lake_store: fixing linting by ensuring all fields have defaults

commit 98037e5
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 15:37:03 2021 +0100

    r/data_lake_analytics_account: fixing the linting

commit 26c30b7
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 15:36:12 2021 +0100

    internal/acceptance: fixing the linting

commit ef67b84
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 15:25:45 2021 +0100

    videoanalyzer: updating to the latest embedded sdk

commit cfa47b7
Author: Matthew Frahry <[email protected]>
Date:   Wed Nov 10 14:13:19 2021 -0800

    regeegen part 2

commit d87d927
Author: Matthew Frahry <[email protected]>
Date:   Tue Nov 9 17:11:25 2021 -0800

    regen embedded sdk

commit 7833565
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 13:21:16 2021 +0100

    updating to include hashicorp#14153

commit 7822f3d
Merge: 705a277 a92f9d5
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 13:20:50 2021 +0100

    Merge pull request hashicorp#14153 from hashicorp/pandora-relay-regen

    relay - regenerate embedded sdk

commit 705a277
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 13:19:24 2021 +0100

    updating to include hashicorp#14158

commit bf89540
Merge: d042f29 f4f13a2
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 13:18:51 2021 +0100

    Merge pull request hashicorp#14158 from hashicorp/pandora-datalake-swap

    datalake - switching to use an embedded sdk

commit 853d95e
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 13:16:47 2021 +0100

    imports

commit 7f84f4a
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 13:14:36 2021 +0100

    r/private_endpoint: fixing the casing on `private_connection_resource_id` if needed

commit 8f5b3dc
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 12:42:35 2021 +0100

    website: updating the resource id for signalr_service_network_acl to match the new format

commit 61d8125
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 12:41:46 2021 +0100

    r/signalr_service_network_acl: adding a state migration for the old -> new id

commit 4e16e75
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 12:31:33 2021 +0100

    r/signalr_service_network_acl: updating to use the native Resource ID validator function

commit e90b825
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 12:31:21 2021 +0100

    website: updating signalr_service to account for the updated resource id

commit 42d9912
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 12:29:11 2021 +0100

    r/signalr_service: adding a state migration for the old/new ID format

commit 7d4ca72
Author: Matthew Frahry <[email protected]>
Date:   Thu Nov 11 12:49:30 2021 -0800

    regen part two

commit 7612229
Author: Matthew Frahry <[email protected]>
Date:   Tue Nov 9 17:09:09 2021 -0800

    regen embedded sdk

commit d042f29
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 12:15:20 2021 +0100

    updating to include hashicorp#14154

commit 2170cd3
Merge: ae96dd4 6907fe0
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 12:14:55 2021 +0100

    Merge pull request hashicorp#14154 from hashicorp/pandora-powerbi-regen

    powerbi - regenerate embedded sdk

commit ae96dd4
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 11:57:27 2021 +0100

    updating to include hashicorp#14155

commit 1d5fba1
Merge: 63dfaea 7782707
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 11:56:45 2021 +0100

    Merge pull request hashicorp#14155 from hashicorp/pandora-maps-regen

    maps - regenerate embedded sdk

commit a92f9d5
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 11:55:58 2021 +0100

    Update internal/services/relay/relay_namespace_resource.go

commit f930ab1
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 11:55:54 2021 +0100

    Update internal/services/relay/relay_hybrid_connection_resource.go

commit 63dfaea
Merge: c4f6fc9 03c8125
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 11:39:39 2021 +0100

    Merge pull request hashicorp#14161 from aristosvo/sql/removal-deprecated-docs-extended_auditing_policy

    `azurerm_(ms)sql_server` - removal of doc for deprecated `extended_auditing_policy`

commit c4f6fc9
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 11:38:58 2021 +0100

    updating to include hashicorp#14157

commit a2daa68
Merge: 605af2e d638e8d
Author: Tom Harvey <[email protected]>
Date:   Fri Nov 12 11:38:29 2021 +0100

    Merge pull request hashicorp#14157 from hashicorp/pandora-databricks-regen

    databricks - regenerate embedded sdk

commit f4f13a2
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 11:36:58 2021 +0100

    dependencies: removing the old azure sdk

commit 03c8125
Author: Aris van Ommeren <[email protected]>
Date:   Fri Nov 12 10:39:37 2021 +0100

    `azurerm_(ms)sql_server` - removal of doc for deprecated `extended_auditing_policy`

commit 15a5699
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 10:06:09 2021 +0100

    datalake: goimports

commit 79b3dfc
Author: tombuildsstuff <[email protected]>
Date:   Fri Nov 12 09:19:59 2021 +0100

    handling the import change

commit cd59eaf
Author: Matthew Frahry <[email protected]>
Date:   Thu Nov 4 08:35:39 2021 -0700

    Fix struct issue

commit 4709fd3
Author: Matthew Frahry <[email protected]>
Date:   Wed Nov 3 17:06:47 2021 -0700

    moving bulk of datalake to embedded sdk

commit 605af2e
Author: tf-release-bot <[email protected]>
Date:   Fri Nov 12 00:58:39 2021 +0000

    v2.85.0

commit ef524f8
Author: kt <[email protected]>
Date:   Thu Nov 11 16:14:22 2021 -0800

    CHANGELOG.md for hashicorp#14052

commit 5d9df60
Author: aristosvo <[email protected]>
Date:   Fri Nov 12 01:13:41 2021 +0100

    `azurerm_sql_managed_instance`: Support for `identity` (hashicorp#14052)

    Fixes hashicorp#14049

commit f0b3431
Author: Yichun Ma <[email protected]>
Date:   Fri Nov 12 06:31:23 2021 +0800

    `managed_disk_resource`: Add `disk_iops_read_only`, `disk_mbps_read_only` (hashicorp#14025)

    Add support for DiskIOPSReadOnly and DiskMBpsReadOnly
    These two properties are the read-only version of DiskIOPSReadWrite and DiskMBpsReadWrite, which specify the read-only IOps and MBps to the disk
    These two properties are only available for Ultra disk, and only available if it is a shared disk.

commit e999081
Author: Dmitry Tokarev <[email protected]>
Date:   Thu Nov 11 16:13:44 2021 -0500

    Doc Fix: `azurerm_iothub_resource` doc shows correct route source option names (hashicorp#14149)

commit 7782707
Author: Matthew Frahry <[email protected]>
Date:   Thu Nov 11 12:59:40 2021 -0800

    regen part two electric boogaloo

commit 6907fe0
Author: Matthew Frahry <[email protected]>
Date:   Thu Nov 11 12:54:43 2021 -0800

    regen part two electric boogaloo

commit d1b5875
Author: Matthew Frahry <[email protected]>
Date:   Thu Nov 11 12:52:20 2021 -0800

    regen part two electric boogaloo

commit b244895
Author: aristosvo <[email protected]>
Date:   Thu Nov 11 20:32:29 2021 +0100

    `azuread`: upgrade of `azuread` components in AccTest to v2 (hashicorp#14105)

    Co-authored-by: Tom Bamford <[email protected]>

commit 6a200da
Author: kt <[email protected]>
Date:   Thu Nov 11 11:01:01 2021 -0800

    CHANGELOG.md for hashicorp#14136

commit f3cba73
Author: aristosvo <[email protected]>
Date:   Thu Nov 11 20:00:28 2021 +0100

    `azurerm_mysql_flexible_server_firewall_rule`: New resource (hashicorp#14136)

    Fixes hashicorp#14132

commit b930347
Author: kt <[email protected]>
Date:   Thu Nov 11 10:23:45 2021 -0800

    CHANGELOG.md for hashicorp#13600

commit 590f7fa
Author: Lucas Maxwell <[email protected]>
Date:   Fri Nov 12 05:22:20 2021 +1100

    New resource: `azurerm_synapse_workspace_aad_admin` - supports setting AAD admin for synapse workspaces with CMK (hashicorp#13600)

    Fixes hashicorp#13195

commit 57eefd3
Author: kt <[email protected]>
Date:   Thu Nov 11 09:37:20 2021 -0800

    CHANGELOG.md for hashicorp#14025

commit eb8e9e7
Author: kt <[email protected]>
Date:   Thu Nov 11 09:34:57 2021 -0800

    CHANGELOG.md for hashicorp#14085

commit 8f8d660
Author: aristosvo <[email protected]>
Date:   Thu Nov 11 18:34:08 2021 +0100

    `azurerm_storage_encryption_scope`: Allow versionless `key_vault_key_id` (hashicorp#14085)

    Fixes hashicorp#14069

commit 1b7a681
Author: kt <[email protected]>
Date:   Thu Nov 11 09:33:18 2021 -0800

    CHANGELOG.md for hashicorp#14098

commit 060459c
Author: Neil Ye <[email protected]>
Date:   Fri Nov 12 01:32:49 2021 +0800

    New Resource: azurerm_monitor_private_link_scope (hashicorp#14098)

    This PR to support new resource Azure Monitor Private Link Scope.

    Background: docs.microsoft.com/en-us/azure/azure-monitor/logs/private-link-security

    Rest API Spec: Azure/azure-rest-api-specs@ddda805/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-07-01-preview/privateLinkScopes_API.json#L196

commit 3c83e15
Author: kt <[email protected]>
Date:   Thu Nov 11 09:30:43 2021 -0800

    CHANGELOG.md for hashicorp#14097

commit 877e642
Author: Elena Xin <[email protected]>
Date:   Fri Nov 12 01:29:58 2021 +0800

    azurerm_backup_protected_vm: Support exclude_disk_luns and include_disk_luns properties for backup protected VM resource (hashicorp#14097)

    The purpose of this PR:

    Supports exclude_disk_luns and include_disk_luns properties for backup protected VM resource.

    Fixes: #issue 13570

commit f59d172
Author: Andy.McCullough <[email protected]>
Date:   Wed Nov 10 22:26:46 2021 +0000

    Minor Update and docs

commit 96a1ded
Merge: 11fa2ff 70a4cb3
Author: amccullough84 <[email protected]>
Date:   Wed Nov 10 20:41:14 2021 +0000

    Merge branch 'hashicorp:main' into fix-dv-hp-regtoken

commit 11fa2ff
Author: Andy.McCullough <[email protected]>
Date:   Wed Nov 10 20:30:12 2021 +0000

    desktopvirtualization\hostpool

    Added registration_token attribute to top level hostpool so we can setnewcomputed when registration_info changes

commit 518569c
Author: Matthew Frahry <[email protected]>
Date:   Tue Nov 9 17:06:10 2021 -0800

    reregen embedded sdk

commit 4ac4a01
Author: Matthew Frahry <[email protected]>
Date:   Tue Nov 9 17:01:13 2021 -0800

    regen embedded sdk

commit 12a8c2b
Author: Matthew Frahry <[email protected]>
Date:   Tue Nov 9 16:58:22 2021 -0800

    regen embedded sdk

commit d638e8d
Author: Matthew Frahry <[email protected]>
Date:   Tue Nov 9 16:27:57 2021 -0800

    Regenenerate sdk

commit 61ed4e7
Author: magodo <[email protected]>
Date:   Mon Nov 8 19:49:51 2021 +0800

    using storage 2021-01-01 for blob inventory policy

commit 4ac292f
Author: magodo <[email protected]>
Date:   Mon Nov 8 17:56:19 2021 +0800

    pass build for test code

commit 1ef6525
Author: magodo <[email protected]>
Date:   Mon Nov 8 17:50:39 2021 +0800

    upgrade storage sdk to 2021-04-01 (compatible way to mitigate breaking chagne of the inventory, but not working actually)
  • Loading branch information
Andy.McCullough committed Nov 15, 2021
1 parent adf61d8 commit ba81d1d
Show file tree
Hide file tree
Showing 567 changed files with 64,492 additions and 25,364 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/depscheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make depscheck
2 changes: 1 addition & 1 deletion .github/workflows/gencheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make gencheck
2 changes: 1 addition & 1 deletion .github/workflows/golint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- uses: golangci/golangci-lint-action@v2
with:
version: 'v1.41.1'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradually-deprecated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: ./scripts/run-gradually-deprecated.sh
2 changes: 1 addition & 1 deletion .github/workflows/link-milestone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: |
go install github.com/stephybun/link-milestone@latest
link-milestone
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tflint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make tflint
2 changes: 1 addition & 1 deletion .github/workflows/thirty-two-bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: GOARCH=386 GOOS=linux go build -o 32bitbuild .
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: bash scripts/gogetcookie.sh
- run: make test
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make validate-examples
2 changes: 1 addition & 1 deletion .github/workflows/website-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.7'
go-version: '1.17.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make website-lint
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.7
1.17.3
63 changes: 46 additions & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,58 @@
## 2.85.0 (Unreleased)
## 2.86.0 (Unreleased)

IMPROVEMENTS:

* compute: updating to use API Version `2021-07-01` [GH-14174]
* databricks: updating the embedded SDK to use the new Resource ID Parsers [GH-14157]
* datalake: updating the embedded SDK to use the new Resource ID Parsers [GH-14158]
* maps: updating the embedded SDK to use the new Resource ID Parsers [GH-14155]
* powerbi: updating the embedded SDK to use the new Resource ID Parsers [GH-14154]
* relay: updating the embedded SDK to use the new Resource ID Parsers [GH-14153]
* signalr: updating the embedded SDK to use the new Resource ID Parsers [GH-14150]
* storage: updating to use API Version `2021-04-01` [GH-14083]
* videoanalyzer: updating the embedded SDK to use the new Resource ID Parsers [GH-14135]
* `azurerm_orchestrated_virtual_machine_scale_set` - added support for VMSS Flex public preview [GH-14003]
* `azurerm_machine_learning_workspace` - support for the `encryption` block [GH-14120]

BUG FIXES:

* `azurerm_linux_virtual_machine_scale_set` - `source_image_reference.offer` and `source_image_reference.publisher` are now ForceNew [GH-14165]
* `azurerm_windows_virtual_machine_scale_set` - `source_image_reference.offer` and `source_image_reference.publisher` are now ForceNew [GH-14165]
* `azurerm_network_watcher_flow_log` - now locks on the network security group to prevent `AnotherOperationInProgress` errors [GH-14160]

## 2.85.0 (November 12, 2021)

FEATURES:

* **New Data Source:** `azurerm_batch_application` [GH-14043]
* **New Data Source:** `azurerm_batch_application` ([#14043](https://github.com/hashicorp/terraform-provider-azurerm/issues/14043))
* **New Resource:** `azurerm_monitor_private_link_scope` ([#14098](https://github.com/hashicorp/terraform-provider-azurerm/issues/14098))
* **New Resource:** `azurerm_mysql_flexible_server_firewall_rule` ([#14136](https://github.com/hashicorp/terraform-provider-azurerm/issues/14136))
* **New Resource:** `azurerm_synapse_workspace_aad_admin` ([#13600](https://github.com/hashicorp/terraform-provider-azurerm/issues/13600))

IMPROVEMENTS:

* dependencies: upgrading to `v0.17.1` of `github.com/hashicorp/go-azure-helpers` [GH-14141]
* dependencies: upgrading to `v2.8.0` of `github.com/hashicorp/terraform-plugin-sdk` [GH-14060]
* `azurerm_application_insights` - support for the `internet_ingestion_enabled` and `internet_query_enabled` properties [GH-14035]
* `azurerm_security_center_subscription_pricing` - `resource_type` can now be set to `OpenSourceRelationalDatabases` [GH-14103]
* `azurerm_virtual_network_gateway` - enable configuration of an active-active zone redundant gateway with P2S [GH-14124]
* dependencies: upgrading to `v0.17.1` of `github.com/hashicorp/go-azure-helpers` ([#14141](https://github.com/hashicorp/terraform-provider-azurerm/issues/14141))
* dependencies: upgrading to `v2.8.0` of `github.com/hashicorp/terraform-plugin-sdk` ([#14060](https://github.com/hashicorp/terraform-provider-azurerm/issues/14060))
* `azurerm_application_insights` - support for the `internet_ingestion_enabled` and `internet_query_enabled` properties ([#14035](https://github.com/hashicorp/terraform-provider-azurerm/issues/14035))
* `azurerm_backup_protected_vm` - support for the `exclude_disk_luns` and `include_disk_luns` properties ([#14097](https://github.com/hashicorp/terraform-provider-azurerm/issues/14097))
* `azurerm_managed_disk_resource` - support for the `disk_iops_read_only` and `disk_mbps_read_only` properties ([#14025](https://github.com/hashicorp/terraform-provider-azurerm/issues/14025))
* `azurerm_security_center_subscription_pricing` - `resource_type` can now be set to `OpenSourceRelationalDatabases` ([#14103](https://github.com/hashicorp/terraform-provider-azurerm/issues/14103))
* `azurerm_storage_encryption_scope` - allow versionless `key_vault_key_id` ([#14085](https://github.com/hashicorp/terraform-provider-azurerm/issues/14085))
* `azurerm_sql_managed_instance` - support for the `identity` block ([#14052](https://github.com/hashicorp/terraform-provider-azurerm/issues/14052))
* `azurerm_virtual_network_gateway` - enable configuration of an active-active zone redundant gateway with P2S ([#14124](https://github.com/hashicorp/terraform-provider-azurerm/issues/14124))

BUG FIXES:

* Data Source: `azurerm_redis_cache` - parsing the `subnet_id` response value case-insensitively [GH-14108]
* Data Source: `azurerm_redis_cache` - ensuring that `shard_count` always has a value set [GH-14108]
* Data Source: `azurerm_consumption_budget_resource_group` - add missing `threshold_type` property in the schema [GH-14125]
* Data Source: `azurerm_consumption_budget_subscription` - add missing `threshold_type` property in the schema [GH-14125]
* `azurerm_api_management_certificate` - set `subject` property from correct field [GH-14026]
* `azurerm_app_service_virtual_network_swift_connection` - fixing a panic when checking for an existing resource during creation [GH-14070]
* `azurerm_frontdoor_resource` - route engines are no longer removed on update [GH-14093]
* `azurerm_redis_cache` - parsing the `subnet_id` response value case-insensitively [GH-14108]
* `azurerm_redis_cache` - ensuring that `shard_count` always has a value set [GH-14108]
* `azurerm_storage_blob` - ensuring that `cache_control` is sent during updates [GH-14100]
* Data Source: `azurerm_redis_cache` - parsing the `subnet_id` response value case-insensitively ([#14108](https://github.com/hashicorp/terraform-provider-azurerm/issues/14108))
* Data Source: `azurerm_redis_cache` - ensuring that `shard_count` always has a value set ([#14108](https://github.com/hashicorp/terraform-provider-azurerm/issues/14108))
* Data Source: `azurerm_consumption_budget_resource_group` - add missing `threshold_type` property in the schema ([#14125](https://github.com/hashicorp/terraform-provider-azurerm/issues/14125))
* Data Source: `azurerm_consumption_budget_subscription` - add missing `threshold_type` property in the schema ([#14125](https://github.com/hashicorp/terraform-provider-azurerm/issues/14125))
* `azurerm_api_management_certificate` - set `subject` property from correct field ([#14026](https://github.com/hashicorp/terraform-provider-azurerm/issues/14026))
* `azurerm_app_service_virtual_network_swift_connection` - fixing a panic when checking for an existing resource during creation ([#14070](https://github.com/hashicorp/terraform-provider-azurerm/issues/14070))
* `azurerm_frontdoor_resource` - route engines are no longer removed on update ([#14093](https://github.com/hashicorp/terraform-provider-azurerm/issues/14093))
* `azurerm_redis_cache` - parsing the `subnet_id` response value case-insensitively ([#14108](https://github.com/hashicorp/terraform-provider-azurerm/issues/14108))
* `azurerm_redis_cache` - ensuring that `shard_count` always has a value set ([#14108](https://github.com/hashicorp/terraform-provider-azurerm/issues/14108))
* `azurerm_storage_blob` - ensuring that `cache_control` is sent during updates ([#14100](https://github.com/hashicorp/terraform-provider-azurerm/issues/14100))

## 2.84.0 (November 05, 2021)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Further [usage documentation is available on the Terraform website](https://regi
## Developer Requirements

* [Terraform](https://www.terraform.io/downloads.html) version 0.12.x + (but 1.x is recommended)
* [Go](https://golang.org/doc/install) version 1.16.x (to build the provider plugin)
* [Go](https://golang.org/doc/install) version 1.17.x (to build the provider plugin)

### On Windows

Expand Down
50 changes: 50 additions & 0 deletions helpers/azure/sku.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import (
"fmt"
"strconv"
"strings"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-07-01/compute"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)

func SplitSku(sku string) (string, int32, error) {
Expand All @@ -20,3 +23,50 @@ func SplitSku(sku string) (string, int32, error) {

return skuParts[0], int32(capacity), nil
}

func ExpandOrchestratedVirtualMachineScaleSetSku(input string, capacity int) (*compute.Sku, error) {
skuParts := strings.Split(input, "_")

if len(skuParts) < 2 || strings.Contains(input, "__") || strings.Contains(input, " ") {
return nil, fmt.Errorf("'sku_name'(%q) is not formatted properly.", input)
}

sku := &compute.Sku{
Name: utils.String(input),
Capacity: utils.Int64(int64(capacity)),
Tier: utils.String("Standard"),
}

return sku, nil
}

func FlattenOrchestratedVirtualMachineScaleSetSku(input *compute.Sku) (*string, error) {
var skuName string
if input != nil && input.Name != nil {
if strings.HasPrefix(strings.ToLower(*input.Name), "standard") {
skuName = *input.Name
} else {
skuName = fmt.Sprintf("Standard_%s", *input.Name)
}

return &skuName, nil
}

return nil, fmt.Errorf("Sku struct 'name' is nil")
}

func ValidateOrchestratedVirtualMachineScaleSetSku(input interface{}, key string) (warnings []string, errors []error) {
v, ok := input.(string)
if !ok {
errors = append(errors, fmt.Errorf("expected %q to be a string", key))
return
}

skuParts := strings.Split(v, "_")

if len(skuParts) < 2 || strings.Contains(v, "__") || strings.Contains(v, " ") {
errors = append(errors, fmt.Errorf("%q(%q) is not formatted properly.", key, v))
}

return
}
13 changes: 7 additions & 6 deletions internal/acceptance/testcase.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,23 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/internal/provider"
)

// lintignore:AT001
func (td TestData) DataSourceTest(t *testing.T, steps []TestStep) {
// DataSources don't need a check destroy - however since this is a wrapper function
// and not matching the ignore pattern `XXX_data_source_test.go`, this needs to be explicitly opted out

// lintignore:AT001
testCase := resource.TestCase{
PreCheck: func() { PreCheck(t) },
Steps: steps,
}
td.runAcceptanceTest(t, testCase)
}

// lintignore:AT001
func (td TestData) DataSourceTestInSequence(t *testing.T, steps []TestStep) {
// DataSources don't need a check destroy - however since this is a wrapper function
// and not matching the ignore pattern `XXX_data_source_test.go`, this needs to be explicitly opted out

// lintignore:AT001
testCase := resource.TestCase{
PreCheck: func() { PreCheck(t) },
Steps: steps,
Expand All @@ -36,7 +38,6 @@ func (td TestData) DataSourceTestInSequence(t *testing.T, steps []TestStep) {
td.runAcceptanceSequentialTest(t, testCase)
}

// lintignore:AT001
func (td TestData) ResourceTest(t *testing.T, testResource types.TestResource, steps []TestStep) {
testCase := resource.TestCase{
PreCheck: func() { PreCheck(t) },
Expand All @@ -54,17 +55,17 @@ func (td TestData) ResourceTest(t *testing.T, testResource types.TestResource, s

// ResourceTestIgnoreCheckDestroyed skips the check to confirm the resource test has been destroyed.
// This is done because certain resources can't actually be deleted.
// lintignore:AT001
func (td TestData) ResourceTestSkipCheckDestroyed(t *testing.T, steps []TestStep) {
// lintignore:AT001
testCase := resource.TestCase{
PreCheck: func() { PreCheck(t) },
Steps: steps,
}
td.runAcceptanceTest(t, testCase)
}

// lintignore:AT001
func (td TestData) ResourceSequentialTestSkipCheckDestroyed(t *testing.T, steps []TestStep) {
// lintignore:AT001
testCase := resource.TestCase{
PreCheck: func() { PreCheck(t) },
Steps: steps,
Expand Down Expand Up @@ -132,7 +133,7 @@ func (td TestData) providers() map[string]func() (*schema.Provider, error) {
func (td TestData) externalProviders() map[string]resource.ExternalProvider {
return map[string]resource.ExternalProvider{
"azuread": {
VersionConstraint: "=1.5.1",
VersionConstraint: "=2.8.0",
Source: "registry.terraform.io/hashicorp/azuread",
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ func resourceApiManagementApiOperationPolicy() *pluginsdk.Resource {
Read: resourceApiManagementAPIOperationPolicyRead,
Update: resourceApiManagementAPIOperationPolicyCreateUpdate,
Delete: resourceApiManagementAPIOperationPolicyDelete,
// TODO: replace this with an importer which validates the ID during import
Importer: pluginsdk.DefaultImporter(),
Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
_, err := parse.ApiOperationPolicyID(id)
return err
}),

Timeouts: &pluginsdk.ResourceTimeout{
Create: pluginsdk.DefaultTimeout(30 * time.Minute),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"testing"

"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)
Expand Down Expand Up @@ -94,18 +94,14 @@ func TestAccApiManagementAPIOperationPolicy_rawXml(t *testing.T) {
}

func (ApiManagementApiOperationPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := azure.ParseAzureResourceID(state.ID)
id, err := parse.ApiOperationPolicyID(state.ID)
if err != nil {
return nil, err
}
resourceGroup := id.ResourceGroup
serviceName := id.Path["service"]
apiName := id.Path["apis"]
operationID := id.Path["operations"]

resp, err := clients.ApiManagement.ApiOperationPoliciesClient.Get(ctx, resourceGroup, serviceName, apiName, operationID, apimanagement.PolicyExportFormatXML)
resp, err := clients.ApiManagement.ApiOperationPoliciesClient.Get(ctx, id.ResourceGroup, id.ServiceName, id.ApiName, id.OperationName, apimanagement.PolicyExportFormatXML)
if err != nil {
return nil, fmt.Errorf("reading ApiManagementApi Operation Policy (%s): %+v", id, err)
return nil, fmt.Errorf("reading %s: %+v", *id, err)
}

return utils.Bool(resp.ID != nil), nil
Expand Down
Loading

0 comments on commit ba81d1d

Please sign in to comment.