Skip to content

Commit b8842a7

Browse files
Merge pull request #24 from spring-financial-group/chore/go-1.26.3
chore: upgrade to go 1.26.3
2 parents 4c7068a + 256460d commit b8842a7

9 files changed

Lines changed: 347 additions & 218 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ dist/
1616

1717
.cr-release-packages/
1818

19+
.idea/
20+
1921
# Dependency directories (remove the comment below to include it)
2022
# vendor/

.golangci.yaml

Lines changed: 107 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,107 @@
1-
run:
2-
deadline: 5m
1+
version: "2"
2+
linters:
3+
default: none
4+
enable:
5+
- asciicheck
6+
- bodyclose
7+
- depguard
8+
- errcheck
9+
- gocritic
10+
- goprintffuncname
11+
- gosec
12+
- govet
13+
- ineffassign
14+
- misspell
15+
- nakedret
16+
- revive
17+
- rowserrcheck
18+
- staticcheck
19+
- unconvert
20+
- unparam
21+
- unused
22+
settings:
23+
depguard:
24+
rules:
25+
Main:
26+
list-mode: lax
27+
deny:
28+
- pkg: github.com/jenkins-x/jx/v2/pkg/log/
29+
desc: use jenkins-x/jx-logging instead
30+
- pkg: github.com/satori/go.uuid
31+
desc: use github.com/google/uuid instead
32+
- pkg: github.com/pborman/uuid
33+
desc: use github.com/google/uuid instead
34+
dupl:
35+
threshold: 100
36+
exhaustive:
37+
default-signifies-exhaustive: false
38+
funlen:
39+
lines: 200
40+
statements: 150
41+
goconst:
42+
min-len: 3
43+
min-occurrences: 3
44+
gocritic:
45+
disabled-checks:
46+
- dupImport
47+
- ifElseChain
48+
- octalLiteral
49+
- whyNoLint
50+
- wrapperFunc
51+
- importShadow
52+
- unnamedResult
53+
enabled-tags:
54+
- diagnostic
55+
- experimental
56+
- opinionated
57+
- performance
58+
- style
59+
gocyclo:
60+
min-complexity: 15
61+
govet:
62+
settings:
63+
printf:
64+
funcs:
65+
- (github.com/jenkins-x/jx-logging/v3/pkg/log/Logger()).Debugf
66+
- (github.com/jenkins-x/jx-logging/v3/pkg/log/Logger()).Infof
67+
- (github.com/jenkins-x/jx-logging/v3/pkg/log/Logger()).Warnf
68+
- (github.com/jenkins-x/jx-logging/v3/pkg/log/Logger()).Errorf
69+
- (github.com/jenkins-x/jx-logging/v3/pkg/log/Logger()).Fatalf
70+
lll:
71+
line-length: 140
72+
mnd:
73+
checks:
74+
- argument
75+
- case
76+
- condition
77+
- return
78+
nolintlint:
79+
require-explanation: false
80+
require-specific: false
81+
allow-unused: false
82+
revive:
83+
confidence: 0
84+
exclusions:
85+
generated: lax
86+
presets:
87+
- comments
88+
- common-false-positives
89+
- legacy
90+
- std-error-handling
91+
paths:
92+
- third_party$
93+
- builtin$
94+
- examples$
95+
formatters:
96+
enable:
97+
- gofmt
98+
- goimports
99+
settings:
100+
gofmt:
101+
simplify: true
102+
exclusions:
103+
generated: lax
104+
paths:
105+
- third_party$
106+
- builtin$
107+
- examples$

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,7 @@ importfmt: get-fmt-deps
166166

167167
.PHONY: lint
168168
lint: ## Lint the code
169-
./hack/gofmt.sh
170-
./hack/linter.sh
171-
./hack/generate.sh
169+
golangci-lint run
172170

173171
.PHONY: all
174172
all: fmt build lint test

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Continuous Delivery Indicators for Jenkins X
1+
# Continuous Delivery Indicators for JayeX
22

