NotificationsYou must be signed in to change notification settings
Fork914
Star10.1k

Commit8411d31

committed

unify code-paths

1 parent1f38a8b commit8411d31Copy full SHA for 8411d31

File tree

2 files changed

+39

-44

lines changed

coderd/agentapi
- audit.go
- audit_test.go

2 files changed

+39

-44

lines changed

`‎coderd/agentapi/audit.go`

Lines changed: 32 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,28 +34,13 @@ func (a AuditAPI) ReportConnection(ctx context.Context, req agentproto.ReportC`
`34`	`34`	`returnnil,xerrors.Errorf("connection id from bytes: %w",err)`
`35`	`35`	`}`
`36`	`36`
`37`		`-varaction database.AuditAction`
`38`		`-switchreq.GetConnection().GetAction() {`
`39`		`-caseagentproto.Connection_CONNECT:`
`40`		`-action=database.AuditActionConnect`
`41`		`-caseagentproto.Connection_DISCONNECT:`
`42`		`-action=database.AuditActionDisconnect`
`43`		`-default:`
`44`		`-returnnil,xerrors.Errorf("unknown agent connection action %q",req.GetConnection().GetAction())`
	`37`	`+action,err:=AgentProtoConnectionActionToAuditAction(req.GetConnection().GetAction())`
	`38`	`+iferr!=nil {`
	`39`	`+returnnil,err`
`45`	`40`	`}`
`46`		`-`
`47`		`-varconnectionType agentsdk.ConnectionType`
`48`		`-switchreq.GetConnection().GetType() {`
`49`		`-caseagentproto.Connection_SSH:`
`50`		`-connectionType=agentsdk.ConnectionTypeSSH`
`51`		`-caseagentproto.Connection_VSCODE:`
`52`		`-connectionType=agentsdk.ConnectionTypeVSCode`
`53`		`-caseagentproto.Connection_JETBRAINS:`
`54`		`-connectionType=agentsdk.ConnectionTypeJetBrains`
`55`		`-caseagentproto.Connection_RECONNECTING_PTY:`
`56`		`-connectionType=agentsdk.ConnectionTypeReconnectingPTY`
`57`		`-default:`
`58`		`-returnnil,xerrors.Errorf("unknown agent connection type %q",req.GetConnection().GetType())`
	`41`	`+connectionType,err:=AgentProtoConnectionTypeToAgentConnectionType(req.GetConnection().GetType())`
	`42`	`+iferr!=nil {`
	`43`	`+returnnil,err`
`59`	`44`	`}`
`60`	`45`
`61`	`46`	`// Fetch contextual data for this audit event.`
`@@ -115,3 +100,29 @@ func (a AuditAPI) ReportConnection(ctx context.Context, req agentproto.ReportC`
`115`	`100`
`116`	`101`	`return&emptypb.Empty{},nil`
`117`	`102`	`}`
	`103`	`+`
	`104`	`+funcAgentProtoConnectionActionToAuditAction(action agentproto.Connection_Action) (database.AuditAction,error) {`
	`105`	`+switchaction {`
	`106`	`+caseagentproto.Connection_CONNECT:`
	`107`	`+returndatabase.AuditActionConnect,nil`
	`108`	`+caseagentproto.Connection_DISCONNECT:`
	`109`	`+returndatabase.AuditActionDisconnect,nil`
	`110`	`+default:`
	`111`	`+return"",xerrors.Errorf("unknown agent connection action %q",action)`
	`112`	`+}`
	`113`	`+}`
	`114`	`+`
	`115`	`+funcAgentProtoConnectionTypeToAgentConnectionType(typ agentproto.Connection_Type) (agentsdk.ConnectionType,error) {`
	`116`	`+switchtyp {`
	`117`	`+caseagentproto.Connection_SSH:`
	`118`	`+returnagentsdk.ConnectionTypeSSH,nil`
	`119`	`+caseagentproto.Connection_VSCODE:`
	`120`	`+returnagentsdk.ConnectionTypeVSCode,nil`
	`121`	`+caseagentproto.Connection_JETBRAINS:`
	`122`	`+returnagentsdk.ConnectionTypeJetBrains,nil`
	`123`	`+caseagentproto.Connection_RECONNECTING_PTY:`
	`124`	`+returnagentsdk.ConnectionTypeReconnectingPTY,nil`
	`125`	`+default:`
	`126`	`+return"",xerrors.Errorf("unknown agent connection type %q",typ)`
	`127`	`+}`
	`128`	`+}`

`‎coderd/agentapi/audit_test.go`

Lines changed: 7 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,32 +147,16 @@ func TestAuditReport(t *testing.T) {`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`-funcagentProtoConnectionActionToAudit(t*testing.T,typ agentproto.Connection_Action) database.AuditAction {`
`151`		`-switchtyp {`
`152`		`-caseagentproto.Connection_CONNECT:`
`153`		`-returndatabase.AuditActionConnect`
`154`		`-caseagentproto.Connection_DISCONNECT:`
`155`		`-returndatabase.AuditActionDisconnect`
`156`		`-default:`
`157`		`-t.Fatalf("unknown agent connection action %q",typ)`
`158`		`-return""`
`159`		`-}`
	`150`	`+funcagentProtoConnectionActionToAudit(t*testing.T,action agentproto.Connection_Action) database.AuditAction {`
	`151`	`+a,err:=agentapi.AgentProtoConnectionActionToAuditAction(action)`
	`152`	`+require.NoError(t,err)`
	`153`	`+returna`
`160`	`154`	`}`
`161`	`155`
`162`	`156`	`funcagentProtoConnectionTypeToSDK(t*testing.T,typ agentproto.Connection_Type) agentsdk.ConnectionType {`
`163`		`-switchtyp {`
`164`		`-caseagentproto.Connection_SSH:`
`165`		`-returnagentsdk.ConnectionTypeSSH`
`166`		`-caseagentproto.Connection_VSCODE:`
`167`		`-returnagentsdk.ConnectionTypeVSCode`
`168`		`-caseagentproto.Connection_JETBRAINS:`
`169`		`-returnagentsdk.ConnectionTypeJetBrains`
`170`		`-caseagentproto.Connection_RECONNECTING_PTY:`
`171`		`-returnagentsdk.ConnectionTypeReconnectingPTY`
`172`		`-default:`
`173`		`-t.Fatalf("unknown agent connection type %q",typ)`
`174`		`-return""`
`175`		`-}`
	`157`	`+action,err:=agentapi.AgentProtoConnectionTypeToAgentConnectionType(typ)`
	`158`	`+require.NoError(t,err)`
	`159`	`+returnaction`
`176`	`160`	`}`
`177`	`161`
`178`	`162`	`funcasAtomicPointer[Tany](vT)*atomic.Pointer[T] {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8411d31

File tree

2 files changed

2 files changed

`‎coderd/agentapi/audit.go`

`‎coderd/agentapi/audit_test.go`

0 commit comments