Skip to content

Commit f3a4e39

Browse files
authored
Merge pull request #1 from mstoykov/moveToSobek
Bump k6 and only use sobek
2 parents 1114598 + 24400eb commit f3a4e39

File tree

6 files changed

+245
-264
lines changed

6 files changed

+245
-264
lines changed

.github/workflows/all.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2222
- name: Install Go
23-
uses: actions/setup-go@v2
23+
uses: actions/setup-go@v5
2424
with:
2525
go-version: 1.x
2626
- name: Run tests

.github/workflows/lint.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
- name: Install Go
17-
uses: actions/setup-go@v2
17+
uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.17.x
19+
go-version: 1.22.x
2020
- name: Check dependencies
2121
run: |
2222
go version
@@ -27,19 +27,19 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout code
30-
uses: actions/checkout@v2
30+
uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 0
3333
- name: Install Go
34-
uses: actions/setup-go@v2
34+
uses: actions/setup-go@v5
3535
with:
36-
go-version: 1.17.x
36+
go-version: 1.22.x
3737
- name: Retrieve golangci-lint version
3838
run: |
3939
echo "::set-output name=Version::$(head -n 1 "${GITHUB_WORKSPACE}/.golangci.yml" | tr -d '# ')"
4040
id: version
4141
- name: golangci-lint
42-
uses: golangci/golangci-lint-action@v3
42+
uses: golangci/golangci-lint-action@v6
4343
with:
4444
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
4545
version: ${{ steps.version.outputs.Version }}

.golangci.yml

+78-52
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# v1.43.0
1+
# v1.60.1
22
# Please don't remove the first line. It uses in CI to determine the golangci version
33
run:
4-
deadline: 5m
4+
timeout: 5m
55

66
issues:
77
# Maximum issues count per one linter. Set to 0 to disable. Default is 50.
@@ -10,33 +10,15 @@ issues:
1010
max-same-issues: 0
1111

1212
# We want to try and improve the comments in the k6 codebase, so individual
13-
# non-golint items from the default exclusion list will gradually be addded
13+
# non-golint items from the default exclusion list will gradually be added
1414
# to the exclude-rules below
1515
exclude-use-default: false
1616

17-
exclude-rules:
18-
# Exclude duplicate code and function length and complexity checking in test
19-
# files (due to common repeats and long functions in test code)
20-
- path: _(test|gen)\.go
21-
linters:
22-
- cyclop
23-
- dupl
24-
- gocognit
25-
- funlen
26-
- lll
27-
- linters:
28-
- paralleltest # false positive: https://github.com/kunwardeep/paralleltest/issues/8.
29-
text: "does not use range value in test Run"
30-
3117
linters-settings:
3218
exhaustive:
3319
default-signifies-exhaustive: true
34-
govet:
35-
check-shadowing: true
3620
cyclop:
3721
max-complexity: 25
38-
maligned:
39-
suggest-new: true
4022
dupl:
4123
threshold: 150
4224
goconst:
@@ -45,37 +27,81 @@ linters-settings:
4527
funlen:
4628
lines: 80
4729
statements: 60
48-
goheader:
49-
template-path: ".license-template"
50-
values:
51-
const:
52-
year: "2022"
53-
regexp:
54-
year-range: (\d\d\d\d|{{year}})
30+
forbidigo:
31+
forbid:
32+
- '^(fmt\\.Print(|f|ln)|print|println)$'
33+
# Forbid everything in os, except os.Signal and os.SyscalError
34+
- '^os\.(.*)$(# Using anything except Signal and SyscallError from the os package is forbidden )?'
35+
# Forbid everything in syscall except the uppercase constants
36+
- '^syscall\.[^A-Z_]+$(# Using anything except constants from the syscall package is forbidden )?'
37+
- '^logrus\.Logger$'
5538