33
It is composed of:
44
- a collector, written in Go, which:
5-
- watches the Jenkins X Pipeline Activities in the Kubernetes Cluster
6-
- watches the Jenkins X Releases in the Kubernetes Cluster & from Lighthouse events
5+
- watches the JayeX Pipeline Activities in the Kubernetes Cluster
6+
- watches the JayeX Releases in the Kubernetes Cluster & from Lighthouse events
77
- watches the Pull Request Events from Lighthouse
88
- watches the Deployment Events from Lighthouse
99
- a storage: a PostgreSQL database

charts/cd-indicators/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: cd-indicators
3-
description: Continuous Delivery Indicators for Jenkins X
3+
description: Continuous Delivery Indicators for JayeX
44
icon: https://raw.githubusercontent.com/jenkins-x/jenkins-x-website/master/images/logo/jenkinsx-icon-color.svg
55
home: https://github.com/jenkins-x/cd-indicators
66
version: 0.0.1

charts/cd-indicators/grafana-dashboards/cd-indicators.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
"interval": null,
155155
"links": [],
156156
"options": {
157-
"content": "# Continuous Delivery Indicators for Jenkins X\n\n- [GitHub repository](https://github.com/jenkins-x/cd-indicators)\n\n",
157+
"content": "# Continuous Delivery Indicators for JayeX\n\n- [GitHub repository](https://github.com/jenkins-x/cd-indicators)\n\n",
158158
"mode": "markdown"
159159
},
160160
"pluginVersion": "7.4.3",

cmd/collector/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func main() {
7777
}
7878
jxClient, err := jxclientset.NewForConfig(kConfig)
7979
if err != nil {
80-
logger.WithError(err).Fatal("failed to create a Jenkins X client")
80+
logger.WithError(err).Fatal("failed to create a JayeX client")
8181
}
8282

8383
dbconf, err := pgxpool.ParseConfig(options.postgresURI)

go.mod

Lines changed: 67 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,85 @@
11
module github.com/jenkins-x/cd-indicators
22

3-
go 1.24.4
3+
go 1.26.3
44

55
require (
66
github.com/jackc/pgx-logrus v0.0.0-20220919124836-b099d8ce75da
7-
github.com/jackc/pgx/v5 v5.7.2
8-
github.com/jenkins-x/go-scm v1.14.59
9-
github.com/jenkins-x/jx-api/v4 v4.8.1
10-
github.com/jenkins-x/lighthouse-client v0.0.1609
7+
github.com/jackc/pgx/v5 v5.10.0
8+
github.com/jenkins-x/go-scm v1.15.30
9+
github.com/jenkins-x/jx-api/v4 v4.8.6
10+
github.com/jenkins-x/lighthouse-client v0.0.1959
1111
github.com/scylladb/go-set v1.0.2
12-
github.com/sirupsen/logrus v1.9.3
13-
github.com/spf13/pflag v1.0.6
14-
k8s.io/apimachinery v0.32.5
15-
k8s.io/client-go v0.32.5
12+
github.com/sirupsen/logrus v1.9.4
13+
github.com/spf13/pflag v1.0.10
14+
k8s.io/apimachinery v0.36.2
15+
k8s.io/client-go v0.36.2
1616
)
1717

