Klomgor · pull · Aug 21, 2025 · Aug 21, 2025 · Aug 21, 2025 · Aug 21, 2025
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -60,7 +60,5 @@
 	"typos.config": ".github/workflows/typos.toml",
 	"[markdown]": {
 		"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
-	},
-	"biome.configurationPath": "./site/biome.jsonc",
-	"biome.lsp.bin": "./site/node_modules/.bin/biome"
+	}
 }
diff --git a/cli/provisioners.go b/cli/provisioners.go
@@ -2,10 +2,12 @@ package cli
 
 import (
 	"fmt"
+	"time"
 
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/v2/cli/cliui"
+	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/serpent"
 )
@@ -39,7 +41,10 @@ func (r *RootCmd) provisionerList() *serpent.Command {
 			cliui.TableFormat([]provisionerDaemonRow{}, []string{"created at", "last seen at", "key name", "name", "version", "status", "tags"}),
 			cliui.JSONFormat(),
 		)
-		limit int64
+		limit   int64
+		offline bool
+		status  []string
+		maxAge  time.Duration
 	)
 
 	cmd := &serpent.Command{
@@ -59,7 +64,10 @@ func (r *RootCmd) provisionerList() *serpent.Command {
 			}
 
 			daemons, err := client.OrganizationProvisionerDaemons(ctx, org.ID, &codersdk.OrganizationProvisionerDaemonsOptions{
-				Limit: int(limit),
+				Limit:   int(limit),
+				Offline: offline,
+				Status:  slice.StringEnums[codersdk.ProvisionerDaemonStatus](status),
+				MaxAge:  maxAge,
 			})
 			if err != nil {
 				return xerrors.Errorf("list provisioner daemons: %w", err)
@@ -98,6 +106,27 @@ func (r *RootCmd) provisionerList() *serpent.Command {
 			Default:       "50",
 			Value:         serpent.Int64Of(&limit),
 		},
+		{
+			Flag:          "show-offline",
+			FlagShorthand: "f",
+			Env:           "CODER_PROVISIONER_SHOW_OFFLINE",
+			Description:   "Show offline provisioners.",
+			Value:         serpent.BoolOf(&offline),
+		},
+		{
+			Flag:          "status",
+			FlagShorthand: "s",
+			Env:           "CODER_PROVISIONER_LIST_STATUS",
+			Description:   "Filter by provisioner status.",
+			Value:         serpent.EnumArrayOf(&status, slice.ToStrings(codersdk.ProvisionerDaemonStatusEnums())...),
+		},
+		{
+			Flag:          "max-age",
+			FlagShorthand: "m",
+			Env:           "CODER_PROVISIONER_LIST_MAX_AGE",
+			Description:   "Filter provisioners by maximum age.",
+			Value:         serpent.DurationOf(&maxAge),
+		},
 	}...)
 
 	orgContext.AttachOptions(cmd)

diff --git a/cli/provisioners_test.go b/cli/provisioners_test.go
@@ -197,6 +197,74 @@ func TestProvisioners_Golden(t *testing.T) {
 		clitest.TestGoldenFile(t, t.Name(), got.Bytes(), replace)
 	})
 
+	t.Run("list with offline provisioner daemons", func(t *testing.T) {
+		t.Parallel()
+
+		var got bytes.Buffer
+		inv, root := clitest.New(t,
+			"provisioners",
+			"list",
+			"--show-offline",
+		)
+		inv.Stdout = &got
+		clitest.SetupConfig(t, templateAdminClient, root)
+		err := inv.Run()
+		require.NoError(t, err)
+
+		clitest.TestGoldenFile(t, t.Name(), got.Bytes(), replace)
+	})
+
+	t.Run("list provisioner daemons by status", func(t *testing.T) {
+		t.Parallel()
+
+		var got bytes.Buffer
+		inv, root := clitest.New(t,
+			"provisioners",
+			"list",
+			"--status=idle,offline,busy",
+		)
+		inv.Stdout = &got
+		clitest.SetupConfig(t, templateAdminClient, root)
+		err := inv.Run()
+		require.NoError(t, err)
+
+		clitest.TestGoldenFile(t, t.Name(), got.Bytes(), replace)
+	})
+
+	t.Run("list provisioner daemons without offline", func(t *testing.T) {
+		t.Parallel()
+
+		var got bytes.Buffer
+		inv, root := clitest.New(t,
+			"provisioners",
+			"list",
+			"--status=idle,busy",
+		)
+		inv.Stdout = &got
+		clitest.SetupConfig(t, templateAdminClient, root)
+		err := inv.Run()
+		require.NoError(t, err)
+
+		clitest.TestGoldenFile(t, t.Name(), got.Bytes(), replace)
+	})
+
+	t.Run("list provisioner daemons by max age", func(t *testing.T) {
+		t.Parallel()
+
+		var got bytes.Buffer
+		inv, root := clitest.New(t,
+			"provisioners",
+			"list",
+			"--max-age=1h",
+		)
+		inv.Stdout = &got
+		clitest.SetupConfig(t, templateAdminClient, root)
+		err := inv.Run()
+		require.NoError(t, err)
+
+		clitest.TestGoldenFile(t, t.Name(), got.Bytes(), replace)
+	})
+
 	// Test jobs list with template admin as members are currently
 	// unable to access provisioner jobs. In the future (with RBAC
 	// changes), we may allow them to view _their_ jobs.

