diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c095bab011..b27d60d226 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v2 with: - go-version: '1.17.6' + go-version: '1.18' - run: make tools - run: make lint - run: make website-lint diff --git a/GNUmakefile b/GNUmakefile index 264516aa1c..0b719103f5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -7,7 +7,7 @@ default: build tools: go install github.com/client9/misspell/cmd/misspell - go install github.com/golangci/golangci-lint/cmd/golangci-lint + go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2 build: fmtcheck go build ./... diff --git a/github/data_source_github_organization_teams_test.go b/github/data_source_github_organization_teams_test.go index 1fb94910bb..f6398058f2 100644 --- a/github/data_source_github_organization_teams_test.go +++ b/github/data_source_github_organization_teams_test.go @@ -1,7 +1,6 @@ package github import ( - "fmt" "testing" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -11,9 +10,9 @@ func TestAccGithubOrganizationTeamsDataSource(t *testing.T) { t.Run("queries without error", func(t *testing.T) { - config := fmt.Sprintf(` + config := ` data "github_organization_teams" "all" {} - `) + ` check := resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet("data.github_organization_teams.all", "teams.0.id"), @@ -49,11 +48,11 @@ func TestAccGithubOrganizationTeamsDataSource(t *testing.T) { t.Run("queries root teams only without error", func(t *testing.T) { - config := fmt.Sprintf(` + config := ` data "github_organization_teams" "root_teams" { root_teams_only = true } - `) + ` check := resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet("data.github_organization_teams.root_teams", "teams.0.id"),