Merge pull request #2187 from buildkite/dbd-no-more-bootstrap-package

Die, Bootstrap, die: Rename package bootstrap -> job
buildkite · Jul 6, 2023 · 5217bde · 5217bde
2 parents 246d52a + fb73d80
commit 5217bde
Show file tree

Hide file tree

Showing 48 changed files with 38 additions and 38 deletions.
diff --git a/agent/job_runner.go b/agent/job_runner.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/buildkite/agent/v3/api"
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/experiments"
 	"github.com/buildkite/agent/v3/hook"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/agent/v3/kubernetes"
 	"github.com/buildkite/agent/v3/logger"
 	"github.com/buildkite/agent/v3/metrics"

diff --git a/clicommand/agent_start.go b/clicommand/agent_start.go
@@ -18,11 +18,11 @@ import (
 
 	"github.com/buildkite/agent/v3/agent"
 	"github.com/buildkite/agent/v3/api"
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/cliconfig"
 	"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/job/shell"
 	"github.com/buildkite/agent/v3/internal/utils"
 	"github.com/buildkite/agent/v3/logger"
 	"github.com/buildkite/agent/v3/metrics"

diff --git a/clicommand/bootstrap.go b/clicommand/bootstrap.go
@@ -9,9 +9,9 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/buildkite/agent/v3/bootstrap"
 	"github.com/buildkite/agent/v3/cliconfig"
 	"github.com/buildkite/agent/v3/experiments"
+	"github.com/buildkite/agent/v3/internal/job"
 	"github.com/buildkite/agent/v3/process"
 	"github.com/urfave/cli"
 )
@@ -411,7 +411,7 @@ var BootstrapCommand = cli.Command{
 		}
 
 		// Configure the bootstraper
