move convert methods to sdks

mafredri · mafredri · commit 632bf98e2e1d · 2025-02-17T13:32:03.000Z
diff --git a/coderd/agentapi/audit.go b/coderd/agentapi/audit.go
@@ -15,6 +15,7 @@ import (
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/database"
+	"github.com/coder/coder/v2/coderd/database/db2sdk"
 	"github.com/coder/coder/v2/codersdk/agentsdk"
 )
 
@@ -33,11 +34,11 @@ func (a *AuditAPI) ReportConnection(ctx context.Context, req *agentproto.ReportC
 		return nil, xerrors.Errorf("connection id from bytes: %w", err)
 	}
 
-	action, err := AgentProtoConnectionActionToAuditAction(req.GetConnection().GetAction())
+	action, err := db2sdk.AuditActionFromAgentProtoConnectionAction(req.GetConnection().GetAction())
 	if err != nil {
 		return nil, err
 	}
-	connectionType, err := AgentProtoConnectionTypeToAgentConnectionType(req.GetConnection().GetType())
+	connectionType, err := agentsdk.ConnectionTypeFromProto(req.GetConnection().GetType())
 	if err != nil {
 		return nil, err
 	}
@@ -102,29 +103,3 @@ func (a *AuditAPI) ReportConnection(ctx context.Context, req *agentproto.ReportC
 
 	return &emptypb.Empty{}, nil
 }
-
-func AgentProtoConnectionActionToAuditAction(action agentproto.Connection_Action) (database.AuditAction, error) {
-	switch action {
-	case agentproto.Connection_CONNECT:
-		return database.AuditActionConnect, nil
-	case agentproto.Connection_DISCONNECT:
-		return database.AuditActionDisconnect, nil
-	default:
-		return "", xerrors.Errorf("unknown agent connection action %q", action)
-	}
-}
-
-func AgentProtoConnectionTypeToAgentConnectionType(typ agentproto.Connection_Type) (agentsdk.ConnectionType, error) {
-	switch typ {
-	case agentproto.Connection_SSH:
-		return agentsdk.ConnectionTypeSSH, nil
-	case agentproto.Connection_VSCODE:
-		return agentsdk.ConnectionTypeVSCode, nil
-	case agentproto.Connection_JETBRAINS:
-		return agentsdk.ConnectionTypeJetBrains, nil
-	case agentproto.Connection_RECONNECTING_PTY:
-		return agentsdk.ConnectionTypeReconnectingPTY, nil
-	default:
-		return "", xerrors.Errorf("unknown agent connection type %q", typ)
-	}
-}
diff --git a/coderd/agentapi/audit_test.go b/coderd/agentapi/audit_test.go
@@ -18,6 +18,7 @@ import (
 	"github.com/coder/coder/v2/coderd/agentapi"
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/database"
+	"github.com/coder/coder/v2/coderd/database/db2sdk"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/codersdk/agentsdk"
@@ -160,13 +161,13 @@ func TestAuditReport(t *testing.T) {
 }
 
 func agentProtoConnectionActionToAudit(t *testing.T, action agentproto.Connection_Action) database.AuditAction {
-	a, err := agentapi.AgentProtoConnectionActionToAuditAction(action)
+	a, err := db2sdk.AuditActionFromAgentProtoConnectionAction(action)
 	require.NoError(t, err)
 	return a
 }
 
 func agentProtoConnectionTypeToSDK(t *testing.T, typ agentproto.Connection_Type) agentsdk.ConnectionType {
-	action, err := agentapi.AgentProtoConnectionTypeToAgentConnectionType(typ)
+	action, err := agentsdk.ConnectionTypeFromProto(typ)
 	require.NoError(t, err)
 	return action
 }
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -15,6 +15,7 @@ import (
 	"golang.org/x/xerrors"
 	"tailscale.com/tailcfg"
 
+	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/rbac/policy"
@@ -705,3 +706,26 @@ func TemplateRoleActions(role codersdk.TemplateRole) []policy.Action {
 	}
 	return []policy.Action{}
 }
+
+func AuditActionFromAgentProtoConnectionAction(action agentproto.Connection_Action) (database.AuditAction, error) {
+	switch action {
+	case agentproto.Connection_CONNECT:
+		return database.AuditActionConnect, nil
+	case agentproto.Connection_DISCONNECT:
+		return database.AuditActionDisconnect, nil
+	default:
+		// Also Connection_ACTION_UNSPECIFIED, no mapping.
+		return "", xerrors.Errorf("unknown agent connection action %q", action)
+	}
+}
+
+func AgentProtoConnectionActionToAuditAction(action database.AuditAction) (agentproto.Connection_Action, error) {
+	switch action {
+	case database.AuditActionConnect:
+		return agentproto.Connection_CONNECT, nil
+	case database.AuditActionDisconnect:
+		return agentproto.Connection_DISCONNECT, nil
+	default:
+		return agentproto.Connection_ACTION_UNSPECIFIED, xerrors.Errorf("unknown agent connection action %q", action)
+	}
+}
diff --git a/codersdk/agentsdk/convert.go b/codersdk/agentsdk/convert.go
@@ -390,3 +390,37 @@ func ProtoFromLifecycleState(s codersdk.WorkspaceAgentLifecycle) (proto.Lifecycl
 	}
 	return proto.Lifecycle_State(caps), nil
 }
+
+func ConnectionTypeFromProto(typ proto.Connection_Type) (ConnectionType, error) {
+	switch typ {
+	case proto.Connection_TYPE_UNSPECIFIED:
+		return ConnectionTypeUnspecified, nil
+	case proto.Connection_SSH:
+		return ConnectionTypeSSH, nil
+	case proto.Connection_VSCODE:
+		return ConnectionTypeVSCode, nil
+	case proto.Connection_JETBRAINS:
+		return ConnectionTypeJetBrains, nil
+	case proto.Connection_RECONNECTING_PTY:
+		return ConnectionTypeReconnectingPTY, nil
+	default:
+		return "", xerrors.Errorf("unknown connection type %q", typ)
+	}
+}
+
+func ProtoFromConnectionType(typ ConnectionType) (proto.Connection_Type, error) {
+	switch typ {
+	case ConnectionTypeUnspecified:
+		return proto.Connection_TYPE_UNSPECIFIED, nil
+	case ConnectionTypeSSH:
+		return proto.Connection_SSH, nil
+	case ConnectionTypeVSCode:
+		return proto.Connection_VSCODE, nil
+	case ConnectionTypeJetBrains:
+		return proto.Connection_JETBRAINS, nil
+	case ConnectionTypeReconnectingPTY:
+		return proto.Connection_RECONNECTING_PTY, nil
+	default:
+		return 0, xerrors.Errorf("unknown connection type %q", typ)
+	}
+}
