move trust package to trust-plugin

thaJeztah · thaJeztah · commit 4711a7b6f8f9 · 2025-10-31T22:20:16.000+01:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cmd/docker-trust/internal/test/notary/client.go b/cmd/docker-trust/internal/test/notary/client.go
diff --git a/cmd/docker-trust/internal/trust/trust.go b/cmd/docker-trust/internal/trust/trust.go
diff --git a/cmd/docker-trust/internal/trust/trust_push.go b/cmd/docker-trust/internal/trust/trust_push.go
diff --git a/cmd/docker-trust/internal/trust/trust_tag.go b/cmd/docker-trust/internal/trust/trust_tag.go
diff --git a/cmd/docker-trust/internal/trust/trust_test.go b/cmd/docker-trust/internal/trust/trust_test.go
diff --git a/cmd/docker-trust/trust/common.go b/cmd/docker-trust/trust/common.go
@@ -10,7 +10,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/config"
 	"github.com/docker/cli/cli/config/configfile"
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/fvbommel/sortorder"
 	registrytypes "github.com/moby/moby/api/types/registry"
 	"github.com/sirupsen/logrus"
diff --git a/cmd/docker-trust/trust/common_test.go b/cmd/docker-trust/trust/common_test.go
@@ -3,7 +3,7 @@ package trust
 import (
 	"testing"
 
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/theupdateframework/notary/client"
 	"github.com/theupdateframework/notary/tuf/data"
 	"gotest.tools/v3/assert"
diff --git a/cmd/docker-trust/trust/helpers.go b/cmd/docker-trust/trust/helpers.go
@@ -3,7 +3,7 @@ package trust
 import (
 	"strings"
 
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/theupdateframework/notary/client"
 	"github.com/theupdateframework/notary/tuf/data"
 )
diff --git a/cmd/docker-trust/trust/inspect_pretty_test.go b/cmd/docker-trust/trust/inspect_pretty_test.go
@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/docker/cli/cli/trust"
+	notaryfake "github.com/docker/cli/cmd/docker-trust/internal/test/notary"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/docker/cli/internal/test"
-	notaryfake "github.com/docker/cli/internal/test/notary"
 	"github.com/moby/moby/client"
 	"github.com/theupdateframework/notary"
 	notaryclient "github.com/theupdateframework/notary/client"
diff --git a/cmd/docker-trust/trust/inspect_test.go b/cmd/docker-trust/trust/inspect_test.go
@@ -4,8 +4,8 @@ import (
 	"io"
 	"testing"
 
+	"github.com/docker/cli/cmd/docker-trust/internal/test/notary"
 	"github.com/docker/cli/internal/test"
-	"github.com/docker/cli/internal/test/notary"
 	"github.com/theupdateframework/notary/client"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/golden"
diff --git a/cmd/docker-trust/trust/key_generate.go b/cmd/docker-trust/trust/key_generate.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/docker/cli/internal/lazyregexp"
 	"github.com/spf13/cobra"
 	"github.com/theupdateframework/notary"
diff --git a/cmd/docker-trust/trust/key_load.go b/cmd/docker-trust/trust/key_load.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/spf13/cobra"
 	"github.com/theupdateframework/notary"
 	"github.com/theupdateframework/notary/storage"
diff --git a/cmd/docker-trust/trust/revoke.go b/cmd/docker-trust/trust/revoke.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/docker/cli/internal/prompt"
 	"github.com/spf13/cobra"
 	"github.com/theupdateframework/notary/client"
diff --git a/cmd/docker-trust/trust/revoke_test.go b/cmd/docker-trust/trust/revoke_test.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
+	"github.com/docker/cli/cmd/docker-trust/internal/test/notary"
 	"github.com/docker/cli/internal/test"
-	"github.com/docker/cli/internal/test/notary"
 	"github.com/theupdateframework/notary/client"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
diff --git a/cmd/docker-trust/trust/sign.go b/cmd/docker-trust/trust/sign.go
@@ -12,7 +12,7 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/moby/moby/api/pkg/authconfig"
 	"github.com/moby/moby/client"
 	"github.com/spf13/cobra"
diff --git a/cmd/docker-trust/trust/sign_test.go b/cmd/docker-trust/trust/sign_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/docker/cli/cli/config"
-	"github.com/docker/cli/cli/trust"
+	notaryfake "github.com/docker/cli/cmd/docker-trust/internal/test/notary"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/docker/cli/internal/test"
-	notaryfake "github.com/docker/cli/internal/test/notary"
 	"github.com/theupdateframework/notary"
 	"github.com/theupdateframework/notary/client"
 	"github.com/theupdateframework/notary/client/changelist"
diff --git a/cmd/docker-trust/trust/signer_add.go b/cmd/docker-trust/trust/signer_add.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/docker/cli/internal/lazyregexp"
 	"github.com/docker/cli/opts"
 	"github.com/spf13/cobra"
diff --git a/cmd/docker-trust/trust/signer_add_test.go b/cmd/docker-trust/trust/signer_add_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/docker/cli/cli/config"
+	notaryfake "github.com/docker/cli/cmd/docker-trust/internal/test/notary"
 	"github.com/docker/cli/internal/test"
-	notaryfake "github.com/docker/cli/internal/test/notary"
 	"github.com/theupdateframework/notary"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
diff --git a/cmd/docker-trust/trust/signer_remove.go b/cmd/docker-trust/trust/signer_remove.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/cli/cli/trust"
+	"github.com/docker/cli/cmd/docker-trust/internal/trust"
 	"github.com/docker/cli/internal/prompt"
 	"github.com/spf13/cobra"
 	"github.com/theupdateframework/notary/client"
diff --git a/cmd/docker-trust/trust/signer_remove_test.go b/cmd/docker-trust/trust/signer_remove_test.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
+	notaryfake "github.com/docker/cli/cmd/docker-trust/internal/test/notary"
 	"github.com/docker/cli/internal/test"
-	notaryfake "github.com/docker/cli/internal/test/notary"
 	"github.com/theupdateframework/notary/client"
 	"github.com/theupdateframework/notary/tuf/data"
 	"gotest.tools/v3/assert"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package trust`
`3`	`3`	`import (`
`4`	`4`	`"strings"`
`5`	`5`
`6`		`- "github.com/docker/cli/cli/trust"`
	`6`	`+ "github.com/docker/cli/cmd/docker-trust/internal/trust"`
`7`	`7`	`"github.com/theupdateframework/notary/client"`
`8`	`8`	`"github.com/theupdateframework/notary/tuf/data"`
`9`	`9`	`)`