Merge pull request #1 from terraform-providers/master

Update fork

.travis.yml

@@ -4,7 +4,7 @@ services:
 - docker
 language: go
 go:
-- "1.12.x"
+- "1.13.x"
 
 branches:
   only:

CHANGELOG.md

@@ -4,36 +4,60 @@ FEATURES:
 
 * **New Data Source:** `azurerm_network_ddos_protection_plan` [GH-4228]
 * **New Data Source:** `azurerm_proximity_placement_group` [GH-4020]
+* **New Data Source:** `azurerm_servicebus_namespace_authorization_rule` [GH-4294]
 * **New Data Source:** `azurerm_sql_database` [GH-4210]
 * **New Data Source:** `azurerm_storage_account_blob_container_sas` [GH-4195]
 * **New Resource:** `azurerm_app_service_certificate` [GH-4192]
-* **New Resource:** `azurerm_proximity_placement_group` [GH-4020]
+* **New Resource:** `azurerm_app_service_source_control_token` [GH-4214]
+* **New Resource:** `azurerm_bot_channels_registration` [GH-4245]
+* **New Resource:** `azurerm_bot_connection` [GH-4311]
+* **New Resource:** `azurerm_frontdoor` [GH-3933]
 * **New Resource:** `azurerm_kusto_cluster` [GH-4129]
 * **New Resource:** `azurerm_kusto_database` [GH-4149]
+* **New Resource:** `azurerm_marketplace_agreement` [GH-4305]
+* **New Resource:** `azurerm_private_dns_zone_virtual_network_link` [GH-3789]
+* **New Resource:** `azurerm_proximity_placement_group` [GH-4020]
 * **New Resource:** `azurerm_stream_analytics_output_servicebus_topic` [GH-4164]
 * **New Resource:** `azurerm_web_application_firewall_policy` [GH-4119]
-* **New Resource:** `azurerm_bot_channels_registration` [GH-4245]
 
 IMPROVEMENTS:
 
 * dependencies: updating `github.com/Azure/azure-sdk-for-go` to `v32.5.0` [GH-4166]
 * dependencies: updating `github.com/Azure/go-autorest` to `v0.9.0` [GH-4166]
 * dependencies: updating `github.com/hashicorp/go-azure-helpers` to `v0.7.0` [GH-4166]
 * dependencies: updating `github.com/terraform-providers/terraform-provider-azuread` to `v0.6.0` [GH-4166]
+* compute: updating to API version `2018-10-01` [GH-4274]
+* network: updating to API version `2019-06-01` [GH-4291]
 * storage: caching the Resource Group Name / Account Key [GH-4205]
 * storage: switching to use SharedKey for authentication with Blobs/Containers rather than SharedKeyLite [GH-4235]
 * Data Source: `azurerm_storage_account` - gracefully degrading when there's a ReadOnly lock/the user doesn't have permissions to list the Keys for the storage account [GH-4248]
 * Data Source: `azurerm_storage_account_sas` - adding an `ISO8601` validator to the `start` and `end` dates [GH-4064]
+* Data Source: `azurerm_virtual_network` - support for the `location` property [GH-4281]
 * `azurerm_api_management` - support for multiple `additional_location` blocks [GH-4175]
-* `azurerm_application_gateway` - allowing `capacity` to be set to 32 [GH-4189]
-* `azurerm_app_service` - fixing a bug where the `logs` block would get reset when `app_settings` were configured [GH-4243]
+* `azurerm_application_gateway` - allowing `capacity` to be set to `32` [GH-4189]
+* `azurerm_application_gateway` - support OWASP version `3.1` for the `rule_set_version` property [GH-4263]
+* `azurerm_application_gateway` - support for the `trusted_root _certificate` property [GH-4206]
+* `azurerm_app_service` - fixing a bug where the Application `logs` block would get reset when `app_settings` were configured [GH-4243]
+* `azurerm_app_service` - support for sending HTTP Logs to Blob Storage [GH-4249]
+* `azurerm_app_service` - the `ip_restriction.ip_address` property is now optional [GH-4184]
+* `azurerm_app_service_slot` - the `ip_restriction.ip_address` property is now optional [GH-4184]
 * `azurerm_availability_set` - support for the `proximity_placement_group_id` property [GH-4020]
 * `azurerm_cognitive_account` - supporting `CognitiveServices` as a `kind` [GH-4209]
