Skip to content

Commit ee638f5

Browse files
msvticketmsvticket
committed
fix: upgrade go and dependencies
related to jenkins-x/jx#8670
1 parent fa540ae commit ee638f5

File tree

15 files changed

+447
-1055
lines changed

15 files changed

+447
-1055
lines changed

‎.goreleaser.yml

+5-14
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,65 @@
1+
version: 2
12
env:
23
- GO111MODULE=on
34
- CGO_ENABLED=0
45
before:
56
hooks:
67
- go mod download
7-
88
builds:
99
- id: cd-indicators
1010
# Path to main.go file or main package.
1111
# Default is `.`.
1212
main: ./cmd/collector/main.go
13-
1413
# Binary name.
1514
# Can be a path (e.g. `bin/app`) to wrap the binary in a directory.
1615
# Default is the name of the project directory.
1716
binary: cd-indicators
18-
1917
# Custom ldflags templates.
2018
# Default is `-s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}} -X main.builtBy=goreleaser`.
2119
ldflags:
2220
- -X "github.com/jenkins-x/cd-indicators/internal/version.Version={{.Env.VERSION}}" -X "github.com/jenkins-x/cd-indicators/internal/version.Revision={{.Env.REV}}" -X "github.com/jenkins-x/cd-indicators/internal/version.Date={{.Env.BUILDDATE}}"
23-
2421
# GOOS list to build for.
2522
# For more info refer to: https://golang.org/doc/install/source#environment
2623
# Defaults are darwin and linux.
2724
goos:
2825
- windows
2926
- darwin
3027
- linux
31-
3228
# GOARCH to build for.
3329
# For more info refer to: https://golang.org/doc/install/source#environment
3430
# Defaults are 386 and amd64.
3531
goarch:
3632
- amd64
3733
- arm64
34+
ignore:
35+
- goos: windows
36+
goarch: arm64
3837
# - arm
3938

4039
archives:
4140
- name_template: "cd-indicators-{{ .Os }}-{{ .Arch }}"
4241
format_overrides:
4342
- goos: windows
4443
format: zip
45-
4644
checksum:
4745
# You can change the name of the checksums file.
4846
# Default is `cd-indicators_{{ .Version }}_checksums.txt`.
4947
name_template: "cd-indicators-checksums.txt"
50-
5148
# Algorithm to be used.
5249
# Accepted options are sha256, sha512, sha1, crc32, md5, sha224 and sha384.
5350
# Default is sha256.
5451
algorithm: sha256
55-
5652
changelog:
57-
# set it to true if you wish to skip the changelog generation
58-
skip: true
59-
53+
disable: true
6054
release:
6155
# If set to true, will not auto-publish the release.
6256
# Default is false.
6357
draft: false
64-
6558
# If set to auto, will mark the release as not ready for production
6659
# in case there is an indicator for this in the tag e.g. v1.0.0-rc1
6760
# If set to true, will mark the release as not ready for production.
6861
# Default is false.
6962
prerelease: false
70-
7163
# You can change the name of the GitHub release.
7264
# Default is `{{.Tag}}`
7365
name_template: "{{.Env.VERSION}}"
74-

‎.lighthouse/jenkins-x/pullrequest.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ spec:
88
tasks:
99
- name: from-build-pack
1010
resources: {}
11+
timeout: 4h0m0s
1112
taskSpec:
1213
metadata: {}
1314
stepTemplate:
@@ -35,5 +36,5 @@ spec:
3536
resources: {}
3637
podTemplate: {}
3738
serviceAccountName: tekton-bot
38-
timeout: 240h0m0s
39+
timeout: 4h0m0s
3940
status: {}

‎.lighthouse/jenkins-x/release.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ spec:
88
tasks:
99
- name: chart
1010
resources: {}
11+
timeout: 4h0m0s
1112
taskSpec:
1213
metadata: {}
1314
stepTemplate:
@@ -36,5 +37,5 @@ spec:
3637
- name: promote-release
3738
resources: {}
3839
serviceAccountName: tekton-bot
39-
timeout: 240h0m0s
40+
timeout: 4h0m0s
4041
status: {}

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ORG_REPO := $(ORG)/$(NAME)
1414
RELEASE_ORG_REPO := $(ORG_REPO)
1515
ROOT_PACKAGE := github.com/$(ORG_REPO)
1616
#GO_VERSION := $(shell $(GO) version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/')
17-
GO_VERSION := 1.13
17+
GO_VERSION := 1.23
1818

1919
GO_DEPENDENCIES := $(call rwildcard,pkg/,*.go) $(call rwildcard,cmd/j,*.go)
2020

