Merge pull request #416 from docker/pass/fix

joe0BAB · web-flow · commit 334210fa64ab · 2026-01-16T10:59:28.000+01:00
fix: properly rename pass module to plugins/pass
diff --git a/client/.gomodguard.yaml b/client/.gomodguard.yaml
@@ -5,9 +5,9 @@ blocked:
         reason: "Forbidden dependency"
     - github.com/docker/secrets-engine/injector:
         reason: "Forbidden dependency"
-    - github.com/docker/secrets-engine/pass:
-        reason: "Forbidden dependency"
     - github.com/docker/secrets-engine/plugin:
         reason: "Forbidden dependency"
+    - github.com/docker/secrets-engine/plugins/pass:
+        reason: "Forbidden dependency"
     - github.com/docker/secrets-engine/store:
         reason: "Forbidden dependency"
diff --git a/go.work.sum b/go.work.sum
@@ -19,6 +19,7 @@ github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1Ig
 github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
 github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
 github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
+github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v29.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -133,4 +134,5 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
diff --git a/plugin/.gomodguard.yaml b/plugin/.gomodguard.yaml
@@ -7,7 +7,7 @@ blocked:
         reason: "Forbidden dependency"
     - github.com/docker/secrets-engine/injector:
         reason: "Forbidden dependency"
-    - github.com/docker/secrets-engine/pass:
+    - github.com/docker/secrets-engine/plugins/pass:
         reason: "Forbidden dependency"
     - github.com/docker/secrets-engine/store:
         reason: "Forbidden dependency"
diff --git a/plugins/pass/command.go b/plugins/pass/command.go
@@ -13,7 +13,7 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/term"
 
-	"github.com/docker/secrets-engine/pass/commands"
+	"github.com/docker/secrets-engine/plugins/pass/commands"
 	"github.com/docker/secrets-engine/store"
 )
 
@@ -64,8 +64,8 @@ func Root(ctx context.Context, s store.Store, info commands.VersionInfo) *cobra.
 }
 
 const (
-	meterName  = "github.com/docker/secrets-engine/pass"
-	tracerName = "github.com/docker/secrets-engine/pass"
+	meterName  = "github.com/docker/secrets-engine/plugins/pass"
+	tracerName = "github.com/docker/secrets-engine/plugins/pass"
 )
 
 func int64counter(counter string, opts ...metric.Int64CounterOption) metric.Int64Counter {
diff --git a/plugins/pass/command_test.go b/plugins/pass/command_test.go
@@ -11,9 +11,9 @@ import (
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 
-	"github.com/docker/secrets-engine/pass/commands"
-	pass "github.com/docker/secrets-engine/pass/store"
-	"github.com/docker/secrets-engine/pass/teststore"
+	"github.com/docker/secrets-engine/plugins/pass/commands"
+	pass "github.com/docker/secrets-engine/plugins/pass/store"
+	"github.com/docker/secrets-engine/plugins/pass/teststore"
 	"github.com/docker/secrets-engine/store"
 	"github.com/docker/secrets-engine/x/secrets"
 	"github.com/docker/secrets-engine/x/testhelper"
diff --git a/plugins/pass/commands/get.go b/plugins/pass/commands/get.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	pass "github.com/docker/secrets-engine/pass/store"
+	pass "github.com/docker/secrets-engine/plugins/pass/store"
 	"github.com/docker/secrets-engine/store"
 )
 
diff --git a/plugins/pass/commands/set.go b/plugins/pass/commands/set.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	pass "github.com/docker/secrets-engine/pass/store"
+	pass "github.com/docker/secrets-engine/plugins/pass/store"
 	"github.com/docker/secrets-engine/store"
 	"github.com/docker/secrets-engine/x/secrets"
 )
diff --git a/plugins/pass/go.mod b/plugins/pass/go.mod
@@ -1,4 +1,4 @@
-module github.com/docker/secrets-engine/pass
+module github.com/docker/secrets-engine/plugins/pass
 
 go 1.25.0
 
diff --git a/plugins/pass/plugin.go b/plugins/pass/plugin.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	pass "github.com/docker/secrets-engine/pass/store"
 	"github.com/docker/secrets-engine/plugin"
+	pass "github.com/docker/secrets-engine/plugins/pass/store"
 	"github.com/docker/secrets-engine/store"
 )
 
