toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24932 from thaJeztah/change-to-camelBack-for-consistency

Browse Source 
Change "rotate_worker_token" to "rotateWorkerToken"
Upstream-commit: 3742557ed49048befea88125df781d5c87131e0d
Component: engine
This commit is contained in:
Vincent Demeester
2016-07-24 10:05:07 +02:00
committed by GitHub
parent 7319473b2d aa4833cce5
commit 66e0358be6
8 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/engine/api/server/router/swarm/cluster_routes.go
View File

@ -67,11 +67,23 @@ func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter,
}
var flags types.UpdateFlags
if r.URL.Query().Get("rotate_worker_token") == "true" {
flags.RotateWorkerToken = true
if value := r.URL.Query().Get("rotateWorkerToken"); value != "" {
rot, err := strconv.ParseBool(value)
if err != nil {
return fmt.Errorf("invalid value for rotateWorkerToken: %s", value)
}
flags.RotateWorkerToken = rot
}
if r.URL.Query().Get("rotate_manager_token") == "true" {
flags.RotateManagerToken = true
if value := r.URL.Query().Get("rotateManagerToken"); value != "" {
rot, err := strconv.ParseBool(value)
if err != nil {
return fmt.Errorf("invalid value for rotateManagerToken: %s", value)
}
flags.RotateManagerToken = rot
}
if err := sr.backend.Update(version, swarm, flags); err != nil {