-* `azurerm_cosmosdb_sql_container` - the property `unique_key.paths` is now marked as ForceNew [GH-4163]
+* `azurerm_container_registry` - support for configuring Virtual Network Rules to Subnets [GH-4293]
+* `azurerm_cosmosdb_account` - correctly validate `max_interval_in_seconds` & `max_staleness_prefix` for geo replicated accounts [GH-4273]
+* `azurerm_cosmosdb_account` - increase creation & deletion wait timeout to `3` hours [GH-4271]
+* `azurerm_cosmosdb_sql_container` - changing the `unique_key.paths` property now forces a new resource [GH-4163]
+* `azurerm_eventhub_namespace` - changing the `kafka_enabled` property now forces a new resource [GH-4264]
 * `azurerm_kubernetes_cluster` - support for configuring the `kube_dashboard` within the `addon_profile` block [GH-4139]
+* `azurerm_kubernetes_cluster` - prevent `pod_cidr` and azure `network_plugin` from being set at the same time causing a new resource to be created [GH-4286]
 * `azurerm_mariadb_server` - support for version `10.3` [GH-4170]
-* `azurerm_postgresql_server` - support for `auto_grow` [GH-4220]
+* `azurerm_mariadb_server` - support for configuring `auto_grow` [GH-4302]
+* `azurerm_managed_disk` - add support for the Ultra SSD `disk_iops_read_write` & `disk_mbps_read_write` properties [GH-4102]
+* `azurerm_mysql_server` - support for configuring `auto_grow` [GH-4303]
+* `azurerm_private_dns_zone` - polling until the dns zone is marked as fully provisioned [GH-4307]
+* `azurerm_postgresql_server` - support for configuring `auto_grow` [GH-4220]
 * `azurerm_resource_group` - the `name` field can now be up to 90 characters [GH-4233]
+* `azurerm_role_assignment` - add `principal_type` and `skip_service_principal_aad_check` properties [GH-4168]
 * `azurerm_storage_account` - gracefully degrading when there's a ReadOnly lock/the user doesn't have permissions to list the Keys for the storage account [GH-4248]
 * `azurerm_storage_blob` - switching over to use the new Storage SDK [GH-4179]
 * `azurerm_storage_blob` - support for Append Blobs [GH-4238]
@@ -42,17 +66,25 @@ IMPROVEMENTS:
 * `azurerm_storage_blob` - the `type` field is now Required, since it had to be set anyway [GH-4238]
 * `azurerm_storage_share_directory` - support for upper-case characters in the `name` field [GH-4178]
 * `azurerm_storage_table` - using the correct storage account name when checking for the presence of an existing storage table [GH-4234]
+* `azurerm_stream_analytics_job` - the field `data_locale` is now optional [GH-4190]
+* `azurerm_stream_analytics_job` - the field `events_late_arrival_max_delay_in_seconds` is now optional [GH-4190]
+* `azurerm_stream_analytics_job` - the field `events_out_of_order_policy` is now optional [GH-4190]
+* `azurerm_stream_analytics_job` - the field `output_error_policy` is now optional [GH-4190]
 * `azurerm_subnet` - support for the actions `Microsoft.Network/virtualNetworks/subnets/join/action` and `Microsoft.Network/virtualNetworks/subnets/prepareNetworkPolicies/action` [GH-4137]
 * `azurerm_virtual_machine` - support for `UltraSSD_LRS` managed disks [GH-3860]
 * `azurerm_virtual_machine` - support for the `proximity_placement_group_id` property [GH-4020]
 * `azurerm_virtual_machine_scale_set` - support for the `proximity_placement_group_id` property [GH-4020]
 
 BUG FIXES:
 
