From 01e5d5bb3539839e00a4e096297189213690909d Mon Sep 17 00:00:00 2001 From: starptech Date: Fri, 31 Jan 2025 12:56:07 +0100 Subject: [PATCH 1/2] fix: error when graph token is not set when cache warmup is enabled --- router/cmd/main.go | 4 ++-- router/core/graph_server.go | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/router/cmd/main.go b/router/cmd/main.go index 44f027b443..e3c5eb0468 100644 --- a/router/cmd/main.go +++ b/router/cmd/main.go @@ -44,12 +44,12 @@ func Main() { result, err := config.LoadConfig(*configPathFlag, *overrideEnvFlag) if err != nil { - log.Fatal("Could not load config", zap.Error(err)) + log.Fatalf("Could not load config: %s", err) } logLevel, err := logging.ZapLogLevelFromString(result.Config.LogLevel) if err != nil { - log.Fatal("Could not parse log level", zap.Error(err)) + log.Fatalf("Could not parse log level: %s", err) } logger := logging.New(!result.Config.JSONLog, result.Config.DevelopmentMode, logLevel). diff --git a/router/core/graph_server.go b/router/core/graph_server.go index 427aeaf7f7..7195b7b524 100644 --- a/router/core/graph_server.go +++ b/router/core/graph_server.go @@ -919,6 +919,11 @@ func (s *graphServer) buildGraphMux(ctx context.Context, operationPlanner := NewOperationPlanner(executor, gm.planCache) if s.Config.cacheWarmup != nil && s.Config.cacheWarmup.Enabled { + + if s.graphApiToken == "" { + return nil, fmt.Errorf("graph token is required for cache warmup in order to communicate with the CDN") + } + processor := NewCacheWarmupPlanningProcessor(&CacheWarmupPlanningProcessorOptions{ OperationProcessor: operationProcessor, OperationPlanner: operationPlanner, From 0955ba396247a00d1bc5eb97acdf53e8164fd63e Mon Sep 17 00:00:00 2001 From: starptech Date: Fri, 31 Jan 2025 13:01:30 +0100 Subject: [PATCH 2/2] fix: improve err msg --- router/internal/jwt/claims.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router/internal/jwt/claims.go b/router/internal/jwt/claims.go index 5d91c6c89e..b6b60f832b 100644 --- a/router/internal/jwt/claims.go +++ b/router/internal/jwt/claims.go @@ -21,7 +21,7 @@ func ExtractFederatedGraphTokenClaims(token string) (*FederatedGraphTokenClaims, _, _, err := jwtParser.ParseUnverified(token, claims) if err != nil { - return nil, fmt.Errorf("invalid token %w", err) + return nil, fmt.Errorf("invalid token: %w", err) } federatedGraphIDValue := claims[FederatedGraphIDClaim]