resolve merge conflict

hashicorp · Aug 9, 2021 · 297ab37 · 297ab37
2 parents 8af6a7f + f9699d3
commit 297ab37
Show file tree

Hide file tree

Showing 439 changed files with 32,560 additions and 17,799 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,28 +1,67 @@
-## 2.70.0 (Unreleased)
+## 2.71.0 (Unreleased)
 
 FEATURES:
 
-* **New Resource** `azurerm_bot_channel_facebook` [GH-12709]
-* **New Resource** `azurerm_bot_channel_sms` [GH-12713]
-* **New Resource** `azurerm_data_factory_trigger_custom_event` [GH-12448]
-* **New Resource** `azurerm_data_factory_trigger_tumbling_window` [GH-12437]
-* **New Resource** `azurerm_data_protection_backup_instance_disk` [GH-12617]
+* **New Data Source** `azurerm_databricks_workspace_private_endpoint_connection` [GH-12543]
+* **New Resource** `azurerm_cdn_endpoint_custom_domain` [GH-12496]
+* **New Resource** `azurerm_cognitive_account_customer_managed_key` [GH-12544]
+* **New Resource** `azurerm_data_factory_data_flow` [GH-12588]
 
 ENHANCEMENTS:
 
-* dependencies: Upgrade `web` (App Service) API to `2021-01-15` [GH-12635]
-* maps: refactoring to use an Embedded SDK [GH-12716]
-* msi: refactoring to use an Embedded SDK [GH-12715]
-* vmware: refactoring to use an Embedded SDK [GH-12751]
-* Data Source: `azurerm_storage_account_sas` - add ip_addresses field [GH-12705]
-* `azurerm_api_management_diagnostic` - support for `operation_name_format` [GH-12736]
-* `azurerm_data_factory_dataset_binary` - the blob `path` and `filename` propeties are now optional [GH-12676]
-* `azurerm_data_factory_trigger_blob_event` - supprot for the `activation` property [GH-12644]
-* `azurerm_automation_certificate` - Allow exportable property to be set [GH-12738]
+
+* dependencies: upgrading to `v56.0.0` of `github.com/Azure/azure-sdk-for-go` [GH-12781]
+* dependencies: updating `containerservice` to use API Version `2021-05-1` [GH-12747]
+* dependencies: updating `machinelearning` to use API Version `2021-04-01` [GH-12804]
+* dependencies: updating `databricks` to use API Version `2021-04-01-preview` [GH-12543]
+* PowerBI: refactoring to use an Embedded SDK [GH-12787]
+* `azurerm_api_management_api_diagnostic` - support for the `operation_name_format` property [GH-12782]
+* `azurerm_databricks_workspace` - support for private link endpoint [GH-12543]
+* `azurerm_kubernetes_cluster` - support for the `local_account_disabled` property [GH-12386]
+* `azurerm_logic_app_workflow` - support for the `workflow_parameters` [GH-12314]
+
+BUG FIXES:
+
+* `azurerm_app_service_active_slot` - fix 404 not found on read for slot [GH-12792]
+* `azurerm_linux_virtual_machine_scale_set` - fix crash in checking for latest image [GH-12808]
+* `azurerm_virtual_machine_extension` - changing the `publisher` property now creates a new resource [GH-12790]
+
+
+## 2.70.0 (July 30, 2021)
+
+FEATURES:
+
+* **New Data Source** `azurerm_storage_share` ([#12693](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12693))
+* **New Resource** `azurerm_bot_channel_alexa` ([#12682](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12682))
+* **New Resource** `azurerm_bot_channel_direct_line_speech` ([#12735](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12735))
+* **New Resource** `azurerm_bot_channel_facebook` ([#12709](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12709))
+* **New Resource** `azurerm_bot_channel_sms` ([#12713](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12713))
+* **New Resource** `azurerm_data_factory_trigger_custom_event` ([#12448](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12448))
+* **New Resource** `azurerm_data_factory_trigger_tumbling_window` ([#12437](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12437))
+* **New Resource** `azurerm_data_protection_backup_instance_disk` ([#12617](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12617))
+
+ENHANCEMENTS:
+
+* dependencies: Upgrade `web` (App Service) API to `2021-01-15` ([#12635](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12635))
+* analysisservices: refactoring to use an Embedded SDK ([#12771](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12771))
+* maps: refactoring to use an Embedded SDK ([#12716](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12716))
+* msi: refactoring to use an Embedded SDK ([#12715](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12715))
+* relay: refactoring to use an Embedded SDK ([#12772](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12772))
+* vmware: refactoring to use an Embedded SDK ([#12751](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12751))
+* Data Source: `azurerm_storage_account_sas` - support for the property `ip_addresses` ([#12705](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12705))
+* `azurerm_api_management_diagnostic` - support for the property `operation_name_format` ([#12736](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12736))
+* `azurerm_automation_certificate` - the `exportable` property can now be set ([#12738](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12738))
+* `azurerm_data_factory_dataset_binary` - the blob `path` and `filename` propeties are now optional ([#12676](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12676))
+* `azurerm_data_factory_trigger_blob_event` - support for the `activation` property ([#12644](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12644))
+* `azurerm_data_factory_pipeline` - support for the `concurrency` and `moniter_metrics_after_duration` properties ([#12685](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12685))
+* `azurerm_hdinsight_interactive_query_cluster` - support for the `encryption_in_transit_enabled` property ([#12767](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12767))
+* `azurerm_hdinsight_spark_cluster` - support for the `encryption_in_transit_enabled` property ([#12767](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12767))
+* `azurerm_firewall_polcy` - support for property `private_ip_ranges` ([#12696](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12696))
 
 BUG FIXES:
 
-* `azurerm_cdn_endpoint` - fixing a crash when the future is nil [GH-12743]
+* `azurerm_cdn_endpoint` - fixing a crash when the future is nil ([#12743](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12743))
+* `azurerm_private_endpoint` - working around a casing issue in `private_connection_resource_id` for MariaDB, MySQL and PostgreSQL resources ([#12761](https://github.com/terraform-providers/terraform-provider-azurerm/issues/12761))
 
 ---