WIP

coder · mtojek · Nov 24, 2022 · Nov 21, 2022 · Nov 22, 2022 · Nov 22, 2022
commit ee6577d218d3ace70594db2c0ddf3d5e583a1b03
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -132,6 +132,7 @@ func (q *sqlQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg GetWorkspa
 		arg.TemplateName,
 		pq.Array(arg.TemplateIds),
 		arg.Name,
+		arg.HasAgent,
 		arg.Offset,
 		arg.Limit,
 	)

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaces.sql b/coderd/database/queries/workspaces.sql
@@ -44,22 +44,36 @@ FROM
 	workspaces
 LEFT JOIN LATERAL (
 	SELECT
+	    build_number,
+	    workspace_builds.job_id,
 		workspace_builds.transition,
 		provisioner_jobs.started_at,
 		provisioner_jobs.updated_at,
 		provisioner_jobs.canceled_at,
 		provisioner_jobs.completed_at,
-		provisioner_jobs.error
+		provisioner_jobs.error,
+		workspace_agents.first_connected_at,
+		workspace_agents.last_connected_at
 	FROM
 		workspace_builds
 	LEFT JOIN
 		provisioner_jobs
 	ON
 		provisioner_jobs.id = workspace_builds.job_id
+	LEFT JOIN
+	    workspace_resources
+	ON
+	    workspace_resources.job_id = provisioner_jobs.id
+	LEFT JOIN
+	    workspace_agents
+	ON
+	    workspace_agents.resource_id = workspace_resources.id
 	WHERE
-		workspace_builds.workspace_id = workspaces.id
+		workspace_builds.workspace_id = '14260b33-a677-4399-8276-39ba287ec119'
 	ORDER BY
-		build_number DESC
+		build_number DESC,
+		workspace_agents.last_connected_at ASC,
+		workspace_agents.first_connected_at ASC
 	LIMIT
 		1
 ) latest_build ON TRUE
@@ -161,6 +175,20 @@ WHERE
 			name ILIKE '%' || @name || '%'
 		ELSE true
 	END
+	-- Filter by agent status
+	AND CASE
+	    WHEN @has_agent :: text != '' THEN
+		    CASE
+			    -- TODO timeout
+			    WHEN @has_agent = 'connecting' THEN
+			        latest_build.first_connected_at IS NULL
+				-- TODO disconnected
+				WHEN @has_agent = 'connected' THEN
+			        latest_build.last_connected_at IS NOT NULL
+			    ELSE true
+			END
+		ELSE true
+	END
 	-- Authorize Filter clause will be injected below in GetAuthorizedWorkspaces
 	-- @authorize_filter
 ORDER BY

diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -1146,7 +1146,7 @@ func workspaceSearchQuery(query string, page codersdk.Pagination) (database.GetW
 	filter.TemplateName = parser.String(searchParams, "", "template")
 	filter.Name = parser.String(searchParams, "", "name")
 	filter.Status = parser.String(searchParams, "", "status")
-
+	filter.HasAgent = parser.String(searchParams, "", "has-agent")
 	return filter, parser.Errors
 }
 

diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -824,6 +824,26 @@ func TestWorkspaceFilterManual(t *testing.T) {
 		require.Len(t, res.Workspaces, 1)
 		require.Equal(t, workspace.ID, res.Workspaces[0].ID)
 	})
+	t.Run("FilterQuery_HasAgent_Connecting", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+		user := coderdtest.CreateFirstUser(t, client)
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
+		workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		// single workspace
+		res, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{
+			FilterQuery: fmt.Sprintf("has-agent:%s", "connected"),
+		})
+		require.NoError(t, err)
+		require.Len(t, res.Workspaces, 0)
+		require.Equal(t, workspace.ID, res.Workspaces[0].ID)
+	})
 }
 
 func TestOffsetLimit(t *testing.T) {