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>
95 lines
2.8 KiB
Go
95 lines
2.8 KiB
Go
// +build !windows
|
|
|
|
package main
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
// Test case for 28884
|
|
func (s *DockerSwarmSuite) TestSecretCreateResolve(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
|
|
name := "test_secret"
|
|
id := d.CreateSecret(c, swarm.SecretSpec{
|
|
Annotations: swarm.Annotations{
|
|
Name: name,
|
|
},
|
|
Data: []byte("foo"),
|
|
})
|
|
c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
|
|
|
|
fake := d.CreateSecret(c, swarm.SecretSpec{
|
|
Annotations: swarm.Annotations{
|
|
Name: id,
|
|
},
|
|
Data: []byte("fake foo"),
|
|
})
|
|
c.Assert(fake, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", fake))
|
|
|
|
out, err := d.Cmd("secret", "ls")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(out, checker.Contains, name)
|
|
c.Assert(out, checker.Contains, fake)
|
|
|
|
out, err = d.Cmd("secret", "rm", id)
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(out, checker.Contains, id)
|
|
|
|
// Fake one will remain
|
|
out, err = d.Cmd("secret", "ls")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(out, checker.Not(checker.Contains), name)
|
|
c.Assert(out, checker.Contains, fake)
|
|
|
|
// Remove based on name prefix of the fake one
|
|
// (which is the same as the ID of foo one) should not work
|
|
// as search is only done based on:
|
|
// - Full ID
|
|
// - Full Name
|
|
// - Partial ID (prefix)
|
|
out, err = d.Cmd("secret", "rm", id[:5])
|
|
c.Assert(err, checker.Not(checker.IsNil))
|
|
c.Assert(out, checker.Not(checker.Contains), id)
|
|
out, err = d.Cmd("secret", "ls")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(out, checker.Not(checker.Contains), name)
|
|
c.Assert(out, checker.Contains, fake)
|
|
|
|
// Remove based on ID prefix of the fake one should succeed
|
|
out, err = d.Cmd("secret", "rm", fake[:5])
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(out, checker.Contains, fake[:5])
|
|
out, err = d.Cmd("secret", "ls")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(out, checker.Not(checker.Contains), name)
|
|
c.Assert(out, checker.Not(checker.Contains), id)
|
|
c.Assert(out, checker.Not(checker.Contains), fake)
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestSecretCreateWithFile(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
|
|
testFile, err := ioutil.TempFile("", "secretCreateTest")
|
|
c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
|
|
defer os.Remove(testFile.Name())
|
|
|
|
testData := "TESTINGDATA"
|
|
_, err = testFile.Write([]byte(testData))
|
|
c.Assert(err, checker.IsNil, check.Commentf("failed to write to temporary file"))
|
|
|
|
testName := "test_secret"
|
|
out, err := d.Cmd("secret", "create", testName, testFile.Name())
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "", check.Commentf("%s", out))
|
|
|
|
id := strings.TrimSpace(out)
|
|
secret := d.GetSecret(c, id)
|
|
c.Assert(secret.Spec.Name, checker.Equals, testName)
|
|
}
|