Skip to content

Commit

Permalink
Fix linting issues (#1107)
Browse files Browse the repository at this point in the history
* Set up Go 1.18 in CI

* Pin version of linter; fix linting mistakes
  • Loading branch information
kfcampbell authored Apr 8, 2022
1 parent b2dcecf commit 61ab049
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
Expand Down
9 changes: 4 additions & 5 deletions github/data_source_github_organization_teams_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package github

import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
Expand All @@ -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"),
Expand Down Expand Up @@ -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"),
Expand Down

0 comments on commit 61ab049

Please sign in to comment.