Skip to content

Commit abdb1c5

Browse files
authored
Update go.mod with new location of the Alizer library (#6962)
* Update 'go.mod' with new location of the Alizer library * Downgrade and pin conflicting versions of 'github.com/docker/{cli,distributions}' Pinning it to the version we had before. Otherwise, there were issues when running 'go mod tidy': ``` $ go mod tidy go: downloading github.com/operator-framework/api v0.17.6 go: finding module for package github.com/docker/docker/pkg/term github.com/redhat-developer/odo/pkg/auth imports github.com/openshift/oc/pkg/cli/login imports github.com/openshift/oc/pkg/helpers/term imports github.com/docker/docker/pkg/term: module github.com/docker/docker@latest found (v24.0.4+incompatible), but does not contain package github.com/docker/docker/pkg/term ``` * Fix expected output in quickstart guides doc automation tests
1 parent abc808b commit abdb1c5

File tree

307 files changed

+11715
-7149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+11715
-7149
lines changed

cmd/odo/alizer_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88

99
"github.com/golang/mock/gomock"
1010

11-
"github.com/redhat-developer/alizer/go/pkg/apis/model"
11+
"github.com/devfile/alizer/pkg/apis/model"
12+
1213
"github.com/redhat-developer/odo/pkg/alizer"
1314
"github.com/redhat-developer/odo/pkg/api"
1415
"github.com/redhat-developer/odo/pkg/odo/genericclioptions/clientset"

docs/website/docs/user-guides/quickstart/docs-mdx/go/go_odo_init_output.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Interactive mode enabled, please answer the following questions:
1111
Based on the files in the current directory odo detected
1212
Language: Go
1313
Project type: Go
14+
Application ports: 8080
1415
The devfile "go:1.0.2" from the registry "DefaultDevfileRegistry" will be downloaded.
1516
? Is this correct? Yes
1617
✓ Downloading devfile "go:1.0.2" from registry "DefaultDevfileRegistry" [3s]

go.mod

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
github.com/AlecAivazis/survey/v2 v2.3.5
99
github.com/Xuanwo/go-locale v1.1.0
1010
github.com/blang/semver v3.5.1+incompatible
11+
github.com/devfile/alizer v1.0.1
1112
github.com/devfile/api/v2 v2.2.1-alpha.0.20230413012049-a6c32fca0dbd
1213
github.com/devfile/library/v2 v2.2.1-0.20230524160049-04a8b3fc66c0
1314
github.com/devfile/registry-support/index/generator v0.0.0-20230322155332-33914affc83b
@@ -17,7 +18,7 @@ require (
1718
github.com/frapposelli/wwhrd v0.4.0
1819
github.com/fsnotify/fsnotify v1.6.0
1920
github.com/ghodss/yaml v1.0.0
20-
github.com/go-git/go-git/v5 v5.6.1
21+
github.com/go-git/go-git/v5 v5.7.0
2122
github.com/go-openapi/jsonpointer v0.19.6
2223
github.com/go-openapi/jsonreference v0.20.2
2324
github.com/go-openapi/spec v0.20.8
@@ -38,7 +39,6 @@ require (
3839
github.com/operator-framework/operator-lifecycle-manager v0.21.2
3940
github.com/pborman/uuid v1.2.1
4041
github.com/posener/complete v1.2.3
41-
github.com/redhat-developer/alizer/go v0.0.0-20230619172619-14114f066cef
4242
github.com/redhat-developer/service-binding-operator v1.0.1-0.20211222115357-5b7bbba3bfb3
4343
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
4444
github.com/securego/gosec/v2 v2.15.0
@@ -49,24 +49,24 @@ require (
4949
github.com/spf13/pflag v1.0.5
5050
github.com/tidwall/gjson v1.14.4
5151
github.com/zalando/go-keyring v0.2.1
52-
golang.org/x/sync v0.2.0
52+
golang.org/x/sync v0.3.0
5353
golang.org/x/sys v0.10.0
54-
golang.org/x/term v0.8.0
55-
golang.org/x/text v0.9.0
54+
golang.org/x/term v0.9.0
55+
golang.org/x/text v0.10.0
5656
gopkg.in/AlecAivazis/survey.v1 v1.8.8
5757
gopkg.in/segmentio/analytics-go.v3 v3.0.0-00010101000000-000000000000
5858
gopkg.in/yaml.v2 v2.4.0
5959
gopkg.in/yaml.v3 v3.0.1
6060
k8s.io/api v0.27.2
6161
k8s.io/apiextensions-apiserver v0.27.2
62-
k8s.io/apimachinery v0.27.2
62+
k8s.io/apimachinery v0.27.3
6363
k8s.io/cli-runtime v0.24.0
6464
k8s.io/client-go v0.27.2
6565
k8s.io/klog v1.0.0
66-
k8s.io/klog/v2 v2.90.1
66+
k8s.io/klog/v2 v2.100.1
6767
k8s.io/kubectl v0.24.0
6868
k8s.io/pod-security-admission v0.26.1
69-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
69+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
7070
sigs.k8s.io/controller-runtime v0.15.0
7171
sigs.k8s.io/yaml v1.3.0
7272
)
@@ -79,7 +79,7 @@ require (
7979
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
8080
github.com/Microsoft/go-winio v0.6.1 // indirect
8181
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 // indirect
82-
github.com/ProtonMail/go-crypto v0.0.0-20230417170513-8ee5748c52b5 // indirect
82+
github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec // indirect
8383
github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2 // indirect
8484
github.com/acomagu/bufpipe v1.0.4 // indirect
8585
github.com/alessio/shellescape v1.4.1 // indirect
@@ -89,28 +89,28 @@ require (
8989
github.com/blang/semver/v4 v4.0.0 // indirect
9090
github.com/cespare/xxhash/v2 v2.2.0 // indirect
9191
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
92-
github.com/cloudflare/circl v1.3.2 // indirect
93-
github.com/containerd/containerd v1.6.3-0.20220401172941-5ff8fce1fcc6 // indirect
92+
github.com/cloudflare/circl v1.3.3 // indirect
93+
github.com/containerd/containerd v1.6.20 // indirect
9494
github.com/containerd/typeurl v1.0.2 // indirect
9595
github.com/creack/pty v1.1.18 // indirect
96-
github.com/danieljoos/wincred v1.1.0 // indirect
96+
github.com/danieljoos/wincred v1.1.2 // indirect
9797
github.com/davecgh/go-spew v1.1.1 // indirect
9898
github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684 // indirect
99-
github.com/docker/cli v20.10.13+incompatible // indirect
99+
github.com/docker/cli v23.0.0-rc.1+incompatible // indirect
100100
github.com/docker/distribution v2.8.2+incompatible // indirect
101-
github.com/docker/docker v20.10.24+incompatible // indirect
102-
github.com/docker/docker-credential-helpers v0.6.4 // indirect
101+
github.com/docker/docker v23.0.0-rc.1+incompatible // indirect
102+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
103103
github.com/docker/go-connections v0.4.0 // indirect
104104
github.com/docker/go-metrics v0.0.1 // indirect
105-
github.com/docker/go-units v0.4.0 // indirect
105+
github.com/docker/go-units v0.5.0 // indirect
106106
github.com/emicklei/dot v0.15.0 // indirect
107107
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
108108
github.com/emirpasic/gods v1.18.1 // indirect
109109
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
110110
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
111111
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
112112
github.com/go-errors/errors v1.0.1 // indirect
113-
github.com/go-git/gcfg v1.5.0 // indirect
113+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
114114
github.com/go-git/go-billy/v5 v5.4.1 // indirect
115115
github.com/go-logr/logr v1.2.4 // indirect
116116
github.com/go-logr/zapr v1.2.4 // indirect
@@ -132,17 +132,17 @@ require (
132132
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
133133
github.com/hashicorp/errwrap v1.1.0 // indirect
134134
github.com/hashicorp/go-multierror v1.1.1 // indirect
135-
github.com/hashicorp/go-version v1.4.0 // indirect
135+
github.com/hashicorp/go-version v1.6.0 // indirect
136136
github.com/hinshun/vt10x v0.0.0-20220301184237-5011da428d02 // indirect
137-
github.com/imdario/mergo v0.3.15 // indirect
137+
github.com/imdario/mergo v0.3.16 // indirect
138138
github.com/inconshreveable/mousetrap v1.1.0 // indirect
139139
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
140140
github.com/jessevdk/go-flags v1.5.0 // indirect
141141
github.com/josharian/intern v1.0.0 // indirect
142142
github.com/json-iterator/go v1.1.12 // indirect
143143
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
144144
github.com/kevinburke/ssh_config v1.2.0 // indirect
145-
github.com/klauspost/compress v1.15.1 // indirect
145+
github.com/klauspost/compress v1.15.12 // indirect
146146
github.com/kr/pty v1.1.8 // indirect
147147
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
148148
github.com/mailru/easyjson v0.7.7 // indirect
@@ -152,7 +152,7 @@ require (
152152
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
153153
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
154154
github.com/mitchellh/reflectwalk v1.0.1 // indirect
155-
github.com/moby/buildkit v0.10.6 // indirect
155+
github.com/moby/buildkit v0.11.6 // indirect
156156
github.com/moby/locker v1.0.1 // indirect
157157
github.com/moby/spdystream v0.2.0 // indirect
158158
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
@@ -163,7 +163,7 @@ require (
163163
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
164164
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
165165
github.com/opencontainers/go-digest v1.0.0 // indirect
166-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
166+
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
167167
github.com/openshift/library-go v0.0.0-20220210170159-18f172cff934 // indirect
168168
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
169169
github.com/pjbgf/sha1cd v0.3.0 // indirect
@@ -174,10 +174,10 @@ require (
174174
github.com/prometheus/common v0.42.0 // indirect
175175
github.com/prometheus/procfs v0.9.0 // indirect
176176
github.com/rivo/uniseg v0.2.0 // indirect
177-
github.com/russross/blackfriday v1.5.2 // indirect
177+
github.com/russross/blackfriday v1.6.0 // indirect
178178
github.com/sergi/go-diff v1.3.1 // indirect
179179
github.com/sirupsen/logrus v1.9.0 // indirect
180-
github.com/skeema/knownhosts v1.1.0 // indirect
180+
github.com/skeema/knownhosts v1.1.1 // indirect
181181
github.com/stretchr/testify v1.8.1 // indirect
182182
github.com/tidwall/match v1.1.1 // indirect
183183
github.com/tidwall/pretty v1.2.0 // indirect
@@ -188,20 +188,20 @@ require (
188188
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
189189
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
190190
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
191-
go.uber.org/atomic v1.7.0 // indirect
192-
go.uber.org/multierr v1.6.0 // indirect
191+
go.uber.org/atomic v1.11.0 // indirect
192+
go.uber.org/multierr v1.11.0 // indirect
193193
go.uber.org/zap v1.24.0 // indirect
194-
golang.org/x/crypto v0.8.0 // indirect
195-
golang.org/x/mod v0.10.0 // indirect
196-
golang.org/x/net v0.10.0 // indirect
194+
golang.org/x/crypto v0.10.0 // indirect
195+
golang.org/x/mod v0.11.0 // indirect
196+
golang.org/x/net v0.11.0 // indirect
197197
golang.org/x/oauth2 v0.5.0 // indirect
198198
golang.org/x/time v0.3.0 // indirect
199-
golang.org/x/tools v0.9.1 // indirect
199+
golang.org/x/tools v0.10.0 // indirect
200200
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
201201
google.golang.org/appengine v1.6.7 // indirect
202-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
202+
google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 // indirect
203203
google.golang.org/grpc v1.51.0 // indirect
204-
google.golang.org/protobuf v1.30.0 // indirect
204+
google.golang.org/protobuf v1.31.0 // indirect
205205
gopkg.in/inf.v0 v0.9.1 // indirect
206206
gopkg.in/warnings.v0 v0.1.2 // indirect
207207
k8s.io/apiserver v0.27.2 // indirect
@@ -230,3 +230,8 @@ replace (
230230
k8s.io/client-go => k8s.io/client-go v0.26.1
231231
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.4
232232
)
233+
234+
replace (
235+
github.com/docker/cli => github.com/docker/cli v20.10.13+incompatible
236+
github.com/docker/docker => github.com/docker/docker v20.10.24+incompatible
237+
)

0 commit comments

Comments
 (0)