+* `azurerm_app_service` - will no longer panic from when an access restriction rule involves a virtual network [GH-4184]
+* `azurerm_app_service_slot` - will no longer panic from when an access restriction rule involves a virtual network [GH-4184]
 * `azurerm_app_service_plan` and `azurerm_app_service_slot` crash fixes [GH-4184]
 * `azurerm_container_group` - make `storage_account_key` field in `volume` block sensitive [GH-4201]
-* `azurerm_log_analytics_linked_service` - crash fix [GH-4142]
-* `azurerm_log_analytics_workspace_linked_service` - crash fix [GH-4152]
+* `azurerm_key_vault_certificate` - prevented a panic caused by an empty element in `extended_key_usage` [GH-4272]
+* `azurerm_log_analytics_linked_service` - will no longer panic if no items are passed into the property `linked_service_properties` [GH-4142]
+* `azurerm_log_analytics_workspace_linked_service` - will no longer panic if no items are passed into the property `linked_service_properties` [GH-4152]
+* `azurerm_network_interface` - changing the `ip_configuration` property to no longer force new resource [GH-4155]
 * `azurerm_virtual_network_peering` - prevent nil object from being read [GH-4180]
 
 ## 1.33.1 (August 27, 2019)

GNUmakefile

@@ -21,7 +21,7 @@ build: fmtcheck
 
 build-docker:
 	mkdir -p bin
-	docker run --rm -v $$(pwd)/bin:/go/bin -v $$(pwd):/go/src/github.com/terraform-providers/terraform-provider-azurerm -w /go/src/github.com/terraform-providers/terraform-provider-azurerm -e GOOS golang:1.12 make build
+	docker run --rm -v $$(pwd)/bin:/go/bin -v $$(pwd):/go/src/github.com/terraform-providers/terraform-provider-azurerm -w /go/src/github.com/terraform-providers/terraform-provider-azurerm -e GOOS golang:1.13 make build
 
 fmt:
 	@echo "==> Fixing source code with gofmt..."
@@ -47,7 +47,7 @@ tflint:
         ./$(PKG_NAME)
 
 test-docker:
-	docker run --rm -v $$(pwd):/go/src/github.com/terraform-providers/terraform-provider-azurerm -w /go/src/github.com/terraform-providers/terraform-provider-azurerm golang:1.12 make test
+	docker run --rm -v $$(pwd):/go/src/github.com/terraform-providers/terraform-provider-azurerm -w /go/src/github.com/terraform-providers/terraform-provider-azurerm golang:1.13 make test
 
 test: fmtcheck
 	go test -i $(TEST) || exit 1

README.md

@@ -1,49 +1,21 @@
-AzureRM Terraform Provider
-==================
+# Terraform Provider for Azure (Resource Manager)
 
