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

Merge pull request #23043 from miyamo2/feat/issues#23038

Browse Source 
fix(diff): do not suggest `--latest` when runs on remote with no args
This commit is contained in:
openshift-merge-bot[bot]
2024-06-24 07:24:55 +00:00
committed by GitHub
parent 57fe4c43b3 5d009715f6
commit 673dde9ec5
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/diff/diff.go
View File

@ -73,6 +73,9 @@ func ValidateContainerDiffArgs(cmd *cobra.Command, args []string) error {
return errors.New("--latest and containers cannot be used together") return errors.New("--latest and containers cannot be used together")
} }
if len(args) == 0 && !given { if len(args) == 0 && !given {
if registry.IsRemote() {
return fmt.Errorf("%q requires a name or id", cmd.CommandPath())
}
return fmt.Errorf("%q requires a name, id, or the \"--latest\" flag", cmd.CommandPath()) return fmt.Errorf("%q requires a name, id, or the \"--latest\" flag", cmd.CommandPath())
} }
return nil return nil

9
test/e2e/diff_test.go
View File

@ -165,4 +165,13 @@ RUN touch %s`, ALPINE, imagefile)
Expect(session.OutputToString()).To(ContainSubstring(confile)) Expect(session.OutputToString()).To(ContainSubstring(confile))
}) })
It("podman diff without args", func() {
session := podmanTest.Podman([]string{"diff"})
session.WaitWithDefaultTimeout()
if IsRemote() {
Expect(session).Should(ExitWithError(125, " requires a name or id"))
} else {
Expect(session).Should(ExitWithError(125, " requires a name, id, or the \"--latest\" flag"))
}
})
}) })