Update golangci-lint (#606)

julienduchesne · web-flow · commit dee3b8ef0da3 · 2022-08-24T10:57:12.000-04:00
v1.49 now mostly supports Go 1.18 so it had lots of findings
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
@@ -2,7 +2,7 @@ local grafanaVersions = ['9.1.0', '9.0.7', '8.5.5', '8.4.7', '8.3.7', '7.5.15'];
 local images = {
   go: 'golang:1.18',
   python: 'python:3.9-alpine',
-  lint: 'golangci/golangci-lint:v1.45',
+  lint: 'golangci/golangci-lint:v1.49',
   grafana(version): 'grafana/grafana:' + version,
 };
 
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -9,7 +9,7 @@ steps:
 - commands:
   - golangci-lint --version
   - golangci-lint run ./...
-  image: golangci/golangci-lint:v1.45
+  image: golangci/golangci-lint:v1.49
   name: lint
 trigger:
   branch:
@@ -348,6 +348,6 @@ workspace:
   path: /drone/terraform-provider-grafana
 ---
 kind: signature
-hmac: caf521c3c5837c7bbed6e18b4433e4e829e66b5ddc115fdeb2300e7445e5e3da
+hmac: 337e340b40f3e6e6fa45e74e98a2e4881bd7e45e1849b234042a39f94a0934e7
 
 ...
diff --git a/.golangci.toml b/.golangci.toml
@@ -1,12 +1,5 @@
 [run]
 timeout = "10m"
-build-tags = [
-  "cloud",
-  "enterprise",
-]
-
-[linters-settings.golint]
-min-confidence = 3
 
 [linters-settings.goconst]
 min-len = 5
@@ -15,14 +8,13 @@ min-occurrences = 5
 [linters]
 disable-all = true
 enable = [
-  "bodyclose",
-  "deadcode",
   "depguard",
   "dogsled",
+  "exportloopref",
   "goconst",
   "gocritic",
+  "gocyclo",
   "goimports",
-  "golint",
   "goprintffuncname",
   "gosec",
   "gosimple",
@@ -31,17 +23,13 @@ enable = [
   "misspell",
   "nakedret",
   "rowserrcheck",
-  "exportloopref",
   "staticcheck",
-  "structcheck",
   "stylecheck",
   "typecheck",
   "unconvert",
-  "unused",
-  "varcheck",
-  "whitespace",
-  "gocyclo",
   "unparam",
+  "unused",
+  "whitespace"
 ]
 
 [[issues.exclude-rules]]
diff --git a/GNUmakefile b/GNUmakefile
@@ -51,7 +51,7 @@ golangci-lint:
 		--rm \
 		--volume "$(shell pwd):/src" \
 		--workdir "/src" \
-		golangci/golangci-lint:v1.45 golangci-lint run ./...
+		golangci/golangci-lint:v1.49 golangci-lint run ./...
 
 linkcheck:
 	docker run -it --entrypoint sh -v "$$PWD:$$PWD" -w "$$PWD" python:3.9-alpine -c "pip3 install linkchecker && linkchecker --config .linkcheckerrc docs"
diff --git a/grafana/data_source_cloud_ips.go b/grafana/data_source_cloud_ips.go
@@ -2,7 +2,6 @@ package grafana
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"net/http"
 	"strings"
@@ -89,7 +88,7 @@ func dataSourceCloudIPsRead(ctx context.Context, d *schema.ResourceData, meta in
 		}
 
 		if err := d.Set(attr, ipStr); err != nil {
-			return diag.FromErr(fmt.Errorf("error setting %s: %v", attr, err))
+			return diag.Errorf("error setting %s: %v", attr, err)
 		}
 	}
 
diff --git a/grafana/data_source_folders.go b/grafana/data_source_folders.go
@@ -2,7 +2,6 @@ package grafana
 
 import (
 	"context"
-	"fmt"
 
 	gapi "github.com/grafana/grafana-api-golang-client"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -65,7 +64,7 @@ func readFolders(ctx context.Context, d *schema.ResourceData, meta interface{})
 	d.SetId("grafana_folders")
 
 	if err := d.Set("folders", flattenFolders(folders)); err != nil {
-		return diag.FromErr(fmt.Errorf("error setting item: %v", err))
+		return diag.Errorf("error setting item: %v", err)
 	}
 
 	return nil
diff --git a/grafana/data_source_oncall_action.go b/grafana/data_source_oncall_action.go
@@ -48,10 +48,10 @@ func dataSourceOnCallActionRead(d *schema.ResourceData, m interface{}) error {
 		return fmt.Errorf("more than one action found matching: %s", options.Name)
 	}
 
-	custom_action := customActionsResponse.CustomActions[0]
+	customAction := customActionsResponse.CustomActions[0]
 
-	d.SetId(custom_action.ID)
-	d.Set("name", custom_action.Name)
+	d.SetId(customAction.ID)
+	d.Set("name", customAction.Name)
 
 	return nil
 }
diff --git a/grafana/data_source_oncall_user_group.go b/grafana/data_source_oncall_user_group.go
@@ -48,10 +48,10 @@ func dataSourceOnCallUserGroupRead(d *schema.ResourceData, m interface{}) error
 		return fmt.Errorf("couldn't find a user group matching: %s", options.SlackHandle)
 	}
 
