Skip to content

Commit 06914dd

Browse files
committed
make trust-plugin a separate module
skip cmd/docker-trust in tests, as it's a separate module. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent c9bb291 commit 06914dd

File tree

137 files changed

+448
-25174
lines changed

Some content is hidden

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

137 files changed

+448
-25174
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
-
7272
name: Test
7373
run: |
74-
go test -coverprofile=/tmp/coverage.txt $(go list ./... | grep -vE '/vendor/|/e2e/')
74+
go test -coverprofile=/tmp/coverage.txt $(go list ./... | grep -vE '/vendor/|/e2e/|/cmd/docker-trust')
7575
go tool cover -func=/tmp/coverage.txt
7676
working-directory: ${{ env.GOPATH }}/src/github.com/docker/cli
7777
shell: bash

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ ENV GO111MODULE=auto
9797
RUN --mount=type=bind,target=.,rw \
9898
--mount=type=cache,target=/root/.cache \
9999
--mount=type=cache,target=/go/pkg/mod \
100-
gotestsum -- -coverprofile=/tmp/coverage.txt $(go list ./... | grep -vE '/vendor/|/e2e/')
100+
gotestsum -- -coverprofile=/tmp/coverage.txt $(go list ./... | grep -vE '/vendor/|/e2e/|/cmd/docker-trust')
101101

102102
FROM scratch AS test-coverage
103103
COPY --from=test /tmp/coverage.txt /coverage.txt

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ test: test-unit ## run tests
3434

3535
.PHONY: test-unit
3636
test-unit: ## run unit tests, to change the output format use: GOTESTSUM_FORMAT=(dots|short|standard-quiet|short-verbose|standard-verbose) make test-unit
37-
gotestsum -- $${TESTDIRS:-$(shell go list ./... | grep -vE '/vendor/|/e2e/')} $(TESTFLAGS)
37+
gotestsum -- $${TESTDIRS:-$(shell go list ./... | grep -vE '/vendor/|/e2e/|/cmd/docker-trust')} $(TESTFLAGS)
3838

3939
.PHONY: test-coverage
4040
test-coverage: ## run test coverage
4141
mkdir -p $(CURDIR)/build/coverage
42-
gotestsum -- $(shell go list ./... | grep -vE '/vendor/|/e2e/') -coverprofile=$(CURDIR)/build/coverage/coverage.txt
42+
gotestsum -- $(shell go list ./... | grep -vE '/vendor/|/e2e/|/cmd/docker-trust') -coverprofile=$(CURDIR)/build/coverage/coverage.txt
4343

4444
.PHONY: lint
4545
lint: ## run all the lint tools

cmd/docker-trust/go.mod

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
module github.com/docker/cli/cmd/docker-trust
2+
3+
go 1.23.0
4+
5+
require (
6+
github.com/containerd/errdefs v1.0.0
7+
github.com/distribution/reference v0.6.0
8+
github.com/docker/cli v29.0.0-rc.2+incompatible
9+
github.com/docker/cli-docs-tool v0.10.0
10+
github.com/docker/distribution v2.8.3+incompatible
11+
github.com/docker/go-connections v0.6.0
12+
github.com/fvbommel/sortorder v1.1.0
13+
github.com/moby/moby/api v1.52.0-beta.4
14+
github.com/moby/moby/client v0.1.0-beta.3
15+
github.com/opencontainers/go-digest v1.0.0
16+
github.com/sirupsen/logrus v1.9.3
17+
github.com/spf13/cobra v1.10.1
18+
github.com/spf13/pflag v1.0.10
19+
github.com/theupdateframework/notary v0.7.1-0.20210315103452-bf96a202a09a
20+
go.opentelemetry.io/otel v1.35.0
21+
gotest.tools/v3 v3.5.2
22+
)
23+
24+
require (
25+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
26+
github.com/Microsoft/go-winio v0.6.2 // indirect
27+
github.com/beorn7/perks v1.0.1 // indirect
28+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
29+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
30+
github.com/cloudflare/cfssl v1.6.4 // indirect
31+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
32+
github.com/containerd/log v0.1.0 // indirect
33+
github.com/containerd/platforms v1.0.0-rc.1 // indirect
34+
github.com/docker/docker-credential-helpers v0.9.4 // indirect
35+
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
36+
github.com/docker/go-metrics v0.0.1 // indirect
37+
github.com/docker/go-units v0.5.0 // indirect
38+
github.com/felixge/httpsnoop v1.0.4 // indirect
39+
github.com/go-logr/logr v1.4.2 // indirect
40+
github.com/go-logr/stdr v1.2.2 // indirect
41+
github.com/google/go-cmp v0.7.0 // indirect
42+
github.com/google/uuid v1.6.0 // indirect
43+
github.com/gorilla/mux v1.8.1 // indirect
44+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
45+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
46+
github.com/mattn/go-runewidth v0.0.17 // indirect
47+
github.com/miekg/pkcs11 v1.1.1 // indirect
48+
github.com/moby/docker-image-spec v1.3.1 // indirect
49+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
50+
github.com/moby/sys/sequential v0.6.0 // indirect
51+
github.com/moby/term v0.5.2 // indirect
52+
github.com/morikuni/aec v1.0.0 // indirect
53+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
54+
github.com/opencontainers/image-spec v1.1.1 // indirect
55+
github.com/prometheus/client_golang v1.22.0 // indirect
56+
github.com/prometheus/client_model v0.6.1 // indirect
57+
github.com/prometheus/common v0.62.0 // indirect
58+
github.com/prometheus/procfs v0.15.1 // indirect
59+
github.com/rivo/uniseg v0.2.0 // indirect
60+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
61+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
62+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
63+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
64+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
65+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
66+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
67+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
68+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
69+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
70+
golang.org/x/crypto v0.39.0 // indirect
71+
golang.org/x/net v0.39.0 // indirect
72+
golang.org/x/sys v0.33.0 // indirect
73+
golang.org/x/term v0.32.0 // indirect
74+
golang.org/x/text v0.26.0 // indirect
75+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
76+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
77+
google.golang.org/grpc v1.72.2 // indirect
78+
google.golang.org/protobuf v1.36.9 // indirect
79+
k8s.io/klog/v2 v2.90.1 // indirect
80+
)

0 commit comments

Comments
 (0)