diff --git a/plugins/pass/plugin_test.go b/plugins/pass/plugin_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	pass "github.com/docker/secrets-engine/pass/store"
-	"github.com/docker/secrets-engine/pass/teststore"
+	pass "github.com/docker/secrets-engine/plugins/pass/store"
+	"github.com/docker/secrets-engine/plugins/pass/teststore"
 	"github.com/docker/secrets-engine/store"
 	"github.com/docker/secrets-engine/x/secrets"
 	"github.com/docker/secrets-engine/x/testhelper"
diff --git a/store/.gomodguard.yaml b/store/.gomodguard.yaml
@@ -7,7 +7,7 @@ blocked:
         reason: "Forbidden dependency"
     - github.com/docker/secrets-engine/injector:
         reason: "Forbidden dependency"
-    - github.com/docker/secrets-engine/pass:
-        reason: "Forbidden dependency"
     - github.com/docker/secrets-engine/plugin:
+        reason: "Forbidden dependency"
+    - github.com/docker/secrets-engine/plugins/pass:
         reason: "Forbidden dependency"
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -109,12 +109,12 @@ github.com/docker/go-units
 ## explicit; go 1.25
 # github.com/docker/secrets-engine/engine v0.0.28 => ./engine
 ## explicit; go 1.25.0
-# github.com/docker/secrets-engine/pass v0.0.15 => ./plugins/pass
-## explicit; go 1.25.0
 # github.com/docker/secrets-engine/plugin v0.0.19 => ./plugin
 ## explicit; go 1.25
 # github.com/docker/secrets-engine/plugins/credentialhelper v0.0.4 => ./plugins/credentialhelper
 ## explicit; go 1.25.0
+# github.com/docker/secrets-engine/plugins/pass v0.0.16 => ./plugins/pass
+## explicit; go 1.25.0
 # github.com/docker/secrets-engine/store v0.0.17 => ./store
 ## explicit; go 1.25
 # github.com/docker/secrets-engine/x v0.0.12-do.not.use => ./x

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"go.opentelemetry.io/otel/trace"`
`14`	`14`	`"golang.org/x/term"`
`15`	`15`
`16`		`- "github.com/docker/secrets-engine/pass/commands"`
	`16`	`+ "github.com/docker/secrets-engine/plugins/pass/commands"`
`17`	`17`	`"github.com/docker/secrets-engine/store"`
`18`	`18`	`)`
`19`	`19`
`@@ -64,8 +64,8 @@ func Root(ctx context.Context, s store.Store, info commands.VersionInfo) *cobra.`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`const (`
`67`		`- meterName = "github.com/docker/secrets-engine/pass"`
`68`		`- tracerName = "github.com/docker/secrets-engine/pass"`
	`67`	`+ meterName = "github.com/docker/secrets-engine/plugins/pass"`
	`68`	`+ tracerName = "github.com/docker/secrets-engine/plugins/pass"`
`69`	`69`	`)`
`70`	`70`
`71`	`71`	`func int64counter(counter string, opts ...metric.Int64CounterOption) metric.Int64Counter {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/spf13/cobra"`
`7`	`7`
`8`		`- pass "github.com/docker/secrets-engine/pass/store"`
	`8`	`+ pass "github.com/docker/secrets-engine/plugins/pass/store"`
`9`	`9`	`"github.com/docker/secrets-engine/store"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/spf13/cobra"`
`10`	`10`
`11`		`- pass "github.com/docker/secrets-engine/pass/store"`
	`11`	`+ pass "github.com/docker/secrets-engine/plugins/pass/store"`
`12`	`12`	`"github.com/docker/secrets-engine/store"`
`13`	`13`	`"github.com/docker/secrets-engine/x/secrets"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/docker/secrets-engine/pass`
	`1`	`+module github.com/docker/secrets-engine/plugins/pass`
`2`	`2`
`3`	`3`	`go 1.25.0`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"errors"`
`6`	`6`
`7`		`- pass "github.com/docker/secrets-engine/pass/store"`
`8`	`7`	`"github.com/docker/secrets-engine/plugin"`
	`8`	`+ pass "github.com/docker/secrets-engine/plugins/pass/store"`
`9`	`9`	`"github.com/docker/secrets-engine/store"`
`10`	`10`	`)`
`11`	`11`