-		bootstrap := bootstrap.New(bootstrap.Config{
+		bootstrap := job.New(job.Config{
 			AgentName:                    cfg.AgentName,
 			ArtifactUploadDestination:    cfg.ArtifactUploadDestination,
 			AutomaticArtifactUploadPaths: cfg.AutomaticArtifactUploadPaths,

diff --git a/clicommand/pipeline_upload.go b/clicommand/pipeline_upload.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/buildkite/agent/v3/agent"
 	"github.com/buildkite/agent/v3/api"
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/cliconfig"
 	"github.com/buildkite/agent/v3/env"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/agent/v3/internal/pipeline"
 	"github.com/buildkite/agent/v3/internal/redactor"
 	"github.com/buildkite/agent/v3/internal/stdin"

diff --git a/hook/hook.go b/hook/hook.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/agent/v3/internal/utils"
 )
 

diff --git a/hook/scriptwrapper.go b/hook/scriptwrapper.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/env"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/agent/v3/internal/shellscript"
 	"github.com/buildkite/agent/v3/internal/utils"
 )

diff --git a/hook/scriptwrapper_test.go b/hook/scriptwrapper_test.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/env"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/bintest/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/bootstrap/api.go → internal/job/api.go b/bootstrap/api.go → internal/job/api.go
@@ -1,4 +1,4 @@
-package bootstrap
+package job
 
 import (
 	"fmt"

diff --git a/bootstrap/bootstrap.go → internal/job/bootstrap.go b/bootstrap/bootstrap.go → internal/job/bootstrap.go
@@ -1,8 +1,8 @@
-// Package bootstrap provides management of the phases of execution of a
+// package job provides management of the phases of execution of a
 // Buildkite job.
 //
 // It is intended for internal use by buildkite-agent only.
-package bootstrap
+package job
 
 import (
 	"context"
@@ -19,10 +19,10 @@ import (
 	"time"
 
 	"github.com/buildkite/agent/v3/agent/plugin"
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/env"
 	"github.com/buildkite/agent/v3/experiments"
 	"github.com/buildkite/agent/v3/hook"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/agent/v3/internal/redactor"
 	"github.com/buildkite/agent/v3/internal/shellscript"
 	"github.com/buildkite/agent/v3/internal/utils"

diff --git a/bootstrap/bootstrap_test.go → internal/job/bootstrap_test.go b/bootstrap/bootstrap_test.go → internal/job/bootstrap_test.go
@@ -1,10 +1,10 @@
-package bootstrap
+package job
 
 import (
 	"context"
 	"testing"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/agent/v3/internal/redactor"
 	"github.com/buildkite/agent/v3/tracetools"
 	"github.com/google/go-cmp/cmp"

diff --git a/bootstrap/config.go → internal/job/config.go b/bootstrap/config.go → internal/job/config.go
@@ -1,4 +1,4 @@
-package bootstrap
+package job
 
 import (
 	"reflect"

diff --git a/bootstrap/config_test.go → internal/job/config_test.go b/bootstrap/config_test.go → internal/job/config_test.go
@@ -1,4 +1,4 @@
-package bootstrap
+package job
 
 import (
 	"testing"

diff --git a/bootstrap/docker.go → internal/job/docker.go b/bootstrap/docker.go → internal/job/docker.go
@@ -1,12 +1,12 @@
-package bootstrap
+package job
 
 import (
 	"context"
 	"errors"
 	"fmt"
 	"strings"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 )
 
 var dockerEnv = []string{

diff --git a/bootstrap/git.go → internal/job/git.go b/bootstrap/git.go → internal/job/git.go
@@ -1,4 +1,4 @@
-package bootstrap
+package job
 
 import (
 	"bufio"
@@ -12,7 +12,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/shellwords"
 )
 

diff --git a/bootstrap/git_test.go → internal/job/git_test.go b/bootstrap/git_test.go → internal/job/git_test.go
@@ -1,12 +1,12 @@
-package bootstrap
+package job
 
 import (
 	"context"
 	"errors"
 	"os"
 	"testing"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/.../integration/artifact_integration_test.go → .../integration/artifact_integration_test.go b/.../integration/artifact_integration_test.go → .../integration/artifact_integration_test.go
diff --git a/bootstrap/integration/bootstrap_tester.go → internal/job/integration/bootstrap_tester.go b/bootstrap/integration/bootstrap_tester.go → internal/job/integration/bootstrap_tester.go
diff --git a/.../checkout_git_mirrors_integration_test.go → .../checkout_git_mirrors_integration_test.go b/.../checkout_git_mirrors_integration_test.go → .../checkout_git_mirrors_integration_test.go
diff --git a/.../integration/checkout_integration_test.go → .../integration/checkout_integration_test.go b/.../integration/checkout_integration_test.go → .../integration/checkout_integration_test.go
diff --git a/...p/integration/command_integration_test.go → ...b/integration/command_integration_test.go b/...p/integration/command_integration_test.go → ...b/integration/command_integration_test.go
diff --git a/bootstrap/integration/doc.go → internal/job/integration/doc.go b/bootstrap/integration/doc.go → internal/job/integration/doc.go
diff --git a/...ap/integration/docker_integration_test.go → ...ob/integration/docker_integration_test.go b/...ap/integration/docker_integration_test.go → ...ob/integration/docker_integration_test.go
diff --git a/bootstrap/integration/git.go → internal/job/integration/git.go b/bootstrap/integration/git.go → internal/job/integration/git.go
diff --git a/...rap/integration/hooks_integration_test.go → ...job/integration/hooks_integration_test.go b/...rap/integration/hooks_integration_test.go → ...job/integration/hooks_integration_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/experiments"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/bintest/v3"
 )
 

diff --git a/...p/integration/job_api_integration_test.go → ...b/integration/job_api_integration_test.go b/...p/integration/job_api_integration_test.go → ...b/integration/job_api_integration_test.go
diff --git a/bootstrap/integration/main_test.go → internal/job/integration/main_test.go b/bootstrap/integration/main_test.go → internal/job/integration/main_test.go
diff --git a/...ap/integration/plugin_integration_test.go → ...ob/integration/plugin_integration_test.go b/...ap/integration/plugin_integration_test.go → ...ob/integration/plugin_integration_test.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/bintest/v3"
 )
 

diff --git a/...trap/integration/test-binary-hook/main.go → .../job/integration/test-binary-hook/main.go b/...trap/integration/test-binary-hook/main.go → .../job/integration/test-binary-hook/main.go
diff --git a/bootstrap/knownhosts.go → internal/job/knownhosts.go b/bootstrap/knownhosts.go → internal/job/knownhosts.go
@@ -1,4 +1,4 @@
-package bootstrap
+package job
 
 import (
 	"bufio"
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	homedir "github.com/mitchellh/go-homedir"
 	"golang.org/x/crypto/ssh/knownhosts"
 )

diff --git a/bootstrap/knownhosts_test.go → internal/job/knownhosts_test.go b/bootstrap/knownhosts_test.go → internal/job/knownhosts_test.go
@@ -1,4 +1,4 @@
-package bootstrap
+package job
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/gliderlabs/ssh"
 )
 

diff --git a/bootstrap/shell/batch.go → internal/job/shell/batch.go b/bootstrap/shell/batch.go → internal/job/shell/batch.go
diff --git a/bootstrap/shell/export_test.go → internal/job/shell/export_test.go b/bootstrap/shell/export_test.go → internal/job/shell/export_test.go
diff --git a/bootstrap/shell/logger.go → internal/job/shell/logger.go b/bootstrap/shell/logger.go → internal/job/shell/logger.go
diff --git a/bootstrap/shell/logger_test.go → internal/job/shell/logger_test.go b/bootstrap/shell/logger_test.go → internal/job/shell/logger_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/bootstrap/shell/lookpath.go → internal/job/shell/lookpath.go b/bootstrap/shell/lookpath.go → internal/job/shell/lookpath.go
diff --git a/bootstrap/shell/lookpath_windows.go → internal/job/shell/lookpath_windows.go b/bootstrap/shell/lookpath_windows.go → internal/job/shell/lookpath_windows.go
diff --git a/bootstrap/shell/shell.go → internal/job/shell/shell.go b/bootstrap/shell/shell.go → internal/job/shell/shell.go
diff --git a/bootstrap/shell/shell_test.go → internal/job/shell/shell_test.go b/bootstrap/shell/shell_test.go → internal/job/shell/shell_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/bintest/v3"
 	"github.com/google/go-cmp/cmp"
 )

diff --git a/bootstrap/shell/signal.go → internal/job/shell/signal.go b/bootstrap/shell/signal.go → internal/job/shell/signal.go
diff --git a/bootstrap/shell/signal_windows.go → internal/job/shell/signal_windows.go b/bootstrap/shell/signal_windows.go → internal/job/shell/signal_windows.go
diff --git a/bootstrap/shell/tempfile.go → internal/job/shell/tempfile.go b/bootstrap/shell/tempfile.go → internal/job/shell/tempfile.go
diff --git a/bootstrap/shell/test.go → internal/job/shell/test.go b/bootstrap/shell/test.go → internal/job/shell/test.go
diff --git a/bootstrap/ssh.go → internal/job/ssh.go b/bootstrap/ssh.go → internal/job/ssh.go
@@ -1,4 +1,4 @@
-package bootstrap
+package job
 
 import (
 	"context"
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/roko"
 )
 

diff --git a/bootstrap/ssh_test.go → internal/job/ssh_test.go b/bootstrap/ssh_test.go → internal/job/ssh_test.go
@@ -1,12 +1,12 @@
-package bootstrap
+package job
 
 import (
 	"context"
 	"path/filepath"
 	"testing"
 	"time"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/bintest/v3"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/bootstrap/tracing.go → internal/job/tracing.go b/bootstrap/tracing.go → internal/job/tracing.go
@@ -1,4 +1,4 @@
-package bootstrap
+package job
 
 import (
 	"context"

diff --git a/internal/redactor/redactor.go b/internal/redactor/redactor.go
@@ -7,7 +7,7 @@ import (
 	"path"
 	"sync"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 )
 
 // RedactLengthMin is the shortest string length that will be considered a

diff --git a/jobapi/server.go b/jobapi/server.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/env"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/agent/v3/internal/socket"
 )
 

diff --git a/jobapi/server_test.go b/jobapi/server_test.go
@@ -14,8 +14,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/buildkite/agent/v3/bootstrap/shell"
 	"github.com/buildkite/agent/v3/env"
+	"github.com/buildkite/agent/v3/internal/job/shell"
 	"github.com/buildkite/agent/v3/jobapi"
 	"github.com/google/go-cmp/cmp"
 )