opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

cli: podman push --encryption-key use StringArray()

Browse Source 
This option accepts a file path so we should allow commas in it.
Also add tests for --decryption-key

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-12-08 17:48:42 +01:00
parent 3e1b9146f7
commit cdb178e954
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/images/push.go
View File

@ -138,7 +138,7 @@ func pushFlags(cmd *cobra.Command) {
_ = cmd.RegisterFlagCompletionFunc(compLevel, completion.AutocompleteNone) _ = cmd.RegisterFlagCompletionFunc(compLevel, completion.AutocompleteNone)
encryptionKeysFlagName := "encryption-key" encryptionKeysFlagName := "encryption-key"
flags.StringSliceVar(&pushOptions.EncryptionKeys, encryptionKeysFlagName, nil, "Key with the encryption protocol to use to encrypt the image (e.g. jwe:/path/to/key.pem)") flags.StringArrayVar(&pushOptions.EncryptionKeys, encryptionKeysFlagName, nil, "Key with the encryption protocol to use to encrypt the image (e.g. jwe:/path/to/key.pem)")
_ = cmd.RegisterFlagCompletionFunc(encryptionKeysFlagName, completion.AutocompleteDefault) _ = cmd.RegisterFlagCompletionFunc(encryptionKeysFlagName, completion.AutocompleteDefault)
encryptLayersFlagName := "encrypt-layer" encryptLayersFlagName := "encrypt-layer"

2
test/e2e/pull_test.go
View File

@ -612,7 +612,7 @@ var _ = Describe("Podman pull", func() {
decryptionTestHelper := func(imgPath string) *PodmanSessionIntegration { decryptionTestHelper := func(imgPath string) *PodmanSessionIntegration {
bitSize := 1024 bitSize := 1024
keyFileName := filepath.Join(podmanTest.TempDir, "key") keyFileName := filepath.Join(podmanTest.TempDir, "key,withcomma")
publicKeyFileName, privateKeyFileName, err := WriteRSAKeyPair(keyFileName, bitSize) publicKeyFileName, privateKeyFileName, err := WriteRSAKeyPair(keyFileName, bitSize)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())

2
test/e2e/run_test.go
View File

@ -2152,7 +2152,7 @@ WORKDIR /madethis`, BB)
} }
bitSize := 1024 bitSize := 1024
keyFileName := filepath.Join(podmanTest.TempDir, "key") keyFileName := filepath.Join(podmanTest.TempDir, "key,withcomma")
publicKeyFileName, privateKeyFileName, err := WriteRSAKeyPair(keyFileName, bitSize) publicKeyFileName, privateKeyFileName, err := WriteRSAKeyPair(keyFileName, bitSize)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())