Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit632bf98

Browse files
committed
move convert methods to sdks
1 parent6234f72 commit632bf98

File tree

4 files changed

+64
-30
lines changed

4 files changed

+64
-30
lines changed

‎coderd/agentapi/audit.go

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
agentproto"github.com/coder/coder/v2/agent/proto"
1616
"github.com/coder/coder/v2/coderd/audit"
1717
"github.com/coder/coder/v2/coderd/database"
18+
"github.com/coder/coder/v2/coderd/database/db2sdk"
1819
"github.com/coder/coder/v2/codersdk/agentsdk"
1920
)
2021

@@ -33,11 +34,11 @@ func (a *AuditAPI) ReportConnection(ctx context.Context, req *agentproto.ReportC
3334
returnnil,xerrors.Errorf("connection id from bytes: %w",err)
3435
}
3536

36-
action,err:=AgentProtoConnectionActionToAuditAction(req.GetConnection().GetAction())
37+
action,err:=db2sdk.AuditActionFromAgentProtoConnectionAction(req.GetConnection().GetAction())
3738
iferr!=nil {
3839
returnnil,err
3940
}
40-
connectionType,err:=AgentProtoConnectionTypeToAgentConnectionType(req.GetConnection().GetType())
41+
connectionType,err:=agentsdk.ConnectionTypeFromProto(req.GetConnection().GetType())
4142
iferr!=nil {
4243
returnnil,err
4344
}
@@ -102,29 +103,3 @@ func (a *AuditAPI) ReportConnection(ctx context.Context, req *agentproto.ReportC
102103

103104
return&emptypb.Empty{},nil
104105
}
105-
106-
funcAgentProtoConnectionActionToAuditAction(action agentproto.Connection_Action) (database.AuditAction,error) {
107-
switchaction {
108-
caseagentproto.Connection_CONNECT:
109-
returndatabase.AuditActionConnect,nil
110-
caseagentproto.Connection_DISCONNECT:
111-
returndatabase.AuditActionDisconnect,nil
112-
default:
113-
return"",xerrors.Errorf("unknown agent connection action %q",action)
114-
}
115-
}
116-
117-
funcAgentProtoConnectionTypeToAgentConnectionType(typ agentproto.Connection_Type) (agentsdk.ConnectionType,error) {
118-
switchtyp {
119-
caseagentproto.Connection_SSH:
120-
returnagentsdk.ConnectionTypeSSH,nil
121-
caseagentproto.Connection_VSCODE:
122-
returnagentsdk.ConnectionTypeVSCode,nil
123-
caseagentproto.Connection_JETBRAINS:
124-
returnagentsdk.ConnectionTypeJetBrains,nil
125-
caseagentproto.Connection_RECONNECTING_PTY:
126-
returnagentsdk.ConnectionTypeReconnectingPTY,nil
127-
default:
128-
return"",xerrors.Errorf("unknown agent connection type %q",typ)
129-
}
130-
}

‎coderd/agentapi/audit_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/coder/coder/v2/coderd/agentapi"
1919
"github.com/coder/coder/v2/coderd/audit"
2020
"github.com/coder/coder/v2/coderd/database"
21+
"github.com/coder/coder/v2/coderd/database/db2sdk"
2122
"github.com/coder/coder/v2/coderd/database/dbmock"
2223
"github.com/coder/coder/v2/coderd/database/dbtime"
2324
"github.com/coder/coder/v2/codersdk/agentsdk"
@@ -160,13 +161,13 @@ func TestAuditReport(t *testing.T) {
160161
}
161162

162163
funcagentProtoConnectionActionToAudit(t*testing.T,action agentproto.Connection_Action) database.AuditAction {
163-
a,err:=agentapi.AgentProtoConnectionActionToAuditAction(action)
164+
a,err:=db2sdk.AuditActionFromAgentProtoConnectionAction(action)
164165
require.NoError(t,err)
165166
returna
166167
}
167168

