fixup! add slug or port to support separation of terminal and ports

mafredri · mafredri · commit 2c1536ed7a7c · 2025-03-06T14:56:08.000+02:00
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000301_add_workspace_app_audit_sessions.up.sql b/coderd/database/migrations/000301_add_workspace_app_audit_sessions.up.sql
@@ -3,7 +3,7 @@ CREATE UNLOGGED TABLE workspace_app_audit_sessions (
 	agent_id UUID NOT NULL,
 	app_id UUID NULL,
 	user_id UUID NULL,
-	ip inet NOT NULL,
+	ip inet NULL,
 	slug_or_port TEXT NOT NULL,
 	started_at TIMESTAMP WITH TIME ZONE NOT NULL,
 	updated_at TIMESTAMP WITH TIME ZONE NOT NULL,
diff --git a/coderd/database/migrations/testdata/fixtures/000301_add_workspace_app_audit_sessions.up.sql b/coderd/database/migrations/testdata/fixtures/000301_add_workspace_app_audit_sessions.up.sql
@@ -1,6 +1,6 @@
 INSERT INTO workspace_app_audit_sessions
-	(agent_id, app_id, user_id, ip, started_at, updated_at)
+	(agent_id, app_id, user_id, ip, slug_or_port, started_at, updated_at)
 VALUES
-	('45e89705-e09d-4850-bcec-f9a937f5d78d', '36b65d0c-042b-4653-863a-655ee739861c', '30095c71-380b-457a-8995-97b8ee6e5307', '127.0.0.1', '2025-03-04 15:08:38.579772+02', '2025-03-04 15:06:48.755158+02'),
-	('45e89705-e09d-4850-bcec-f9a937f5d78d', '36b65d0c-042b-4653-863a-655ee739861c', NULL, '127.0.0.1', '2025-03-04 15:08:44.411389+02', '2025-03-04 15:08:44.411389+02'),
-	('45e89705-e09d-4850-bcec-f9a937f5d78d', NULL, NULL, '::1', '2025-03-04 15:25:55.555306+02', '2025-03-04 15:25:55.555306+02');
+	('45e89705-e09d-4850-bcec-f9a937f5d78d', '36b65d0c-042b-4653-863a-655ee739861c', '30095c71-380b-457a-8995-97b8ee6e5307', '127.0.0.1', '', '2025-03-04 15:08:38.579772+02', '2025-03-04 15:06:48.755158+02'),
+	('45e89705-e09d-4850-bcec-f9a937f5d78d', '36b65d0c-042b-4653-863a-655ee739861c', NULL, '127.0.0.1', '', '2025-03-04 15:08:44.411389+02', '2025-03-04 15:08:44.411389+02'),
+	('45e89705-e09d-4850-bcec-f9a937f5d78d', NULL, NULL, '::1', 'terminal', '2025-03-04 15:25:55.555306+02', '2025-03-04 15:25:55.555306+02');
diff --git a/coderd/workspaceapps/db.go b/coderd/workspaceapps/db.go
@@ -467,12 +467,13 @@ func (p *DBTokenProvider) auditInitAutocommitRequest(ctx context.Context, w http
 			}
 
 			sessionID, err = tx.InsertWorkspaceAppAuditSession(dangerousSystemCtx, database.InsertWorkspaceAppAuditSessionParams{
-				AgentID:   aReq.dbReq.Agent.ID,
-				AppID:     uuid.NullUUID{Valid: aReq.dbReq.App.ID != uuid.Nil, UUID: aReq.dbReq.App.ID},
-				UserID:    userID,
-				Ip:        aReq.ip,
-				StartedAt: aReq.time,
-				UpdatedAt: aReq.time,
+				AgentID:    aReq.dbReq.Agent.ID,
+				AppID:      uuid.NullUUID{Valid: aReq.dbReq.App.ID != uuid.Nil, UUID: aReq.dbReq.App.ID},
+				UserID:     userID,
+				Ip:         aReq.ip,
+				SlugOrPort: appInfo.SlugOrPort,
+				StartedAt:  aReq.time,
+				UpdatedAt:  aReq.time,
 			})
 			if err != nil {
 				return xerrors.Errorf("insert workspace app audit session: %w", err)
