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

Author: pgavlin

.circleci/config.yml

@@ -14,15 +14,17 @@ commands:
             - "/go/pkg/mod"
 
 jobs:
-  "docker-go112 build":
+  "docker-go114 build":
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
     steps:
       - get_dependencies
       - run: go build ./...
-  "docker-go112 test":
+  "docker-go114 test":
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
+        environment:
+          TF_ACC_TERRAFORM_VERSION: "0.12.26"
     parameters:
       test_results:
         type: string
@@ -40,21 +42,21 @@ jobs:
           destination: raw-test-output
       - store_test_results:
           path: << parameters.test_results >>
-  "docker-go112 vet":
+  "docker-go114 vet":
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
     steps:
       - get_dependencies
       - run: go vet ./...
-  "docker-go112 gofmt":
+  "docker-go114 gofmt":
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
     steps:
       - get_dependencies
       - run: ./scripts/gofmtcheck.sh
-  "docker-go112 release":
+  "docker-go114 release":
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
     steps:
       - add_ssh_keys:
           fingerprints:
@@ -66,39 +68,41 @@ workflows:
   version: 2
   pr:
     jobs:
-      - "docker-go112 build"
-      - "docker-go112 test":
+      - "docker-go114 build"
+      - "docker-go114 test":
           requires:
-            - "docker-go112 build"
-      - "docker-go112 vet":
+            - "docker-go114 build"
+      - "docker-go114 vet":
           requires:
-            - "docker-go112 build"
-      - "docker-go112 gofmt":
+            - "docker-go114 build"
+      - "docker-go114 gofmt":
           requires:
-            - "docker-go112 build"
+            - "docker-go114 build"
   release:
     jobs:
-      - "docker-go112 build"
-      - "docker-go112 test":
+      - "docker-go114 build"
+      - "docker-go114 test":
           requires:
-            - "docker-go112 build"
-      - "docker-go112 vet":
+            - "docker-go114 build"
+      - "docker-go114 vet":
           requires:
-            - "docker-go112 build"
-      - "docker-go112 gofmt":
+            - "docker-go114 build"
+      - "docker-go114 gofmt":
           requires:
-            - "docker-go112 build"
+            - "docker-go114 build"
       - trigger-release:
           filters:
             branches:
-              only: master
+              only:
+                - master
           type: approval
-      - "docker-go112 release":
+      - "docker-go114 release":
           filters:
             branches:
-              only: master
+              only:
+                - master
           requires:
             - trigger-release
-            - "docker-go112 test"
-            - "docker-go112 vet"
-            - "docker-go112 gofmt"
+            - "docker-go114 test"
+            - "docker-go114 vet"
+            - "docker-go114 gofmt"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,13 +8,14 @@ labels: bug
 <!---
 Inspect your go.mod as below to find the version, and paste the result between the ``` marks below.
 
-go mod edit -json | jq '.Require[] | select(.Path=="github.com/hashicorp/terraform-plugin-sdk")'
+go mod edit -json | jq '.Require[] | select(.Path=="github.com/hashicorp/terraform-plugin-sdk/v2")'
 
 If you are not running the latest version of the SDK, please try upgrading
 because your bug may have already been fixed.
 
-If the command above doesn't yield any results, it means you may not have migrated
-to the standalone SDK yet. See https://www.terraform.io/docs/extend/plugin-sdk.html for more.
+If the command above doesn't yield any results, it means you may either be using v1 of the SDK or
+have not have migrated to the standalone SDK yet. See https://www.terraform.io/docs/extend/plugin-sdk.html
+for more.
 -->
 
 ```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,13 +8,14 @@ labels: enhancement
 <!--
 Inspect your go.mod as below to find the version, and paste the result between the ``` marks below.
 
-go mod edit -json | jq '.Require[] | select(.Path=="github.com/hashicorp/terraform-plugin-sdk")'
+go mod edit -json | jq '.Require[] | select(.Path=="github.com/hashicorp/terraform-plugin-sdk/v2")'
 
 If you are not running the latest version of the SDK, please try upgrading
 because your feature may have already been implemented.
 
-If the command above doesn't yield any results, it means you may not have migrated
-to the standalone SDK yet. See https://www.terraform.io/docs/extend/plugin-sdk.html for more.
+If the command above doesn't yield any results, it means you may either be using v1 of the SDK or
+have not have migrated to the standalone SDK yet. See https://www.terraform.io/docs/extend/plugin-sdk.html
+for more.
 -->
 ```
 ...

.github/SECURITY.md

@@ -1 +1 @@
-1.12.9
+1.14.2