-- Website: https://www.terraform.io
-- [![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby)
-- Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
-- Slack workspace: [Terraform on Azure](https://terraform-azure.slack.com) ([Request Invite](https://join.slack.com/t/terraform-azure/shared_invite/enQtNDMzNjQ5NzcxMDc3LTJkZTJhNTg3NTE5ZTdjZjFhMThmMTVmOTg5YWJkMDU1YTMzN2YyOWJmZGM3MGI4OTQ0ODQxNTEyNjdjMDAxMjM))
+The AzureRM Provider supports Terraform 0.10.x and later - but Terraform 0.12.x is recommended.
 
-General Requirements
-------------
+* [Terraform Website](https://www.terraform.io)
+* [AzureRM Provider Documentation](https://www.terraform.io/docs/providers/azurerm/index.html)
+* [AzureRM Provider Usage Examples](https://github.com/terraform-providers/terraform-provider-azurerm/tree/master/examples)
+* [Slack Workspace for Contributors](https://terraform-azure.slack.com) ([Request Invite](https://join.slack.com/t/terraform-azure/shared_invite/enQtNDMzNjQ5NzcxMDc3LTJkZTJhNTg3NTE5ZTdjZjFhMThmMTVmOTg5YWJkMDU1YTMzN2YyOWJmZGM3MGI4OTQ0ODQxNTEyNjdjMDAxMjM))
 
--	[Terraform](https://www.terraform.io/downloads.html) 0.10.x
--	[Go](https://golang.org/doc/install) 1.12.x (to build the provider plugin)
-
-Windows Specific Requirements
------------------------------
-- [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm)
-- [Git Bash for Windows](https://git-scm.com/download/win)
-
-For *GNU32 Make*, make sure its bin path is added to PATH environment variable.*
-
-For *Git Bash for Windows*, at the step of "Adjusting your PATH environment", please choose "Use Git and optional Unix tools from Windows Command Prompt".*
-
-Building The Provider
----------------------
-
-Clone repository to: `$GOPATH/src/github.com/terraform-providers/terraform-provider-azurerm`
-
-```sh
-$ mkdir -p $GOPATH/src/github.com/terraform-providers; cd $GOPATH/src/github.com/terraform-providers
-$ git clone [email protected]:terraform-providers/terraform-provider-azurerm
-```
-
-Enter the provider directory and build the provider
-
-```sh
-$ cd $GOPATH/src/github.com/terraform-providers/terraform-provider-azurerm
-$ make build
-```
-
-Using the provider
-----------------------
+## Usage Example
 
 ```
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
+  # We recommend pinning to the specific version of the Azure Provider you're using
+  # since new versions are released frequently
+  version = "=1.34.0"
+
   # More information on the authentication methods supported by
   # the AzureRM Provider can be found here:
   # http://terraform.io/docs/providers/azurerm/index.html
@@ -71,12 +43,34 @@ resource "azurerm_virtual_network" "test" {
 
 Further [usage documentation is available on the Terraform website](https://www.terraform.io/docs/providers/azurerm/index.html).
 
-Developing the Provider
----------------------------
+## Developer Requirements
 
-If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.12+ is **required**). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
+* [Terraform](https://www.terraform.io/downloads.html) version 0.10.x +
+* [Go](https://golang.org/doc/install) version 1.13.x (to build the provider plugin)
 
-To compile the provider, run `make build`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory.
+If you're on Windows you'll also need:
+* [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm)
+* [Git Bash for Windows](https://git-scm.com/download/win)
+
+For *GNU32 Make*, make sure its bin path is added to PATH environment variable.*
+
+For *Git Bash for Windows*, at the step of "Adjusting your PATH environment", please choose "Use Git and optional Unix tools from Windows Command Prompt".*
+
+## Developing the Provider
+
+If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.13+ is **required**). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
+
+First clone the repository to: `$GOPATH/src/github.com/terraform-providers/terraform-provider-azurerm`
+
+```sh
+$ mkdir -p $GOPATH/src/github.com/terraform-providers; cd $GOPATH/src/github.com/terraform-providers
+$ git clone [email protected]:terraform-providers/terraform-provider-azurerm
+$ cd $GOPATH/src/github.com/terraform-providers/terraform-provider-azurerm
+```
+
+Once inside the provider directory, you can run `make tools` to install the dependent tooling required to compile the provider.
+
+At this point you can compile the provider by running `make build`, which will build the provider and put the provider binary in the `$GOPATH/bin` directory.
 
 ```sh
 $ make build
@@ -85,7 +79,13 @@ $ $GOPATH/bin/terraform-provider-azurerm
 ...
 ```
 
-In order to run the unit tests for the provider, you can run:
+You can also cross-compile if necessary:
+
+```sh
+GOOS=windows GOARCH=amd64 make build
+```
+
+In order to run the Unit Tests for the provider, you can run:
 
 ```sh
 $ make test
@@ -110,8 +110,3 @@ The following Environment Variables must be set in your shell prior to running a
 
 **Note:** Acceptance tests create real resources in Azure which often cost money to run.
 
-Crosscompiling
---------------
-```sh
-GOOS=windows GOARCH=amd64 make build
-```