Skip to content

Commit 1fed334

Browse files
dnephinvieux
dnephin
authored and
vieux
committed
Add integration test for stack deploy with secrets.
Signed-off-by: Daniel Nephin <dnephin@docker.com> (cherry picked from commit 6ec84ef) Signed-off-by: Victor Vieux <vieux@docker.com>
1 parent 2f44570 commit 1fed334

File tree

6 files changed

+111
-10
lines changed

6 files changed

+111
-10
lines changed

‎cli/command/secret/utils.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import (
1111
"golang.org/x/net/context"
1212
)
1313

14-
func getSecretsByNameOrIDPrefixes(ctx context.Context, client client.APIClient, terms []string) ([]swarm.Secret, error) {
14+
// GetSecretsByNameOrIDPrefixes returns secrets given a list of ids or names
15+
func GetSecretsByNameOrIDPrefixes(ctx context.Context, client client.APIClient, terms []string) ([]swarm.Secret, error) {
1516
args := filters.NewArgs()
1617
for _, n := range terms {
1718
args.Add("names", n)
@@ -24,7 +25,7 @@ func getSecretsByNameOrIDPrefixes(ctx context.Context, client client.APIClient,
2425
}
2526

2627
func getCliRequestedSecretIDs(ctx context.Context, client client.APIClient, terms []string) ([]string, error) {
27-
secrets, err := getSecretsByNameOrIDPrefixes(ctx, client, terms)
28+
secrets, err := GetSecretsByNameOrIDPrefixes(ctx, client, terms)
2829
if err != nil {
2930
return nil, err
3031
}

‎cli/command/stack/deploy.go‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package stack
22

33
import (
4-
"errors"
54
"fmt"
65
"io/ioutil"
76
"os"
@@ -12,10 +11,12 @@ import (
1211
"github.com/docker/docker/api/types/swarm"
1312
"github.com/docker/docker/cli"
1413
"github.com/docker/docker/cli/command"
14+
secretcli "github.com/docker/docker/cli/command/secret"
1515
"github.com/docker/docker/cli/compose/convert"
1616
"github.com/docker/docker/cli/compose/loader"
1717
composetypes "github.com/docker/docker/cli/compose/types"
1818
dockerclient "github.com/docker/docker/client"
19+
"github.com/pkg/errors"
1920
"github.com/spf13/cobra"
2021
"golang.org/x/net/context"
2122
)
@@ -225,9 +226,22 @@ func createSecrets(
225226
) error {
226227
client := dockerCli.Client()
227228

228-
for _, secret := range secrets {
229-
fmt.Fprintf(dockerCli.Out(), "Creating secret %s\n", secret.Name)
230-
_, err := client.SecretCreate(ctx, secret)
229+
for _, secretSpec := range secrets {
230+
// TODO: fix this after https://github.com/docker/docker/pull/29218
231+
secrets, err := secretcli.GetSecretsByNameOrIDPrefixes(ctx, client, []string{secretSpec.Name})
232+
switch {
233+
case err != nil:
234+
return err
235+
case len(secrets) > 1:
236+
return errors.Errorf("ambiguous secret name: %s", secretSpec.Name)
237+
case len(secrets) == 0:
238+
fmt.Fprintf(dockerCli.Out(), "Creating secret %s\n", secretSpec.Name)
239+
_, err = client.SecretCreate(ctx, secretSpec)
240+
default:
241+
secret := secrets[0]
242+
// Update secret to ensure that the local data hasn't changed
243+
err = client.SecretUpdate(ctx, secret.ID, secret.Meta.Version, secretSpec)
244+
}
231245
if err != nil {
232246
return err
233247
}

‎cli/compose/convert/compose_test.go‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/docker/docker/api/types/network"
88
composetypes "github.com/docker/docker/cli/compose/types"
99
"github.com/docker/docker/pkg/testutil/assert"
10+
"github.com/docker/docker/pkg/testutil/tempfile"
1011
)
1112

1213
func TestNamespaceScope(t *testing.T) {
@@ -88,3 +89,34 @@ func TestNetworks(t *testing.T) {
8889
assert.DeepEqual(t, networks, expected)
8990
assert.DeepEqual(t, externals, []string{"special"})
9091
}
92+
93+
func TestSecrets(t *testing.T) {
94+
namespace := Namespace{name: "foo"}
95+
96+
secretText := "this is the first secret"
97+
secretFile := tempfile.NewTempFile(t, "convert-secrets", secretText)
98+
defer secretFile.Remove()
99+
100+
source := map[string]composetypes.SecretConfig{
101+
"one": {
102+
File: secretFile.Name(),
103+
Labels: map[string]string{"monster": "mash"},
104+
},
105+
"ext": {
106+
External: composetypes.External{
107+
External: true,
108+
},
109+
},
110+
}
111+
112+
specs, err := Secrets(namespace, source)
113+
assert.NilError(t, err)
114+
assert.Equal(t, len(specs), 1)
115+
secret := specs[0]
116+
assert.Equal(t, secret.Name, "foo_one")
117+
assert.DeepEqual(t, secret.Labels, map[string]string{
118+
"monster": "mash",
119+
LabelNamespace: "foo",
120+
})
121+
assert.DeepEqual(t, secret.Data, []byte(secretText))
122+
}

‎integration-cli/docker_cli_stack_test.go‎

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
package main
22

33
import (
4+
"encoding/json"
45
"io/ioutil"
56
"os"
7+
"sort"
68

9+
"github.com/docker/docker/api/types/swarm"
10+
"github.com/docker/docker/integration-cli/checker"
711
"github.com/docker/docker/pkg/integration/checker"
812
"github.com/go-check/check"
913
)
1014

1115
func (s *DockerSwarmSuite) TestStackRemove(c *check.C) {
12-
testRequires(c, ExperimentalDaemon)
1316
d := s.AddDaemon(c, true, true)
1417

1518
stackArgs := append([]string{"stack", "remove", "UNKNOWN_STACK"})
@@ -20,7 +23,6 @@ func (s *DockerSwarmSuite) TestStackRemove(c *check.C) {
2023
}
2124

2225
func (s *DockerSwarmSuite) TestStackTasks(c *check.C) {
23-
testRequires(c, ExperimentalDaemon)
2426
d := s.AddDaemon(c, true, true)
2527

2628
stackArgs := append([]string{"stack", "ps", "UNKNOWN_STACK"})
@@ -31,7 +33,6 @@ func (s *DockerSwarmSuite) TestStackTasks(c *check.C) {
3133
}
3234

3335
func (s *DockerSwarmSuite) TestStackServices(c *check.C) {
34-
testRequires(c, ExperimentalDaemon)
3536
d := s.AddDaemon(c, true, true)
3637

3738
stackArgs := append([]string{"stack", "services", "UNKNOWN_STACK"})
@@ -42,7 +43,6 @@ func (s *DockerSwarmSuite) TestStackServices(c *check.C) {
4243
}
4344

4445
func (s *DockerSwarmSuite) TestStackDeployComposeFile(c *check.C) {
45-
testRequires(c, ExperimentalDaemon)
4646
d := s.AddDaemon(c, true, true)
4747

4848
testStackName := "testdeploy"
@@ -65,6 +65,43 @@ func (s *DockerSwarmSuite) TestStackDeployComposeFile(c *check.C) {
6565
c.Assert(out, check.Equals, "NAME SERVICES\n")
6666
}
6767

68+
func (s *DockerSwarmSuite) TestStackDeployWithSecretsTwice(c *check.C) {
69+
d := s.AddDaemon(c, true, true)
70+
71+
testStackName := "testdeploy"
72+
stackArgs := []string{
73+
"stack", "deploy",
74+
"--compose-file", "fixtures/deploy/secrets.yaml",
75+
testStackName,
76+
}
77+
out, err := d.Cmd(stackArgs...)
78+
c.Assert(err, checker.IsNil, check.Commentf(out))
79+
80+
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", "testdeploy_web")
81+
c.Assert(err, checker.IsNil)
82+
83+
var refs []swarm.SecretReference
84+
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
85+
c.Assert(refs, checker.HasLen, 2)
86+
87+
sort.Sort(sortSecrets(refs))
88+
c.Assert(refs[0].SecretName, checker.Equals, "testdeploy_special")
89+
c.Assert(refs[0].File.Name, checker.Equals, "special")
90+
c.Assert(refs[1].SecretName, checker.Equals, "testdeploy_super")
91+
c.Assert(refs[1].File.Name, checker.Equals, "foo.txt")
92+
c.Assert(refs[1].File.Mode, checker.Equals, os.FileMode(0400))
93+
94+
// Deploy again to ensure there are no errors when secret hasn't changed
95+
out, err = d.Cmd(stackArgs...)
96+
c.Assert(err, checker.IsNil, check.Commentf(out))
97+
}
98+
99+
type sortSecrets []swarm.SecretReference
100+
101+
func (s sortSecrets) Len() int { return len(s) }
102+
func (s sortSecrets) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
103+
func (s sortSecrets) Less(i, j int) bool { return s[i].SecretName < s[j].SecretName }
104+
68105
// testDAB is the DAB JSON used for testing.
69106
// TODO: Use template/text and substitute "Image" with the result of
70107
// `docker inspect --format '{{index .RepoDigests 0}}' busybox:latest`

‎integration-cli/fixtures/deploy/secrets.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
version: "3.1"
3+
services:
4+
web:
5+
image: busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0
6+
command: top
7+
secrets:
8+
- special
9+
- source: super
10+
target: foo.txt
11+
mode: 0400
12+
secrets:
13+
special:
14+
file: fixtures/secrets/default
15+
super:
16+
file: fixtures/secrets/default

‎integration-cli/fixtures/secrets/default‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
this is the secret

0 commit comments

Comments
 (0)