Move first batch of ext-suffixed packages to standard with x prefix (#3838)

Author: bufdev

.golangci.yml

@@ -49,7 +49,7 @@ linters:
       forbid:
         # Use private/pkg/thread.Parallelize
         - pattern: ^errgroup\.
-        # Use private/pkg/execext
+        # Use private/pkg/standard/xos/xexec
         - pattern: ^exec\.Cmd$
         - pattern: ^exec\.Command$
         - pattern: ^exec\.CommandContext$
@@ -229,7 +229,7 @@ linters:
       - linters:
           - containedctx
         # we actually want to embed a context here
-        path: private/pkg/execext/process.go
+        path: private/pkg/standard/xos/xexec/process.go
       - linters:
           - gochecknoinits
         # we actually want to use init here
@@ -242,15 +242,15 @@ linters:
       - linters:
           - forbidigo
         # this is one of two files we want to allow exec.Cmd functions in
-        path: private/pkg/execext/execext.go
+        path: private/pkg/standard/xos/xexec/xexec.go
       - linters:
           - forbidigo
         # this is one of two files we want to allow exec.Cmd functions in
-        path: private/pkg/execext/process.go
+        path: private/pkg/standard/xos/xexec/process.go
       - linters:
           - gosec
         # G204 checks that exec.Command is not called with non-constants.
-        path: private/pkg/execext/execext.go
+        path: private/pkg/standard/xos/xexec/xexec.go
         text: 'G204:'
       - linters:
           - gosec
@@ -273,6 +273,11 @@ linters:
         # We cache os.Getwd in osext, osext has a Chdir that clears the cache.
         path: private/pkg/osext/osext.go
         text: os.Chdir
+      - linters:
+          - forbidigo
+        # We're going to move xfilepath out.
+        path: private/pkg/standard/xpath/xfilepath/xfilepath.go
+        text: os.Getwd
       - linters:
           - gochecknoinits
         # protoencoding calls detrand.Disable via go:linkname and and init function. See the comments

private/buf/bufcli/flags_args.go

@@ -24,7 +24,7 @@ import (
 	"buf.build/go/app"
 	"buf.build/go/app/appcmd"
 	"github.com/bufbuild/buf/private/buf/buffetch"
-	"github.com/bufbuild/buf/private/pkg/stringutil"
+	"github.com/bufbuild/buf/private/pkg/standard/xstrings"
 	"github.com/spf13/pflag"
 )
 
@@ -154,7 +154,7 @@ func BindVisibility(flagSet *pflag.FlagSet, addr *string, flagName string, empty
 		addr,
 		flagName,
 		defaultVisibility,
-		fmt.Sprintf(`The module's visibility setting. Must be one of %s`, stringutil.SliceToString(allVisibilityStrings)),
+		fmt.Sprintf(`The module's visibility setting. Must be one of %s`, xstrings.SliceToString(allVisibilityStrings)),
 	)
 }
 
@@ -165,7 +165,7 @@ func BindCreateVisibility(flagSet *pflag.FlagSet, addr *string, flagName string,
 		addr,
 		flagName,
 		privateVisibility,
-		fmt.Sprintf(`The module's visibility setting, if created. Can only be set with --%s. Must be one of %s`, createFlagName, stringutil.SliceToString(allVisibilityStrings)),
+		fmt.Sprintf(`The module's visibility setting, if created. Can only be set with --%s. Must be one of %s`, createFlagName, xstrings.SliceToString(allVisibilityStrings)),
 	)
 }
 
@@ -176,7 +176,7 @@ func BindArchiveStatus(flagSet *pflag.FlagSet, addr *string, flagName string) {
 		addr,
 		flagName,
 		DefaultArchiveStatus,
-		fmt.Sprintf(`The archive status of the labels listed. Must be one of %s`, stringutil.SliceToString(allArchiveStatusStrings)),
+		fmt.Sprintf(`The archive status of the labels listed. Must be one of %s`, xstrings.SliceToString(allArchiveStatusStrings)),
 	)
 }
 

private/buf/bufctl/controller.go

