github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-01 09:02:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix the "missing image" check when reading oci:

Browse Source 
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2025-05-28 22:26:25 +02:00
parent 56410674b7
commit 8be40c376b
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/skopeo/utils.go
View File

@ -419,9 +419,10 @@ func promptForPassphrase(privateKeyFile string, stdin, stdout *os.File) (string,
// authentication error, an I/O error etc.) // authentication error, an I/O error etc.)
// TODO drive this into containers/image properly // TODO drive this into containers/image properly
func isNotFoundImageError(err error) bool { func isNotFoundImageError(err error) bool {
var layoutImageNotFoundError ocilayout.ImageNotFoundError
return isDockerManifestUnknownError(err) || return isDockerManifestUnknownError(err) ||
errors.Is(err, storage.ErrNoSuchImage) || errors.Is(err, storage.ErrNoSuchImage) ||
errors.Is(err, ocilayout.ImageNotFoundError{}) errors.As(err, &layoutImageNotFoundError)
} }
// isDockerManifestUnknownError is a copy of code from containers/image, // isDockerManifestUnknownError is a copy of code from containers/image,

2
integration/copy_test.go
View File

@ -497,6 +497,8 @@ func (s *copySuite) TestCopySimple() {
assertSkopeoSucceeds(t, "", "copy", "docker://registry.k8s.io/pause:latest", "oci:"+ociDest+":"+ociImgName) assertSkopeoSucceeds(t, "", "copy", "docker://registry.k8s.io/pause:latest", "oci:"+ociDest+":"+ociImgName)
_, err := os.Stat(ociDest) _, err := os.Stat(ociDest)
require.NoError(t, err) require.NoError(t, err)
// copy exits with status 2 if the image is not found within the container, in some transports.
assertSkopeoFailsWithStatus(t, 2, "copy", "oci:"+ociDest+":thisdoesnotexist", "dir:"+t.TempDir())
// docker v2s2 -> OCI image layout without image name // docker v2s2 -> OCI image layout without image name
ociDest = "pause-latest-noimage" ociDest = "pause-latest-noimage"

10
integration/utils_test.go
View File

@ -83,6 +83,16 @@ func assertSkopeoFails(t *testing.T, regexp string, args ...string) {
assert.Regexp(t, "(?s)"+regexp, string(out)) // (?s) : '.' will also match newlines assert.Regexp(t, "(?s)"+regexp, string(out)) // (?s) : '.' will also match newlines
} }
// assertSkopeoFailsWithStatus runs a skopeo command as if exec.Command().CombinedOutput,
// and verifies that it fails with a specific exit status.
func assertSkopeoFailsWithStatus(t *testing.T, status int, args ...string) {
t.Logf("Running %s %s", skopeoBinary, strings.Join(args, " "))
_, err := exec.Command(skopeoBinary, args...).CombinedOutput()
var exitErr *exec.ExitError
require.ErrorAs(t, err, &exitErr)
assert.Equal(t, status, exitErr.ExitCode())
}
// runCommandWithInput runs a command as if exec.Command(), sending it the input to stdin, // runCommandWithInput runs a command as if exec.Command(), sending it the input to stdin,
// and verifies that the exit status is 0, or terminates t on failure. // and verifies that the exit status is 0, or terminates t on failure.
func runCommandWithInput(t *testing.T, input string, name string, args ...string) { func runCommandWithInput(t *testing.T, input string, name string, args ...string) {