As the title says.  Bumping the main branch back to a dev version.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>

…/v5.32.0

Bump c/storage to v1.55.0, c/image to v5.32.0

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…m-vbauerster-mpb-v8-8.x

fix(deps): update module github.com/vbauerster/mpb/v8 to v8.7.5

We are already calling m.LayerInfos() anyway, so there is ~no
extra cost. And using LayerInfos means we don't need to worry
about reversing the order of layers, and we will have access
to the layer index, allowing us to acccess the indexTo* fields
in the future.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

- Don't claim that we only use compressed digests.
- Explicitly document that we assume TOC digests to be unambiguous
- Actually define the term "DiffID".
- Be more precise in computeID about the criteria being layer identity,
  not where we pull the layer from.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Some errors are severe enough that just logging and continuing is
not really worthwhile.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

…tyDataLocked

Currrently we "only" have indexToTOCDigest and blobDiffIDs, but we will make this
more complex.

Centralizing the consumption of these fields into trustedLayerIdentityDataLocked
ensure that all consumers interpret the data exactly consistently (and it also
allows us to use a single "trusted" variable instead of 2/3 individual ones).

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

The new code is not called, so it should not change behavior
(apart from extending the BoltDB/SQLite schema).

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

…storage by DiffID

If we can, prefer identifying layers by DiffID, because multiple TOCs can map to the
same DiffID; and because it maximizes reuse with non-TOC layers.

For now, the new situation is unreachable.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

We will add one more instance of this, so share the code.

Should not change behavior (it does remove one unreachable code path).

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

… is known

- Multiple TOC values might correspond to a single DiffID (e.g. if different
  compression levels are used); try to share them all, identified by DiffID
  (so that we also reuse with non-TOC pulls).
  - LayersByTOCDigest only uses a single TOC digest per layer; BlobInfoCache
    allows multiple matches, matches layers which have been since deleted,
    and potentially matches TOC digests which we have created by pushing
    but haven't pulled yet.
- On reuse, we can now use DiffID-based layer identities even if the reuse
  was TOC~driven.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

…yers

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

…ayers

- Rely on it instead of triggering the "untrusted DiffID" logic
- Also propagate it to storage

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Record (TOC digest → DiffID) mapping in BlobInfoCache

This is to prevent codespell from complaining about pathc -> patch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Use ok instead of isT and isV, and limit the variables scope.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

s/doesnt/does-not/

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

This just changes fo to f, without disrupting the test.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

This fixes a comment in the test code ("expection", "out", and
punctuation) to the best of my knowledge.

Fixes: c84a3fa ("copy/multiple_test: multiple copy requests of same compression")
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Found by codespell 2.3.0:

	Error: ./copy/single.go:217: resuing ==> reusing, resuming, rescuing

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Current .codespellrc contains too many exclusions, and as a result it
misses some legitimate typos.

A few previous commits silenced or fixed some of the codespell warnings
in preparation for this one, which minimizes exclusions, and fixes the
actual remaining typos.

The fixes here are the result of codespell -w.

./copy/sign_test.go:119: overidden ==> overridden
./copy/encryption.go:51: pratice ==> practice
./copy/multiple_test.go:80: crated ==> created
./copy/progress_bars.go:124: progres ==> progress

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Revamp codespell

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…g-x-oauth2-0.x

fix(deps): update module golang.org/x/oauth2 to v0.22.0

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…g-x-sync-0.x

fix(deps): update module golang.org/x/sync to v0.8.0

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

manifest: LayerInfos: preallocate the slice

…er match

The rules expect us to set manifest editing updates.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

... and add CandidateWithLocation and CandidateWithUnknownLocation ,
so that the BIC implementations only need to deal with one value
instead of carrying around three; we will want to add one more,
and encapsulating them all into a single template will make it
transparent to the cache implementations.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

... just because we now can, and to nudge all future caches to be designed
around CandidateTemplateWithCompression.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

We will add more logic to the default case, so sharing the
CandidateCompressionMatchesReuseConditions call is not going to be
as easy. Split the two code paths.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

We will want to record more than a single alghoritm name. For now,
just introduce the structure and modify users, we'll add the new fields
later.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

… blobs

... because we don't trust the TOC data, if any.

This allows us to remove the zstd:chunked hack; we, at least,
now record those blobs as zstd.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

zstd:chunked refactoring for early review

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…g-x-crypto-0.x

fix(deps): update module golang.org/x/crypto to v0.26.0

If we don't know an uncompressed digest, don't try using "".

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

The cache implementations are recording both the base and specific compression variant;
CandidateLocations2 all call CandidateTemplateWithCompression to choose the
appropriate variants to return based on CandidateLocations2Options.

This way, neither the BIC implementations nor the transports are not responsible for
converting zstd:chunked entries to zstd entries if the user wants the latter.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Introduce distinct uploadedCompressorBaseVariantName and
uploadedCompressorSpecificVariantName fields; that way we now never
call RecordDigestCompressorData with inconsistent zstd / zstd:chunked in one field,
so we can always record data when we see, or create, a zstd:chunked layer,
removing the current hack.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

- Add a CompressionAnnotations field
- Allow turning a known-zstd blob into a zstd:chunked one if we
  know the right annotations

This just adds the fields, nothing sets them yet, should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

- Return the required annotations, if we have them
- If we have a zstd blob and the BIC contains the annotations,
  we don't check for the blob's presence initially. In that case,
  don't skip it if we find the BIC annotations.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

... instead of only treating it as zstd.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Record zstd:chunked format, and annotations, in BlobInfoCache

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Signed-off-by: Miloslav Trmač <mitr@redhat.com>