Skip to content

Commit

Permalink
Merge branch 'main' into f-mssql-database-named-replica
Browse files Browse the repository at this point in the history
  • Loading branch information
mbfrahry committed Mar 21, 2024
2 parents 0bb7dc1 + e24cfbe commit 4bfb9d2
Show file tree
Hide file tree
Showing 703 changed files with 18,972 additions and 6,042 deletions.
38 changes: 16 additions & 22 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,45 @@
* Please do not leave "+1" or "me too" comments, they generate extra noise for PR followers and do not help prioritize for review


## Description

<!-- Please include a description below with the reason for the PR, what it is doing, what it is trying to accomplish, and anything relevant for a reviewer to know.
If this is a breaking change for users please detail how it cannot be avoided and why it should be made in a minor version of the provider -->


## PR Checklist

- [ ] I have followed the guidelines in our [Contributing Documentation](../blob/main/contributing/README.md).
- [ ] I have checked to ensure there aren't other open [Pull Requests](../pulls) for the same update/change.
- [ ] I have checked if my changes close any open issues. If so please include appropriate [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) below.
- [ ] I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
- [ ] I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
For example: “`resource_name_here` - description of change e.g. adding property `new_property_name_here`



<!-- You can erase any parts of this template below this point that are not applicable to your Pull Request. -->


## New Feature Submissions

- [ ] My submission includes Test coverage as described in the [Contribution Guide](../blob/main/contributing/topics/guide-new-resource.md) and the tests pass. (if this is not possible for any reason, please include details of why below)


## Changes to existing Resource / Data Source

- [ ] I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
- [ ] I have written new tests for my resource or datasource changes.
- [ ] I have written new tests for my resource or datasource changes & updated any relevent documentation.
- [ ] I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
- [ ] (For changes that include a **state migration only**). I have manually tested the migration path between relevant versions of the provider.


## Documentation Changes

- [ ] Documentation is written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.

## Testing

## Description

<!-- Please include a description below with the reason for the PR, what it is doing, what it is trying to accomplish, and anything relevant for a reviewer to know.
- [ ] My submission includes Test coverage as described in the [Contribution Guide](../blob/main/contributing/topics/guide-new-resource.md) and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

If this is a breaking change for users please detail how it cannot be avoided and why it should be made in a minor version of the provider -->
<!-- Please include testing logs or evidence here or an explanation on why no testing evidence can be provided.
## Testing Logs/Evidence

