Commit2c1536e

committed

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

1 parent4426bcf commit2c1536eCopy full SHA for 2c1536e

File tree

+13

-12

lines changed

+13

-12

lines changed

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ CREATE UNLOGGED TABLE workspace_app_audit_sessions (`
`3`	`3`	`agent_id UUIDNOT NULL,`
`4`	`4`	`app_id UUIDNULL,`
`5`	`5`	`user_id UUIDNULL,`
`6`		`-ipinetNOTNULL,`
	`6`	`+ipinetNULL,`
`7`	`7`	`slug_or_portTEXTNOT NULL,`
`8`	`8`	`started_atTIMESTAMP WITH TIME ZONENOT NULL,`
`9`	`9`	`updated_atTIMESTAMP WITH TIME ZONENOT NULL,`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`INSERT INTO workspace_app_audit_sessions`
`2`		`-(agent_id, app_id, user_id, ip, started_at, updated_at)`
	`2`	`+(agent_id, app_id, user_id, ip,slug_or_port,started_at, updated_at)`
`3`	`3`	`VALUES`
`4`		`-('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'),`
`5`		`-('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'),`
`6`		`-('45e89705-e09d-4850-bcec-f9a937f5d78d',NULL,NULL,'::1','2025-03-04 15:25:55.555306+02','2025-03-04 15:25:55.555306+02');`
	`4`	`+('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'),`
	`5`	`+('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'),`
	`6`	`+('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');`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -467,12 +467,13 @@ func (p *DBTokenProvider) auditInitAutocommitRequest(ctx context.Context, w http`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`sessionID,err=tx.InsertWorkspaceAppAuditSession(dangerousSystemCtx, database.InsertWorkspaceAppAuditSessionParams{`
`470`		`-AgentID:aReq.dbReq.Agent.ID,`
`471`		`-AppID: uuid.NullUUID{Valid:aReq.dbReq.App.ID!=uuid.Nil,UUID:aReq.dbReq.App.ID},`
`472`		`-UserID:userID,`
`473`		`-Ip:aReq.ip,`
`474`		`-StartedAt:aReq.time,`
`475`		`-UpdatedAt:aReq.time,`
	`470`	`+AgentID:aReq.dbReq.Agent.ID,`
	`471`	`+AppID: uuid.NullUUID{Valid:aReq.dbReq.App.ID!=uuid.Nil,UUID:aReq.dbReq.App.ID},`
	`472`	`+UserID:userID,`
	`473`	`+Ip:aReq.ip,`
	`474`	`+SlugOrPort:appInfo.SlugOrPort,`
	`475`	`+StartedAt:aReq.time,`
	`476`	`+UpdatedAt:aReq.time,`
`476`	`477`	`})`
`477`	`478`	`iferr!=nil {`
`478`	`479`	`returnxerrors.Errorf("insert workspace app audit session: %w",err)`

Comments

(0)