From b43e61c8c7a1c6b840e769680e1763420b620eec Mon Sep 17 00:00:00 2001 From: Irena Rindos Date: Wed, 24 Aug 2022 14:43:15 -0400 Subject: [PATCH] bug(workers): Create worker-led panics on invalid token (#2388) * Check for error before returning result --- internal/cmd/commands/authmethodscmd/oidc_funcs.go | 5 ++++- internal/cmd/commands/workerscmd/worker-led_funcs.go | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/cmd/commands/authmethodscmd/oidc_funcs.go b/internal/cmd/commands/authmethodscmd/oidc_funcs.go index e998188b0..4119e6dc1 100644 --- a/internal/cmd/commands/authmethodscmd/oidc_funcs.go +++ b/internal/cmd/commands/authmethodscmd/oidc_funcs.go @@ -291,7 +291,10 @@ func executeExtraOidcActionsImpl(c *OidcCommand, origResp *api.Response, origIte opts = append(opts, authmethods.WithOidcAuthMethodDisableDiscoveredConfigValidation(true)) } result, err := amClient.ChangeState(c.Context, c.FlagId, version, c.flagState, opts...) - return result.GetResponse(), result.GetItem(), err + if err != nil { + return nil, nil, err + } + return result.GetResponse(), result.GetItem(), nil } return origResp, origItem, origError } diff --git a/internal/cmd/commands/workerscmd/worker-led_funcs.go b/internal/cmd/commands/workerscmd/worker-led_funcs.go index 13a1cffba..b8d92a996 100644 --- a/internal/cmd/commands/workerscmd/worker-led_funcs.go +++ b/internal/cmd/commands/workerscmd/worker-led_funcs.go @@ -58,7 +58,10 @@ func executeExtraWorkerLedActionsImpl(c *WorkerLedCommand, origResp *api.Respons switch c.Func { case "create": result, err := workerClient.CreateWorkerLed(c.Context, c.flagWorkerGeneratedAuthToken, c.FlagScopeId, opts...) - return result.GetResponse(), result.GetItem(), err + if err != nil { + return nil, nil, err + } + return result.GetResponse(), result.GetItem(), nil } return origResp, origItem, origError }