Merge remote-tracking branch 'upstream/master' into subscription_tags

.github/ISSUE_TEMPLATE/Bug_Report.md

@@ -58,11 +58,11 @@ To obtain the debug output, see the [Terraform documentation on debugging](https
 
 <!--- If Terraform produced a panic, please provide a link to a GitHub Gist containing the output of the `crash.log`. --->
 
-### Expected Behavior
+### Expected Behaviour
 
 <!--- What should have happened? --->
 
-### Actual Behavior
+### Actual Behaviour
 
 <!--- What actually happened? --->
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,11 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Terraform Azure Provider Questions
+    url: https://discuss.hashicorp.com/c/terraform-providers/tf-azure
+    about: GitHub issues in this repository are only intended for bug reports and feature requests. Other issues will be closed. Please ask and answer questions through the Terraform Azure Provider Community Forum.
+  - name: Terraform Core Bug Reports and Feature Requests
+    url: https://github.com/hashicorp/terraform/issues/new/choose
+    about: Terraform Core, which handles the Terraform configuration language, CLI commands, and resource dependency graph, has its own codebase. Bug reports and feature requests for those pieces of functionality should be directed to that repository.
+  - name: Terraform Language or Workflow Questions
+    url: https://discuss.hashicorp.com/c/terraform-core
+    about: Please ask and answer language or workflow related questions through the Terraform Core Community Forum.

.github/workflows/depscheck.yaml

@@ -2,7 +2,7 @@
 name: Vendor Dependencies Check
 on:
   pull_request:
-    types: ['opened', 'edited', 'reopened', 'synchronize']
+    types: ['opened', 'synchronize']
     paths:
       - '**.go'
       - 'vendor/**'
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.5'
+          go-version: '1.15.5'
       - run: bash scripts/gogetcookie.sh
       - run: make tools
       - run: make depscheck

.github/workflows/gencheck.yaml

@@ -0,0 +1,21 @@
+---
+name: Generation Check
+on:
+  pull_request:
+    types: ['opened', 'synchronize']
+    paths:
+      - '**.go'
+      - 'azurerm/**'
+      - '.github/workflows/**'
+
+jobs:
+  gencheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.15.5'
+      - run: bash scripts/gogetcookie.sh
+      - run: make tools
+      - run: make gencheck

.github/workflows/golint.yaml

@@ -0,0 +1,24 @@
+---
+name: GoLang Linting
+on:
+  pull_request:
+    types: ['opened', 'synchronize']
+    paths:
+      - '**.go'
+      - 'vendor/**'
+      - '.github/workflows/**'
+
+jobs:
+  golint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.15.5'
+      - uses: golangci/golangci-lint-action@v2
+        with:
+          version: 'v1.32'
+          args: --timeout=30m0s

.github/workflows/teamcity-test.yaml

@@ -0,0 +1,29 @@
+---
+name: TeamCity Config Test
+on:
+  pull_request:
+    types: ['opened', 'synchronize']
+    paths:
+      - '!.teamcity/components/generated/**'
+      - '!.teamcity/target/**'
+      - '.teamcity/**'
+      - '.github/workflows/**'
+
+jobs:
+  teamcity-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '13'
+          java-package: jdk
+      - uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - run: make teamcity-test

.github/workflows/tflint.yaml

@@ -2,7 +2,7 @@
 name: Terraform Schema Linting
 on:
   pull_request:
-    types: ['opened', 'edited', 'reopened', 'synchronize']
+    types: ['opened', 'synchronize']
     paths:
       - '**.go'
       - 'vendor/**'
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.5'
+          go-version: '1.15.5'
       - run: bash scripts/gogetcookie.sh
       - run: make tools
       - run: make tflint

.github/workflows/thirty-two-bit.yaml

@@ -0,0 +1,23 @@
+---
+name: 32 Bit Build
+on:
+  pull_request:
+    types: ['opened', 'synchronize']
+    paths:
+      - '**.go'
+      - 'vendor/**'
+      - '.github/workflows/**'
+
+jobs:
+  compatability-32bit-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.15.5'
+      - run: bash scripts/gogetcookie.sh
+      - run: make tools
+      - run: GOARCH=386 GOOS=linux go build -o 32bitbuild .

.github/workflows/unit-test.yaml

@@ -2,7 +2,7 @@
 name: Unit Tests
 on:
   pull_request:
-    types: ['opened', 'edited', 'reopened', 'synchronize']
+    types: ['opened', 'synchronize']
     paths:
       - '**.go'
       - 'vendor/**'
@@ -17,8 +17,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.5'
+          go-version: '1.15.5'
       - run: bash scripts/gogetcookie.sh
-      - run: make tools
       - run: make test
-

.github/workflows/website-lint.yaml

@@ -2,7 +2,7 @@
 name: Website Linting
 on:
   pull_request:
-    types: ['opened', 'edited', 'reopened', 'synchronize']
+    types: ['opened', 'synchronize']
     paths:
       - 'website/**'
       - '.github/workflows/**'
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.5'
+          go-version: '1.15.5'
       - run: bash scripts/gogetcookie.sh
       - run: make tools
       - run: make website-lint

.github/workflows/website-test.yaml

@@ -2,7 +2,7 @@
 name: Website checks
 on:
   pull_request:
-    types: ['opened', 'edited', 'reopened', 'synchronize']
+    types: ['opened', 'synchronize']
     paths:
       - 'website/**'
       - '.github/workflows/**'
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.5'
+          go-version: '1.15.5'
       - run: bash scripts/gogetcookie.sh
       - run: make tools
       - run: make website-test

.go-version

@@ -1 +1 @@
-1.14.5
+1.15.5

.golangci.yml

@@ -1,6 +1,8 @@
 run:
-  deadline: 10m10s
+  deadline: 12m10s
   modules-download-mode: vendor
+  skip-dirs:
+    - vendor
 
 issues:
   max-per-linter: 0
@@ -9,6 +11,7 @@ issues:
 linters:
   disable-all: true
   enable:
+    - asciicheck
     - deadcode
     - errcheck
     - gocritic