@@ -45,10 +45,10 @@ import (
 	imagev1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/image/v1"
 	"github.com/bufbuild/buf/private/pkg/git"
 	"github.com/bufbuild/buf/private/pkg/httpauth"
-	"github.com/bufbuild/buf/private/pkg/ioext"
 	"github.com/bufbuild/buf/private/pkg/normalpath"
 	"github.com/bufbuild/buf/private/pkg/protoencoding"
-	"github.com/bufbuild/buf/private/pkg/slicesext"
+	"github.com/bufbuild/buf/private/pkg/standard/xio"
+	"github.com/bufbuild/buf/private/pkg/standard/xslices"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
 	"github.com/bufbuild/buf/private/pkg/syserror"
 	"github.com/bufbuild/buf/private/pkg/wasm"
@@ -726,7 +726,7 @@ func (c *controller) GetMessage(
 	if err != nil {
 		return nil, 0, err
 	}
-	data, err := ioext.ReadAllAndClose(readCloser)
+	data, err := xio.ReadAllAndClose(readCloser)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -1205,13 +1205,13 @@ func (c *controller) warnUnconfiguredTransitiveImports(
 	// First, figure out if we have a local module. If we don't, just return - the Workspace
 	// was purely built from remote Modules, and therefore buf.yaml configured dependencies
 	// do not apply.
-	if slicesext.Count(workspace.Modules(), bufmodule.Module.IsLocal) == 0 {
+	if xslices.Count(workspace.Modules(), bufmodule.Module.IsLocal) == 0 {
 		return nil
 	}
 	// Construct a struct map of all the FullName strings of the configured buf.yaml
 	// Module dependencies, and the local Modules. These are considered OK to depend on
 	// for non-imports in the Image.
-	configuredFullNameStrings, err := slicesext.MapError(
+	configuredFullNameStrings, err := xslices.MapError(
 		workspace.ConfiguredDepModuleRefs(),
 		func(moduleRef bufparse.Ref) (string, error) {
 			moduleFullName := moduleRef.FullName()
@@ -1224,7 +1224,7 @@ func (c *controller) warnUnconfiguredTransitiveImports(
 	if err != nil {
 		return err
 	}
-	configuredFullNameStringMap := slicesext.ToStructMap(configuredFullNameStrings)
+	configuredFullNameStringMap := xslices.ToStructMap(configuredFullNameStrings)
 	for _, localModule := range bufmodule.ModuleSetLocalModules(workspace) {
 		if moduleFullName := localModule.FullName(); moduleFullName != nil {
 			configuredFullNameStringMap[moduleFullName.String()] = struct{}{}
@@ -1314,7 +1314,7 @@ func getImageFileInfosForModuleSet(ctx context.Context, moduleSet bufmodule.Modu
 	if err != nil {
 		return nil, err
 	}
-	return slicesext.Map(
+	return xslices.Map(
 		fileInfos,
 		func(fileInfo bufmodule.FileInfo) bufimage.ImageFileInfo {
 			return bufimage.ImageFileInfoForModuleFileInfo(fileInfo)
@@ -1478,15 +1478,15 @@ func newStaticPluginKeyProviderForPluginConfigs(
 	pluginKeys []bufplugin.PluginKey,
 ) (_ bufplugin.PluginKeyProvider, retErr error) {
 	// Validate that all remote PluginConfigs are present in the buf.lock file.
-	pluginKeysByFullName, err := slicesext.ToUniqueValuesMap(pluginKeys, func(pluginKey bufplugin.PluginKey) string {
+	pluginKeysByFullName, err := xslices.ToUniqueValuesMap(pluginKeys, func(pluginKey bufplugin.PluginKey) string {
 		return pluginKey.FullName().String()
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to validate remote PluginKeys: %w", err)
 	}
 	// Remote PluginConfig Refs are any PluginConfigs that have a Ref.
-	remotePluginRefs := slicesext.Filter(
-		slicesext.Map(pluginConfigs, func(pluginConfig bufconfig.PluginConfig) bufparse.Ref {
+	remotePluginRefs := xslices.Filter(
+		xslices.Map(pluginConfigs, func(pluginConfig bufconfig.PluginConfig) bufparse.Ref {
 			return pluginConfig.Ref()
 		}),
 		func(pluginRef bufparse.Ref) bool {

private/buf/buffetch/buffetch.go

@@ -29,8 +29,8 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
 	"github.com/bufbuild/buf/private/pkg/git"
 	"github.com/bufbuild/buf/private/pkg/httpauth"
+	"github.com/bufbuild/buf/private/pkg/standard/xstrings"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
-	"github.com/bufbuild/buf/private/pkg/stringutil"
 )
 
 const (
@@ -51,34 +51,34 @@ var (
 	// MessageFormatsString is the string representation of all message formats.
 	//
 	// This does not include deprecated formats.
-	MessageFormatsString = stringutil.SliceToString(messageFormatsNotDeprecated)
+	MessageFormatsString = xstrings.SliceToString(messageFormatsNotDeprecated)
 	// SourceDirFormatsString is the string representation of all source directory formats.
 	// This includes all of the formats in SourceFormatsString except the protofile format.
 	//
 	// This does not include deprecated formats.
-	SourceDirFormatsString = stringutil.SliceToString(sourceDirFormatsNotDeprecated)
+	SourceDirFormatsString = xstrings.SliceToString(sourceDirFormatsNotDeprecated)
 	// SourceFormatsString is the string representation of all source formats.
 	//
 	// This does not include deprecated formats.
-	SourceFormatsString = stringutil.SliceToString(sourceFormatsNotDeprecated)
+	SourceFormatsString = xstrings.SliceToString(sourceFormatsNotDeprecated)
 	// ModuleFormatsString is the string representation of all module formats.
 	//
 	// Module formats are also source formats.
 	//
 	// This does not include deprecated formats.
-	ModuleFormatsString = stringutil.SliceToString(moduleFormatsNotDeprecated)
+	ModuleFormatsString = xstrings.SliceToString(moduleFormatsNotDeprecated)
 	// SourceOrModuleFormatsString is the string representation of all source or module formats.
 	//
 	// This does not include deprecated formats.
-	SourceOrModuleFormatsString = stringutil.SliceToString(sourceOrModuleFormatsNotDeprecated)
+	SourceOrModuleFormatsString = xstrings.SliceToString(sourceOrModuleFormatsNotDeprecated)
 	// DirOrProtoFileFormatsString is the string representation of all dir or proto file formats.
 	//
 	// This does not include deprecated formats.
-	DirOrProtoFileFormatsString = stringutil.SliceToString(dirOrProtoFileFormats)
+	DirOrProtoFileFormatsString = xstrings.SliceToString(dirOrProtoFileFormats)
 	// AllFormatsString is the string representation of all formats.
 	//
 	// This does not include deprecated formats.
-	AllFormatsString = stringutil.SliceToString(allFormatsNotDeprecated)
+	AllFormatsString = xstrings.SliceToString(allFormatsNotDeprecated)
 
 	// ErrModuleFormatDetectedForDirOrProtoFileRef is the error returned if a module is the
 	// detected format in the DirOrProtoFileRefParser. We have a special heuristic to determine

private/buf/buffetch/internal/dir_ref.go

@@ -18,8 +18,8 @@ import (
 	"strings"
 
 	"buf.build/go/app"
-	"github.com/bufbuild/buf/private/pkg/filepathext"
 	"github.com/bufbuild/buf/private/pkg/normalpath"
+	"github.com/bufbuild/buf/private/pkg/standard/xpath/xfilepath"
 )
 
 var (
@@ -47,7 +47,7 @@ func newDirRef(
 	if strings.Contains(path, "://") {
 		return nil, NewInvalidPathError(format, path)
 	}
-	path, err := filepathext.RealClean(path)
+	path, err := xfilepath.RealClean(path)
 	if err != nil {
 		return nil, NewRealCleanPathError(path)
 	}

private/buf/buffetch/internal/proto_file_writer.go

@@ -23,8 +23,8 @@ import (
 	"os"
 
 	"buf.build/go/app"
-	"github.com/bufbuild/buf/private/pkg/ioext"
 	"github.com/bufbuild/buf/private/pkg/normalpath"
+	"github.com/bufbuild/buf/private/pkg/standard/xio"
 )
 
 type protoFileWriter struct {
@@ -62,11 +62,11 @@ func (w *protoFileWriter) PutProtoFile(
 		// This was in the old formatter, just keeping as-is for now instead of using os.Create.
 		return os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 	case FileSchemeStdio, FileSchemeStdout:
-		return ioext.NopWriteCloser(container.Stdout()), nil
+		return xio.NopWriteCloser(container.Stdout()), nil
 	case FileSchemeStdin:
 		return nil, errors.New("cannot write to stdin")
 	case FileSchemeNull:
-		return ioext.DiscardWriteCloser, nil
+		return xio.DiscardWriteCloser, nil
 	default:
 		return nil, fmt.Errorf("unknown FileScheme: %v", fileScheme)
 	}

private/buf/buffetch/internal/reader.go

@@ -32,10 +32,10 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufparse"
 	"github.com/bufbuild/buf/private/pkg/git"
 	"github.com/bufbuild/buf/private/pkg/httpauth"
-	"github.com/bufbuild/buf/private/pkg/ioext"
 	"github.com/bufbuild/buf/private/pkg/normalpath"
 	"github.com/bufbuild/buf/private/pkg/osext"
-	"github.com/bufbuild/buf/private/pkg/slicesext"
+	"github.com/bufbuild/buf/private/pkg/standard/xio"
+	"github.com/bufbuild/buf/private/pkg/standard/xslices"
 	"github.com/bufbuild/buf/private/pkg/storage"
 	"github.com/bufbuild/buf/private/pkg/storage/storagearchive"
 	"github.com/bufbuild/buf/private/pkg/storage/storagemem"
@@ -272,7 +272,7 @@ func (r *reader) getArchiveBucket(
 			readerAt = bytes.NewReader(data)
 			size = int64(len(data))
 		} else {
-			readerAt, err = ioext.ReaderAtForReader(readCloser)
+			readerAt, err = xio.ReaderAtForReader(readCloser)
 			if err != nil {
 				return nil, nil, err
 			}
@@ -438,9 +438,9 @@ func (r *reader) getFileReadCloserAndSize(
 		if err != nil {
 			return nil, -1, err
 		}
-		return ioext.CompositeReadCloser(
+		return xio.CompositeReadCloser(
 			gzipReadCloser,
-			ioext.ChainCloser(
+			xio.ChainCloser(
 				gzipReadCloser,
 				readCloser,
 			),
@@ -451,9 +451,9 @@ func (r *reader) getFileReadCloserAndSize(
 			return nil, -1, err
 		}
 		zstdReadCloser := zstdDecoder.IOReadCloser()
-		return ioext.CompositeReadCloser(
+		return xio.CompositeReadCloser(
 			zstdReadCloser,
-			ioext.ChainCloser(
+			xio.ChainCloser(
 				zstdReadCloser,
 				readCloser,
 			),
@@ -501,7 +501,7 @@ func (r *reader) getFileReadCloserAndSizePotentiallyCompressed(
 	case FileSchemeStdout:
 		return nil, -1, errors.New("cannot read from stdout")
 	case FileSchemeNull:
-		return ioext.DiscardReadCloser, 0, nil
+		return xio.DiscardReadCloser, 0, nil
 	default:
 		return nil, -1, fmt.Errorf("unknown FileScheme: %v", fileScheme)
 	}
@@ -901,13 +901,13 @@ func validatePaths(
 	if _, err := normalpath.NormalizeAndValidate(inputSubDirPath); err != nil {
 		return err
 	}
-	if _, err := slicesext.MapError(
+	if _, err := xslices.MapError(
 		targetPaths,
 		normalpath.NormalizeAndValidate,
 	); err != nil {
 		return err
 	}
-	if _, err := slicesext.MapError(
+	if _, err := xslices.MapError(
 		targetPaths,
 		normalpath.NormalizeAndValidate,
 	); err != nil {
@@ -925,13 +925,13 @@ func mapTargetPathsAndTargetExcludePathsForArchiveAndGitRefs(
 	if inputSubDirPath == "." {
 		return targetPaths, targetExcludePaths
 	}
-	return slicesext.Map(
+	return xslices.Map(
 			targetPaths,
 			func(targetPath string) string {
 				return normalpath.Join(inputSubDirPath, targetPath)
 			},
 		),
-		slicesext.Map(
+		xslices.Map(
 			targetExcludePaths,
 			func(targetExcludePath string) string {
 				return normalpath.Join(inputSubDirPath, targetExcludePath)

private/buf/buffetch/internal/writer.go

@@ -24,7 +24,7 @@ import (
 	"os"
 
 	"buf.build/go/app"
-	"github.com/bufbuild/buf/private/pkg/ioext"
+	"github.com/bufbuild/buf/private/pkg/standard/xio"
 	"github.com/klauspost/compress/zstd"
 )
 
@@ -121,9 +121,9 @@ func (w *writer) putFileWriteCloser(
 		return writeCloser, nil
 	case CompressionTypeGzip:
 		gzipWriteCloser := gzip.NewWriter(writeCloser)
-		return ioext.CompositeWriteCloser(
+		return xio.CompositeWriteCloser(
 			gzipWriteCloser,
-			ioext.ChainCloser(
+			xio.ChainCloser(
 				gzipWriteCloser,
 				writeCloser,
 			),
@@ -133,9 +133,9 @@ func (w *writer) putFileWriteCloser(
 		if err != nil {
 			return nil, err
 		}
-		return ioext.CompositeWriteCloser(
+		return xio.CompositeWriteCloser(
 			zstdWriteCloser,
-			ioext.ChainCloser(
+			xio.ChainCloser(
 				zstdWriteCloser,
 				writeCloser,
 			),
@@ -170,11 +170,11 @@ func (w *writer) putFileWriteCloserPotentiallyUncompressed(
 		if !w.stdioEnabled {
 			return nil, NewWriteStdioDisabledError()
 		}
-		return ioext.NopWriteCloser(container.Stdout()), nil
+		return xio.NopWriteCloser(container.Stdout()), nil
 	case FileSchemeStdin:
 		return nil, errors.New("cannot write to stdin")
 	case FileSchemeNull:
-		return ioext.DiscardWriteCloser, nil
+		return xio.DiscardWriteCloser, nil
 	default:
 		return nil, fmt.Errorf("unknown FileScheme: %v", fileScheme)
 	}