Skip to content

update dependencies #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 4 commits into from
Jun 29, 2022
Merged

update dependencies #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9c3bf3
Bump gopkg.in/yaml.v2 to gopkg.in/yaml.v3 3.0.1
crazy-max Jun 13, 2022
413e8d1
Bump github.com/stretchr/testify from 1.7.0 to 1.7.2
crazy-max Jun 13, 2022
b7481dc
Bump github.com/spf13/cobra from 1.2.1 to 1.4.0
crazy-max Jun 13, 2022
fba4d46
example: update to buildx 0.8.2
crazy-max Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,20 @@ jobs:
name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.16
go-version: 1.18
-
name: Run
run: |
go run main.go
working-directory: ./example
-
name: List docs
run: |
tree -nh ./example/docs
-
name: Upload docs
uses: actions/upload-artifact@v3
with:
name: example-docs
path: ./example/docs/*
if-no-files-found: error
2 changes: 1 addition & 1 deletion clidocstool_yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/docker/cli-docs-tool/annotation"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

type cmdOption struct {
Expand Down
140 changes: 132 additions & 8 deletions example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,141 @@
module github.com/docker/cli-docs-tool/example

go 1.16
go 1.18

require (
github.com/docker/buildx v0.6.3
github.com/docker/cli v20.10.7+incompatible
github.com/docker/cli-docs-tool v0.0.0
github.com/spf13/cobra v1.2.1
github.com/docker/buildx v0.8.2
github.com/docker/cli v20.10.12+incompatible
Copy link
Member

@thaJeztah thaJeztah Jun 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps change this to the latest 20.10.x (I know it's not used because of the replace, but 🤷‍♂️)

Copy link
Member

@thaJeztah thaJeztah Jun 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, this is the example .. perhaps doesn't matter

github.com/docker/cli-docs-tool v0.4.0
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/apparentlymart/go-cidr v1.0.1 // indirect
github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/compose-spec/compose-go v1.2.1 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/containerd v1.6.1 // indirect
github.com/containerd/continuity v0.2.2 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/containerd/typeurl v1.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e // indirect
github.com/docker/distribution v2.8.0+incompatible // indirect
github.com/docker/docker v20.10.7+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.4 // indirect
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/fvbommel/sortorder v1.0.1 // indirect
github.com/go-logr/logr v1.2.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gofrs/flock v0.7.3 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 // indirect
github.com/hashicorp/hcl/v2 v2.8.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.0 // indirect
github.com/mattn/go-shellwords v1.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/miekg/pkcs11 v1.0.3 // indirect
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/moby/buildkit v0.10.1-0.20220403220257-10e6f94bf90d // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/mount v0.3.0 // indirect
github.com/moby/sys/mountinfo v0.6.0 // indirect
github.com/moby/sys/signal v0.6.0 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 // indirect
github.com/opencontainers/runc v1.1.0 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/theupdateframework/notary v0.6.1 // indirect
github.com/tonistiigi/fsutil v0.0.0-20220315205639-9ed612626da3 // indirect
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zclconf/go-cty v1.10.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
go.opentelemetry.io/otel v1.4.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1 // indirect
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
go.opentelemetry.io/otel/metric v0.27.0 // indirect
go.opentelemetry.io/otel/sdk v1.4.1 // indirect
go.opentelemetry.io/otel/trace v1.4.1 // indirect
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.44.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.23.4 // indirect
k8s.io/apimachinery v0.23.4 // indirect
k8s.io/client-go v0.23.4 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

// upstream replace from buildx repo
replace (
github.com/docker/cli => github.com/docker/cli v20.10.3-0.20210702143511-f782d1355eff+incompatible
github.com/docker/cli-docs-tool => ../
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20210609100121-ef4d47340142+incompatible
github.com/docker/cli => github.com/docker/cli v20.10.3-0.20220226190722-8667ccd1124c+incompatible
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220121014307-40bb9831756f+incompatible
Comment on lines +134 to +135
Copy link
Member

@thaJeztah thaJeztah Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were these replace rules still needed?

Copy link
Member Author

@crazy-max crazy-max Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes still needed otherwise wrong dep is being used: https://github.com/docker/cli-docs-tool/runs/6918594068?check_suite_focus=true#step:4:117

# github.com/tonistiigi/fsutil
Error: ../../../../go/pkg/mod/github.com/tonistiigi/fsutil@v0.0.0-20220315205639-9ed612626da3/walker.go:100:30: undefined: fileutils.MatchInfo
Error: ../../../../go/pkg/mod/github.com/tonistiigi/fsutil@v0.0.0-20220315205639-9ed612626da3/walker.go:101:30: undefined: fileutils.MatchInfo
Error: ../../../../go/pkg/mod/github.com/tonistiigi/fsutil@v0.0.0-20220315205639-9ed612626da3/walker.go:156:41: undefined: fileutils.MatchInfo
Error: ../../../../go/pkg/mod/github.com/tonistiigi/fsutil@v0.0.0-20220315205639-9ed612626da3/walker.go:160:40: includeMatcher.MatchesUsingParentResults undefined (type *fileutils.PatternMatcher has no field or method MatchesUsingParentResults)
Error: ../../../../go/pkg/mod/github.com/tonistiigi/fsutil@v0.0.0-20220315205639-9ed612626da3/walker.go:191:41: undefined: fileutils.MatchInfo
Error: ../../../../go/pkg/mod/github.com/tonistiigi/fsutil@v0.0.0-20220315205639-9ed612626da3/walker.go:195:40: excludeMatcher.MatchesUsingParentResults undefined (type *fileutils.PatternMatcher has no field or method MatchesUsingParentResults)
# github.com/docker/buildx/driver/kubernetes/context
Error: ../../../../go/pkg/mod/github.com/docker/buildx@v0.8.2/driver/kubernetes/context/load.go:31:41: cannot use &EndpointMeta{} (value of type *EndpointMeta) as type command.EndpointDefaultResolver in variable declaration:
	*EndpointMeta does not implement command.EndpointDefaultResolver (wrong type for ResolveDefault method)
		have ResolveDefault() (interface{}, *"github.com/docker/cli/cli/context/store".EndpointTLSData, error)
		want ResolveDefault(command.Orchestrator) (interface{}, *"github.com/docker/cli/cli/context/store".EndpointTLSData, error)

k8s.io/api => k8s.io/api v0.22.4
k8s.io/apimachinery => k8s.io/apimachinery v0.22.4
k8s.io/client-go => k8s.io/client-go v0.22.4
Comment on lines +136 to +138
Copy link
Member

@thaJeztah thaJeztah Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bit unfortunate that we need this as a dependency; do you think the example would have less dependencies if we would use docker/cli for it?

Copy link
Member Author

@crazy-max crazy-max Jun 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bit unfortunate that we need this as a dependency;

Yeah we need them because factories need to be imported for --driver flag.

do you think the example would have less dependencies if we would use docker/cli for it?

Not sure it will be better as the cli vendor swarmkit with grpc stuff.

)

replace github.com/docker/cli-docs-tool => ../
Loading