DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Fix refresh session

Browse source 
It seems that Status is a string when you create a session, but a number
when you refresh it (?).

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2025-04-17 10:52:39 +00:00
parent 19ba210804
commit 12f40a5352
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
params/github.go
View file

@ -251,7 +251,7 @@ type RunnerScaleSet struct {
GetAcquirableJobsURL string `json:"getAcquirableJobsUrl,omitempty"`
AcquireJobsURL string `json:"acquireJobsUrl,omitempty"`
Statistics *RunnerScaleSetStatistic `json:"statistics,omitempty"`
Status string `json:"status,omitempty"`
Status interface{} `json:"status,omitempty"`
Enabled *bool `json:"enabled,omitempty"`
}

10
util/github/scalesets/message_sessions.go
View file

@ -59,6 +59,10 @@ func (m *MessageSession) Close() error {
return nil
}
func (m *MessageSession) MessageQueueAccessToken() string {
return m.session.MessageQueueAccessToken
}
func (m *MessageSession) LastError() error {
return m.lastErr
}
@ -128,9 +132,8 @@ func (m *MessageSession) Refresh(ctx context.Context) error {
if err := json.NewDecoder(resp.Body).Decode(&refreshedSession); err != nil {
return fmt.Errorf("failed to decode response: %w", err)
}
slog.DebugContext(ctx, "refreshed message session token", "session_id", refreshedSession.SessionID.String())
m.session.MessageQueueAccessToken = refreshedSession.MessageQueueAccessToken
m.session.Statistics = refreshedSession.Statistics
slog.DebugContext(ctx, "refreshed message session token", "session", refreshedSession)
m.session = &refreshedSession
return nil
}
@ -150,7 +153,6 @@ func (m *MessageSession) maybeRefreshToken(ctx context.Context) error {
expiresIn := time.Duration(randInt.Int64())*time.Millisecond + 10*time.Minute
slog.DebugContext(ctx, "checking if message session token needs refresh", "expires_at", expiresAt)
if m.session.ExpiresIn(expiresIn) {
slog.DebugContext(ctx, "refreshing message session token")
if err := m.Refresh(ctx); err != nil {
return fmt.Errorf("failed to refresh message queue token: %w", err)
}