@@ -65,15 +65,17 @@ func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter,
6565 rawVersion := r .URL .Query ().Get ("version" )
6666 version , err := strconv .ParseUint (rawVersion , 10 , 64 )
6767 if err != nil {
68- return fmt .Errorf ("Invalid swarm version '%s': %s" , rawVersion , err .Error ())
68+ err := fmt .Errorf ("invalid swarm version '%s': %v" , rawVersion , err )
69+ return errors .NewBadRequestError (err )
6970 }
7071
7172 var flags types.UpdateFlags
7273
7374 if value := r .URL .Query ().Get ("rotateWorkerToken" ); value != "" {
7475 rot , err := strconv .ParseBool (value )
7576 if err != nil {
76- return fmt .Errorf ("invalid value for rotateWorkerToken: %s" , value )
77+ err := fmt .Errorf ("invalid value for rotateWorkerToken: %s" , value )
78+ return errors .NewBadRequestError (err )
7779 }
7880
7981 flags .RotateWorkerToken = rot
@@ -82,7 +84,8 @@ func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter,
8284 if value := r .URL .Query ().Get ("rotateManagerToken" ); value != "" {
8385 rot , err := strconv .ParseBool (value )
8486 if err != nil {
85- return fmt .Errorf ("invalid value for rotateManagerToken: %s" , value )
87+ err := fmt .Errorf ("invalid value for rotateManagerToken: %s" , value )
88+ return errors .NewBadRequestError (err )
8689 }
8790
8891 flags .RotateManagerToken = rot
@@ -91,7 +94,7 @@ func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter,
9194 if value := r .URL .Query ().Get ("rotateManagerUnlockKey" ); value != "" {
9295 rot , err := strconv .ParseBool (value )
9396 if err != nil {
94- return fmt .Errorf ("invalid value for rotateManagerUnlockKey: %s" , value )
97+ return errors . NewBadRequestError ( fmt .Errorf ("invalid value for rotateManagerUnlockKey: %s" , value ) )
9598 }
9699
97100 flags .RotateManagerUnlockKey = rot
@@ -184,7 +187,8 @@ func (sr *swarmRouter) updateService(ctx context.Context, w http.ResponseWriter,
184187 rawVersion := r .URL .Query ().Get ("version" )
185188 version , err := strconv .ParseUint (rawVersion , 10 , 64 )
186189 if err != nil {
187- return fmt .Errorf ("Invalid service version '%s': %s" , rawVersion , err .Error ())
190+ err := fmt .Errorf ("invalid service version '%s': %v" , rawVersion , err )
191+ return errors .NewBadRequestError (err )
188192 }
189193
190194 // Get returns "" if the header does not exist
@@ -294,7 +298,8 @@ func (sr *swarmRouter) updateNode(ctx context.Context, w http.ResponseWriter, r
294298 rawVersion := r .URL .Query ().Get ("version" )
295299 version , err := strconv .ParseUint (rawVersion , 10 , 64 )
296300 if err != nil {
297- return fmt .Errorf ("Invalid node version '%s': %s" , rawVersion , err .Error ())
301+ err := fmt .Errorf ("invalid node version '%s': %v" , rawVersion , err )
302+ return errors .NewBadRequestError (err )
298303 }
299304
300305 if err := sr .backend .UpdateNode (vars ["id" ], version , node ); err != nil {
0 commit comments