coder · spikecurtis · Oct 31, 2023 · Oct 30, 2023
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -6308,6 +6308,7 @@ func (q *FakeQuerier) UpdateWorkspaceAgentStartupByID(_ context.Context, arg dat
 		}
 
 		agent.Version = arg.Version
+		agent.APIVersion = arg.APIVersion
 		agent.ExpandedDirectory = arg.ExpandedDirectory
 		agent.Subsystems = arg.Subsystems
 		q.workspaceAgents[index] = agent

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceagents.sql b/coderd/database/queries/workspaceagents.sql
@@ -69,7 +69,8 @@ UPDATE
 SET
 	version = $2,
 	expanded_directory = $3,
-	subsystems = $4
+	subsystems = $4,
+	api_version = $5
 WHERE
 	id = $1;
 

diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -250,6 +250,8 @@ func (api *API) workspaceAgentManifest(rw http.ResponseWriter, r *http.Request)
 	})
 }
 
+const AgentAPIVersionREST = "1.0"
+
 // @Summary Submit workspace agent startup
 // @ID submit-workspace-agent-startup
 // @Security CoderSessionToken
@@ -321,6 +323,7 @@ func (api *API) postWorkspaceAgentStartup(rw http.ResponseWriter, r *http.Reques
 		Version:           req.Version,
 		ExpandedDirectory: req.ExpandedDirectory,
 		Subsystems:        convertWorkspaceAgentSubsystems(req.Subsystems),
+		APIVersion:        AgentAPIVersionREST,
 	}); err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Error setting agent version",
@@ -1542,6 +1545,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin
 		LogsOverflowed:           dbAgent.LogsOverflowed,
 		LogSources:               logSources,
 		Version:                  dbAgent.Version,
+		APIVersion:               dbAgent.APIVersion,
 		EnvironmentVariables:     envs,
 		Directory:                dbAgent.Directory,
 		ExpandedDirectory:        dbAgent.ExpandedDirectory,

diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -21,6 +21,7 @@ import (
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/agent/agenttest"
+	"github.com/coder/coder/v2/coderd"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
@@ -1367,6 +1368,7 @@ func TestWorkspaceAgent_Startup(t *testing.T) {
 		require.Equal(t, expectedDir, wsagent.ExpandedDirectory)
 		// Sorted
 		require.Equal(t, expectedSubsystems, wsagent.Subsystems)
+		require.Equal(t, coderd.AgentAPIVersionREST, wsagent.APIVersion)
 	})
 
 	t.Run("InvalidSemver", func(t *testing.T) {

diff --git a/codersdk/deployment_test.go b/codersdk/deployment_test.go
@@ -218,7 +218,7 @@ func TestTimezoneOffsets(t *testing.T) {
 		//	Name:           "Eastern",
 		//	Loc:            must(time.LoadLocation("America/New_York")),
 		//	ExpectedOffset: -4,
-		//},
+		// },
 		//{
 		//	Name:           "Central",
 		//	Loc:            must(time.LoadLocation("America/Chicago")),

diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -166,6 +166,7 @@ type WorkspaceAgent struct {
 	Directory            string                  `json:"directory,omitempty"`
 	ExpandedDirectory    string                  `json:"expanded_directory,omitempty"`
 	Version              string                  `json:"version"`
+	APIVersion           string                  `json:"api_version"`
 	Apps                 []WorkspaceApp          `json:"apps"`
 	// DERPLatency is mapped by region name (e.g. "New York City", "Seattle").
 	DERPLatency              map[string]DERPRegion     `json:"latency,omitempty"`

diff --git a/docs/api/agents.md b/docs/api/agents.md
diff --git a/docs/api/builds.md b/docs/api/builds.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md