Internalise utils

One day, utils will be cleaned up. Until then, we should reduce its exposure to the world.
buildkite · May 30, 2023 · 4d5792f · 4d5792f
1 parent 2e86655
commit 4d5792f
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 7 deletions.
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
@@ -24,11 +24,11 @@ import (
 	"github.com/buildkite/agent/v3/experiments"
 	"github.com/buildkite/agent/v3/hook"
 	"github.com/buildkite/agent/v3/internal/shellscript"
+	"github.com/buildkite/agent/v3/internal/utils"
 	"github.com/buildkite/agent/v3/kubernetes"
 	"github.com/buildkite/agent/v3/process"
 	"github.com/buildkite/agent/v3/redaction"
 	"github.com/buildkite/agent/v3/tracetools"
-	"github.com/buildkite/agent/v3/utils"
 	"github.com/buildkite/roko"
 	"github.com/buildkite/shellwords"
 )

diff --git a/clicommand/agent_start.go b/clicommand/agent_start.go
@@ -23,12 +23,12 @@ import (
 	"github.com/buildkite/agent/v3/experiments"
 	"github.com/buildkite/agent/v3/hook"
 	"github.com/buildkite/agent/v3/internal/agentapi"
+	"github.com/buildkite/agent/v3/internal/utils"
 	"github.com/buildkite/agent/v3/logger"
 	"github.com/buildkite/agent/v3/metrics"
 	"github.com/buildkite/agent/v3/process"
 	"github.com/buildkite/agent/v3/status"
 	"github.com/buildkite/agent/v3/tracetools"
-	"github.com/buildkite/agent/v3/utils"
 	"github.com/buildkite/agent/v3/version"
 	"github.com/buildkite/shellwords"
 	"github.com/mitchellh/go-homedir"

diff --git a/cliconfig/file.go b/cliconfig/file.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/buildkite/agent/v3/utils"
+	"github.com/buildkite/agent/v3/internal/utils"
 )
 
 type File struct {

diff --git a/cliconfig/loader.go b/cliconfig/loader.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/buildkite/agent/v3/internal/utils"
 	"github.com/buildkite/agent/v3/logger"
-	"github.com/buildkite/agent/v3/utils"
 	"github.com/oleiade/reflections"
 	"github.com/urfave/cli"
 )

diff --git a/hook/hook.go b/hook/hook.go
@@ -10,7 +10,7 @@ import (
 	"runtime"
 
 	"github.com/buildkite/agent/v3/bootstrap/shell"
-	"github.com/buildkite/agent/v3/utils"
+	"github.com/buildkite/agent/v3/internal/utils"
 )
 
 // Find returns the absolute path to the best matching hook file in a path, or

diff --git a/hook/scriptwrapper.go b/hook/scriptwrapper.go
@@ -13,7 +13,7 @@ import (
 	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/env"
 	"github.com/buildkite/agent/v3/internal/shellscript"
-	"github.com/buildkite/agent/v3/utils"
+	"github.com/buildkite/agent/v3/internal/utils"
 )
 
 const (

diff --git a/utils/doc.go → internal/utils/doc.go b/utils/doc.go → internal/utils/doc.go
@@ -1,5 +1,4 @@
 // Package utils provides some file- and filepath-helper functions.
 //
-// It is intended for internal use by buildkite-agent only.
 // TODO: `utils` is too vague. Find a better name for this package.
 package utils
diff --git a/utils/file.go → internal/utils/file.go b/utils/file.go → internal/utils/file.go
diff --git a/utils/path.go → internal/utils/path.go b/utils/path.go → internal/utils/path.go
diff --git a/utils/path_test.go → internal/utils/path_test.go b/utils/path_test.go → internal/utils/path_test.go
diff --git a/utils/path_windows_test.go → internal/utils/path_windows_test.go b/utils/path_windows_test.go → internal/utils/path_windows_test.go