Skip to content

Commit 5587be9

Browse files
committed
fix lint
1 parent f845f2b commit 5587be9

File tree

7 files changed

+62
-19
lines changed

7 files changed

+62
-19
lines changed

.golangci.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# golangci-lint v2 configuration
2+
# See https://golangci-lint.run/docs/configuration/ for full options
3+
4+
version: "2"
5+
6+
linters:
7+
enable:
8+
- errcheck
9+
- govet
10+
- misspell
11+
- revive
12+
13+
settings:
14+
errcheck:
15+
# Don't check error returns for these functions
16+
exclude-functions:
17+
- (*net/http.Response.Body).Close
18+
- (net/http.ResponseWriter).Write
19+
20+
revive:
21+
rules:
22+
# Disable overly strict rules
23+
- name: exported
24+
disabled: true
25+
- name: package-comments
26+
disabled: true
27+
- name: unexported-return
28+
disabled: true
29+
30+
exclusions:
31+
# Enable predefined exclusion presets
32+
presets:
33+
- std-error-handling
34+
- common-false-positives
35+
36+
# Custom exclusion rules
37+
rules:
38+
# Exclude errcheck for deferred Close() calls
39+
- linters:
40+
- errcheck
41+
text: Error return value of.*\.Close.* is not checked
42+
43+
formatters:
44+
enable:
45+
- gofmt
46+
- goimports

disk_image_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ import (
66
"time"
77
)
88

9-
func TestClienterDiskImage(t *testing.T) {
10-
var c Clienter
11-
12-
c, _ = NewClient("foo", "NYC1")
13-
c, _ = NewFakeClient()
14-
_, _ = c.ListDiskImages()
15-
}
16-
179
func TestGetDiskImage(t *testing.T) {
1810
client, server, _ := NewClientForTesting(map[string]string{
1911
"/v2/disk_images/b82168fe-66f6-4b38-a3b8-5283542d5475": `{

errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ func decodeError(err error) error {
10601060
err := errors.New(msg.String())
10611061
return KubernetesClusterInvalidNameError.wrap(err)
10621062
default:
1063-
err := fmt.Errorf(fmt.Sprintf("Unknown error response - status: %s, code: %d, reason: %s", errorData.Status, errorData.Code, errorData.Reason))
1063+
err := fmt.Errorf("unknown error response - status: %s, code: %d, reason: %s", errorData.Status, errorData.Code, errorData.Reason)
10641064
return CommonError.wrap(err)
10651065
}
10661066
}

fake_client_test.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ import (
1010
func TestClienter(t *testing.T) {
1111
var c Clienter
1212

13-
c, _ = NewClient("foo", "NYC1")
14-
c, _ = NewFakeClient()
15-
_, _ = c.ListAllInstances()
16-
c.ListIPs()
13+
c, err := NewClient("foo", "NYC1")
14+
if err != nil {
15+
t.Fail()
16+
}
17+
18+
_ = c
1719
}
1820

1921
// TestIPs is a test for the IPs method.
@@ -60,7 +62,11 @@ func TestInstances(t *testing.T) {
6062
Count: 1,
6163
Hostname: "foo.example.com",
6264
}
63-
client.CreateInstance(config)
65+
_, err := client.CreateInstance(config)
66+
if err != nil {
67+
t.Errorf("Request returned an error: %s", err)
68+
return
69+
}
6470

6571
results, err := client.ListInstances(1, 10)
6672
if err != nil {

instance_size.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type InstanceSize struct {
2222
Selectable bool `json:"selectable,omitempty"`
2323
}
2424

25-
// ListInstanceSizes returns all availble sizes of instances
25+
// ListInstanceSizes returns all available sizes of instances
2626
// TODO: Rename to Size because this return all size (k8s, vm, database, kfaas)
2727
func (c *Client) ListInstanceSizes() ([]InstanceSize, error) {
2828
resp, err := c.SendGetRequest("/v2/sizes")

network.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ func (c *Client) GetDefaultNetwork() (*Network, error) {
107107
}
108108

109109
networks := make([]Network, 0)
110-
json.NewDecoder(bytes.NewReader(resp)).Decode(&networks)
110+
if err := json.NewDecoder(bytes.NewReader(resp)).Decode(&networks); err != nil {
111+
return nil, fmt.Errorf("could not decode networks: %w", err)
112+
}
111113
for _, network := range networks {
112114
if network.Default {
113115
return &network, nil

utils/random.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package utils
22

33
import (
44
"math/rand"
5-
"time"
65
)
76

87
var adjectives = [...]string{
@@ -42,7 +41,5 @@ var nouns = [...]string{
4241

4342
// RandomName generates a Heroku-style random name for instances/clusters/etc
4443
func RandomName() string {
45-
rand.Seed(time.Now().Unix())
46-
4744
return adjectives[rand.Intn(len(adjectives))] + "-" + nouns[rand.Intn(len(nouns))]
4845
}

0 commit comments

Comments
 (0)