Skip to content

Commit babf416

Browse files
joe0BABjoe0BAB
authored
Merge pull request #415 from docker/engine/cleanup
feat: engine module should never reference store module
2 parents 735208d + 8035f64 commit babf416

File tree

9 files changed

+2
-197
lines changed

9 files changed

+2
-197
lines changed

‎cmd/engine/go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ require (
2626
connectrpc.com/connect v1.18.1 // indirect
2727
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
2828
github.com/danieljoos/wincred v1.2.3 // indirect
29-
github.com/docker/docker-auth/auth v0.0.1-beta // indirect
3029
github.com/docker/docker-credential-helpers v0.9.4 // indirect
3130
github.com/docker/secrets-engine/plugin v0.0.19 // indirect
3231
github.com/docker/secrets-engine/store v0.0.17 // indirect

‎cmd/engine/go.sum‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@ github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMF
99
github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
1010
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
1111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
12-
github.com/docker/docker-auth/auth v0.0.1-beta h1:4kygrW5JPaDhcvYNN30pB++8JmulaoeYwCnP+BZadjQ=
13-
github.com/docker/docker-auth/auth v0.0.1-beta/go.mod h1:kRzMmGlgmGE5J0QtIKsX9Ygdo33OqhAUPAO+fhOvlP8=
1412
github.com/docker/docker-credential-helpers v0.9.4 h1:76ItO69/AP/V4yT9V4uuuItG0B1N8hvt0T0c0NN/DzI=
1513
github.com/docker/docker-credential-helpers v0.9.4/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c=
16-
github.com/docker/secrets-engine v0.0.7 h1:DVdrx5DLZhTo6ef2vO/ZauBuFbJYClrcp0QOkEyioEA=
1714
github.com/docker/secrets-engine/client v0.0.16 h1:x6IeuuJXE7E9zfK0ZZzOBTJhtgli/abRX2qWUV6wLDc=
1815
github.com/docker/secrets-engine/client v0.0.16/go.mod h1:0/DJvZvZKVwxum7gGKbP44v3vHr4y03skTBrD0Asn2k=
1916
github.com/docker/secrets-engine/plugin v0.0.19 h1:MZpwFIpDJXdlb+jS7GMaH2FUTshxlSQ77XYyu/OVsyc=

‎cmd/engine/main.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"time"
99

1010
"github.com/docker/secrets-engine/engine"
11-
"github.com/docker/secrets-engine/engine/builtins/dockerauth"
1211
"github.com/docker/secrets-engine/pass"
1312
pstore "github.com/docker/secrets-engine/pass/store"
1413
"github.com/docker/secrets-engine/plugins/credentialhelper"
@@ -63,15 +62,10 @@ func main() {
6362
if err != nil {
6463
panic(err)
6564
}
66-
dockerAuthPlugin, err := dockerauth.NewDockerAuthPlugin(logger)
67-
if err != nil {
68-
panic(err)
69-
}
7065

7166
matchAllPattern := secrets.MustParsePattern("**")
7267

7368
plugins[engine.Config{Name: "docker-pass", Version: version, Pattern: matchAllPattern}] = passPlugin
74-
plugins[engine.Config{Name: "docker-auth", Version: version, Pattern: matchAllPattern}] = dockerAuthPlugin
7569

7670
credentialHelperPlugin, err := credentialhelper.New(logger)
7771
if err != nil {

‎engine/.gomodguard.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ blocked:
99
reason: "Forbidden dependency"
1010
# - github.com/docker/secrets-engine/plugin:
1111
# reason: "Forbidden dependency"
12-
# - github.com/docker/secrets-engine/store:
13-
# reason: "Forbidden dependency"
12+
- github.com/docker/secrets-engine/store:
13+
reason: "Forbidden dependency"

‎engine/builtins/dockerauth/auth.go‎

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎engine/go.mod‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ replace github.com/docker/secrets-engine/x => ../x
1616
require (
1717
connectrpc.com/connect v1.18.1
1818
github.com/cenkalti/backoff/v5 v5.0.3
19-
github.com/docker/docker-auth/auth v0.0.1-beta
2019
github.com/docker/secrets-engine/client v0.0.16
2120
github.com/docker/secrets-engine/plugin v0.0.19
22-
github.com/docker/secrets-engine/store v0.0.17
2321
github.com/docker/secrets-engine/x v0.0.12-do.not.use
2422
github.com/go-chi/chi/v5 v5.2.3
2523
github.com/hashicorp/yamux v0.1.2
@@ -32,11 +30,9 @@ require (
3230
)
3331

3432
require (
35-
github.com/danieljoos/wincred v1.2.3 // indirect
3633
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3734
github.com/go-logr/logr v1.4.3 // indirect
3835
github.com/go-logr/stdr v1.2.2 // indirect
39-
github.com/godbus/dbus/v5 v5.1.0 // indirect
4036
github.com/google/uuid v1.6.0 // indirect
4137
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
4238
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -47,7 +43,6 @@ require (
4743
go.opentelemetry.io/otel/metric v1.38.0 // indirect
4844
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
4945
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
50-
golang.org/x/crypto v0.41.0 // indirect
5146
golang.org/x/mod v0.26.0 // indirect
5247
golang.org/x/net v0.43.0 // indirect
5348
golang.org/x/text v0.28.0 // indirect

‎engine/go.sum‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,15 @@ github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1x
44
github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
55
github.com/containerd/nri v0.10.0 h1:bt2NzfvlY6OJE0i+fB5WVeGQEycxY7iFVQpEbh7J3Go=
66
github.com/containerd/nri v0.10.0/go.mod h1:5VyvLa/4uL8FjyO8nis1UjbCutXDpngil17KvBSL6BU=
7-
github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
8-
github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
97
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
108
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
11-
github.com/docker/docker-auth/auth v0.0.1-beta h1:4kygrW5JPaDhcvYNN30pB++8JmulaoeYwCnP+BZadjQ=
12-
github.com/docker/docker-auth/auth v0.0.1-beta/go.mod h1:kRzMmGlgmGE5J0QtIKsX9Ygdo33OqhAUPAO+fhOvlP8=
139
github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
1410
github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
1511
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
1612
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
1713
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1814
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
1915
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
20-
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
21-
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
2216
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
2317
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
2418
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -37,8 +31,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
3731
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3832
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
3933
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
40-
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
41-
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
4234
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
4335
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
4436
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
@@ -63,8 +55,6 @@ go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOV
6355
go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
6456
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
6557
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
66-
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
67-
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
6858
golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
6959
golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
7060
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=

‎vendor/github.com/docker/docker-auth/auth/authstore/store.go‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎vendor/modules.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ github.com/docker/cli/opts
9292
github.com/docker/cli/pkg/kvfile
9393
# github.com/docker/distribution v2.8.3+incompatible
9494
## explicit
95-
# github.com/docker/docker-auth/auth v0.0.1-beta
96-
## explicit; go 1.24.4
97-
github.com/docker/docker-auth/auth/authstore
9895
# github.com/docker/docker-credential-helpers v0.9.4
9996
## explicit; go 1.21
10097
github.com/docker/docker-credential-helpers/client

0 commit comments

Comments
 (0)