mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
83363fb2d4
It is wrong to pass an arbitrary string to a function expecting %-style formatting. One solution would be to replace any % with %%, but it's easier to just do what this patch does. Generated with: for f in $(git grep -l 'check.Commentf(out)'); do \ sed -i -e 's/check\.Commentf(out)/check.Commentf("%s", out)/g' $f; \ done Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
137 lines
5.2 KiB
Go
137 lines
5.2 KiB
Go
// +build !windows
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSwarmSuite) TestServiceUpdateLabel(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name=test", "busybox", "top")
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
service := d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 0)
|
|
|
|
// add label to empty set
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-add", "foo=bar")
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 1)
|
|
c.Assert(service.Spec.Labels["foo"], checker.Equals, "bar")
|
|
|
|
// add label to non-empty set
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-add", "foo2=bar")
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 2)
|
|
c.Assert(service.Spec.Labels["foo2"], checker.Equals, "bar")
|
|
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-rm", "foo2")
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 1)
|
|
c.Assert(service.Spec.Labels["foo2"], checker.Equals, "")
|
|
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-rm", "foo")
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 0)
|
|
c.Assert(service.Spec.Labels["foo"], checker.Equals, "")
|
|
|
|
// now make sure we can add again
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-add", "foo=bar")
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 1)
|
|
c.Assert(service.Spec.Labels["foo"], checker.Equals, "bar")
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestServiceUpdateSecrets(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
testName := "test_secret"
|
|
id := d.CreateSecret(c, swarm.SecretSpec{
|
|
Annotations: swarm.Annotations{
|
|
Name: testName,
|
|
},
|
|
Data: []byte("TESTINGDATA"),
|
|
})
|
|
c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
|
|
testTarget := "testing"
|
|
serviceName := "test"
|
|
|
|
out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name", serviceName, "busybox", "top")
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
|
|
// add secret
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--secret-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
var refs []swarm.SecretReference
|
|
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
|
|
c.Assert(refs, checker.HasLen, 1)
|
|
|
|
c.Assert(refs[0].SecretName, checker.Equals, testName)
|
|
c.Assert(refs[0].File, checker.Not(checker.IsNil))
|
|
c.Assert(refs[0].File.Name, checker.Equals, testTarget)
|
|
|
|
// remove
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--secret-rm", testName)
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
|
|
c.Assert(refs, checker.HasLen, 0)
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestServiceUpdateConfigs(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
testName := "test_config"
|
|
id := d.CreateConfig(c, swarm.ConfigSpec{
|
|
Annotations: swarm.Annotations{
|
|
Name: testName,
|
|
},
|
|
Data: []byte("TESTINGDATA"),
|
|
})
|
|
c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id))
|
|
testTarget := "/testing"
|
|
serviceName := "test"
|
|
|
|
out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name", serviceName, "busybox", "top")
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
|
|
// add config
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--config-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Configs }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
var refs []swarm.ConfigReference
|
|
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
|
|
c.Assert(refs, checker.HasLen, 1)
|
|
|
|
c.Assert(refs[0].ConfigName, checker.Equals, testName)
|
|
c.Assert(refs[0].File, checker.Not(checker.IsNil))
|
|
c.Assert(refs[0].File.Name, checker.Equals, testTarget)
|
|
|
|
// remove
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--config-rm", testName)
|
|
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Configs }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
|
|
c.Assert(refs, checker.HasLen, 0)
|
|
}
|