Add --default-mounts-file hidden flag

The hidden flag is used to override the path of the default mounts file
for testing purposes.
Also modified the secrets pkg to allow for this override to happen.

Signed-off-by: umohnani8 <umohnani@redhat.com>

Closes: #678
Approved by: mheon
This commit is contained in:
umohnani8
2018-04-26 11:29:02 -04:00
committed by Atomic Bot
parent d7d0e13837
commit 6ac8a24db4
7 changed files with 34 additions and 9 deletions

View File

@ -260,7 +260,7 @@ var _ = Describe("Podman run", func() {
})
It("podman run with secrets", func() {
containersDir := "/usr/share/containers"
containersDir := filepath.Join(podmanTest.TempDir, "containers")
err := os.MkdirAll(containersDir, 0755)
Expect(err).To(BeNil())
@ -288,18 +288,15 @@ var _ = Describe("Podman run", func() {
execSession.WaitWithDefaultTimeout()
Expect(execSession.ExitCode()).To(Equal(0))
session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "cat", "/run/secrets/test.txt"})
session := podmanTest.Podman([]string{"--default-mounts-file=" + mountsFile, "run", "--rm", ALPINE, "cat", "/run/secrets/test.txt"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(Equal(secretsString))
session = podmanTest.Podman([]string{"run", "--rm", ALPINE, "ls", "/run/secrets/mysymlink"})
session = podmanTest.Podman([]string{"--default-mounts-file=" + mountsFile, "run", "--rm", ALPINE, "ls", "/run/secrets/mysymlink"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(ContainSubstring("key.pem"))
err = os.RemoveAll(containersDir)
Expect(err).To(BeNil())
})
It("podman run with FIPS mode secrets", func() {