<!-- Please include your testing evidence here or an explanation on why no testing evidence can be provided.
For state migrations please test the changes locally and provide details here, such as the versions involved in testing the migration path. For further details on testing state migration changes please see our guide on [state migrations](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/contributing/topics/guide-state-migrations.md#testing) in the contributor documentation. -->

## Related Issue(s)
Fixes #0000

## Change Log

Below please provide what should go into the changelog (if anything) conforming to the [Changelog Format documented here](../blob/main/contributing/topics/maintainer-changelog.md).

<!-- Replace the changelog example below with your entry. One resource per line. -->
Expand All @@ -69,8 +62,9 @@ This is a (please select all that apply):
- [ ] Breaking Change


## Related Issue(s)
Fixes #0000


> [!NOTE]
> If this PR changes meaningfully during the course of review please update the title and description as required.

34 changes: 32 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,49 @@ BREAKING CHANGES:
* `azurerm_linux_function_app` - `app_settings["WEBSITE_RUN_FROM_PACKAGE"]` must be added to `ignore_changes` for deployments where an external tool modifies the `WEBSITE_RUN_FROM_PACKAGE` property in the `app_settings` block. [GH-24848]
* `azurerm_linux_function_app_slot` - `app_settings["WEBSITE_RUN_FROM_PACKAGE"]` must be added to `ignore_changes` for deployments where an external tool modifies the `WEBSITE_RUN_FROM_PACKAGE` property in the `app_settings` block. [GH-24848]

FEATURES:

* New Resource: `azurerm_elastic_san_volume` [GH-24802]

ENHANCEMENTS:

* dependencies: updating to `v0.20240315.1103122` of `github.com/hashicorp/go-azure-sdk` [GH-25166]
* dependencies: updating to `v0.20240321.1145953` of `github.com/hashicorp/go-azure-sdk` [GH-25332]
* dependencies: updating to `v0.25.2` of `github.com/tombuildsstuff/giovanni` [GH-25305]
* `azurestackhci`: updating to API Version `2024-01-01` [GH-25279]
* `monitor/scheduledqueryrules`: updatingt to API version `2023-03-15-preview` [GH-25350]
* `cosmosdb`: updating to use the transport layer from `hashicorp/go-azure-sdk` rather than `Azure/go-autorest` [GH-25166]
* Data Source `azurerm_stack_hci_cluster`: refactoring the association to use `hashicorp/go-azure-sdk` [GH-25293]
* `azurerm_app_configuration` - support for Environments other than Azure Public [GH-25271]
* `azurerm_automanage_configuration`: refactoring to use `hashicorp/go-azure-sdk` [GH-25293]
* `azurerm_container_app_environment` - add support for `Consumption` workload profile [GH-25285]
* `azurerm_cosmosdb_postgresql_cluster` - expose list of server names and FQDN in the `servers` block [GH-25240]
* `azurerm_data_share` - hyphens are now allowed in the resource's name [GH-25242]
* `azurerm_data_factory_integration_runtime_azure_ssis` - support for the `copy_compute_scale` and `pipeline_external_compute_scale` blocks [GH-25281]
* `azurerm_healthcare_service` - support for the `identity` and `configuration_export_storage_account_name` properties [GH-25193]
* `azurerm_nginx_deployment` - support the `auto_scale_profile` block [GH-24950]
* `azurerm_storage_account` - support for `dns_endpoint_type` [GH-22583]
* `azurerm_netapp_account_resource` - support for the `kerberos_ad_name`, `kerberos_kdc_ip property`, `enable_aes_encryption`, `local_nfs_users_with_ldap_allowed`, `server_root_ca_certificate`, `ldap_over_tls_enabled`, and `ldap_signing_enabled` properties [GH-25340]
* `azurerm_netapp_account_resource` - support for [Support for Azure Netapp Files - AD Site Name #12462] via the `site_name` property [GH-25340]
* `azurerm_stack_hci_cluster`: refactoring the association to use `hashicorp/go-azure-sdk` [GH-25293]
* `azurerm_storage_account` - support for the `dns_endpoint_type` property [GH-22583]
* `azurerm_storage_blob_inventory_policy`: refactoring to use `hashicorp/go-azure-sdk` [GH-25268]
* `azurerm_synapse_spark_pool` - added support for `3.4` [GH-25319]

BUG FIXES:

* Data Source: `azurerm_storage_blob` - fix a bug that incorrectly parsed the endpoint in the resource ID [GH-25283]
* Data Source: `azurerm_storage_table_entity` - fixing a regression when parsing the table endpoint [GH-25307]
* `netapp_account_resource` - correct the `smb_server_name` property validation [GH-25340]
* `azurerm_backup_policy_file_share` - prevent a bug when the `include_last_days` property does not work when `days` is empty [GH-25280]
* `azurerm_backup_policy_vm` - prevent a bug when the `include_last_days` property does not work when `days` is empty [GH-25280]
* `azurerm_container_app_custom_domain` - prevent an issue where the secret was not being passed through (#25196) [GH-25251]
* `azurerm_data_protection_backup_instance_kubernetes_cluster` - prevent the protection errosr `ScenarioPluginInvalidWorkflowDataRequest` and `UserErrorKubernetesBackupExtensionUnhealthy` [azurerm_data_protection_backup_instance_kubernetes_cluster is created with message "Fix protection error for the backup instance" and code ScenarioPluginInvalidWorkflowDataRequest #25294] [GH-25345]
* `azurerm_purview_account` - will now allow for PurView accounts with missing or disabled eventhubs without keys [GH-25301]
* `azurerm_storage_account` - fix a crash when the storage account becomes unavailable whilst reading [GH-25332]
* `azurerm_storage_blob` - fixing a regression where blobs within a nested directory wouldn't be parsed correctly [GH-25305]
* `azurerm_storage_data_lake_gen2_path` - fixing a bug where there was no timeout available during import [GH-25282]
* `azurerm_storage_queue` - fixing a bug where the Table URI was obtained rather than the Queue URI [GH-25262]
* `azurerm_subscription` - fixing an issue when creating a subscription alias [GH-25181]


## 3.96.0 (March 14, 2024)

Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.4.0
github.com/hashicorp/go-azure-helpers v0.66.2
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240315.1103122
github.com/hashicorp/go-azure-sdk/sdk v0.20240315.1103122
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240321.1145953
github.com/hashicorp/go-azure-sdk/sdk v0.20240321.1145953
github.com/hashicorp/go-hclog v1.5.0
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
Expand All @@ -29,7 +29,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0
github.com/rickb777/date v1.12.5-0.20200422084442-6300e543c4d9
github.com/sergi/go-diff v1.2.0
github.com/tombuildsstuff/giovanni v0.25.1
github.com/tombuildsstuff/giovanni v0.25.3-0.20240320223224-81f160a937cd
github.com/tombuildsstuff/kermit v0.20240122.1123108
golang.org/x/crypto v0.18.0
golang.org/x/tools v0.13.0
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-azure-helpers v0.66.2 h1:+Pzuo7pdKl0hBXXr5ymmhs4Q40tHAo2nAvHq4WgSjx8=
github.com/hashicorp/go-azure-helpers v0.66.2/go.mod h1:kJxXrFtJKJdOEqvad8pllAe7dhP4DbN8J6sqFZe47+4=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240315.1103122 h1:cBuhqUvm59V6Na2GvC2WhuW2exShMy7mlYfJq5RdiKo=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240315.1103122/go.mod h1:Bqyftfx+hmU/CAUixSsO6JG8iAnYZfZCsTplJxWVkVE=
github.com/hashicorp/go-azure-sdk/sdk v0.20240315.1103122 h1:Ufy2m3h4a0kAiVHzffpuqLEYNFiE+rFbTfOPXd6m7YI=
github.com/hashicorp/go-azure-sdk/sdk v0.20240315.1103122/go.mod h1:POOjeoqNp+mvlLBuibJTziUAkBZ7FxXGeGestwemL/w=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240321.1145953 h1:eoU9iMmWgufB441trZJ45TsZ+0vJ79vGKdBuVVYUXwI=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240321.1145953/go.mod h1:zvsDltRIRr58vA0EpSmY+a6NcgGirQE/u02Ag+D8jmM=
github.com/hashicorp/go-azure-sdk/sdk v0.20240321.1145953 h1:WAcSZL5+H9Z/DjUZ0x0sluNoEno/mD4b+NWpY04vJrw=
github.com/hashicorp/go-azure-sdk/sdk v0.20240321.1145953/go.mod h1:POOjeoqNp+mvlLBuibJTziUAkBZ7FxXGeGestwemL/w=
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 Expand Up @@ -225,8 +225,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/tombuildsstuff/giovanni v0.25.1 h1:GP3Q+LAs7Uwf1ZXogOyq7bG4v0A7ROtuU2UKBzIxLK0=
github.com/tombuildsstuff/giovanni v0.25.1/go.mod h1:U5QCrP5ATt9csJfaceJaqV96ZDCn1yWLhzw04oIaYE8=
github.com/tombuildsstuff/giovanni v0.25.3-0.20240320223224-81f160a937cd h1:c8P1GroZZFmmrPf/P9s3tgTtRErAnXwR8d7M/JgjVr4=
github.com/tombuildsstuff/giovanni v0.25.3-0.20240320223224-81f160a937cd/go.mod h1:s7xbU2lN5Iz9MBglmDDv9p2QPbn6x3UkJBtpCfUerLs=
github.com/tombuildsstuff/kermit v0.20240122.1123108 h1:icQaxsv/ANv/KC4Sr0V1trrWA/XIL+3QAVBDpiSTgj8=
github.com/tombuildsstuff/kermit v0.20240122.1123108/go.mod h1:T3YBVFhRV4qA7SbnRaNE6eapIMpKDA9rG/V7Ocsjlno=
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
Expand Down
1 change: 0 additions & 1 deletion internal/clients/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ func Build(ctx context.Context, builder ClientBuilder) (*Client, error) {
KeyVaultAuthorizer: authWrapper.AutorestAuthorizer(keyVaultAuth).BearerAuthorizerCallback(),
ManagedHSMAuthorizer: authWrapper.AutorestAuthorizer(managedHSMAuth).BearerAuthorizerCallback(),
ResourceManagerAuthorizer: authWrapper.AutorestAuthorizer(resourceManagerAuth),
StorageAuthorizer: authWrapper.AutorestAuthorizer(storageAuth),
SynapseAuthorizer: authWrapper.AutorestAuthorizer(synapseAuth),

CustomCorrelationRequestID: builder.CustomCorrelationRequestID,
Expand Down
8 changes: 5 additions & 3 deletions internal/clients/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/Azure/go-autorest/autorest/validation"
aadb2c_v2021_04_01_preview "github.com/hashicorp/go-azure-sdk/resource-manager/aadb2c/2021-04-01-preview"
analysisservices_v2017_08_01 "github.com/hashicorp/go-azure-sdk/resource-manager/analysisservices/2017-08-01"
azurestackhci_v2023_08_01 "github.com/hashicorp/go-azure-sdk/resource-manager/azurestackhci/2023-08-01"
azurestackhci_v2024_01_01 "github.com/hashicorp/go-azure-sdk/resource-manager/azurestackhci/2024-01-01"
datadog_v2021_03_01 "github.com/hashicorp/go-azure-sdk/resource-manager/datadog/2021-03-01"
dns_v2018_05_01 "github.com/hashicorp/go-azure-sdk/resource-manager/dns/2018-05-01"
eventgrid_v2022_06_15 "github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2022-06-15"
Expand Down Expand Up @@ -176,7 +176,7 @@ type Client struct {
Authorization *authorization.Client
Automanage *automanage.Client
Automation *automation.Client
AzureStackHCI *azurestackhci_v2023_08_01.Client
AzureStackHCI *azurestackhci_v2024_01_01.Client
Batch *batch.Client
Blueprints *blueprints.Client
Bot *bot.Client
Expand Down Expand Up @@ -341,7 +341,9 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
if client.Authorization, err = authorization.NewClient(o); err != nil {
return fmt.Errorf("building clients for Authorization: %+v", err)
}
client.Automanage = automanage.NewClient(o)
if client.Automanage, err = automanage.NewClient(o); err != nil {
return fmt.Errorf("building clients for AutoManage: %+v", err)
}
if client.Automation, err = automation.NewClient(o); err != nil {
return fmt.Errorf("building clients for Automation: %+v", err)
}
Expand Down
2 changes: 0 additions & 2 deletions internal/common/client_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@ type ClientOptions struct {
ResourceManagerEndpoint string

// Legacy authorizers for go-autorest
AttestationAuthorizer autorest.Authorizer
BatchManagementAuthorizer autorest.Authorizer
KeyVaultAuthorizer autorest.Authorizer
ManagedHSMAuthorizer autorest.Authorizer
ResourceManagerAuthorizer autorest.Authorizer
StorageAuthorizer autorest.Authorizer
SynapseAuthorizer autorest.Authorizer
}

Expand Down
Loading

0 comments on commit 4bfb9d2

Please sign in to comment.