Merge pull request integrations#372 from martinssipenko/integrationsg…

…h-370-go1.13

Upgrade to go 1.13

.go-version

@@ -1 +1 @@
-1.11.5
+1.13.8

.golangci.yml

@@ -24,5 +24,5 @@ linters:
 
 linters-settings:
   errcheck:
-    ignore: github.com/hashicorp/terraform/helper/schema:ForceNew|Set,fmt:.*,io:Close
+    ignore: github.com/hashicorp/terraform-plugin-sdk/helper/schema:ForceNew|Set,fmt:.*,io:Close
 

.travis.yml

@@ -4,7 +4,10 @@ services:
 - docker
 language: go
 go:
-  - "1.11.x"
+  - "1.13.x"
+
+env:
+  - GOFLAGS=-mod=vendor
 
 branches:
   only:
@@ -16,8 +19,8 @@ install:
 # packages that live there.
 # See: https://github.com/golang/go/issues/12933
 - bash scripts/gogetcookie.sh
-- make tools 
-  
+- make tools
+
 matrix:
   fast_finish: true
   allow_failures:
@@ -31,5 +34,3 @@ matrix:
     script: make website-lint
   - name: "make website-test"
     script: make website-test
-env:
-  - GOFLAGS=-mod=vendor GO111MODULE=on

GNUmakefile

@@ -12,20 +12,17 @@ tools:
 build: fmtcheck
 	go install
 
-errcheck:
-	@sh -c "'$(CURDIR)/scripts/errcheck.sh'"
-
 fmt:
 	@echo "==> Fixing source code with gofmt..."
-	gofmt -w $(GOFMT_FILES)
+	gofmt -s -w $(GOFMT_FILES)
 
 fmtcheck:
 	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
 
 lint:
 	@echo "==> Checking source code against linters..."
 	golangci-lint run ./...
-	
+
 test: fmtcheck
 	go test -i $(TEST) || exit 1
 	echo $(TEST) | \
@@ -42,6 +39,15 @@ test-compile:
 	fi
 	go test -c $(TEST) $(TESTARGS)
 
+vet:
+	@echo "go vet ."
+	@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
+		echo ""; \
+		echo "Vet found suspicious constructs. Please check the reported constructs"; \
+		echo "and fix them if necessary before submitting the code for review."; \
+		exit 1; \
+	fi
+
 website:
 ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
@@ -60,5 +66,5 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
-.PHONY: build test testacc vet fmt fmtcheck errcheck lint tools test-compile website website-lint website-test
+.PHONY: build test testacc vet fmt fmtcheck lint tools test-compile website website-lint website-test
 

README.md

