Skip to content

Commit 24a2330

Browse files
committed
Fix gomod
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
1 parent 91670fe commit 24a2330

File tree

2 files changed

+158
-500
lines changed

2 files changed

+158
-500
lines changed

go.mod

Lines changed: 48 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,86 @@
11
module github.com/redhat-developer/gitops-backend
22

3-
<<<<<<< HEAD
4-
go 1.23.0
5-
6-
toolchain go1.23.8
7-
=======
8-
go 1.22.3
9-
10-
toolchain go1.22.6
11-
>>>>>>> 0869d72 (go mod tidy)
3+
go 1.23
124

135
require (
14-
github.com/argoproj/argo-cd/v2 v2.12.3
15-
github.com/go-git/go-git/v5 v5.12.0
6+
github.com/argoproj/argo-cd/v2 v2.14.11
7+
github.com/go-git/go-git/v5 v5.13.2
168
github.com/google/go-cmp v0.6.0
179
github.com/jenkins-x/go-scm v1.14.43
1810
github.com/julienschmidt/httprouter v1.3.0
1911
github.com/openshift/api v0.0.0-20240906151052-5d963dce87aa
20-
github.com/prometheus/client_golang v1.19.1
12+
github.com/prometheus/client_golang v1.20.5
2113
github.com/sirupsen/logrus v1.9.3
2214
github.com/spf13/cobra v1.8.1
2315
github.com/spf13/viper v1.7.0
2416
go.uber.org/zap v1.26.0
2517
k8s.io/api v0.31.2
2618
k8s.io/apimachinery v0.31.2
2719
k8s.io/client-go v0.31.2
28-
sigs.k8s.io/controller-runtime v0.19.1
20+
sigs.k8s.io/controller-runtime v0.19.3
2921
sigs.k8s.io/kustomize/api v0.17.2
3022
sigs.k8s.io/kustomize/kyaml v0.17.1
3123
sigs.k8s.io/yaml v1.4.0
3224
)
3325