diff --git a/cli/testdata/TestProvisioners_Golden/list.golden b/cli/testdata/TestProvisioners_Golden/list.golden
@@ -1,5 +1,4 @@
-ID                                    CREATED AT            LAST SEEN AT          NAME                 VERSION       TAGS                                    KEY NAME  STATUS   CURRENT JOB ID                        CURRENT JOB STATUS  PREVIOUS JOB ID                       PREVIOUS JOB STATUS  ORGANIZATION  
-00000000-0000-0000-aaaa-000000000000  ====[timestamp]=====  ====[timestamp]=====  default-provisioner  v0.0.0-devel  map[owner: scope:organization]          built-in  idle     <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000001  succeeded            Coder         
-00000000-0000-0000-aaaa-000000000001  ====[timestamp]=====  ====[timestamp]=====  provisioner-1        v0.0.0        map[foo:bar owner: scope:organization]  built-in  busy     00000000-0000-0000-bbbb-000000000002  running             <nil>                                 <nil>                Coder         
-00000000-0000-0000-aaaa-000000000002  ====[timestamp]=====  ====[timestamp]=====  provisioner-2        v0.0.0        map[owner: scope:organization]          built-in  offline  <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000003  succeeded            Coder         
-00000000-0000-0000-aaaa-000000000003  ====[timestamp]=====  ====[timestamp]=====  provisioner-3        v0.0.0        map[owner: scope:organization]          built-in  idle     <nil>                                 <nil>               <nil>                                 <nil>                Coder         
+ID                                    CREATED AT            LAST SEEN AT          NAME                 VERSION       TAGS                                    KEY NAME  STATUS  CURRENT JOB ID                        CURRENT JOB STATUS  PREVIOUS JOB ID                       PREVIOUS JOB STATUS  ORGANIZATION  
+00000000-0000-0000-aaaa-000000000000  ====[timestamp]=====  ====[timestamp]=====  default-provisioner  v0.0.0-devel  map[owner: scope:organization]          built-in  idle    <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000001  succeeded            Coder         
+00000000-0000-0000-aaaa-000000000001  ====[timestamp]=====  ====[timestamp]=====  provisioner-1        v0.0.0        map[foo:bar owner: scope:organization]  built-in  busy    00000000-0000-0000-bbbb-000000000002  running             <nil>                                 <nil>                Coder         
+00000000-0000-0000-aaaa-000000000003  ====[timestamp]=====  ====[timestamp]=====  provisioner-3        v0.0.0        map[owner: scope:organization]          built-in  idle    <nil>                                 <nil>               <nil>                                 <nil>                Coder         
diff --git a/cli/testdata/TestProvisioners_Golden/list_provisioner_daemons_by_max_age.golden b/cli/testdata/TestProvisioners_Golden/list_provisioner_daemons_by_max_age.golden
@@ -0,0 +1,4 @@
+CREATED AT            LAST SEEN AT          KEY NAME  NAME                 VERSION       STATUS  TAGS                                    
+====[timestamp]=====  ====[timestamp]=====  built-in  default-provisioner  v0.0.0-devel  idle    map[owner: scope:organization]          
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-1        v0.0.0        busy    map[foo:bar owner: scope:organization]  
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-3        v0.0.0        idle    map[owner: scope:organization]          
diff --git a/cli/testdata/TestProvisioners_Golden/list_provisioner_daemons_by_status.golden b/cli/testdata/TestProvisioners_Golden/list_provisioner_daemons_by_status.golden
@@ -0,0 +1,5 @@
+CREATED AT            LAST SEEN AT          KEY NAME  NAME                 VERSION       STATUS   TAGS                                    
+====[timestamp]=====  ====[timestamp]=====  built-in  default-provisioner  v0.0.0-devel  idle     map[owner: scope:organization]          
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-1        v0.0.0        busy     map[foo:bar owner: scope:organization]  
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-2        v0.0.0        offline  map[owner: scope:organization]          
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-3        v0.0.0        idle     map[owner: scope:organization]          
diff --git a/cli/testdata/TestProvisioners_Golden/list_provisioner_daemons_without_offline.golden b/cli/testdata/TestProvisioners_Golden/list_provisioner_daemons_without_offline.golden
@@ -0,0 +1,4 @@
+CREATED AT            LAST SEEN AT          KEY NAME  NAME                 VERSION       STATUS  TAGS                                    
+====[timestamp]=====  ====[timestamp]=====  built-in  default-provisioner  v0.0.0-devel  idle    map[owner: scope:organization]          
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-1        v0.0.0        busy    map[foo:bar owner: scope:organization]  
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-3        v0.0.0        idle    map[owner: scope:organization]          
diff --git a/cli/testdata/TestProvisioners_Golden/list_with_offline_provisioner_daemons.golden b/cli/testdata/TestProvisioners_Golden/list_with_offline_provisioner_daemons.golden
@@ -0,0 +1,5 @@
+CREATED AT            LAST SEEN AT          KEY NAME  NAME                 VERSION       STATUS   TAGS                                    
+====[timestamp]=====  ====[timestamp]=====  built-in  default-provisioner  v0.0.0-devel  idle     map[owner: scope:organization]          
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-1        v0.0.0        busy     map[foo:bar owner: scope:organization]  
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-2        v0.0.0        offline  map[owner: scope:organization]          
+====[timestamp]=====  ====[timestamp]=====  built-in  provisioner-3        v0.0.0        idle     map[owner: scope:organization]          
diff --git a/cli/testdata/coder_provisioner_list_--help.golden b/cli/testdata/coder_provisioner_list_--help.golden
@@ -17,8 +17,17 @@ OPTIONS:
   -l, --limit int, $CODER_PROVISIONER_LIST_LIMIT (default: 50)
           Limit the number of provisioners returned.
 
