Jan 30, 2024 · Jan 26, 2024
diff --git a/agent/agent.go b/agent/agent.go
 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)
 }
 }
 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)
diff --git a/agent/agenttest/client.go b/agent/agenttest/client.go
 if err != nil {
 return nil, err
 }
 returnagentproto.ServiceBannerFromSDK(sb), nil
 returnagentsdk.ProtoFromServiceBanner(sb), nil
 }

 func (*FakeAgentAPI) UpdateStats(context.Context, *agentproto.UpdateStatsRequest) (*agentproto.UpdateStatsResponse, error) {
diff --git a/agent/proto/convert.go b/agent/proto/convert.go
diff --git a/coderd/agentapi/servicebanner.go b/coderd/agentapi/servicebanner.go

 "github.com/coder/coder/v2/agent/proto"
 "github.com/coder/coder/v2/coderd/appearance"
 "github.com/coder/coder/v2/codersdk/agentsdk"
 )

 type ServiceBannerAPI struct {
 if err != nil {
 return nil, xerrors.Errorf("fetch appearance: %w", err)
 }
 returnproto.ServiceBannerFromSDK(cfg.ServiceBanner), nil
 returnagentsdk.ProtoFromServiceBanner(cfg.ServiceBanner), nil
 }
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
 })
 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
Expand Up		@@ -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)
		}
		}
Expand DownExpand Up		@@ -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)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -277,7 +277,7 @@ func (f FakeAgentAPI) GetServiceBanner(context.Context, agentproto.GetServiceB
		if err != nil {
		return nil, err
		}
		returnagentproto.ServiceBannerFromSDK(sb), nil
		returnagentsdk.ProtoFromServiceBanner(sb), nil
		}

		func (FakeAgentAPI) UpdateStats(context.Context, agentproto.UpdateStatsRequest) (*agentproto.UpdateStatsResponse, error) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 {
Expand All		@@ -19,5 +20,5 @@ func (a ServiceBannerAPI) GetServiceBanner(ctx context.Context, _ proto.GetSer
		if err != nil {
		return nil, xerrors.Errorf("fetch appearance: %w", err)
		}
		returnproto.ServiceBannerFromSDK(cfg.ServiceBanner), nil
		returnagentsdk.ProtoFromServiceBanner(cfg.ServiceBanner), nil
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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"
Expand Down