Update from master TF repo

.github/ISSUE_TEMPLATE/Question.md

@@ -11,5 +11,5 @@ so we recommend using our other community resources instead of asking here 👍.
 
 If you have a support request or question please submit them to one of these resources:
 
-* [Terraform community resources](https://www.terraform.io/docs/extend/community/index.html)
+* [HashiCorp Community Forums](https://discuss.hashicorp.com/c/terraform-providers)
 * [HashiCorp support](https://support.hashicorp.com) (Terraform Enterprise customers)

.gitignore

@@ -42,3 +42,6 @@ examples/**/test.tf
 examples/**/test.tfvars
 examples/**/terraform
 examples/**/terraform.zip
+
+#never upload the build to git
+terraform-provider-azurerm

.golangci-travisrest.yml

@@ -0,0 +1,36 @@
+run:
+  deadline: 30m10s
+  modules-download-mode: vendor
+
+issues:
+  max-per-linter: 0
+  max-same-issues: 0
+
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - errcheck
+    - gofmt
+    - goimports
+    - gosimple
+    - govet
+    - ineffassign
+    - interfacer
+    - nakedret
+    - misspell
+    - structcheck
+    - typecheck
+    - unused
+    - unconvert
+    - varcheck
+    - vet
+    - vetshadow
+    - whitespace
+
+linters-settings:
+  errcheck:
+    ignore: github.com/hashicorp/terraform/helper/schema:ForceNew|Set,fmt:.*,io:Close
+  misspell:
+    ignore-words:
+      - hdinsight

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  deadline: 7m7s
+  deadline: 10m10s
   modules-download-mode: vendor
 
 issues:
@@ -27,10 +27,11 @@ linters:
     - varcheck
     - vet
     - vetshadow
+    - whitespace
 
 linters-settings:
   errcheck:
     ignore: github.com/hashicorp/terraform/helper/schema:ForceNew|Set,fmt:.*,io:Close
   misspell:
     ignore-words:
-      - hdinsight
+      - hdinsight

.hashibot.hcl

@@ -0,0 +1,26 @@
+queued_behavior "release_commenter" "releases" {
+  repo_prefix = "terraform-provider-"
+
+  message = <<-EOF
+    This has been released in [version ${var.release_version} of the provider](${var.changelog_link}). Please see the [Terraform documentation on provider versioning](https://www.terraform.io/docs/configuration/providers.html#provider-versions) or reach out if you need any assistance upgrading. As an example:
+    ```hcl
+    provider "${var.project_name}" {
+        version = "~> ${var.release_version}"
+    }
+    # ... other configuration ...
+    ```
+  EOF
+}
+
+poll "closed_issue_locker" "locker" {
+  schedule             = "0 50 14 * * *"
+  closed_for           = "720h" # 30 days
+  max_issues           = 500
+  sleep_between_issues = "5s"
+
+  message = <<-EOF
+    I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
+
+    If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉  hashibot-feedback@hashicorp.com. Thanks!
+  EOF
+}

.travis.yml

@@ -1,34 +1,39 @@
-dist: trusty
+dist: xenial
 sudo: required
 services:
 - docker
 language: go
 go:
-- "1.12.x"
+- "1.13.x"
+
+branches:
+  only:
+    - master
 
 env:
-  matrix:
-  - MODE=unit-tests
-  - MODE=linters
-  - MODE=website
+  global:
+    GOFLAGS=-mod=vendor
 
 install:
-# This script is used by the Travis build to install a cookie for
-# go.googlesource.com so rate limits are higher when using `go get` to fetch
-# packages that live there.
-# See: https://github.com/golang/go/issues/12933
-- bash scripts/gogetcookie.sh
-- make tools
+  # This script is used by the Travis build to install a cookie for
+  # go.googlesource.com so rate limits are higher when using `go get` to fetch
+  # packages that live there.
+  # See: https://github.com/golang/go/issues/12933
+  - bash scripts/gogetcookie.sh
+  - make tools
 
-script:
-  - if [[ $MODE == 'unit-tests' ]]; then make test; fi
-  - if [[ $MODE == 'linters' ]]; then GOGC=30 make lint; fi
-  - if [[ $MODE == 'website' ]]; then make website-test; fi
-
-branches:
-  only:
-  - master
 matrix:
   fast_finish: true
   allow_failures:
-  - go: tip
+    - go: tip
+  include:
+    - name: "make lintrest"
+      script: GOGC=20 make lintrest
+    - name: "make tflint"
+      script: make tflint
+    - name: "make test"
+      script: make test
+    - name: "make website-lint"
+      script: make website-lint
+    - name: "make website-test"
+      script: make website-test

GNUmakefile

@@ -9,33 +9,26 @@ GOFLAGS=-mod=vendor
 
 default: build
 
+tools:
+	@echo "==> installing required tooling..."
+	@sh "$(CURDIR)/scripts/gogetcookie.sh"
+	GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell
+	GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+	GO111MODULE=off go get -u github.com/bflad/tfproviderlint/cmd/tfproviderlint
+
 build: fmtcheck
 	go install
 
 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
-
-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
-
-test: fmtcheck
-	go test -i $(TEST) || exit 1
-	echo $(TEST) | \
-		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
-
-testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 180m -ldflags="-X=github.com/terraform-providers/terraform-provider-azurerm/version.ProviderVersion=acc"
-
-debugacc: fmtcheck
-	TF_ACC=1 dlv test $(TEST) --headless --listen=:2345 --api-version=2 -- -test.v $(TESTARGS)
+	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..."
 	# This logic should match the search logic in scripts/gofmtcheck.sh
 	find . -name '*.go' | grep -v vendor | xargs gofmt -s -w
 
-# Currently required by tf-deploy compile
+# Currently required by tf-deploy compile, duplicated by linters
 fmtcheck:
 	@sh "$(CURDIR)/scripts/gofmtcheck.sh"
 
@@ -47,11 +40,34 @@ lint:
 	@echo "==> Checking source code against linters..."
 	golangci-lint run ./...
 
-tools:
-	@echo "==> installing required tooling..."
-	@sh "$(CURDIR)/scripts/gogetcookie.sh"
-	GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell
-	GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+# we have split off static check because it causes travis to fail with an OOM error
+lintstatic:
+	@echo "==> Checking source code against static check linters..."
+	(while true; do sleep 300; echo "(Hey travis! I'm still alive and linting)"; done) & PID=$$!; echo $$PID; \
+	golangci-lint run ./... -v --no-config --concurrency 1 --deadline=30m10s --disable-all --enable=staticcheck; ES=$$?; kill -9 $$PID; exit $$ES
+
+lintrest:
+	@echo "==> Checking source code against linters..."
+	golangci-lint run ./... -v --config .golangci-travisrest.yml
+
+tflint:
+	@echo "==> Checking source code against terraform provider linters..."
+	@tfproviderlint \
+        -R001 -R002 -R003 -R004\
+        -S001 -S002 -S003 -S004 -S005 -S006 -S007 -S008 -S009 -S010 -S011 -S012 -S013 -S014 -S015 -S016 -S017 -S018 -S019\
+        ./$(PKG_NAME)
+
+whitespace:
+	@echo "==> Fixing source code with whitespace linter..."
+	golangci-lint run ./... --no-config --disable-all --enable=whitespace --fix
+
+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.13 make test
+
+test: fmtcheck
+	go test -i $(TEST) || exit 1
+	echo $(TEST) | \
+		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
 test-compile:
 	@if [ "$(TEST)" = "./..." ]; then \
@@ -61,6 +77,16 @@ test-compile:
 	fi
 	go test -c $(TEST) $(TESTARGS)
 
+testacc: fmtcheck
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 180m -ldflags="-X=github.com/terraform-providers/terraform-provider-azurerm/version.ProviderVersion=acc"
+
+debugacc: fmtcheck
+	TF_ACC=1 dlv test $(TEST) --headless --listen=:2345 --api-version=2 -- -test.v $(TESTARGS)
+
+website-lint:
+	@echo "==> Checking website against linters..."
+	@misspell -error -source=text -i hdinsight website/
+
 website:
 ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."

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 git@github.com: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 git@github.com: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
@@ -106,11 +106,7 @@ The following Environment Variables must be set in your shell prior to running a
 - `ARM_ENVIRONMENT`
 - `ARM_TEST_LOCATION`
 - `ARM_TEST_LOCATION_ALT`
+- `ARM_TEST_LOCATION_ALT2`
 
 **Note:** Acceptance tests create real resources in Azure which often cost money to run.
 
-Crosscompiling
---------------
-```sh
-GOOS=windows GOARCH=amd64 make build
-```