5639
linters:
57-
enable-all: true
58-
disable:
59-
- nlreturn
60-
- gci
61-
- gochecknoinits
62-
- godot
63-
- godox
64-
- gomodguard
65-
- testpackage
66-
- wsl
67-
- gomnd
68-
- goerr113 # most of the errors here are meant for humans
69-
- goheader
70-
- exhaustivestruct
71-
- thelper
72-
- gocyclo # replaced by cyclop since it also calculates the package complexity
73-
- maligned # replaced by govet 'fieldalignment'
74-
- interfacer # deprecated
75-
- scopelint # deprecated, replaced by exportloopref
76-
- wrapcheck # a little bit too much for k6, maybe after https://github.com/tomarrell/wrapcheck/issues/2 is fixed
77-
- golint # this linter is deprecated
78-
- varnamelen # disabled before the final decision in (https://github.com/grafana/k6/pull/2323)
79-
- ireturn
80-
- tagliatelle
40+
disable-all: true
41+
enable:
42+
- asasalint
43+
- asciicheck
44+
- bidichk
45+
- bodyclose
46+
- canonicalheader
47+
- contextcheck
48+
- cyclop
49+
- dogsled
50+
- dupl
51+
- durationcheck
52+
- errcheck
53+
- errchkjson
54+
- errname
55+
- errorlint
56+
- exhaustive
57+
- exportloopref
58+
- fatcontext
59+
- forbidigo
60+
- forcetypeassert
61+
- funlen
62+
- gocheckcompilerdirectives
63+
- gochecknoglobals
64+
- gocognit
65+
- goconst
66+
- gocritic
67+
- gofmt
68+
- gofumpt
69+
- goimports
70+
- gomoddirectives
71+
- goprintffuncname
72+
- gosec
73+
- gosimple
74+
- govet
75+
- importas
76+
- ineffassign
77+
- interfacebloat
78+
- lll
79+
- makezero
80+
- misspell
81+
- nakedret
82+
- nestif
83+
- nilerr
84+
- nilnil
85+
- noctx
86+
- nolintlint
87+
- nosprintfhostport
88+
- paralleltest
89+
- prealloc
90+
- predeclared
91+
- promlinter
92+
- revive
93+
- reassign
94+
- rowserrcheck
95+
- sqlclosecheck
96+
- staticcheck
97+
- stylecheck
98+
- tenv
99+
- tparallel
100+
- typecheck
101+
- unconvert
102+
- unparam
103+
- unused
104+
- usestdlibvars
105+
- wastedassign
106+
- whitespace
81107
fast: false

go.mod

+39-17
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,53 @@
11
module github.com/mstoykov/k6-taskqueue-lib
22

3-
go 1.17
3+
go 1.22
4+
5+
toolchain go1.23.3
46

57
require (
6-
github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf
7-
github.com/stretchr/testify v1.7.1
8-
go.k6.io/k6 v0.37.1-0.20220426072701-d105f5474bc3
8+
github.com/grafana/sobek v0.0.0-20240808084414-f7ac208544fe
9+
github.com/stretchr/testify v1.9.0
10+
go.k6.io/k6 v0.53.0
911
)
1012

1113
require (
14+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
1215
github.com/davecgh/go-spew v1.1.1 // indirect
13-
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
14-
github.com/fatih/color v1.13.0 // indirect
15-
github.com/go-sourcemap/sourcemap v2.1.4-0.20211119122758-180fcef48034+incompatible // indirect
16+
github.com/dlclark/regexp2 v1.9.0 // indirect
17+
github.com/evanw/esbuild v0.21.2 // indirect
18+
github.com/fatih/color v1.17.0 // indirect
19+
github.com/go-logr/logr v1.4.2 // indirect
20+
github.com/go-logr/stdr v1.2.2 // indirect
21+
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
22+
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
23+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
24+
github.com/josharian/intern v1.0.0 // indirect
1625
github.com/mailru/easyjson v0.7.7 // indirect
17-
github.com/mattn/go-colorable v0.1.12 // indirect
18-
github.com/mattn/go-isatty v0.0.14 // indirect
19-
github.com/nxadm/tail v1.4.8 // indirect
20-
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
26+
github.com/mattn/go-colorable v0.1.13 // indirect
27+
github.com/mattn/go-isatty v0.0.20 // indirect
28+
github.com/mstoykov/atlas v0.0.0-20220811071828-388f114305dd // indirect
29+
github.com/onsi/ginkgo v1.16.5 // indirect
30+
github.com/onsi/gomega v1.35.1 // indirect
2131
github.com/pmezard/go-difflib v1.0.0 // indirect
2232
github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e // indirect
23-
github.com/sirupsen/logrus v1.8.1 // indirect
33+
github.com/sirupsen/logrus v1.9.3 // indirect
2434
github.com/spf13/afero v1.1.2 // indirect
25-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
26-
golang.org/x/text v0.3.7 // indirect
27-
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
28-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
35+
go.opentelemetry.io/otel v1.24.0 // indirect
36+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
37+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
38+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
39+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
40+
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
41+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
42+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
43+
golang.org/x/net v0.30.0 // indirect
44+
golang.org/x/sys v0.26.0 // indirect
45+
golang.org/x/text v0.19.0 // indirect
46+
golang.org/x/time v0.5.0 // indirect
47+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
48+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
49+
google.golang.org/grpc v1.64.1 // indirect
50+
google.golang.org/protobuf v1.35.1 // indirect
2951
gopkg.in/guregu/null.v3 v3.3.0 // indirect
30-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
52+
gopkg.in/yaml.v3 v3.0.1 // indirect
3153
)

0 commit comments

Comments
 (0)