3426
require (
3527
cloud.google.com/go/compute/metadata v0.5.2 // indirect
36-
code.gitea.io/sdk/gitea v0.18.0 // indirect
37-
dario.cat/mergo v1.0.0 // indirect
28+
code.gitea.io/sdk/gitea v0.19.0 // indirect
29+
dario.cat/mergo v1.0.1 // indirect
3830
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3931
github.com/MakeNowJust/heredoc v1.0.0 // indirect
40-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
32+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4133
github.com/Microsoft/go-winio v0.6.1 // indirect
42-
github.com/ProtonMail/go-crypto v1.0.0 // indirect
43-
github.com/argoproj/gitops-engine v0.7.1-0.20240714153147-adb68bcaab73 // indirect
34+
github.com/ProtonMail/go-crypto v1.1.5 // indirect
35+
github.com/argoproj/gitops-engine v0.7.1-0.20250328191959-6d3cf122b03f // indirect
4436
github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1 // indirect
4537
github.com/beorn7/perks v1.0.1 // indirect
4638
github.com/blang/semver/v4 v4.0.0 // indirect
4739
github.com/bluekeyes/go-gitdiff v0.8.0 // indirect
48-
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
40+
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
4941
github.com/bombsimon/logrusr/v2 v2.0.1 // indirect
50-
github.com/bradleyfalzon/ghinstallation/v2 v2.6.0 // indirect
42+
github.com/bradleyfalzon/ghinstallation/v2 v2.12.0 // indirect
43+
github.com/casbin/casbin/v2 v2.102.0 // indirect
44+
github.com/casbin/govaluate v1.2.0 // indirect
5145
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5246
github.com/chai2010/gettext-go v1.0.2 // indirect
5347
github.com/cloudflare/circl v1.3.7 // indirect
54-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
48+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
5549
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5650
github.com/davidmz/go-pageant v1.0.2 // indirect
5751
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
5852
github.com/distribution/reference v0.5.0 // indirect
59-
github.com/dlclark/regexp2 v1.11.2 // indirect
53+
github.com/dlclark/regexp2 v1.11.4 // indirect
6054
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
6155
github.com/emirpasic/gods v1.18.1 // indirect
6256
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
6357
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6458
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
6559
github.com/fatih/camelcase v1.0.0 // indirect
66-
github.com/fsnotify/fsnotify v1.7.0 // indirect
60+
github.com/fsnotify/fsnotify v1.8.0 // indirect
6761
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6862
github.com/go-errors/errors v1.4.2 // indirect
6963
github.com/go-fed/httpsig v1.1.0 // indirect
7064
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
71-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
65+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
7266
github.com/go-logr/logr v1.4.2 // indirect
73-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
74-
github.com/go-openapi/jsonreference v0.20.2 // indirect
75-
github.com/go-openapi/swag v0.22.4 // indirect
67+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
68+
github.com/go-openapi/jsonreference v0.21.0 // indirect
69+
github.com/go-openapi/swag v0.23.0 // indirect
7670
github.com/go-redis/cache/v9 v9.0.0 // indirect
7771
github.com/gobwas/glob v0.2.3 // indirect
7872
github.com/gogo/protobuf v1.3.2 // indirect
79-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
73+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
8074
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8175
github.com/golang/protobuf v1.5.4 // indirect
82-
github.com/google/btree v1.1.2 // indirect
76+
github.com/google/btree v1.1.3 // indirect
8377
github.com/google/gnostic-models v0.6.8 // indirect
84-
github.com/google/go-github/v53 v53.2.0 // indirect
78+
github.com/google/go-github/v66 v66.0.0 // indirect
8579
github.com/google/go-querystring v1.1.0 // indirect
8680
github.com/google/gofuzz v1.2.0 // indirect
8781
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8882
github.com/google/uuid v1.6.0 // indirect
89-
github.com/gorilla/websocket v1.5.0 // indirect
83+
github.com/gorilla/websocket v1.5.3 // indirect
9084
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
9185
github.com/hashicorp/go-version v1.6.0 // indirect
9286
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -98,7 +92,8 @@ require (
9892
github.com/json-iterator/go v1.1.12 // indirect
9993
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
10094
github.com/kevinburke/ssh_config v1.2.0 // indirect
101-
github.com/klauspost/compress v1.16.5 // indirect
95+
github.com/klauspost/compress v1.17.9 // indirect
96+
github.com/kylelemons/godebug v1.1.0 // indirect
10297
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
10398
github.com/magiconair/properties v1.8.1 // indirect
10499
github.com/mailru/easyjson v0.7.7 // indirect
@@ -114,28 +109,28 @@ require (
114109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
115110
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
116111
github.com/opencontainers/go-digest v1.0.0 // indirect
117-
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
112+
github.com/opencontainers/image-spec v1.1.0 // indirect
118113
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
119114
github.com/pelletier/go-toml v1.2.0 // indirect
120115
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
121-
github.com/pjbgf/sha1cd v0.3.0 // indirect
116+
github.com/pjbgf/sha1cd v0.3.2 // indirect
122117
github.com/pkg/errors v0.9.1 // indirect
123118
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
124119
github.com/prometheus/client_model v0.6.1 // indirect
125120
github.com/prometheus/common v0.55.0 // indirect
126121
github.com/prometheus/procfs v0.15.1 // indirect
127-
github.com/redis/go-redis/v9 v9.0.5 // indirect
122+
github.com/redis/go-redis/v9 v9.7.1 // indirect
128123
github.com/robfig/cron/v3 v3.0.1 // indirect
129124
github.com/russross/blackfriday/v2 v2.1.0 // indirect
130125
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
131126
github.com/shurcooL/githubv4 v0.0.0-20190718010115-4ba037080260 // indirect
132127
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
133-
github.com/skeema/knownhosts v1.2.2 // indirect
128+
github.com/skeema/knownhosts v1.3.0 // indirect
134129
github.com/spf13/afero v1.2.2 // indirect
135-
github.com/spf13/cast v1.6.0 // indirect
130+
github.com/spf13/cast v1.7.0 // indirect
136131
github.com/spf13/jwalterweatherman v1.0.0 // indirect
137132
github.com/spf13/pflag v1.0.5 // indirect
138-
github.com/stretchr/testify v1.9.0 // indirect
133+
github.com/stretchr/testify v1.10.0 // indirect
139134
github.com/subosito/gotenv v1.2.0 // indirect
140135
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
141136
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
@@ -145,19 +140,19 @@ require (
145140
github.com/xlab/treeprint v1.2.0 // indirect
146141
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
147142
go.uber.org/multierr v1.11.0 // indirect
148-
golang.org/x/crypto v0.24.0 // indirect
149-
golang.org/x/mod v0.17.0 // indirect
150-
golang.org/x/net v0.26.0 // indirect
151-
golang.org/x/oauth2 v0.21.0 // indirect
152-
golang.org/x/sync v0.7.0 // indirect
153-
golang.org/x/sys v0.25.0 // indirect
154-
golang.org/x/term v0.21.0 // indirect
155-
golang.org/x/text v0.16.0 // indirect
156-
golang.org/x/time v0.5.0 // indirect
157-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
158-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
159-
google.golang.org/grpc v1.65.0 // indirect
160-
google.golang.org/protobuf v1.34.2 // indirect
143+
golang.org/x/crypto v0.32.0 // indirect
144+
golang.org/x/mod v0.22.0 // indirect
145+
golang.org/x/net v0.34.0 // indirect
146+
golang.org/x/oauth2 v0.24.0 // indirect
147+
golang.org/x/sync v0.10.0 // indirect
148+
golang.org/x/sys v0.29.0 // indirect
149+
golang.org/x/term v0.28.0 // indirect
150+
golang.org/x/text v0.21.0 // indirect
151+
golang.org/x/time v0.8.0 // indirect
152+
golang.org/x/tools v0.27.0 // indirect
153+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
154+
google.golang.org/grpc v1.68.1 // indirect
155+
google.golang.org/protobuf v1.35.2 // indirect
161156
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
162157
gopkg.in/inf.v0 v0.9.1 // indirect
163158
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -175,7 +170,7 @@ require (
175170
k8s.io/kubectl v0.31.2 // indirect
176171
k8s.io/kubernetes v1.31.0 // indirect
177172
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
178-
oras.land/oras-go/v2 v2.3.0 // indirect
173+
oras.land/oras-go/v2 v2.5.0 // indirect
179174
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
180-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
175+
sigs.k8s.io/structured-merge-diff/v4 v4.4.4-0.20241211184406-7bf59b3d70ee // indirect
181176
)

0 commit comments

Comments
 (0)