feat(api): maintenance allow worker and service calls (#6163)

richardlt · web-flow · commit 386edb19918d · 2022-05-04T11:57:00.000+02:00
diff --git a/engine/api/router_middleware.go b/engine/api/router_middleware.go
@@ -9,8 +9,11 @@ import (
 )
 
 func (api *API) maintenanceMiddleware(ctx context.Context, w http.ResponseWriter, req *http.Request, rc *service.HandlerConfig) (context.Context, error) {
-	if !isMaintainer(ctx) && api.Maintenance && !rc.MaintenanceAware && rc.Method != http.MethodGet {
-		return ctx, sdk.WrapError(sdk.ErrServiceUnavailable, "CDS Maintenance ON")
+	if api.Maintenance && !rc.MaintenanceAware && rc.Method != http.MethodGet {
+		isAllowed := isMaintainer(ctx) || isService(ctx) || isWorker(ctx)
+		if !isAllowed {
+			return ctx, sdk.WrapError(sdk.ErrServiceUnavailable, "CDS Maintenance ON")
+		}
 	}
 	return ctx, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,11 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func (api API) maintenanceMiddleware(ctx context.Context, w http.ResponseWriter, req http.Request, rc *service.HandlerConfig) (context.Context, error) {`
`12`		`- if !isMaintainer(ctx) && api.Maintenance && !rc.MaintenanceAware && rc.Method != http.MethodGet {`
`13`		`- return ctx, sdk.WrapError(sdk.ErrServiceUnavailable, "CDS Maintenance ON")`
	`12`	`+ if api.Maintenance && !rc.MaintenanceAware && rc.Method != http.MethodGet {`
	`13`	`+ isAllowed := isMaintainer(ctx) \|\| isService(ctx) \|\| isWorker(ctx)`
	`14`	`+ if !isAllowed {`
	`15`	`+ return ctx, sdk.WrapError(sdk.ErrServiceUnavailable, "CDS Maintenance ON")`
	`16`	`+ }`
`14`	`17`	`}`
`15`	`18`	`return ctx, nil`
`16`	`19`	`}`