Skip to content

Commit 2e621a7

Browse files
mafredrimafredri
committed
chore(agent): update agent proto client
This change updates the agent API client signatures to v2.6 from v2.4. The updated client will be used in the future. Updates coder/internal#621
1 parent 5f7e5d7 commit 2e621a7

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎agent/agent.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ func (t *trySingleflight) Do(key string, fn func()) {
456456
fn()
457457
}
458458

459-
func (a *agent) reportMetadata(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
459+
func (a *agent) reportMetadata(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
460460
tickerDone := make(chan struct{})
461461
collectDone := make(chan struct{})
462462
ctx, cancel := context.WithCancel(ctx)
@@ -672,7 +672,7 @@ func (a *agent) reportMetadata(ctx context.Context, aAPI proto.DRPCAgentClient24
672672

673673
// reportLifecycle reports the current lifecycle state once. All state
674674
// changes are reported in order.
675-
func (a *agent) reportLifecycle(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
675+
func (a *agent) reportLifecycle(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
676676
for {
677677
select {
678678
case <-a.lifecycleUpdate:
@@ -752,7 +752,7 @@ func (a *agent) setLifecycle(state codersdk.WorkspaceAgentLifecycle) {
752752
}
753753

754754
// reportConnectionsLoop reports connections to the agent for auditing.
755-
func (a *agent) reportConnectionsLoop(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
755+
func (a *agent) reportConnectionsLoop(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
756756
for {
757757
select {
758758
case <-a.reportConnectionsUpdate:
@@ -872,7 +872,7 @@ func (a *agent) reportConnection(id uuid.UUID, connectionType proto.Connection_T
872872
// fetchServiceBannerLoop fetches the service banner on an interval. It will
873873
// not be fetched immediately; the expectation is that it is primed elsewhere
874874
// (and must be done before the session actually starts).
875-
func (a *agent) fetchServiceBannerLoop(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
875+
func (a *agent) fetchServiceBannerLoop(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
876876
ticker := time.NewTicker(a.announcementBannersRefreshInterval)
877877
defer ticker.Stop()
878878
for {
@@ -925,7 +925,7 @@ func (a *agent) run() (retErr error) {
925925
connMan := newAPIConnRoutineManager(a.gracefulCtx, a.hardCtx, a.logger, aAPI, tAPI)
926926

927927
connMan.startAgentAPI("init notification banners", gracefulShutdownBehaviorStop,
928-
func(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
928+
func(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
929929
bannersProto, err := aAPI.GetAnnouncementBanners(ctx, &proto.GetAnnouncementBannersRequest{})
930930
if err != nil {
931931
return xerrors.Errorf("fetch service banner: %w", err)
@@ -942,7 +942,7 @@ func (a *agent) run() (retErr error) {
942942
// sending logs gets gracefulShutdownBehaviorRemain because we want to send logs generated by
943943
// shutdown scripts.
944944
connMan.startAgentAPI("send logs", gracefulShutdownBehaviorRemain,
945-
func(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
945+
func(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
946946
err := a.logSender.SendLoop(ctx, aAPI)
947947
if xerrors.Is(err, agentsdk.ErrLogLimitExceeded) {
948948
// we don't want this error to tear down the API connection and propagate to the
@@ -961,7 +961,7 @@ func (a *agent) run() (retErr error) {
961961
connMan.startAgentAPI("report metadata", gracefulShutdownBehaviorStop, a.reportMetadata)
962962

963963
// resources monitor can cease as soon as we start gracefully shutting down.
964-
connMan.startAgentAPI("resources monitor", gracefulShutdownBehaviorStop, func(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
964+
connMan.startAgentAPI("resources monitor", gracefulShutdownBehaviorStop, func(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
965965
logger := a.logger.Named("resources_monitor")
966966
clk := quartz.NewReal()
967967
config, err := aAPI.GetResourcesMonitoringConfiguration(ctx, &proto.GetResourcesMonitoringConfigurationRequest{})
@@ -1008,7 +1008,7 @@ func (a *agent) run() (retErr error) {
10081008
connMan.startAgentAPI("handle manifest", gracefulShutdownBehaviorStop, a.handleManifest(manifestOK))
10091009

10101010
connMan.startAgentAPI("app health reporter", gracefulShutdownBehaviorStop,
1011-
func(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
1011+
func(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
10121012
if err := manifestOK.wait(ctx); err != nil {
10131013
return xerrors.Errorf("no manifest: %w", err)
10141014
}
@@ -1041,7 +1041,7 @@ func (a *agent) run() (retErr error) {
10411041

10421042
connMan.startAgentAPI("fetch service banner loop", gracefulShutdownBehaviorStop, a.fetchServiceBannerLoop)
10431043

1044-
connMan.startAgentAPI("stats report loop", gracefulShutdownBehaviorStop, func(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
1044+
connMan.startAgentAPI("stats report loop", gracefulShutdownBehaviorStop, func(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
10451045
if err := networkOK.wait(ctx); err != nil {
10461046
return xerrors.Errorf("no network: %w", err)
10471047
}
@@ -1056,8 +1056,8 @@ func (a *agent) run() (retErr error) {
10561056
}
10571057

10581058
// handleManifest returns a function that fetches and processes the manifest
1059-
func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
1060-
return func(ctx context.Context, aAPI proto.DRPCAgentClient24) error {
1059+
func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
1060+
return func(ctx context.Context, aAPI proto.DRPCAgentClient26) error {
10611061
var (
10621062
sentResult = false
10631063
err error
@@ -1187,8 +1187,8 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
11871187

11881188
// createOrUpdateNetwork waits for the manifest to be set using manifestOK, then creates or updates
11891189
// the tailnet using the information in the manifest
1190-
func (a *agent) createOrUpdateNetwork(manifestOK, networkOK *checkpoint) func(context.Context, proto.DRPCAgentClient24) error {
1191-
return func(ctx context.Context, _ proto.DRPCAgentClient24) (retErr error) {
1190+
func (a *agent) createOrUpdateNetwork(manifestOK, networkOK *checkpoint) func(context.Context, proto.DRPCAgentClient26) error {
1191+
return func(ctx context.Context, _ proto.DRPCAgentClient26) (retErr error) {
11921192
if err := manifestOK.wait(ctx); err != nil {
11931193
return xerrors.Errorf("no manifest: %w", err)
11941194
}
@@ -1960,7 +1960,7 @@ const (
19601960

19611961
type apiConnRoutineManager struct {
19621962
logger slog.Logger
1963-
aAPI proto.DRPCAgentClient24
1963+
aAPI proto.DRPCAgentClient26
19641964
tAPI tailnetproto.DRPCTailnetClient24
19651965
eg *errgroup.Group
19661966
stopCtx context.Context
@@ -1969,7 +1969,7 @@ type apiConnRoutineManager struct {
19691969

19701970
func newAPIConnRoutineManager(
19711971
gracefulCtx, hardCtx context.Context, logger slog.Logger,
1972-
aAPI proto.DRPCAgentClient24, tAPI tailnetproto.DRPCTailnetClient24,
1972+
aAPI proto.DRPCAgentClient26, tAPI tailnetproto.DRPCTailnetClient24,
19731973
) *apiConnRoutineManager {
19741974
// routines that remain in operation during graceful shutdown use the remainCtx. They'll still
19751975
// exit if the errgroup hits an error, which usually means a problem with the conn.
@@ -2002,7 +2002,7 @@ func newAPIConnRoutineManager(
20022002
// but for Tailnet.
20032003
func (a *apiConnRoutineManager) startAgentAPI(
20042004
name string, behavior gracefulShutdownBehavior,
2005-
f func(context.Context, proto.DRPCAgentClient24) error,
2005+
f func(context.Context, proto.DRPCAgentClient26) error,
20062006
) {
20072007
logger := a.logger.With(slog.F("name", name))
20082008
var ctx context.Context

0 commit comments

Comments
 (0)