1818
require (
19-
cel.dev/expr v0.23.1 // indirect
20-
code.gitea.io/sdk/gitea v0.21.0 // indirect
19+
cel.dev/expr v0.25.1 // indirect
20+
code.gitea.io/sdk/gitea v0.22.1 // indirect
2121
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
2222
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
23-
fortio.org/safecast v1.0.0 // indirect
24-
github.com/42wim/httpsig v1.2.2 // indirect
23+
fortio.org/safecast v1.2.0 // indirect
24+
github.com/42wim/httpsig v1.2.3 // indirect
2525
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
2626
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2727
github.com/beorn7/perks v1.0.1 // indirect
2828
github.com/blendle/zapdriver v1.3.1 // indirect
29-
github.com/bluekeyes/go-gitdiff v0.8.0 // indirect
29+
github.com/bluekeyes/go-gitdiff v0.8.1 // indirect
3030
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
3131
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3232
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3333
github.com/davidmz/go-pageant v1.0.2 // indirect
34-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
34+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
3535
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
36-
github.com/fatih/color v1.15.0 // indirect
37-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
36+
github.com/fatih/color v1.19.0 // indirect
37+
github.com/fxamacker/cbor/v2 v2.9.2 // indirect
3838
github.com/ghodss/yaml v1.0.0 // indirect
3939
github.com/go-fed/httpsig v1.1.0 // indirect
4040
github.com/go-kit/log v0.2.1 // indirect
4141
github.com/go-logfmt/logfmt v0.5.1 // indirect
42-
github.com/go-logr/logr v1.4.2 // indirect
43-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
44-
github.com/go-openapi/jsonreference v0.21.0 // indirect
45-
github.com/go-openapi/swag v0.23.0 // indirect
42+
github.com/go-logr/logr v1.4.3 // indirect
43+
github.com/go-openapi/jsonpointer v0.23.1 // indirect
44+
github.com/go-openapi/jsonreference v0.21.5 // indirect
45+
github.com/go-openapi/swag v0.26.0 // indirect
46+
github.com/go-openapi/swag/cmdutils v0.26.0 // indirect
47+
github.com/go-openapi/swag/conv v0.26.0 // indirect
48+
github.com/go-openapi/swag/fileutils v0.26.0 // indirect
49+
github.com/go-openapi/swag/jsonname v0.26.0 // indirect
50+
github.com/go-openapi/swag/jsonutils v0.26.0 // indirect
51+
github.com/go-openapi/swag/loading v0.26.0 // indirect
52+
github.com/go-openapi/swag/mangling v0.26.0 // indirect
53+
github.com/go-openapi/swag/netutils v0.26.0 // indirect
54+
github.com/go-openapi/swag/stringutils v0.26.0 // indirect
55+
github.com/go-openapi/swag/typeutils v0.26.0 // indirect
56+
github.com/go-openapi/swag/yamlutils v0.26.0 // indirect
4657
github.com/go-stack/stack v1.8.1 // indirect
47-
github.com/gogo/protobuf v1.3.2 // indirect
48-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
58+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
4959
github.com/golang/protobuf v1.5.4 // indirect
5060
github.com/google/cel-go v0.25.0 // indirect
51-
github.com/google/gnostic-models v0.6.9 // indirect
61+
github.com/google/gnostic-models v0.7.1 // indirect
5262
github.com/google/go-cmp v0.7.0 // indirect
53-
github.com/google/gofuzz v1.2.0 // indirect
5463
github.com/google/uuid v1.6.0 // indirect
5564
github.com/gorilla/securecookie v1.1.1 // indirect
5665
github.com/gorilla/sessions v1.2.1 // indirect
57-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
66+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
5867
github.com/hashicorp/errwrap v1.1.0 // indirect
5968
github.com/hashicorp/go-multierror v1.1.1 // indirect
6069
github.com/hashicorp/go-version v1.7.0 // indirect
6170
github.com/jackc/pgpassfile v1.0.0 // indirect
6271
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
6372
github.com/jackc/puddle/v2 v2.2.2 // indirect
64-
github.com/jenkins-x/jx-logging/v3 v3.0.16 // indirect
65-
github.com/jenkins-x/logrus-stackdriver-formatter v0.2.7 // indirect
66-
github.com/josharian/intern v1.0.0 // indirect
73+
github.com/jenkins-x/jx-logging/v3 v3.1.6 // indirect
74+
github.com/jenkins-x/logrus-stackdriver-formatter v0.2.9 // indirect
6775
github.com/json-iterator/go v1.1.12 // indirect
6876
github.com/klauspost/compress v1.18.0 // indirect
69-
github.com/mailru/easyjson v0.9.0 // indirect
70-
github.com/mattn/go-colorable v0.1.13 // indirect
71-
github.com/mattn/go-isatty v0.0.17 // indirect
77+
github.com/mattn/go-colorable v0.1.14 // indirect
78+
github.com/mattn/go-isatty v0.0.22 // indirect
7279
github.com/mitchellh/copystructure v1.2.0 // indirect
7380
github.com/mitchellh/reflectwalk v1.0.2 // indirect
7481
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
75-
github.com/modern-go/reflect2 v1.0.2 // indirect
82+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7683
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7784
github.com/pkg/errors v0.9.1 // indirect
7885
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -85,41 +92,44 @@ require (
8592
github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b // indirect
8693
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
8794
github.com/stoewer/go-strcase v1.3.0 // indirect
88-
github.com/stretchr/testify v1.10.0 // indirect
89-
github.com/tektoncd/pipeline v1.1.0 // indirect
95+
github.com/stretchr/testify v1.11.1 // indirect
96+
github.com/tektoncd/pipeline v1.2.0 // indirect
9097
github.com/x448/float16 v0.8.4 // indirect
91-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
98+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
9299
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
93100
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
94101
go.opencensus.io v0.24.0 // indirect
95102
go.uber.org/multierr v1.11.0 // indirect
96103
go.uber.org/zap v1.27.0 // indirect
97-
golang.org/x/crypto v0.38.0 // indirect
104+
go.yaml.in/yaml/v2 v2.4.4 // indirect
105+
go.yaml.in/yaml/v3 v3.0.4 // indirect
106+
golang.org/x/crypto v0.51.0 // indirect
98107
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
99-
golang.org/x/net v0.40.0 // indirect
100-
golang.org/x/oauth2 v0.30.0 // indirect
101-
golang.org/x/sync v0.14.0 // indirect
102-
golang.org/x/sys v0.33.0 // indirect
103-
golang.org/x/term v0.32.0 // indirect
104-
golang.org/x/text v0.25.0 // indirect
105-
golang.org/x/time v0.11.0 // indirect
108+
golang.org/x/net v0.54.0 // indirect
109+
golang.org/x/oauth2 v0.36.0 // indirect
110+
golang.org/x/sync v0.21.0 // indirect
111+
golang.org/x/sys v0.46.0 // indirect
112+
golang.org/x/term v0.43.0 // indirect
113+
golang.org/x/text v0.38.0 // indirect
114+
golang.org/x/time v0.15.0 // indirect
106115
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
107-
google.golang.org/api v0.229.0 // indirect
108-
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
109-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
110-
google.golang.org/grpc v1.72.2 // indirect
111-
google.golang.org/protobuf v1.36.6 // indirect
112-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
116+
google.golang.org/api v0.233.0 // indirect
117+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
118+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
119+
google.golang.org/grpc v1.79.3 // indirect
120+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
121+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
113122
gopkg.in/inf.v0 v0.9.1 // indirect
114123
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect
115124
gopkg.in/yaml.v2 v2.4.0 // indirect
116125
gopkg.in/yaml.v3 v3.0.1 // indirect
117-
k8s.io/api v0.32.5 // indirect
118-
k8s.io/klog/v2 v2.130.1 // indirect
119-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
120-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
126+
k8s.io/api v0.36.2 // indirect
127+
k8s.io/klog/v2 v2.140.0 // indirect
128+
k8s.io/kube-openapi v0.0.0-20260511211612-da4e56fe5676 // indirect
129+
k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 // indirect
121130
knative.dev/pkg v0.0.0-20250415155312-ed3e2158b883 // indirect
122-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
123-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
124-
sigs.k8s.io/yaml v1.4.0 // indirect
131+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
132+
sigs.k8s.io/randfill v1.0.0 // indirect
133+
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect
134+
sigs.k8s.io/yaml v1.6.0 // indirect
125135
)

0 commit comments

Comments
 (0)