feat: use agent v2 API to post startup (#11877)

Uses the v2 Agent API to post startup information.

coderd/agentapi/api.go

@@ -29,8 +29,6 @@ import (
 	tailnetproto "github.com/coder/coder/v2/tailnet/proto"
 )
 
-const AgentAPIVersionDRPC = "2.0"
-
 // API implements the DRPC agent API interface from agent/proto. This struct is
 // instantiated once per agent connection and kept alive for the duration of the
 // session.

coderd/agentapi/lifecycle.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"golang.org/x/exp/slices"
 	"golang.org/x/mod/semver"
 	"golang.org/x/xerrors"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -16,6 +17,12 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 )
 
+type contextKeyAPIVersion struct{}
+
+func WithAPIVersion(ctx context.Context, version string) context.Context {
+	return context.WithValue(ctx, contextKeyAPIVersion{}, version)
+}
+
 type LifecycleAPI struct {
 	AgentFn                  func(context.Context) (database.WorkspaceAgent, error)
 	WorkspaceIDFn            func(context.Context, *database.WorkspaceAgent) (uuid.UUID, error)
@@ -123,6 +130,10 @@ func (a *LifecycleAPI) UpdateLifecycle(ctx context.Context, req *agentproto.Upda
 }
 
 func (a *LifecycleAPI) UpdateStartup(ctx context.Context, req *agentproto.UpdateStartupRequest) (*agentproto.Startup, error) {
+	apiVersion, ok := ctx.Value(contextKeyAPIVersion{}).(string)
+	if !ok {
+		return nil, xerrors.Errorf("internal error; api version unspecified")
+	}
 	workspaceAgent, err := a.AgentFn(ctx)
 	if err != nil {
 		return nil, err
@@ -164,13 +175,14 @@ func (a *LifecycleAPI) UpdateStartup(ctx context.Context, req *agentproto.Update
 			dbSubsystems = append(dbSubsystems, dbSubsystem)
 		}
 	}
+	slices.Sort(dbSubsystems)
 
 	err = a.Database.UpdateWorkspaceAgentStartupByID(ctx, database.UpdateWorkspaceAgentStartupByIDParams{
 		ID:                workspaceAgent.ID,
 		Version:           req.Startup.Version,
 		ExpandedDirectory: req.Startup.ExpandedDirectory,
 		Subsystems:        dbSubsystems,
-		APIVersion:        AgentAPIVersionDRPC,
+		APIVersion:        apiVersion,
 	})
 	if err != nil {
 		return nil, xerrors.Errorf("update workspace agent startup in database: %w", err)

coderd/agentapi/lifecycle_test.go

@@ -382,10 +382,11 @@ func TestUpdateStartup(t *testing.T) {
 				database.WorkspaceAgentSubsystemEnvbuilder,
 				database.WorkspaceAgentSubsystemExectrace,
 			},
-			APIVersion: agentapi.AgentAPIVersionDRPC,
+			APIVersion: "2.0",
 		}).Return(nil)
 
-		resp, err := api.UpdateStartup(context.Background(), &agentproto.UpdateStartupRequest{
+		ctx := agentapi.WithAPIVersion(context.Background(), "2.0")
+		resp, err := api.UpdateStartup(ctx, &agentproto.UpdateStartupRequest{
 			Startup: startup,
 		})
 		require.NoError(t, err)
@@ -416,7 +417,8 @@ func TestUpdateStartup(t *testing.T) {
 			Subsystems:        []agentproto.Startup_Subsystem{},
 		}
 
-		resp, err := api.UpdateStartup(context.Background(), &agentproto.UpdateStartupRequest{
+		ctx := agentapi.WithAPIVersion(context.Background(), "2.0")
+		resp, err := api.UpdateStartup(ctx, &agentproto.UpdateStartupRequest{
 			Startup: startup,
 		})
 		require.Error(t, err)
@@ -451,7 +453,8 @@ func TestUpdateStartup(t *testing.T) {
 			},
 		}
 
-		resp, err := api.UpdateStartup(context.Background(), &agentproto.UpdateStartupRequest{
+		ctx := agentapi.WithAPIVersion(context.Background(), "2.0")
+		resp, err := api.UpdateStartup(ctx, &agentproto.UpdateStartupRequest{
 			Startup: startup,
 		})
 		require.Error(t, err)