@@ -11,7 +11,7 @@ Requirements
 ------------
 
 -	[Terraform](https://www.terraform.io/downloads.html) 0.10.x
--	[Go](https://golang.org/doc/install) 1.11 (to build the provider plugin)
+-	[Go](https://golang.org/doc/install) 1.13 (to build the provider plugin)
 
 Building The Provider
 ---------------------
@@ -106,9 +106,10 @@ Export an environment variable corresponding to `GITHUB_TEMPLATE_REPOSITORY=test
 Export your github username (the one you used to create the personal access token above) as `GITHUB_TEST_USER`. You will need to export a
 different github username as `GITHUB_TEST_COLLABORATOR`. Please note that these usernames cannot be the same as each other, and both of them
 must be real github usernames. The collaborator user does not need to be added as a collaborator to your test repo or organization, but as
-the acceptance tests do real things (and will trigger some notifications for this user), you should probably make sure the person you specify knows that you're doing this just to be nice.
+the acceptance tests do real things (and will trigger some notifications for this user), you should probably make sure the person you specify
+knows that you're doing this just to be nice. You can also export `GITHUB_TEST_COLLABORATOR_TOKEN` in order to test the invitation acceptance.
 
 Additionally the user exported as `GITHUB_TEST_USER` should have a public email address configured in their profile; this should be exported
 as `GITHUB_TEST_USER_EMAIL` and the Github name exported as `GITHUB_TEST_USER_NAME` (this could be different to your GitHub login).
 
-Finally, export the ID of the release created in the template repository as `GITHUB_TEMPLATE_REPOSITORY_RELEASE_ID`
+Finally, export the ID of the release created in the template repository as `GITHUB_TEMPLATE_REPOSITORY_RELEASE_ID`

github/config.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 
 	"github.com/google/go-github/v29/github"
-	"github.com/hashicorp/terraform/helper/logging"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/logging"
 	"golang.org/x/oauth2"
 )
 

github/data_source_github_collaborators.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/google/go-github/v29/github"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func dataSourceGithubCollaborators() *schema.Resource {

github/data_source_github_collaborators_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccGithubCollaboratorsDataSource_basic(t *testing.T) {

github/data_source_github_ip_ranges.go

@@ -1,7 +1,7 @@
 package github
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGithubIpRanges() *schema.Resource {

github/data_source_github_ip_ranges_test.go

@@ -3,7 +3,7 @@ package github
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccGithubIpRangesDataSource_existing(t *testing.T) {

github/data_source_github_release.go

@@ -3,13 +3,13 @@ package github
 import (
 	"context"
 	"fmt"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"log"
 	"strconv"
 	"strings"
 
 	"github.com/google/go-github/v29/github"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGithubRelease() *schema.Resource {

github/data_source_github_release_test.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccGithubReleaseDataSource_fetchByLatestNoReleaseReturnsError(t *testing.T) {

github/data_source_github_repositories.go

@@ -5,8 +5,8 @@ import (
 	"log"
 
 	"github.com/google/go-github/v29/github"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func dataSourceGithubRepositories() *schema.Resource {

github/data_source_github_repositories_test.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccGithubRepositoriesDataSource_basic(t *testing.T) {

github/data_source_github_repository.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGithubRepository() *schema.Resource {

github/data_source_github_repository_test.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccGithubRepositoryDataSource_fullName_noMatchReturnsError(t *testing.T) {

github/data_source_github_team.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/google/go-github/v29/github"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGithubTeam() *schema.Resource {

github/data_source_github_team_test.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccGithubTeamDataSource_noMatchReturnsError(t *testing.T) {

github/data_source_github_user.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceGithubUser() *schema.Resource {

github/data_source_github_user_test.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
 func TestAccGithubUserDataSource_noMatchReturnsError(t *testing.T) {

github/migrate_github_repository_webhook.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func resourceGithubWebhookMigrateState(v int, is *terraform.InstanceState, meta interface{}) (*terraform.InstanceState, error) {

github/migrate_github_repository_webhook_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestMigrateGithubWebhookStateV0toV1(t *testing.T) {

github/provider.go

@@ -1,8 +1,8 @@
 package github
 
 import (
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func Provider() terraform.ResourceProvider {

github/provider_test.go

@@ -10,10 +10,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
-	"github.com/terraform-providers/terraform-provider-tls/tls"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 var testUser string = os.Getenv("GITHUB_TEST_USER")
@@ -28,7 +27,6 @@ func init() {
 	testAccProvider = Provider().(*schema.Provider)
 	testAccProviders = map[string]terraform.ResourceProvider{
 		"github": testAccProvider,
-		"tls":    tls.Provider(),
 	}
 	testAccProviderFactories = func(providers *[]*schema.Provider) map[string]terraform.ResourceProviderFactory {
 		return map[string]terraform.ResourceProviderFactory{
@@ -75,7 +73,7 @@ func testAccPreCheck(t *testing.T) {
 func TestProvider_individual(t *testing.T) {
 
 	username := "hashibot"
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
 		},
@@ -174,7 +172,7 @@ func TestProvider_insecure(t *testing.T) {
 `
 
 	username := "hashibot"
-	resource.ParallelTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
 		},

github/resource_github_branch_protection.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/google/go-github/v29/github"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
 func resourceGithubBranchProtection() *schema.Resource {

github/resource_github_branch_protection_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/google/go-github/v29/github"
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/kylelemons/godebug/pretty"
 )
 
@@ -77,7 +77,7 @@ func TestAccGithubBranchProtection_users(t *testing.T) {
 	rString := acctest.RandString(5)
 	repoName := fmt.Sprintf("tf-acc-test-branch-prot-%s", rString)
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccGithubBranchProtectionDestroy,
@@ -95,10 +95,6 @@ func TestAccGithubBranchProtection_users(t *testing.T) {
 					resource.TestCheckResourceAttr(rn, "restrictions.0.users.#", "1"),
 				),
 			},
-			{
-				Config:      testAccGithubBranchProtectionConfigUser(repoName, "user_with_underscore"),
-				ExpectError: regexp.MustCompile("unable to add users in restrictions: user_with_underscore"),
-			},
 			{
 				ResourceName:      rn,
 				ImportState:       true,
@@ -108,9 +104,6 @@ func TestAccGithubBranchProtection_users(t *testing.T) {
 	})
 }
 
-/* TODO: Research what's going on with this restrictions bug in the API
-that started 2 Aug '19. No changes were made before the error started
-*/
 func TestAccGithubBranchProtection_teams(t *testing.T) {
 	var firstP, secondP, thirdP github.Protection
 
@@ -480,7 +473,7 @@ resource "github_team" "first" {
 resource "github_team_repository" "first" {
   team_id    = "${github_team.first.id}"
   repository = "${github_repository.test.name}"
-  permission = "pull"
+  permission = "push"
 }
 
 resource "github_team" "second" {
@@ -490,7 +483,7 @@ resource "github_team" "second" {
 resource "github_team_repository" "second" {
   team_id    = "${github_team.second.id}"
   repository = "${github_repository.test.name}"
-  permission = "pull"
+  permission = "push"
 }
 
 resource "github_branch_protection" "master" {