-	user_group := userGroupsResponse.UserGroups[0]
+	userGroup := userGroupsResponse.UserGroups[0]
 
-	d.SetId(user_group.ID)
-	d.Set("slack_id", user_group.SlackUserGroup.ID)
+	d.SetId(userGroup.ID)
+	d.Set("slack_id", userGroup.SlackUserGroup.ID)
 
 	return nil
 }
diff --git a/grafana/data_source_slack_channel.go b/grafana/data_source_slack_channel.go
@@ -50,11 +50,11 @@ func dataSourceOnCallSlackChannelRead(d *schema.ResourceData, m interface{}) err
 		return fmt.Errorf("more than one slack_channel found matching: %s", options.ChannelName)
 	}
 
-	slack_channel := slackChannelsResponse.SlackChannels[0]
+	slackChannel := slackChannelsResponse.SlackChannels[0]
 
-	d.SetId(slack_channel.SlackId)
-	d.Set("name", slack_channel.Name)
-	d.Set("slack_id", slack_channel.SlackId)
+	d.SetId(slackChannel.SlackId)
+	d.Set("name", slackChannel.Name)
+	d.Set("slack_id", slackChannel.SlackId)
 
 	return nil
 }
diff --git a/grafana/provider.go b/grafana/provider.go
@@ -332,7 +332,7 @@ func createGrafanaClient(d *schema.ResourceData) (string, *gapi.Config, *gapi.Cl
 	}
 
 	apiURL := d.Get("url").(string)
