Merge pull request #48 from sensu/staticcheck

Replace golangci-lint w/staticcheck
sensu · May 6, 2022 · 81d9c27 · 81d9c27
2 parents 593bc2a + e31a6ad
commit 81d9c27
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 32 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
diff --git a/.github/workflows/static-check.yml b/.github/workflows/static-check.yml
@@ -0,0 +1,17 @@
+name: static-check
+
+on: [push, pull_request]
+
+jobs:
+  staticcheck:
+    name: staticcheck (project)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+      - uses: dominikh/staticcheck-action@v1.2.0
+        with:
+          version: "2022.1"
+env:
+  GO_VERSION: 1.18.1
diff --git a/main.go b/main.go
@@ -17,7 +17,7 @@ type HandlerConfig struct {
 	sensu.PluginConfig
 	authToken        string
 	dedupKeyTemplate string
-	statusMapJson    string
+	statusMapJSON    string
 	summaryTemplate  string
 	teamName         string
 	teamSuffix       string
@@ -77,7 +77,7 @@ var (
 			Argument:  "status-map",
 			Shorthand: "s",
 			Usage:     "The status map used to translate a Sensu check status to a PagerDuty severity, can be set with PAGERDUTY_STATUS_MAP",
-			Value:     &config.statusMapJson,
+			Value:     &config.statusMapJSON,
 			Default:   "",
 		},
 		{
@@ -159,7 +159,7 @@ func checkArgs(event *corev2.Event) error {
 }
 
 func manageIncident(event *corev2.Event) error {
-	severity, err := getPagerDutySeverity(event, config.statusMapJson)
+	severity, err := getPagerDutySeverity(event, config.statusMapJSON)
 	if err != nil {
 		return err
 	}
@@ -243,12 +243,12 @@ func getPagerDutyDedupKey(event *corev2.Event) (string, error) {
 	return templates.EvalTemplate("dedupKey", config.dedupKeyTemplate, event)
 }
 
-func getPagerDutySeverity(event *corev2.Event, statusMapJson string) (string, error) {
+func getPagerDutySeverity(event *corev2.Event, statusMapJSON string) (string, error) {
 	var statusMap map[uint32]string
 	var err error
 
-	if len(statusMapJson) > 0 {
-		statusMap, err = parseStatusMap(statusMapJson)
+	if len(statusMapJSON) > 0 {
+		statusMap, err = parseStatusMap(statusMapJSON)
 		if err != nil {
 			return "", err
 		}
@@ -272,11 +272,11 @@ func getPagerDutySeverity(event *corev2.Event, statusMapJson string) (string, er
 	return severity, nil
 }
 
-func parseStatusMap(statusMapJson string) (map[uint32]string, error) {
+func parseStatusMap(statusMapJSON string) (map[uint32]string, error) {
 	validPagerDutySeverities := map[string]bool{"info": true, "critical": true, "warning": true, "error": true}
 
 	statusMap := eventStatusMap{}
-	err := json.Unmarshal([]byte(statusMapJson), &statusMap)
+	err := json.Unmarshal([]byte(statusMapJSON), &statusMap)
 	if err != nil {
 		return nil, err
 	}

diff --git a/main_test.go b/main_test.go
@@ -3,10 +3,11 @@ package main
 import (
 	"encoding/json"
 
-	corev2 "github.com/sensu/sensu-go/api/core/v2"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+
+	corev2 "github.com/sensu/sensu-go/api/core/v2"
+	"github.com/stretchr/testify/assert"
 )
 
 var (
@@ -58,10 +59,10 @@ func Test_ParseStatusMap_InvalidSeverity(t *testing.T) {
 }
 
 func Test_GetPagerDutySeverity_Success(t *testing.T) {
-	statusMapJson := "{\"info\":[130,10],\"error\":[4]}"
+	statusMapJSON := "{\"info\":[130,10],\"error\":[4]}"
 
 	eventWithStatus.Check.Status = 10
-	pagerDutySeverity, err := getPagerDutySeverity(&eventWithStatus, statusMapJson)
+	pagerDutySeverity, err := getPagerDutySeverity(&eventWithStatus, statusMapJSON)
 	assert.Nil(t, err)
 	assert.Equal(t, "info", pagerDutySeverity)
 }
@@ -81,19 +82,19 @@ func Test_GetPagerDutySeverity_NoStatusMapLowStatus(t *testing.T) {
 }
 
 func Test_GetPagerDutySeverity_InvalidStatusMap(t *testing.T) {
-	statusMapJson := "{\"info\":[130,10],\"error\"[4]}"
+	statusMapJSON := "{\"info\":[130,10],\"error\"[4]}"
 
 	eventWithStatus.Check.Status = 2
-	pagerDutySeverity, err := getPagerDutySeverity(&eventWithStatus, statusMapJson)
+	pagerDutySeverity, err := getPagerDutySeverity(&eventWithStatus, statusMapJSON)
 	assert.NotNil(t, err)
 	assert.Empty(t, pagerDutySeverity)
 }
 
 func Test_GetPagerDutySeverity_StatusMapSeverityNotInMap(t *testing.T) {
-	statusMapJson := "{\"info\":[130,10],\"error\":[4]}"
+	statusMapJSON := "{\"info\":[130,10],\"error\":[4]}"
 
 	eventWithStatus.Check.Status = 2
-	pagerDutySeverity, err := getPagerDutySeverity(&eventWithStatus, statusMapJson)
+	pagerDutySeverity, err := getPagerDutySeverity(&eventWithStatus, statusMapJSON)
 	assert.Nil(t, err)
 	assert.Equal(t, "critical", pagerDutySeverity)
 }