Skip to content

feat(s3): add publishedPrefix to pathCache to avoid reupload of files - #1480

Merged
neolynx merged 3 commits into
aptly-dev:masterfrom
alguimodd:s3-reupload-fix
Nov 11, 2025
Merged

feat(s3): add publishedPrefix to pathCache to avoid reupload of files#1480
neolynx merged 3 commits into
aptly-dev:masterfrom
alguimodd:s3-reupload-fix

Conversation

@alguimodd

@alguimodd alguimodd commented Aug 13, 2025

Copy link
Copy Markdown
Contributor

Fixes #1475

Requirements

All new code should be covered with tests, documentation should be updated. CI should pass.

Description of the Change

This adds the publishedPrefix to paths added to pathCache so it can be correctly compared to the relPath.

Checklist

  • unit-test added (if change is algorithm)
  • functional test added/updated (if change is functional)
  • man page updated (if applicable)
  • bash completion updated (if applicable)
  • documentation updated
  • author name in AUTHORS

@neolynx neolynx mentioned this pull request Aug 15, 2025
Closed
@neolynx neolynx self-assigned this Aug 15, 2025
@neolynx
neolynx requested a review from cfiehe August 15, 2025 18:24
@neolynx neolynx added this to the 1.6.3 milestone Aug 27, 2025
@neolynx
neolynx requested a review from a team August 29, 2025 08:36
@neolynx neolynx added needs review Ready for review & merge needs rebase The PR needs to be rebased on master labels Aug 30, 2025
cfiehe
cfiehe approved these changes Nov 8, 2025
View reviewed changes

@cfiehe cfiehe left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should fix the cache lookup issue. Files are looked up with respect to the publishedPrefix, but they are not put into the cache containing that publishedPrefix. The result is a cache miss in use cases with a non-empty publishedPrefix.

@alguimodd
Thanks yor fixing and your detailed analysis.

@neolynx
Can you please merge this change and close the corresponding issue. Thanks a lot.

@neolynx neolynx removed needs review Ready for review & merge needs rebase The PR needs to be rebased on master labels Nov 11, 2025
@neolynx
neolynx merged commit ba65daf into aptly-dev:master Nov 11, 2025
37 checks passed
@peschmae peschmae mentioned this pull request Mar 23, 2026
Closed
@neolynx neolynx mentioned this pull request Jun 20, 2026
Open
@BrewTestBot BrewTestBot mentioned this pull request Jun 25, 2026
Merged
social4hyq pushed a commit to social4hyq/homebrew-core that referenced this pull request Sep 20, 2026
HarmonybrewBot HarmonybrewBot
!12365 merge bump-aptly-1.6.3 into main
6ad99fb 
aptly 1.6.3

Created-by: HarmonybrewBot
Commit-by: HarmonybrewBot
Merged-by: HarmonybrewBot
Description: Created by `brew bump`

---

Created with `brew bump-formula-pr`.<details>
  <summary>release notes</summary>
  <pre>## Changes


  * NEW FEATURES:
  * Google Cloud Storage (GCS) publish backend (aptly-dev/aptly#1550)
  * dput-compatible file upload API (aptly-dev/aptly#1436)
  * JFrog Artifactory publish backend (aptly-dev/aptly#1553)
  * AppStream (DEP-11) mirror support (aptly-dev/aptly#1543)
  * Multiple GPG keys support (aptly-dev/aptly#1479)
  * GPG key list & delete API (aptly-dev/aptly#1558)
  * Edit mirror API endpoint (aptly-dev/aptly#1535)
  * NumPackages in list responses (aptly-dev/aptly#1559)
  * Mirror latest packages (aptly-dev/aptly#1513)
  * Reproducible builds / `SOURCE_DATE_EPOCH` support (aptly-dev/aptly#1537), aptly-dev/aptly#1542)
  * `Release` file `Version` field support (aptly-dev/aptly#1533)
  * `InRelease` file `Signed-By` field support (aptly-dev/aptly#1518), aptly-dev/aptly#1519)
  * GCP / Google Artifact Registry authentication (aptly-dev/aptly#1505)
  * Update publish label & origin (aptly-dev/aptly#1484)
  * Ubuntu 26.04 / resolute builds (aptly-dev/aptly#1571)
  * BUG FIXES:
  * Race condition & concurrency fixes for the REST API (aptly-dev/aptly#1574)
  * Fix empty line in `Package-List` for source packages (aptly-dev/aptly#1588)
  * Publish: check storage exists before publishing (aptly-dev/aptly#1587)
  * S3 publish race condition (aptly-dev/aptly#1594)
  * Repo edit name optionally (aptly-dev/aptly#1593)
  * Fix crash in `aptly db recover` (aptly-dev/aptly#1565)
  * Fix deadlocks in task list (aptly-dev/aptly#1529)
  * Fix S3 re-upload issue (aptly-dev/aptly#1480)
  * Fix `aptly repo edit` API (aptly-dev/aptly#1493)
  * Fix out-of-disk-space error handling (aptly-dev/aptly#1504)
  * Fix `aptly mirror update` removing unrelated params (aptly-dev/aptly#1466)
  * Fix concurrent pool linking race condition (aptly-dev/aptly#1481)
  * Fix `dpkg`-compliant version comparison (aptly-dev/aptly#1509)
  * Fix Swagger property casing and spec errors (aptly-dev/aptly#1510), aptly-dev/aptly#1498)
  * Remove useless nil check (aptly-dev/aptly#1482)
  * Format Go code with gofmt (aptly-dev/aptly#1483)
  * DEPENDENCIES CHANGES:
  * Go toolchain → 1.25.0
  * `go.opentelemetry.io/otel` → v1.41.0 (aptly-dev/aptly#1586)
  * `go.opentelemetry.io/otel/sdk` → v1.43.0 (aptly-dev/aptly#1584)
  * `github.com/go-jose/go-jose/v4` → v4.1.4 (aptly-dev/aptly#1585)
  * `github.com/go-git/go-git/v5` → v5.19.1 (aptly-dev/aptly#1590)
  * `github.com/ulikunitz/xz` → v0.5.15 (fixes 32-bit build failures)
  * `golang.org/x/crypto` → v0.45.0 (aptly-dev/aptly#1506)
  * `google.golang.org/grpc` → v1.79.3 (aptly-dev/aptly#1546)
  * `github.com/aws/aws-sdk-go-v2/service/s3` → v1.97.3 (aptly-dev/aptly#1554)
  * `github.com/cloudflare/circl` → v1.6.3 (aptly-dev/aptly#1461), aptly-dev/aptly#1541)
  * `requests` (Python, system tests) → 2.33.0 (aptly-dev/aptly#1460), aptly-dev/aptly#1547)
  * `github.com/ProtonMail/go-crypto` → v1.4.0
  * `golang.org/x/net` → v0.48.0
</pre>
  <p>View the full release notes at <a href="https://github.com/aptly-dev/aptly/releases/tag/v1.6.3">https://github.com/aptly-dev/aptly/releases/tag/v1.6.3</a>.</p>
</details>
<hr>

See merge request: Harmonybrew/homebrew-core!12365
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cfiehe cfiehe cfiehe approved these changes

Assignees

@neolynx neolynx

Labels

None yet

Projects

None yet

Milestone

1.6.3

Development

Successfully merging this pull request may close these issues.

S3 uploads all packages whether they are already present or not in published mirror

3 participants

@alguimodd @cfiehe @neolynx