[chore] Move set from internal to pkg (#3129)

dominikschulz · web-flow · commit 1e05f6a61821 · 2025-04-19T20:29:24.000+02:00
Signed-off-by: Dominik Schulz &lt;dominik.schulz@gauner.org&gt;
diff --git a/internal/action/clone.go b/internal/action/clone.go
@@ -14,11 +14,11 @@ import (
 	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/cui"
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/internal/store/root"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/debug"
 	"github.com/gopasspw/gopass/pkg/fsutil"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/urfave/cli/v2"
 )
diff --git a/internal/action/commands.go b/internal/action/commands.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/gopasspw/gopass/internal/backend"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/internal/action/config.go b/internal/action/config.go
@@ -7,9 +7,9 @@ import (
 	"github.com/gopasspw/gopass/internal/action/exit"
 	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/internal/action/mount.go b/internal/action/mount.go
@@ -13,12 +13,12 @@ import (
 	"github.com/gopasspw/gopass/internal/backend"
 	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/internal/store"
 	"github.com/gopasspw/gopass/internal/store/root"
 	"github.com/gopasspw/gopass/internal/tree"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/internal/action/recipients.go b/internal/action/recipients.go
@@ -8,10 +8,10 @@ import (
 	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/cui"
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/internal/tree"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/urfave/cli/v2"
 )
diff --git a/internal/audit/output.go b/internal/audit/output.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/internal/tpl"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 func (r *Report) PrintResults(ctx context.Context) error {
diff --git a/internal/audit/report.go b/internal/audit/report.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/gopasspw/gopass/internal/hashsum"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 type Finding struct {
diff --git a/internal/backend/crypto/age/recipients.go b/internal/backend/crypto/age/recipients.go
@@ -8,8 +8,8 @@ import (
 	"filippo.io/age/agessh"
 	"filippo.io/age/plugin"
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 // FindRecipients returns all list of usable recipient key IDs matching the search strings.
diff --git a/internal/backend/registry.go b/internal/backend/registry.go
@@ -8,7 +8,7 @@ import (
 	"slices"
 	"sync"
 
-	"github.com/gopasspw/gopass/internal/set"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 var (
diff --git a/internal/backend/storage/fossilfs/status.go b/internal/backend/storage/fossilfs/status.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/gopasspw/gopass/internal/set"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 type fossilStatus struct {
diff --git a/internal/config/docs_test.go b/internal/config/docs_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gopasspw/gopass/internal/set"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 // ignoredEnvs is a list of environment variables that are used by gopass
diff --git a/internal/config/legacy/io.go b/internal/config/legacy/io.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/debug"
 	"github.com/gopasspw/gopass/pkg/fsutil"
+	"github.com/gopasspw/gopass/pkg/set"
 	"gopkg.in/yaml.v3"
 )
 
diff --git a/internal/create/wizard.go b/internal/create/wizard.go
@@ -16,7 +16,6 @@ import (
 	"github.com/gopasspw/gopass/internal/editor"
 	"github.com/gopasspw/gopass/internal/hook"
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/internal/store/root"
 	"github.com/gopasspw/gopass/internal/tpl"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
@@ -25,6 +24,7 @@ import (
 	"github.com/gopasspw/gopass/pkg/gopass/secrets"
 	"github.com/gopasspw/gopass/pkg/pwgen"
 	"github.com/gopasspw/gopass/pkg/pwgen/pwrules"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/gopasspw/gopass/pkg/termio"
 	"github.com/martinhoefling/goxkcdpwgen/xkcdpwgen"
 	"github.com/urfave/cli/v2"
diff --git a/internal/recipients/recipients.go b/internal/recipients/recipients.go
@@ -9,7 +9,7 @@ import (
 	"encoding/hex"
 	"strings"
 
-	"github.com/gopasspw/gopass/internal/set"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 // Recipients is a list of Key IDs. It will try to retain the file as much as possible while manipulating the recipients.
diff --git a/internal/store/leaf/recipients.go b/internal/store/leaf/recipients.go
@@ -12,10 +12,10 @@ import (
 	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
 	"github.com/gopasspw/gopass/internal/recipients"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/internal/store"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/gopasspw/gopass/pkg/termio"
 )
 
diff --git a/internal/store/leaf/store.go b/internal/store/leaf/store.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"github.com/gopasspw/gopass/internal/backend"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 // Store is a password store.
diff --git a/internal/store/mockstore/inmem/store.go b/internal/store/mockstore/inmem/store.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/blang/semver/v4"
 	"github.com/gopasspw/gopass/internal/backend"
-	"github.com/gopasspw/gopass/internal/set"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 // InMem is a thread-safe in-memory store.
diff --git a/main_test.go b/main_test.go
@@ -16,8 +16,8 @@ import (
 	"github.com/gopasspw/gopass/internal/backend/crypto/gpg"
 	"github.com/gopasspw/gopass/internal/config"
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/ctxutil"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/gopasspw/gopass/tests/gptest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/gitconfig/config_test.go b/pkg/gitconfig/config_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gopasspw/gopass/internal/set"
+	"github.com/gopasspw/gopass/pkg/set"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pkg/gitconfig/configs.go b/pkg/gitconfig/configs.go
@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/appdir"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 // Configs is a container for a config "view" that is composed of several different
diff --git a/pkg/gopass/secrets/akv.go b/pkg/gopass/secrets/akv.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 var kvSep = ": "
diff --git a/pkg/gopass/secrets/yaml.go b/pkg/gopass/secrets/yaml.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/caspr-io/yamlpath"
 	"github.com/gopasspw/gopass/internal/out"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/debug"
 	"github.com/gopasspw/gopass/pkg/gopass"
+	"github.com/gopasspw/gopass/pkg/set"
 	yaml "gopkg.in/yaml.v3"
 )
 
diff --git a/pkg/pwgen/pwrules/aliases.go b/pkg/pwgen/pwrules/aliases.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/gopasspw/gopass/internal/config"
-	"github.com/gopasspw/gopass/internal/set"
 	"github.com/gopasspw/gopass/pkg/debug"
+	"github.com/gopasspw/gopass/pkg/set"
 )
 
 // LookupAliases looks up known aliases for the given domain.
diff --git a/pkg/set/filter.go b/pkg/set/filter.go
diff --git a/pkg/set/filter_test.go b/pkg/set/filter_test.go
diff --git a/pkg/set/map.go b/pkg/set/map.go
diff --git a/pkg/set/map_test.go b/pkg/set/map_test.go
diff --git a/pkg/set/set.go b/pkg/set/set.go
diff --git a/pkg/set/set_test.go b/pkg/set/set_test.go
diff --git a/pkg/set/sorted.go b/pkg/set/sorted.go
diff --git a/pkg/set/sorted_test.go b/pkg/set/sorted_test.go

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`"github.com/gopasspw/gopass/internal/backend"`
`7`		`- "github.com/gopasspw/gopass/internal/set"`
`8`	`7`	`"github.com/gopasspw/gopass/pkg/debug"`
	`8`	`+ "github.com/gopasspw/gopass/pkg/set"`
`9`	`9`	`"github.com/urfave/cli/v2"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import (`
`12`	`12`	`"time"`
`13`	`13`
`14`	`14`	`"github.com/gopasspw/gopass/internal/out"`
`15`		`- "github.com/gopasspw/gopass/internal/set"`
`16`	`15`	`"github.com/gopasspw/gopass/internal/tpl"`
`17`	`16`	`"github.com/gopasspw/gopass/pkg/debug"`
	`17`	`+ "github.com/gopasspw/gopass/pkg/set"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func (r *Report) PrintResults(ctx context.Context) error {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"time"`
`7`	`7`
`8`	`8`	`"github.com/gopasspw/gopass/internal/hashsum"`
`9`		`- "github.com/gopasspw/gopass/internal/set"`
`10`	`9`	`"github.com/gopasspw/gopass/pkg/debug"`
	`10`	`+ "github.com/gopasspw/gopass/pkg/set"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type Finding struct {`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"filippo.io/age/agessh"`
`9`	`9`	`"filippo.io/age/plugin"`
`10`	`10`	`"github.com/gopasspw/gopass/internal/out"`
`11`		`- "github.com/gopasspw/gopass/internal/set"`
`12`	`11`	`"github.com/gopasspw/gopass/pkg/debug"`
	`12`	`+ "github.com/gopasspw/gopass/pkg/set"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// FindRecipients returns all list of usable recipient key IDs matching the search strings.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"slices"`
`9`	`9`	`"sync"`
`10`	`10`
`11`		`- "github.com/gopasspw/gopass/internal/set"`
	`11`	`+ "github.com/gopasspw/gopass/pkg/set"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"strings"`
`6`	`6`
`7`		`- "github.com/gopasspw/gopass/internal/set"`
	`7`	`+ "github.com/gopasspw/gopass/pkg/set"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type fossilStatus struct {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"strings"`
`10`	`10`	`"testing"`
`11`	`11`
`12`		`- "github.com/gopasspw/gopass/internal/set"`
	`12`	`+ "github.com/gopasspw/gopass/pkg/set"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// ignoredEnvs is a list of environment variables that are used by gopass`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ import (`
`6`	`6`	`"os"`
`7`	`7`	`"path/filepath"`
`8`	`8`
`9`		`- "github.com/gopasspw/gopass/internal/set"`
`10`	`9`	`"github.com/gopasspw/gopass/pkg/debug"`
`11`	`10`	`"github.com/gopasspw/gopass/pkg/fsutil"`
	`11`	`+ "github.com/gopasspw/gopass/pkg/set"`
`12`	`12`	`"gopkg.in/yaml.v3"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"encoding/hex"`
`10`	`10`	`"strings"`
`11`	`11`
`12`		`- "github.com/gopasspw/gopass/internal/set"`
	`12`	`+ "github.com/gopasspw/gopass/pkg/set"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// Recipients is a list of Key IDs. It will try to retain the file as much as possible while manipulating the recipients.`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"strings"`
`11`	`11`
`12`	`12`	`"github.com/gopasspw/gopass/internal/backend"`
`13`		`- "github.com/gopasspw/gopass/internal/set"`
`14`	`13`	`"github.com/gopasspw/gopass/pkg/debug"`
	`14`	`+ "github.com/gopasspw/gopass/pkg/set"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// Store is a password store.`