Update deps to support Go 1.21

The dependencies wouldn't build on recent Go versions, which was kind of
annoying. Upgrade dependencies so we can use a more recent toolchain.

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
     "name": "envbuilder",
-    "image": "mcr.microsoft.com/devcontainers/go:0-1.20",
+    "image": "mcr.microsoft.com/devcontainers/go:1.22",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker": {}
     }

.github/workflows/ci.yaml

@@ -45,7 +45,7 @@ jobs:
       # Install Go!
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.20.5"
+          go-version: "~1.21"
 
       - name: Test
         run: go test ./...

.github/workflows/release.yaml

@@ -35,7 +35,7 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: "~1.20"
+          go-version: "~1.21"
 
       - name: Docker Login
         uses: docker/login-action@v2

cmd/envbuilder/main.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"cdr.dev/slog"
-	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/codersdk/agentsdk"
+	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/codersdk/agentsdk"
 	"github.com/coder/envbuilder"
 	"github.com/spf13/cobra"
 
@@ -32,7 +32,7 @@ func main() {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options := envbuilder.OptionsFromEnv(os.LookupEnv)
 
-			var sendLogs func(ctx context.Context, log ...agentsdk.StartupLog) error
+			var sendLogs func(ctx context.Context, log ...agentsdk.Log) error
 			agentURL := os.Getenv("CODER_AGENT_URL")
 			agentToken := os.Getenv("CODER_AGENT_TOKEN")
 			if agentToken != "" {
@@ -53,15 +53,15 @@ func main() {
 					},
 				}
 				var flushAndClose func(ctx context.Context) error
-				sendLogs, flushAndClose = agentsdk.StartupLogsSender(client.PatchStartupLogs, slog.Logger{})
+				sendLogs, flushAndClose = agentsdk.LogsSender(agentsdk.ExternalLogSourceID, client.PatchLogs, slog.Logger{})
 				defer flushAndClose(cmd.Context())
 			}
 
 			options.Logger = func(level codersdk.LogLevel, format string, args ...interface{}) {
 				output := fmt.Sprintf(format, args...)
 				fmt.Fprintln(cmd.ErrOrStderr(), output)
 				if sendLogs != nil {
-					sendLogs(cmd.Context(), agentsdk.StartupLog{
+					sendLogs(cmd.Context(), agentsdk.Log{
 						CreatedAt: time.Now(),
 						Output:    output,
 						Level:     level,

envbuilder.go

@@ -31,7 +31,7 @@ import (
 	"github.com/GoogleContainerTools/kaniko/pkg/creds"
 	"github.com/GoogleContainerTools/kaniko/pkg/executor"
 	"github.com/GoogleContainerTools/kaniko/pkg/util"
-	"github.com/coder/coder/codersdk"
+	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/envbuilder/devcontainer"
 	"github.com/containerd/containerd/platforms"
 	"github.com/distribution/distribution/v3/configuration"