+  -m, --max-age duration, $CODER_PROVISIONER_LIST_MAX_AGE
+          Filter provisioners by maximum age.
+
   -o, --output table|json (default: table)
           Output format.
 
+  -f, --show-offline bool, $CODER_PROVISIONER_SHOW_OFFLINE
+          Show offline provisioners.
+
+  -s, --status [offline|idle|busy], $CODER_PROVISIONER_LIST_STATUS
+          Filter by provisioner status.
+
 ———
 Run `coder --help` for a list of global options.
diff --git a/coderd/agentapi/stats_test.go b/coderd/agentapi/stats_test.go
@@ -41,11 +41,12 @@ func TestUpdateStates(t *testing.T) {
 			Name: "tpl",
 		}
 		workspace = database.Workspace{
-			ID:           uuid.New(),
-			OwnerID:      user.ID,
-			TemplateID:   template.ID,
-			Name:         "xyz",
-			TemplateName: template.Name,
+			ID:            uuid.New(),
+			OwnerID:       user.ID,
+			OwnerUsername: user.Username,
+			TemplateID:    template.ID,
+			Name:          "xyz",
+			TemplateName:  template.Name,
 		}
 		agent = database.WorkspaceAgent{
 			ID:   uuid.New(),
@@ -138,9 +139,6 @@ func TestUpdateStates(t *testing.T) {
 		// Workspace gets fetched.
 		dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agent.ID).Return(workspace, nil)
 
-		// User gets fetched to hit the UpdateAgentMetricsFn.
-		dbM.EXPECT().GetUserByID(gomock.Any(), user.ID).Return(user, nil)
-
 		// We expect an activity bump because ConnectionCount > 0.
 		dbM.EXPECT().ActivityBumpWorkspace(gomock.Any(), database.ActivityBumpWorkspaceParams{
 			WorkspaceID:   workspace.ID,
@@ -380,9 +378,6 @@ func TestUpdateStates(t *testing.T) {
 			LastUsedAt: now.UTC(),
 		}).Return(nil)
 
-		// User gets fetched to hit the UpdateAgentMetricsFn.
-		dbM.EXPECT().GetUserByID(gomock.Any(), user.ID).Return(user, nil)
-
 		resp, err := api.UpdateStats(context.Background(), req)
 		require.NoError(t, err)
 		require.Equal(t, &agentproto.UpdateStatsResponse{
@@ -498,9 +493,6 @@ func TestUpdateStates(t *testing.T) {
 			LastUsedAt: now,
 		}).Return(nil)
 
-		// User gets fetched to hit the UpdateAgentMetricsFn.
-		dbM.EXPECT().GetUserByID(gomock.Any(), user.ID).Return(user, nil)
-
 		// Ensure that pubsub notifications are sent.
 		notifyDescription := make(chan struct{})
 		ps.SubscribeWithErr(wspubsub.WorkspaceEventChannel(workspace.OwnerID),

diff --git a/coderd/database/check_constraint.go b/coderd/database/check_constraint.go
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000361_username_length_constraint.down.sql b/coderd/database/migrations/000361_username_length_constraint.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE users
+DROP CONSTRAINT IF EXISTS users_username_min_length;
diff --git a/coderd/database/migrations/000361_username_length_constraint.up.sql b/coderd/database/migrations/000361_username_length_constraint.up.sql
@@ -0,0 +1,3 @@
+ALTER TABLE users
+ADD CONSTRAINT users_username_min_length
+CHECK (length(username) >= 1);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE users
		DROP CONSTRAINT IF EXISTS users_username_min_length;