-	cli.Transport = logging.NewTransport("Grafana", transport)
+	cli.Transport = logging.NewSubsystemLoggingHTTPTransport("Grafana", transport)
 	cfg := gapi.Config{
 		Client:     cli,
 		NumRetries: d.Get("retries").(int),
@@ -405,8 +405,8 @@ func createSMClient(d *schema.ResourceData) (string, *smapi.Client) {
 
 func createOnCallClient(d *schema.ResourceData) (*onCallAPI.Client, error) {
 	aToken := d.Get("oncall_access_token").(string)
-	base_url := d.Get("oncall_url").(string)
-	return onCallAPI.New(base_url, aToken)
+	baseURL := d.Get("oncall_url").(string)
+	return onCallAPI.New(baseURL, aToken)
 }
 
 // getJSONMap is a helper function that parses the given environment variable as a JSON object
diff --git a/grafana/resource_alerting_contact_point.go b/grafana/resource_alerting_contact_point.go
@@ -265,10 +265,7 @@ func commonNotifierResource() *schema.Resource {
 const RedactedContactPointField = "[REDACTED]"
 
 func redactedContactPointDiffSuppress(k, oldValue, newValue string, d *schema.ResourceData) bool {
-	if oldValue == RedactedContactPointField {
-		return true
-	}
-	return false
+	return oldValue == RedactedContactPointField
 }
 
 const UIDSeparator = ";"
diff --git a/grafana/resource_alerting_contact_point_notifiers.go b/grafana/resource_alerting_contact_point_notifiers.go
@@ -585,15 +585,15 @@ type pagerDutyNotifier struct{}
 
 var _ notifier = (*pagerDutyNotifier)(nil)
 
-func (p pagerDutyNotifier) meta() notifierMeta {
+func (n pagerDutyNotifier) meta() notifierMeta {
 	return notifierMeta{
 		field:   "pagerduty",
 		typeStr: "pagerduty",
 		desc:    "A contact point that sends notifications to PagerDuty.",
 	}
 }
 
-func (p pagerDutyNotifier) schema() *schema.Resource {
+func (n pagerDutyNotifier) schema() *schema.Resource {
 	r := commonNotifierResource()
 	r.Schema["integration_key"] = &schema.Schema{
 		Type:             schema.TypeString,
@@ -693,15 +693,15 @@ type pushoverNotifier struct{}
 
 var _ notifier = (*pushoverNotifier)(nil)
 
-func (p pushoverNotifier) meta() notifierMeta {
+func (n pushoverNotifier) meta() notifierMeta {
 	return notifierMeta{
 		field:   "pushover",
 		typeStr: "pushover",
 		desc:    "A contact point that sends notifications to Pushover.",
 	}
 }
 
-func (p pushoverNotifier) schema() *schema.Resource {
+func (n pushoverNotifier) schema() *schema.Resource {
 	r := commonNotifierResource()
 	r.Schema["user_key"] = &schema.Schema{
 		Type:             schema.TypeString,
diff --git a/grafana/resource_alerting_rule_group.go b/grafana/resource_alerting_rule_group.go
@@ -287,7 +287,7 @@ func unpackRuleGroup(data *schema.ResourceData) (gapi.RuleGroup, error) {
 
 	rules := make([]gapi.AlertRule, 0, len(packedRules))
 	for i := range packedRules {
-		rule, err := unpackAlertRule(packedRules[i], group, folder, interval, orgID)
+		rule, err := unpackAlertRule(packedRules[i], group, folder, orgID)
 		if err != nil {
 			return gapi.RuleGroup{}, err
 		}
@@ -321,7 +321,7 @@ func packAlertRule(r gapi.AlertRule) (interface{}, error) {
 	return json, nil
 }
 
-func unpackAlertRule(raw interface{}, groupName string, folderUID string, interval int, orgID int) (gapi.AlertRule, error) {
+func unpackAlertRule(raw interface{}, groupName string, folderUID string, orgID int) (gapi.AlertRule, error) {
 	json := raw.(map[string]interface{})
 	data, err := unpackRuleData(json["data"])
 	if err != nil {
diff --git a/grafana/resource_annotation.go b/grafana/resource_annotation.go
@@ -144,7 +144,7 @@ func ReadAnnotation(ctx context.Context, d *schema.ResourceData, meta interface{
 		}
 	}
 
-	if &annotation == nil {
+	if annotation.ID <= 0 {
 		return diag.Errorf("unable to find Grafana annotation ID %d", id)
 	}
 
diff --git a/grafana/resource_cloud_stack.go b/grafana/resource_cloud_stack.go
@@ -341,8 +341,8 @@ func FlattenStack(d *schema.ResourceData, stack gapi.Stack) error {
 }
 
 // Append path to baseurl
-func appendPath(baseUrl, path string) (string, error) {
-	bu, err := url.Parse(baseUrl)
+func appendPath(baseURL, path string) (string, error) {
+	bu, err := url.Parse(baseURL)
 	if err != nil {
 		return "", err
 	}
@@ -388,7 +388,7 @@ func waitForStackReadiness(ctx context.Context, d *schema.ResourceData) diag.Dia
 		return nil
 	})
 	if err != nil {
-		return diag.FromErr(fmt.Errorf("error waiting for stack to be ready: %w", err))
+		return diag.Errorf("error waiting for stack to be ready: %v", err)
 	}
 
 	return nil
diff --git a/grafana/resource_dashboard_test.go b/grafana/resource_dashboard_test.go
@@ -226,7 +226,7 @@ func testAccDashboardFolderCheckDestroy(dashboard *gapi.Dashboard, folder *gapi.
 		if err == nil {
 			return fmt.Errorf("dashboard still exists")
 		}
-		folder, err = getFolderById(client, folder.ID)
+		folder, err = getFolderByID(client, folder.ID)
 		if err == nil {
 			return fmt.Errorf("the following folder still exists: %s", folder.Title)
 		}
diff --git a/grafana/resource_datasource_permission_test.go b/grafana/resource_datasource_permission_test.go
@@ -34,6 +34,7 @@ func TestAccDatasourcePermission_basic(t *testing.T) {
 	})
 }
 
+//nolint:unused
 func testAccDatasourcePermissionsCheckExists(rn string, datasourceID *int64) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[rn]
@@ -63,6 +64,7 @@ func testAccDatasourcePermissionsCheckExists(rn string, datasourceID *int64) res
 	}
 }
 
+//nolint:unused
 func testAccDatasourcePermissionCheckDestroy(datasourceID *int64) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*client).gapi
diff --git a/grafana/resource_folder.go b/grafana/resource_folder.go
@@ -115,7 +115,7 @@ func ReadFolder(ctx context.Context, d *schema.ResourceData, meta interface{}) d
 		return diag.FromErr(err)
 	}
 
-	folder, err := getFolderById(client, id)
+	folder, err := getFolderByID(client, id)
 	if err != nil {
 		if strings.HasPrefix(err.Error(), "status: 404") {
 			log.Printf("[WARN] removing folder %d from state because it no longer exists in grafana", id)
@@ -181,7 +181,7 @@ func NormalizeFolderConfigJSON(configI interface{}) string {
 // Hackish way to get the folder by ID.
 // TODO: Revert to using the specific folder ID GET endpoint once it's fixed
 // Broken in 8.5.0
-func getFolderById(client *gapi.Client, id int64) (*gapi.Folder, error) {
+func getFolderByID(client *gapi.Client, id int64) (*gapi.Folder, error) {
 	folders, err := client.Folders()
 	if err != nil {
 		return nil, err
diff --git a/grafana/resource_folder_test.go b/grafana/resource_folder_test.go
@@ -128,7 +128,7 @@ func testAccFolderCheckExists(rn string, folder *gapi.Folder) resource.TestCheck
 		if id == 0 {
 			return fmt.Errorf("got a folder id of 0")
 		}
-		gotFolder, err := getFolderById(client, id)
+		gotFolder, err := getFolderByID(client, id)
 		if err != nil {
 			return fmt.Errorf("error getting folder: %s", err)
 		}
@@ -142,7 +142,7 @@ func testAccFolderCheckExists(rn string, folder *gapi.Folder) resource.TestCheck
 func testAccFolderCheckDestroy(folder *gapi.Folder) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*client).gapi
-		_, err := getFolderById(client, folder.ID)
+		_, err := getFolderByID(client, folder.ID)
 		if err == nil {
 			return fmt.Errorf("folder still exists")
 		}
diff --git a/grafana/resource_library_panel_test.go b/grafana/resource_library_panel_test.go
@@ -167,7 +167,7 @@ func testAccLibraryPanelFolderCheckDestroy(panel *gapi.LibraryPanel, folder *gap
 		if err == nil {
 			return fmt.Errorf("panel still exists")
 		}
-		folder, err = getFolderById(client, folder.ID)
+		folder, err = getFolderByID(client, folder.ID)
 		if err == nil {
 			return fmt.Errorf("the following folder still exists: %s", folder.Title)
 		}
diff --git a/grafana/resource_oncall_escalation.go b/grafana/resource_oncall_escalation.go
@@ -204,10 +204,10 @@ func resourceEscalationCreate(ctx context.Context, d *schema.ResourceData, m int
 		return diag.Errorf("grafana OnCall api client is not configured")
 	}
 
-	escalationChainIdData := d.Get("escalation_chain_id").(string)
+	escalationChainIDData := d.Get("escalation_chain_id").(string)
 
 	createOptions := &onCallAPI.CreateEscalationOptions{
-		EscalationChainId: escalationChainIdData,
+		EscalationChainId: escalationChainIDData,
 		ManualOrder:       true,
 	}
 
diff --git a/grafana/resource_oncall_escalation_chain.go b/grafana/resource_oncall_escalation_chain.go
@@ -45,11 +45,11 @@ func ResourceOnCallEscalationChainCreate(ctx context.Context, d *schema.Resource
 	}
 
 	nameData := d.Get("name").(string)
-	teamIdData := d.Get("team_id").(string)
+	teamIDData := d.Get("team_id").(string)
 
 	createOptions := &onCallAPI.CreateEscalationChainOptions{
 		Name:   nameData,
-		TeamId: teamIdData,
+		TeamId: teamIDData,
 	}
 
 	escalationChain, _, err := client.EscalationChains.CreateEscalationChain(createOptions)
diff --git a/grafana/resource_oncall_integration.go b/grafana/resource_oncall_integration.go
diff --git a/grafana/resource_oncall_on_call_shift.go b/grafana/resource_oncall_on_call_shift.go
diff --git a/grafana/resource_oncall_outgoing_webhook.go b/grafana/resource_oncall_outgoing_webhook.go
diff --git a/grafana/resource_oncall_route.go b/grafana/resource_oncall_route.go
diff --git a/grafana/resource_oncall_schedule.go b/grafana/resource_oncall_schedule.go
diff --git a/grafana/resource_playlist.go b/grafana/resource_playlist.go
diff --git a/grafana/resource_service_account_test.go b/grafana/resource_service_account_test.go

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package grafana`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "fmt"`
`6`	`5`	`"io"`
`7`	`6`	`"net/http"`
`8`	`7`	`"strings"`
`@@ -89,7 +88,7 @@ func dataSourceCloudIPsRead(ctx context.Context, d *schema.ResourceData, meta in`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`if err := d.Set(attr, ipStr); err != nil {`
`92`		`- return diag.FromErr(fmt.Errorf("error setting %s: %v", attr, err))`
	`91`	`+ return diag.Errorf("error setting %s: %v", attr, err)`
`93`	`92`	`}`
`94`	`93`	`}`
`95`	`94`
Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,10 @@ func dataSourceOnCallActionRead(d *schema.ResourceData, m interface{}) error {`
`48`	`48`	`return fmt.Errorf("more than one action found matching: %s", options.Name)`
`49`	`49`	`}`
`50`	`50`
`51`		`- custom_action := customActionsResponse.CustomActions[0]`
	`51`	`+ customAction := customActionsResponse.CustomActions[0]`
`52`	`52`
`53`		`- d.SetId(custom_action.ID)`
`54`		`- d.Set("name", custom_action.Name)`
	`53`	`+ d.SetId(customAction.ID)`
	`54`	`+ d.Set("name", customAction.Name)`
`55`	`55`
`56`	`56`	`return nil`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,11 @@ func dataSourceOnCallSlackChannelRead(d *schema.ResourceData, m interface{}) err`
`50`	`50`	`return fmt.Errorf("more than one slack_channel found matching: %s", options.ChannelName)`
`51`	`51`	`}`
`52`	`52`
`53`		`- slack_channel := slackChannelsResponse.SlackChannels[0]`
	`53`	`+ slackChannel := slackChannelsResponse.SlackChannels[0]`
`54`	`54`
`55`		`- d.SetId(slack_channel.SlackId)`
`56`		`- d.Set("name", slack_channel.Name)`
`57`		`- d.Set("slack_id", slack_channel.SlackId)`
	`55`	`+ d.SetId(slackChannel.SlackId)`
	`56`	`+ d.Set("name", slackChannel.Name)`
	`57`	`+ d.Set("slack_id", slackChannel.SlackId)`
`58`	`58`
`59`	`59`	`return nil`
`60`	`60`	`}`