168169
funcagentProtoConnectionTypeToSDK(t*testing.T,typ agentproto.Connection_Type) agentsdk.ConnectionType {
169-
action,err:=agentapi.AgentProtoConnectionTypeToAgentConnectionType(typ)
170+
action,err:=agentsdk.ConnectionTypeFromProto(typ)
170171
require.NoError(t,err)
171172
returnaction
172173
}

‎coderd/database/db2sdk/db2sdk.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"golang.org/x/xerrors"
1616
"tailscale.com/tailcfg"
1717

18+
agentproto"github.com/coder/coder/v2/agent/proto"
1819
"github.com/coder/coder/v2/coderd/database"
1920
"github.com/coder/coder/v2/coderd/rbac"
2021
"github.com/coder/coder/v2/coderd/rbac/policy"
@@ -705,3 +706,26 @@ func TemplateRoleActions(role codersdk.TemplateRole) []policy.Action {
705706
}
706707
return []policy.Action{}
707708
}
709+
710+
funcAuditActionFromAgentProtoConnectionAction(action agentproto.Connection_Action) (database.AuditAction,error) {
711+
switchaction {
712+
caseagentproto.Connection_CONNECT:
713+
returndatabase.AuditActionConnect,nil
714+
caseagentproto.Connection_DISCONNECT:
715+
returndatabase.AuditActionDisconnect,nil
716+
default:
717+
// Also Connection_ACTION_UNSPECIFIED, no mapping.
718+
return"",xerrors.Errorf("unknown agent connection action %q",action)
719+
}
720+
}
721+
722+
funcAgentProtoConnectionActionToAuditAction(action database.AuditAction) (agentproto.Connection_Action,error) {
723+
switchaction {
724+
casedatabase.AuditActionConnect:
725+
returnagentproto.Connection_CONNECT,nil
726+
casedatabase.AuditActionDisconnect:
727+
returnagentproto.Connection_DISCONNECT,nil
728+
default:
729+
returnagentproto.Connection_ACTION_UNSPECIFIED,xerrors.Errorf("unknown agent connection action %q",action)
730+
}
731+
}

‎codersdk/agentsdk/convert.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,3 +390,37 @@ func ProtoFromLifecycleState(s codersdk.WorkspaceAgentLifecycle) (proto.Lifecycl
390390
}
391391
returnproto.Lifecycle_State(caps),nil
392392
}
393+
394+
funcConnectionTypeFromProto(typ proto.Connection_Type) (ConnectionType,error) {
395+
switchtyp {
396+
caseproto.Connection_TYPE_UNSPECIFIED:
397+
returnConnectionTypeUnspecified,nil
398+
caseproto.Connection_SSH:
399+
returnConnectionTypeSSH,nil
400+
caseproto.Connection_VSCODE:
401+
returnConnectionTypeVSCode,nil
402+
caseproto.Connection_JETBRAINS:
403+
returnConnectionTypeJetBrains,nil
404+
caseproto.Connection_RECONNECTING_PTY:
405+
returnConnectionTypeReconnectingPTY,nil
406+
default:
407+
return"",xerrors.Errorf("unknown connection type %q",typ)
408+
}
409+
}
410+
411+
funcProtoFromConnectionType(typConnectionType) (proto.Connection_Type,error) {
412+
switchtyp {
413+
caseConnectionTypeUnspecified:
414+
returnproto.Connection_TYPE_UNSPECIFIED,nil
415+
caseConnectionTypeSSH:
416+
returnproto.Connection_SSH,nil
417+
caseConnectionTypeVSCode:
418+
returnproto.Connection_VSCODE,nil
419+
caseConnectionTypeJetBrains:
420+
returnproto.Connection_JETBRAINS,nil
421+
caseConnectionTypeReconnectingPTY:
422+
returnproto.Connection_RECONNECTING_PTY,nil
423+
default:
424+
return0,xerrors.Errorf("unknown connection type %q",typ)
425+
}
426+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp