Commit Graph

222 Commits

Author SHA1 Message Date
Brent Baude
870378ba16 Move skopeo to go.podman.io
With potential repo moves and cirus EOL, we have decided to begin
preparing by making changes to the skopeo module name.  See
https://github.com/containers/go.podman.io/pull/6 for more information.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2026-04-20 13:00:55 -05:00
Ricardo Branco
2b2257a19d integration: Force amd64 on TestProxyMetadata
Otherwise test fails on other architectures due to
https://github.com/containers/skopeo/issues/2829

Signed-off-by: Ricardo Branco <rbranco@suse.de>
2026-03-27 18:40:29 +01:00
Miloslav Trmač
c468542c7b Use --retry-times 3 for (skopeo sync) tests
... if they contact external registries.

This should, hopefully, decrease the flake rate.
We have already done this for (skopeo copy), sync seems
to have been missed at that time.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-03-12 19:38:56 +01:00
Miloslav Trmač
6be1904790 Use t.Tempdir() instead of manual os.CreateTemp() in tests
We don't have to worry about cleanup, and also in other respects
the code is shorter.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-03-12 19:38:56 +01:00
Miloslav Trmač
33ea6c63a1 Use fmt.Appendf instead of Sprintf + conversion
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-03-11 18:56:13 +01:00
Miloslav Trmač
8b9f757eb1 Use "any" instead of "interface{}"
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-03-11 18:18:57 +01:00
Miloslav Trmač
c49d55b2a4 Use WaitGroup.Go
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-03-11 18:18:47 +01:00
Miloslav Trmač
6a0b6b1c86 Update CI image and tests
registry-v2-schema1 is now registry-v2-schema1-only,
and there is a new registry-v2-schema1-supported because the default
/usr/bin/registry does not support schema1 any more.

Adjust tests.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-03-10 19:02:36 +01:00
Miloslav Trmač
726479d948 Replace the boolean for schema1 registry with an enum
We will add one more registry.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-03-10 18:44:00 +01:00
Miloslav Trmač
af1b87a955 Add a --tls-details option and integration tests
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-02-26 19:58:04 +01:00
Miloslav Trmač
a64f780f83 Update tests for a changed error message
008d971bc0
changed the text we were looking for.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2026-02-02 13:56:34 +01:00
promalert
f952b7facd chore: fix function name in comment
Signed-off-by: promalert <promalert@outlook.com>
2026-01-07 15:03:46 +08:00
Jonathan Lebon
40f0e16777 skopeo: add --require-signed
In bootc, we want the ability to assert that signature verification is
enforced.

Add a new top-level `--require-signed` switch. When passed, we use the
new `RequireSignatureVerification()` method to ensure that signature
verification is enforced.

Part of https://github.com/containers/skopeo/issues/1829.

Signed-off-by: Jonathan Lebon <jonathan@jlebon.com>
2026-01-05 15:02:18 -05:00
Jonathan Lebon
767d9cb005 integration/signing_test: move findFingerprint to utils_test.go
Prep for another test which will also use this.

Signed-off-by: Jonathan Lebon <jonathan@jlebon.com>
2025-12-27 22:07:41 -05:00
Paul Holzinger
7182fecc79 format the code with gofumpt
Use it based on the outcome from our community discussion[1].

[1] https://github.com/containers/podman/discussions/27291

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-11-18 22:46:37 +01:00
Miloslav Trmač
fe086daee7 Use retries in more cases of copying from external registries
We added retries to other registry operations before,
these were missed for some reason.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-11-10 13:54:43 +01:00
Colin Walters
53f9612136 main: Add support for overriding HTTP User-Agent
I want this for https://github.com/bootc-dev/bootc/issues/1686
so we can distinguish pulls there.

But more generally it's can be a good idea for people writing
scripts using skopeo to set custom user agents so that registries
can more easily trace which actors are performing tasks.

Assisted-by: Claude Code
Signed-off-by: Colin Walters <walters@verbum.org>
2025-10-20 19:40:17 +02:00
Lokesh Mandvekar
a489ea39a7 test-integration-local: use SKOPEO_BINARY if set
Else use ./bin/skopeo as the default binary.

This makes it a lot more flexible compared to just searching and using
the first skopeo in PATH. Also, allows to avoid any binary installation
to /usr/bin.

The SKOPEO_BINARY evaluation logic has been moved to a separate and
reusable Makefile target.

Co-authored-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-09-17 08:31:10 -04:00
Miloslav Trmač
f59e8938db Add --sign-by-sq-fingerprint and an integration test
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-11 19:00:40 +02:00
Miloslav Trmač
cba2164671 Update CI images
... from https://github.com/containers/automation_images/pull/416

That requires updating tests to also work with rust-podman-sequoia 0.2.0:
d41fefaa1f changed
how the error is reported.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-11 19:00:20 +02:00
Miloslav Trmač
b258da23c2 Update conditions for signing tests
NewEphemeralSigningMechanism() may, with Sequoia, return
a mechanism which !SupportsSigning(); so, to determine that,
test with a non-ephemeral mechanism instead. (That's likely
actually faster, because we create a GNUPGHOME in these tests
anyway, so we avoid creating an deleting a separate temporary
directory.)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-11 19:00:10 +02:00
Miloslav Trmač
0114569b17 Use strings.SplitSeq
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-08 23:05:37 +02:00
Miloslav Trmač
24c2a374d6 Use bytes.SplitSeq
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-09-08 23:05:30 +02:00
Jan Kaluza
d64631991b Migrate storage, image and common to monorepo and remote go.podman.io imports.
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
2025-08-28 09:21:52 +02:00
Miloslav Trmač
0a70844b33 Update tests to work with the Sequoia c/image backend
Currently, if a key is not found, the GPG mechanism reports
> Invalid GPG signature: {$GoStructDump}
while the Sequoia one reports
> $keyFingerprint was not found

Accept both.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-08-19 23:21:34 +02:00
Lokesh Mandvekar
d1bbcb4626 openshiftCluster.dockerLogin: create path with parents
Co-authored-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-07-22 10:47:37 -04:00
Lokesh Mandvekar
5973d144f2 integration: rename registry binary
The skopeo_cidev image is updated with the registry binary from the
docker-distribution package instead of building one from source.

Ref: https://github.com/containers/automation_images/pull/410

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2025-07-22 10:47:37 -04:00
Miloslav Trmač
94e949984f Centralize policy edits in copySuite.policyFixture
Should not change test behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-18 17:59:10 +02:00
Miloslav Trmač
5d2cb67fb1 Use t.Cleanup in fileFromFixture
... to simplify users.

Should not change test behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-07-18 17:59:10 +02:00
Miloslav Trmač
634c0d99f3 Fix the "missing image" check when reading oci:
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-06-25 20:54:25 +02:00
Miloslav Trmač
40353ad7eb Fix some comments
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-06-25 20:54:25 +02:00
Miloslav Trmač
3618a76e92 Add --retry[-times] to test operations that tend to fail
... to decrease impact of flakes.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-06-04 19:25:38 +02:00
Colin Walters
983e77d85f proxy: Add GetRawBlob
The original model the idea here is the proxy centralizes
verification of things like digest. However in practice,
this causes reading to be seriously awkward; ref
https://github.com/containers/containers-image-proxy-rs/issues/79
(Basically `FinishPipe` blocks the metadata channel)

Also, I have a project to implement a registry frontend to
`containers-storage:` and a core problem with `GetBlob` right
now is it *requires* the blob size up front even though the
underlying Go logic doesn't.

Moving to a "raw" interface solves that too. In this new
raw API, we return two file descriptors, one for the data
and one for the error channel, which contains a JSON
serialization of an error.

For the error type we reuse the existing "is error retryable"
and expose that back to the client.

We also (backwards compatibly) add this new error code
for the existing APIs.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-05-16 14:14:52 -04:00
Kir Kolyshkin
b74989dfbc integration: add unix tag to non-windows tests
These tests can't be compiled on Windows, so add unix build tag.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-04-14 12:29:02 +02:00
Kir Kolyshkin
25481e1a88 integration: add _test suffix to files
Some files in integration did not have _test, resulting in lots of
complains when running golangci-lint with --tests=false.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2025-04-14 12:29:02 +02:00
luozexuan
b6b6415286 chore: fix some function names in comment
Signed-off-by: luozexuan <fetchcode@139.com>
2025-03-30 16:19:50 +08:00
Colin Walters
5b30cfe29c Merge branch 'main' into layer-info-extended 2025-03-21 17:56:01 -04:00
Miloslav Trmač
7983f20adb Remove obsolete build tag syntax
per (go fix ./...).

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-03-21 21:00:49 +01:00
Miloslav Trmač
1f49b2c0c0 Use slices.Backward
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2025-03-21 21:00:31 +01:00
Colin Walters
a31470d7a4 proxy: Add GetLayerInfoPiped
I was experimenting with images with lots of layers (> 200) and
this invocation was incorrectly adding the entire response
into what was intended as the metadata plane.

`GetManifest` and `GetConfig` (even those are relatively small)
still always return their data over a pipe, same as blobs.

Add a new `GetLayerInfoPiped` that does the same so we
can easily get this information for images with a lot of layers.

Signed-off-by: Colin Walters <walters@verbum.org>
2025-03-21 15:05:59 -04:00
Miloslav Trmač
9166a97bbb Use a range expression
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2024-09-03 19:26:40 +02:00
Miloslav Trmač
cd71084908 Refer to registry.k8s.io instead of k8s.gcr.io
... per https://kubernetes.io/blog/2023/02/06/k8s-gcr-io-freeze-announcement/ .

We are seeing intermittent failures (sufficient to reliably cause a test suite failure)
pulling from k8s.gcr.io, let's see if using the newer one improves things.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2024-06-17 20:02:15 +02:00
Miloslav Trmač
513a4f1ab3 Update for changed c/image error texts
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2024-05-14 00:27:18 +02:00
writegr
50159e219c chore: fix function names
Signed-off-by: writegr <wellweek@outlook.com>
2024-04-18 18:09:30 +02:00
Miloslav Trmač
a75ed81668 Use strings.CutSuffix
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2024-04-05 17:15:16 +02:00
Miloslav Trmač
9821af6f11 Freeze the fedora-minimal image reference at Fedora 38
... because the tests are assuming a v2s2 image, but
as of Fedora 39, the image uses the OCI format.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2024-04-03 18:13:23 +02:00
Miloslav Trmač
8f2a7c65ff Also change the MIME type in manifest when decompressing a layer
... for purposes of comparison

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2024-02-08 00:16:13 +01:00
Miloslav Trmač
812a02af41 Replace decompress-dirs.sh with Go code
We will need to make it more sophisticated than
it is practical to do in Go.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2024-02-08 00:16:06 +01:00
Miloslav Trmač
09f282e468 Split decompressDir from runDecompressDirs
... so that we have a new function which only decompresses
one image at a time.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2024-02-08 00:16:00 +01:00
Colin Walters
f7dc084799 proxy: Change the imgid to uint64
In PR review for a different issue, the question of what happens
if we hit overflow for the imageid serial was hit.  This feels
pretty unlikely; if I did the math right, it'd require opening
an average of 136 images per second to overflow it in a year.
Nevertheless, in practice what we're sending on the wire is just a JSON
number, and if we extend this to the "max safe JSON number" of 2^53,
it'd take 285,616,414 images per second to overflow in a year, going
from implausible to probably impossible.

With a bit more work of course, we could make this a sparse mapping
and reuse freed numbers, but eh.

Signed-off-by: Colin Walters <walters@verbum.org>
2023-07-13 00:24:55 +02:00