coder
diff --git a/‎agent/agent.go
Lines changed: 2 additions & 2 deletions b/‎agent/agent.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎agent/agenttest/client.go
Lines changed: 1 addition & 1 deletion b/‎agent/agenttest/client.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎agent/proto/convert.go
Lines changed: 0 additions & 122 deletions b/‎agent/proto/convert.go
Lines changed: 0 additions & 122 deletions
diff --git a/‎coderd/agentapi/servicebanner.go
Lines changed: 2 additions & 1 deletion b/‎coderd/agentapi/servicebanner.go
Lines changed: 2 additions & 1 deletion
diff --git a/‎coderd/workspaceagents.go
Lines changed: 3 additions & 47 deletions b/‎coderd/workspaceagents.go
Lines changed: 3 additions & 47 deletions
@@ -677,7 +677,7 @@ func (a *agent) fetchServiceBannerLoop(ctx context.Context, aAPI proto.DRPCAgent
 				a.logger.Error(ctx, "failed to update service banner", slog.Error(err))
 				return err
 			}
-			serviceBanner := proto.SDKServiceBannerFromProto(sbp)
+			serviceBanner := agentsdk.ServiceBannerFromProto(sbp)
 			a.serviceBanner.Store(&serviceBanner)
 		}
 	}
@@ -710,7 +710,7 @@ func (a *agent) run(ctx context.Context) error {
 	if err != nil {
 		return xerrors.Errorf("fetch service banner: %w", err)
 	}
-	serviceBanner := proto.SDKServiceBannerFromProto(sbp)
+	serviceBanner := agentsdk.ServiceBannerFromProto(sbp)
 	a.serviceBanner.Store(&serviceBanner)
 
 	manifest, err := a.client.Manifest(ctx)
 
@@ -277,7 +277,7 @@ func (f *FakeAgentAPI) GetServiceBanner(context.Context, *agentproto.GetServiceB
 	if err != nil {
 		return nil, err
 	}
-	return agentproto.ServiceBannerFromSDK(sb), nil
+	return agentsdk.ProtoFromServiceBanner(sb), nil
 }
 
 func (*FakeAgentAPI) UpdateStats(context.Context, *agentproto.UpdateStatsRequest) (*agentproto.UpdateStatsResponse, error) {
 
@@ -8,6 +8,7 @@ import (
 
 	"github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/appearance"
+	"github.com/coder/coder/v2/codersdk/agentsdk"
 )
 
 type ServiceBannerAPI struct {
@@ -19,5 +20,5 @@ func (a *ServiceBannerAPI) GetServiceBanner(ctx context.Context, _ *proto.GetSer
 	if err != nil {
 		return nil, xerrors.Errorf("fetch appearance: %w", err)
 	}
-	return proto.ServiceBannerFromSDK(cfg.ServiceBanner), nil
+	return agentsdk.ProtoFromServiceBanner(cfg.ServiceBanner), nil
 }
@@ -179,60 +179,16 @@ func (api *API) workspaceAgentManifest(rw http.ResponseWriter, r *http.Request)
 		})
 		return
 	}
-
-	apps, err := agentproto.SDKAppsFromProto(manifest.Apps)
-	if err != nil {
-		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error converting workspace agent apps.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-
-	scripts, err := agentproto.SDKAgentScriptsFromProto(manifest.Scripts)
-	if err != nil {
-		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error converting workspace agent scripts.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-
-	agentID, err := uuid.FromBytes(manifest.AgentId)
+	sdkManifest, err := agentsdk.ManifestFromProto(manifest)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error converting workspace agent ID.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-	workspaceID, err := uuid.FromBytes(manifest.WorkspaceId)
-	if err != nil {
-		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error converting workspace ID.",
+			Message: "Internal error converting manifest.",
 			Detail:  err.Error(),
 		})
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, agentsdk.Manifest{
-		AgentID:                  agentID,
-		AgentName:                manifest.AgentName,
-		OwnerName:                manifest.OwnerUsername,
-		WorkspaceID:              workspaceID,
-		WorkspaceName:            manifest.WorkspaceName,
-		Apps:                     apps,
-		Scripts:                  scripts,
-		DERPMap:                  tailnet.DERPMapFromProto(manifest.DerpMap),
-		DERPForceWebSockets:      manifest.DerpForceWebsockets,
-		GitAuthConfigs:           int(manifest.GitAuthConfigs),
-		EnvironmentVariables:     manifest.EnvironmentVariables,
-		Directory:                manifest.Directory,
-		VSCodePortProxyURI:       manifest.VsCodePortProxyUri,
-		MOTDFile:                 manifest.MotdPath,
-		DisableDirectConnections: manifest.DisableDirectConnections,
-		Metadata:                 agentproto.SDKAgentMetadataDescriptionsFromProto(manifest.Metadata),
-	})
+	httpapi.Write(ctx, rw, http.StatusOK, sdkManifest)
 }
 
 const AgentAPIVersionREST = "1.0"
Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ func (a *agent) fetchServiceBannerLoop(ctx context.Context, aAPI proto.DRPCAgent`
`677`	`677`	`a.logger.Error(ctx, "failed to update service banner", slog.Error(err))`
`678`	`678`	`return err`
`679`	`679`	`}`
`680`		`- serviceBanner := proto.SDKServiceBannerFromProto(sbp)`
	`680`	`+ serviceBanner := agentsdk.ServiceBannerFromProto(sbp)`
`681`	`681`	`a.serviceBanner.Store(&serviceBanner)`
`682`	`682`	`}`
`683`	`683`	`}`
`@@ -710,7 +710,7 @@ func (a *agent) run(ctx context.Context) error {`
`710`	`710`	`if err != nil {`
`711`	`711`	`return xerrors.Errorf("fetch service banner: %w", err)`
`712`	`712`	`}`
`713`		`- serviceBanner := proto.SDKServiceBannerFromProto(sbp)`
	`713`	`+ serviceBanner := agentsdk.ServiceBannerFromProto(sbp)`
`714`	`714`	`a.serviceBanner.Store(&serviceBanner)`
`715`	`715`
`716`	`716`	`manifest, err := a.client.Manifest(ctx)`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ func (f FakeAgentAPI) GetServiceBanner(context.Context, agentproto.GetServiceB`
`277`	`277`	`if err != nil {`
`278`	`278`	`return nil, err`
`279`	`279`	`}`
`280`		`- return agentproto.ServiceBannerFromSDK(sb), nil`
	`280`	`+ return agentsdk.ProtoFromServiceBanner(sb), nil`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`func (FakeAgentAPI) UpdateStats(context.Context, agentproto.UpdateStatsRequest) (*agentproto.UpdateStatsResponse, error) {`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/coder/coder/v2/agent/proto"`
`10`	`10`	`"github.com/coder/coder/v2/coderd/appearance"`
	`11`	`+ "github.com/coder/coder/v2/codersdk/agentsdk"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`type ServiceBannerAPI struct {`
`@@ -19,5 +20,5 @@ func (a ServiceBannerAPI) GetServiceBanner(ctx context.Context, _ proto.GetSer`
`19`	`20`	`if err != nil {`
`20`	`21`	`return nil, xerrors.Errorf("fetch appearance: %w", err)`
`21`	`22`	`}`
`22`		`- return proto.ServiceBannerFromSDK(cfg.ServiceBanner), nil`
	`23`	`+ return agentsdk.ProtoFromServiceBanner(cfg.ServiceBanner), nil`
`23`	`24`	`}`