Skip to content

Commit 210ab34

Browse files
romanlevinzefhemel
romanlevin
authored and
zefhemel
committed
Fix issues detected by linter (#27)
Fix issues detected by linter All of these were detected using `staticcheck` and `megachecker`.
1 parent 84f8502 commit 210ab34

File tree

12 files changed

+36
-77
lines changed

12 files changed

+36
-77
lines changed

‎cmd/ax/alert.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ func init() {
2020
addAlertCommand.Flag("name", "Name for alert").Required().StringVar(&alertFlagName)
2121
}
2222

23-
func setupDest() alert.Alerter {
24-
return nil
25-
}
26-
2723
func addAlertMain(rc config.RuntimeConfig, client common.Client) {
2824
alertConfig := config.AlertConfig{
2925
Env: rc.ActiveEnv,

‎pkg/alert/slack/slack.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,7 @@ func (alerter *SlackAlerter) SendAlert(lm common.LogMessage) error {
103103
expire := time.Now().Add(time.Hour * 24 * 7)
104104
alerter.seenCache.Set(contentHash, resp.Ts, &expire)
105105

106-
err = alerter.seenCache.Flush()
107-
if err != nil {
108-
return err
109-
}
110-
return nil
106+
return alerter.seenCache.Flush()
111107
}
112108

113109
var _ alert.Alerter = &SlackAlerter{}

‎pkg/backend/common/client_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,54 +17,54 @@ func TestFilter(t *testing.T) {
1717
lastHour := time.Now().Add(-time.Hour)
1818
nextHour := time.Now().Add(time.Hour)
1919
shouldMatchQueries := []Query{
20-
Query{
20+
{
2121
Filters: []QueryFilter{
22-
QueryFilter{FieldName: "someStr", Value: "Zef", Operator: "="},
22+
{FieldName: "someStr", Value: "Zef", Operator: "="},
2323
},
2424
},
25-
Query{
25+
{
2626
Filters: []QueryFilter{
27-
QueryFilter{FieldName: "someN", Value: "34", Operator: "="},
27+
{FieldName: "someN", Value: "34", Operator: "="},
2828
},
2929
},
30-
Query{
30+
{
3131
QueryString: "zef",
3232
Filters: []QueryFilter{
33-
QueryFilter{FieldName: "someN", Value: "34", Operator: "="},
33+
{FieldName: "someN", Value: "34", Operator: "="},
3434
},
3535
},
36-
Query{
36+
{
3737
QueryString: "zef",
3838
Filters: []QueryFilter{
39-
QueryFilter{FieldName: "someN", Value: "34", Operator: "="},
39+
{FieldName: "someN", Value: "34", Operator: "="},
4040
},
4141
Before: &nextHour,
4242
After: &lastHour,
4343
},
44-
Query{
44+
{
4545
Filters: []QueryFilter{
46-
QueryFilter{FieldName: "someN", Value: "32", Operator: "!="},
46+
{FieldName: "someN", Value: "32", Operator: "!="},
4747
},
4848
},
49-
Query{
49+
{
5050
Filters: []QueryFilter{
51-
QueryFilter{FieldName: "someNonexistingField", Value: "Pete", Operator: "!="},
51+
{FieldName: "someNonexistingField", Value: "Pete", Operator: "!="},
5252
},
5353
},
5454
}
5555
shouldNotMatchQueries := []Query{
56-
Query{
56+
{
5757
Filters: []QueryFilter{
58-
QueryFilter{FieldName: "someStr", Value: "Pete", Operator: "="},
58+
{FieldName: "someStr", Value: "Pete", Operator: "="},
5959
},
6060
},
61-
Query{
61+
{
6262
QueryString: "bla",
6363
Filters: []QueryFilter{
64-
QueryFilter{FieldName: "someStr", Value: "Pete", Operator: "="},
64+
{FieldName: "someStr", Value: "Pete", Operator: "="},
6565
},
6666
},
67-
Query{
67+
{
6868
After: &nextHour,
6969
},
7070
}

‎pkg/backend/kibana/client.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ type indexList struct {
3939
} `json:"saved_objects"`
4040
}
4141

42-
type indexListHit struct {
43-
Id string `json:"_id"`
44-
}
45-
4642
func (client *Client) ListIndices() ([]string, error) {
4743
req, err := http.NewRequest("GET", fmt.Sprintf("%s/api/saved_objects/?type=index-pattern&per_page=10000", client.URL), nil)
4844
if err != nil {

‎pkg/backend/kibana/util.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ func safeFilename(name string) string {
2626
return re.ReplaceAllString(name, "_")
2727
}
2828

29-
3029
func unixMillis(t time.Time) int64 {
3130
return t.Unix() * 1000
3231
}

‎pkg/complete/complete.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func GatherCompletionInfo(rc config.RuntimeConfig, messages <-chan common.LogMes
2121
// This will be read back as a map[string]interface{} not a bool
2222
if existingAttributes, ok := cache.Get(completionsKey).(map[string]interface{}); ok {
2323
log.Println("Found existing attribute cache")
24-
for existingAttr, _ := range existingAttributes {
24+
for existingAttr := range existingAttributes {
2525
attrNames[existingAttr] = true
2626
}
2727
}
@@ -31,7 +31,7 @@ func GatherCompletionInfo(rc config.RuntimeConfig, messages <-chan common.LogMes
3131
go func() {
3232
for message := range messages {
3333
resultChan <- message
34-
for k, _ := range message.Attributes {
34+
for k := range message.Attributes {
3535
if !attrNames[k] {
3636
attrNames[k] = true
3737
changed = true
@@ -73,7 +73,7 @@ func GetCompletions(rc config.RuntimeConfig) map[string]bool {
7373
res := cache.Get(fmt.Sprintf("completions:%s", rc.ActiveEnv))
7474
result := make(map[string]bool)
7575
if attrNames, ok := res.(map[string]interface{}); ok {
76-
for attrName, _ := range attrNames {
76+
for attrName := range attrNames {
7777
result[attrName] = true
7878
}
7979
}

‎pkg/config/cloudwatch.go‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ import (
77
"github.com/egnyte/ax/pkg/backend/cloudwatch"
88
)
99

10-
func testCloudWatch(em EnvMap) bool {
11-
cwClient := cloudwatch.New(em["accesskey"], em["accesssecretkey"], em["region"], "")
12-
_, err := cwClient.ListGroups()
13-
return err != nil
14-
}
15-
1610
func cloudwatchConfig(reader *bufio.Reader, existingConfig Config) (EnvMap, error) {
1711
em := EnvMap{
1812
"backend": "cloudwatch",
@@ -37,15 +31,12 @@ func cloudwatchConfig(reader *bufio.Reader, existingConfig Config) (EnvMap, erro
3731
var cwClient *cloudwatch.CloudwatchClient
3832
var groups []string
3933
var err error
40-
for {
41-
fmt.Println("Attempting to connect to Cloudwatch")
42-
cwClient = cloudwatch.New(em["accesskey"], em["accesssecretkey"], em["region"], "")
43-
groups, err = cwClient.ListGroups()
44-
if err != nil {
45-
fmt.Printf("Got error connecting to Cloudwatch: %s\n", err)
46-
return em, err
47-
}
48-
break
34+
fmt.Println("Attempting to connect to Cloudwatch")
35+
cwClient = cloudwatch.New(em["accesskey"], em["accesssecretkey"], em["region"], "")
36+
groups, err = cwClient.ListGroups()
37+
if err != nil {
38+
fmt.Printf("Got error connecting to Cloudwatch: %s\n", err)
39+
return em, err
4940
}
5041
fmt.Println("List of groups:")
5142
for _, group := range groups {

‎pkg/config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func AddEnv() {
215215
func envHintAction() []string {
216216
config := LoadConfig()
217217
results := make([]string, 0, len(config.Environments))
218-
for k, _ := range config.Environments {
218+
for k := range config.Environments {
219219
results = append(results, k)
220220
}
221221
return results

‎pkg/config/kibana.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ import (
77
"github.com/egnyte/ax/pkg/backend/kibana"
88
)
99

10-
func testKibana(em EnvMap) bool {
11-
kibanaClient := kibana.New(em["url"], em["auth"], "")
12-
_, err := kibanaClient.ListIndices()
13-
return err != nil
14-
}
15-
1610
func kibanaConfig(reader *bufio.Reader, existingConfig Config) (EnvMap, error) {
1711
em := EnvMap{
1812
"backend": "kibana",

‎pkg/config/stackdriver.go‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ import (
77
"github.com/egnyte/ax/pkg/backend/stackdriver"
88
)
99

10-
func testStackdriver(em EnvMap) bool {
11-
cwClient := stackdriver.New(em["credentials"], em["project"], em["log"])
12-
_, err := cwClient.ListLogs()
13-
return err != nil
14-
}
15-
1610
func stackdriverConfig(reader *bufio.Reader, existingConfig Config) (EnvMap, error) {
1711
em := EnvMap{
1812
"backend": "stackdriver",
@@ -36,15 +30,12 @@ func stackdriverConfig(reader *bufio.Reader, existingConfig Config) (EnvMap, err
3630
var sdClient *stackdriver.StackdriverClient
3731
var logs []string
3832
var err error
39-
for {
40-
fmt.Println("Attempting to connect to Stackdriver")
41-
sdClient = stackdriver.New(em["credentials"], em["project"], "")
42-
logs, err = sdClient.ListLogs()
43-
if err != nil {
44-
fmt.Printf("Got error connecting to Stackdriver: %s\n", err)
45-
return em, err
46-
}
47-
break
33+
fmt.Println("Attempting to connect to Stackdriver")
34+
sdClient = stackdriver.New(em["credentials"], em["project"], "")
35+
logs, err = sdClient.ListLogs()
36+
if err != nil {
37+
fmt.Printf("Got error connecting to Stackdriver: %s\n", err)
38+
return em, err
4839
}
4940
fmt.Println("List of logs:")
5041
for _, log := range logs {

0 commit comments

Comments
 (0)