Skip to content

Commit d29dda3

Browse files
committed
ci: Add lint on more build tags, fix lint errors
Signed-off-by: Aaron Wilson <aawilson@nvidia.com>
1 parent f0bbd93 commit d29dda3

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
export GOPATH="$(go env GOPATH)"
3838
make lint
3939
TAGS=statsd make lint ############### TODO: delete after v3.30 (by Fall 2025)
40-
TAGS="nethttp ht debug" make lint
41-
TAGS="aws gcp azure" make lint
40+
TAGS="nethttp debug oteltracing oci aws gcp azure" make lint
4241
make fmt-check
4342
make spell-check

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ lint:linux:
216216
- !reference [.default_run_rules, rules]
217217
script:
218218
- make lint
219-
- TAGS="oteltracing statsd ht" make lint
219+
- TAGS="nethttp debug oteltracing statsd oci aws gcp azure" make lint
220220
- make fmt-check
221221
- make spell-check
222222

cmd/authn/unit_internal_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ package main
99
// NOTE go:build debug (above) =====================================
1010

1111
import (
12-
"github.com/NVIDIA/aistore/api/env"
13-
"github.com/NVIDIA/aistore/cmn/kvdb"
1412
"os"
1513
"testing"
1614
"time"
1715

1816
"github.com/NVIDIA/aistore/api/apc"
1917
"github.com/NVIDIA/aistore/api/authn"
18+
"github.com/NVIDIA/aistore/api/env"
2019
"github.com/NVIDIA/aistore/cmd/authn/tok"
2120
"github.com/NVIDIA/aistore/cmn"
2221
"github.com/NVIDIA/aistore/cmn/cos"
22+
"github.com/NVIDIA/aistore/cmn/kvdb"
2323
"github.com/NVIDIA/aistore/core/mock"
2424
"github.com/NVIDIA/aistore/tools/tassert"
2525
)
@@ -139,7 +139,7 @@ func testUserDelete(mgr *mgr, t *testing.T) {
139139
}
140140
}
141141

142-
func createManagerWithAdmin(driver kvdb.Driver) (m *mgr, code int, err error) {
142+
func createManagerWithAdmin(driver kvdb.Driver) (*mgr, error) {
143143
oldPass, wasSet := os.LookupEnv(env.AisAuthAdminPassword)
144144
os.Setenv(env.AisAuthAdminPassword, "admin-pass-for-test")
145145
// Reset after test
@@ -150,13 +150,14 @@ func createManagerWithAdmin(driver kvdb.Driver) (m *mgr, code int, err error) {
150150
os.Unsetenv(env.AisAuthAdminPassword)
151151
}
152152
}()
153-
return newMgr(driver)
153+
m, _, err := newMgr(driver)
154+
return m, err
154155
}
155156

156157
func TestManager(t *testing.T) {
157158
driver := mock.NewDBDriver()
158159
// NOTE: new manager initializes users DB and adds a default user as a Guest
159-
mgr, _, err := createManagerWithAdmin(driver)
160+
mgr, err := createManagerWithAdmin(driver)
160161
tassert.CheckError(t, err)
161162
createUsers(mgr, t)
162163
testInvalidUser(mgr, t)
@@ -184,7 +185,7 @@ func TestToken(t *testing.T) {
184185
)
185186

186187
driver := mock.NewDBDriver()
187-
mgr, _, err := createManagerWithAdmin(driver)
188+
mgr, err := createManagerWithAdmin(driver)
188189
tassert.CheckFatal(t, err)
189190
createUsers(mgr, t)
190191
defer deleteUsers(mgr, false, t)

0 commit comments

Comments
 (0)