Skip to content

Commit 5dde09a

Browse files
committed
add gochecknoglobals linter and associated fixes
1 parent 829676f commit 5dde09a

File tree

3 files changed

+30
-28
lines changed

3 files changed

+30
-28
lines changed

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ linters:
2727
- exhaustive
2828
- forbidigo
2929
- gci
30+
- gochecknoglobals
3031
- goconst
3132
- gocritic
3233
- gocyclo

main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const (
3131
)
3232

3333
var (
34+
//nolint:gochecknoglobals
3435
showVersion = flag.Bool("version", false, "Print version and exit")
3536
)
3637

method/method_test.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -110,35 +110,35 @@ type locTest struct {
110110
accessKeySecret string
111111
}
112112

113-
var locTests = []locTest{
114-
{
115-
"s3://fake-access-key-id:fake-access-key-secret@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
116-
"fake-access-key-id",
117-
"fake-access-key-secret",
118-
},
119-
{
120-
"s3://fake-ac/cess-key-id:fake-ac/cess-key-secret@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
121-
"fake-ac/cess-key-id",
122-
"fake-ac/cess-key-secret", // secret contains a forward slash
123-
},
124-
{
125-
"s3://fake-ac%2Fcess-key-id:fake-ac%2Fcess-key-secret@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
126-
"fake-ac/cess-key-id", // access key contains a forward slash that was encoded as %2F in the original url
127-
"fake-ac/cess-key-secret", // secret contains a forward slash that was encoded as %2F in the original url
128-
},
129-
{
130-
"s3://fake-access-key-id:@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
131-
"fake-access-key-id",
132-
"", // secret is blank
133-
},
134-
{
135-
"s3://:fake-access-key-secret@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
136-
"", // access key is blank
137-
"fake-access-key-secret",
138-
},
139-
}
140-
141113
func TestCreateLocation(t *testing.T) {
114+
locTests := []locTest{
115+
{
116+
"s3://fake-access-key-id:fake-access-key-secret@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
117+
"fake-access-key-id",
118+
"fake-access-key-secret",
119+
},
120+
{
121+
"s3://fake-ac/cess-key-id:fake-ac/cess-key-secret@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
122+
"fake-ac/cess-key-id",
123+
"fake-ac/cess-key-secret", // secret contains a forward slash
124+
},
125+
{
126+
"s3://fake-ac%2Fcess-key-id:fake-ac%2Fcess-key-secret@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
127+
"fake-ac/cess-key-id", // access key contains a forward slash that was encoded as %2F in the original url
128+
"fake-ac/cess-key-secret", // secret contains a forward slash that was encoded as %2F in the original url
129+
},
130+
{
131+
"s3://fake-access-key-id:@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
132+
"fake-access-key-id",
133+
"", // secret is blank
134+
},
135+
{
136+
"s3://:fake-access-key-secret@s3.amazonaws.com/apt-repo-bucket/apt/generic/python-bernhard_0.2.3-1_all.deb",
137+
"", // access key is blank
138+
"fake-access-key-secret",
139+
},
140+
}
141+
142142
for _, lt := range locTests {
143143
l, err := newLocation(lt.url, "s3.amazonaws.com")
144144
if err != nil {

0 commit comments

Comments
 (0)