‎cmd/collector/main.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import (
44
"context"
55
"errors"
66
"fmt"
7+
"github.com/jackc/pgx/v5/tracelog"
78
"net/http"
89
"os"
910
"strings"
1011
"time"
1112

12-
"github.com/jackc/pgx/v4"
13-
"github.com/jackc/pgx/v4/log/logrusadapter"
14-
"github.com/jackc/pgx/v4/pgxpool"
13+
logrusadapter "github.com/jackc/pgx-logrus"
14+
"github.com/jackc/pgx/v5/pgxpool"
1515
"github.com/jenkins-x/cd-indicators/collector"
1616
"github.com/jenkins-x/cd-indicators/internal/kube"
1717
"github.com/jenkins-x/cd-indicators/internal/lighthouse"
@@ -46,7 +46,7 @@ func init() {
4646
pflag.StringVar(&options.lighthouseHMACKey, "lighthouse-hmac-key", os.Getenv("LIGHTHOUSE_HMAC_KEY"), "HMAC key used by Lighthouse to sign the webhooks")
4747
pflag.StringVar(&options.listenAddr, "listen-addr", ":8080", "Address on which the HTTP server will listen for incoming connections")
4848
pflag.StringVar(&options.logLevel, "log-level", "INFO", "Log level - one of: trace, debug, info, warn(ing), error, fatal or panic")
49-
pflag.StringVar(&options.logLevelForPostgres, "log-level-db", "WARN", "Log level for the database operations - one of: trace, debug, info, warn(ing), error, fatal or panic")
49+
pflag.StringVar(&options.logLevelForPostgres, "log-level-db", "WARN", "Log level for the database operations - one of: trace, debug, info, warn, error or none")
5050
pflag.StringVar(&options.kubeConfigPath, "kubeconfig", kube.DefaultKubeConfigPath(), "Kubernetes Config Path. Default: KUBECONFIG env var value")
5151
pflag.BoolVar(&options.printVersion, "version", false, "Print the version")
5252
}
@@ -84,12 +84,12 @@ func main() {
8484
if err != nil {
8585
logger.WithError(err).Fatal("Failed to parse postgresURI")
8686
}
87-
dbconf.ConnConfig.Logger = logrusadapter.NewLogger(logger)
88-
dbconf.ConnConfig.LogLevel, err = pgx.LogLevelFromString(strings.ToLower(options.logLevelForPostgres))
87+
pgLogLevel, err := tracelog.LogLevelFromString(strings.ToLower(options.logLevelForPostgres))
8988
if err != nil {
9089
logger.WithField("logLevel", strings.ToLower(options.logLevelForPostgres)).WithError(err).Fatal("Invalid log level for database operations")
9190
}
92-
dbpool, err := pgxpool.ConnectConfig(ctx, dbconf)
91+
dbconf.ConnConfig.Tracer = &tracelog.TraceLog{Logger: logrusadapter.NewLogger(logger), LogLevel: pgLogLevel}
92+
dbpool, err := pgxpool.NewWithConfig(ctx, dbconf)
9393
if err != nil {
9494
logger.WithError(err).Fatal("Failed to connect to database")
9595
}

‎go.mod

+118-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,126 @@
11
module github.com/jenkins-x/cd-indicators
22

3-
go 1.15
3+
go 1.23.0
4+
5+
toolchain go1.23.3
46

57
require (
6-
github.com/jackc/pgx/v4 v4.10.1
7-
github.com/jenkins-x/go-scm v1.7.3
8-
github.com/jenkins-x/jx-api/v4 v4.0.14
9-
github.com/jenkins-x/lighthouse v1.0.33
10-
github.com/mitchellh/go-homedir v1.1.0
8+
github.com/jackc/pgx-logrus v0.0.0-20220919124836-b099d8ce75da
9+
github.com/jackc/pgx/v5 v5.7.2
10+
github.com/jenkins-x/go-scm v1.14.56
11+
github.com/jenkins-x/jx-api/v4 v4.7.9
12+
github.com/jenkins-x/lighthouse-client v0.0.1490
1113
github.com/scylladb/go-set v1.0.2
12-
github.com/sirupsen/logrus v1.7.0
13-
github.com/spf13/pflag v1.0.5
14-
k8s.io/apimachinery v0.20.2
15-
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
14+
github.com/sirupsen/logrus v1.9.3
15+
github.com/spf13/pflag v1.0.6
16+
k8s.io/apimachinery v0.32.3
17+
k8s.io/client-go v0.32.3
1618
)
1719

18-
replace (
19-
k8s.io/api => k8s.io/api v0.19.2
20-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.2
21-
k8s.io/client-go => k8s.io/client-go v0.19.2
20+
require (
21+
cel.dev/expr v0.19.1 // indirect
22+
code.gitea.io/sdk/gitea v0.20.0 // indirect
23+
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
24+
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
25+
fortio.org/safecast v1.0.0 // indirect
26+
github.com/42wim/httpsig v1.2.1 // indirect
27+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
28+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
29+
github.com/beorn7/perks v1.0.1 // indirect
30+
github.com/blendle/zapdriver v1.3.1 // indirect
31+
github.com/bluekeyes/go-gitdiff v0.8.0 // indirect
32+
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
33+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
34+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
35+
github.com/davidmz/go-pageant v1.0.2 // indirect
36+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
37+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
38+
github.com/fatih/color v1.15.0 // indirect
39+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
40+
github.com/ghodss/yaml v1.0.0 // indirect
41+
github.com/go-fed/httpsig v1.1.0 // indirect
42+
github.com/go-kit/log v0.2.1 // indirect
43+
github.com/go-logfmt/logfmt v0.5.1 // indirect
44+
github.com/go-logr/logr v1.4.2 // indirect
45+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
46+
github.com/go-openapi/jsonreference v0.21.0 // indirect
47+
github.com/go-openapi/swag v0.23.0 // indirect
48+
github.com/go-stack/stack v1.8.1 // indirect
49+
github.com/gogo/protobuf v1.3.2 // indirect
50+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
51+
github.com/golang/protobuf v1.5.4 // indirect
52+
github.com/google/cel-go v0.23.2 // indirect
53+
github.com/google/gnostic-models v0.6.8 // indirect
54+
github.com/google/go-cmp v0.7.0 // indirect
55+
github.com/google/gofuzz v1.2.0 // indirect
56+
github.com/google/uuid v1.6.0 // indirect
57+
github.com/gorilla/securecookie v1.1.1 // indirect
58+
github.com/gorilla/sessions v1.2.1 // indirect
59+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
60+
github.com/hashicorp/errwrap v1.1.0 // indirect
61+
github.com/hashicorp/go-multierror v1.1.1 // indirect
62+
github.com/hashicorp/go-version v1.7.0 // indirect
63+
github.com/jackc/pgpassfile v1.0.0 // indirect
64+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
65+
github.com/jackc/puddle/v2 v2.2.2 // indirect
66+
github.com/jenkins-x/jx-logging/v3 v3.0.16 // indirect
67+
github.com/jenkins-x/logrus-stackdriver-formatter v0.2.7 // indirect
68+
github.com/josharian/intern v1.0.0 // indirect
69+
github.com/json-iterator/go v1.1.12 // indirect
70+
github.com/mailru/easyjson v0.7.7 // indirect
71+
github.com/mattn/go-colorable v0.1.13 // indirect
72+
github.com/mattn/go-isatty v0.0.17 // indirect
73+
github.com/mitchellh/copystructure v1.2.0 // indirect
74+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
75+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
76+
github.com/modern-go/reflect2 v1.0.2 // indirect
77+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
78+
github.com/pkg/errors v0.9.1 // indirect
79+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
80+
github.com/prometheus/client_golang v1.19.1 // indirect
81+
github.com/prometheus/client_model v0.6.1 // indirect
82+
github.com/prometheus/common v0.55.0 // indirect
83+
github.com/prometheus/procfs v0.15.1 // indirect
84+
github.com/prometheus/statsd_exporter v0.22.7 // indirect
85+
github.com/rawlingsj/jsonschema v0.0.0-20210511142122-a9c2cfdb7dcf // indirect
86+
github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b // indirect
87+
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
88+
github.com/stoewer/go-strcase v1.2.0 // indirect
89+
github.com/stretchr/testify v1.10.0 // indirect
90+
github.com/tektoncd/pipeline v0.69.0 // indirect
91+
github.com/x448/float16 v0.8.4 // indirect
92+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
93+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
94+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
95+
go.opencensus.io v0.24.0 // indirect
96+
go.uber.org/multierr v1.11.0 // indirect
97+
go.uber.org/zap v1.27.0 // indirect
98+
golang.org/x/crypto v0.32.0 // indirect
99+
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
100+
golang.org/x/net v0.34.0 // indirect
101+
golang.org/x/oauth2 v0.26.0 // indirect
102+
golang.org/x/sync v0.11.0 // indirect
103+
golang.org/x/sys v0.29.0 // indirect
104+
golang.org/x/term v0.28.0 // indirect
105+
golang.org/x/text v0.21.0 // indirect
106+
golang.org/x/time v0.9.0 // indirect
107+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
108+
google.golang.org/api v0.217.0 // indirect
109+
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
110+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
111+
google.golang.org/grpc v1.70.0 // indirect
112+
google.golang.org/protobuf v1.36.5 // indirect
113+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
114+
gopkg.in/inf.v0 v0.9.1 // indirect
115+
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect
116+
gopkg.in/yaml.v2 v2.4.0 // indirect
117+
gopkg.in/yaml.v3 v3.0.1 // indirect
118+
k8s.io/api v0.32.3 // indirect
119+
k8s.io/klog/v2 v2.130.1 // indirect
120+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
121+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
122+
knative.dev/pkg v0.0.0-20250117084104-c43477f0052b // indirect
123+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
124+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
125+
sigs.k8s.io/yaml v1.4.0 // indirect
22126
)

0 commit comments

Comments
 (0)