feat: modularize patching logic #1228
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #1228 +/- ##
==========================================
+ Coverage 42.65% 42.86% +0.21%
==========================================
Files 24 35 +11
Lines 3946 4122 +176
==========================================
+ Hits 1683 1767 +84
- Misses 2135 2224 +89
- Partials 128 131 +3 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
b4acadb to
323400f
Compare
144a58d to
e6d155a
Compare
This was referenced Jul 28, 2025
e6d155a to
aa818d9
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR modularizes the patching logic by breaking down the monolithic patch.go file into separate, focused modules and introduces a standardized Options struct for consistent parameter passing across the copacetic system.
Key changes:
- Splits large
patch.gointo focused modules (single.go, multi.go, platform.go, etc.) - Introduces
types.Optionsstruct to standardize copacetic configuration - Creates
commonpackage with shared utilities for OS detection, progress display, and platform handling
Reviewed Changes
Copilot reviewed 19 out of 19 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/types/options.go | Introduces standardized Options struct for copacetic configuration |
| pkg/patch/single.go | Handles single-architecture image patching logic |
| pkg/patch/multi.go | Manages multi-platform image patching workflow |
| pkg/patch/platform.go | Contains platform-specific utilities and filtering logic |
| pkg/patch/core.go | Provides core patching functionality for reuse by different frontends |
| pkg/patch/manifest.go | Handles multi-platform manifest creation and management |
| pkg/patch/build.go | Manages build configuration and source policy validation |
| pkg/patch/loader.go | Contains image loader detection logic |
| pkg/patch/patch.go | Refactored main patch orchestration with simplified interface |
| pkg/patch/cmd.go | Updates command interface to use new Options struct |
| pkg/patch/patch_test.go | Updates tests to work with new modular structure |
| pkg/common/*.go | New shared utilities for OS detection, progress display, and platform handling |
Comments suppressed due to low confidence (2)
pkg/patch/platform.go:121
- The
fmt.Sprintfcall inside the log statement creates unnecessary string formatting overhead. Consider usingplatforms.Format(*it.PatchedDesc.Platform)or constructing the string directly in the log call.
return nil, fmt.Errorf("error getting manifest: %w", err)
pkg/patch/cmd.go:21
- [nitpick] The field name was changed from
reportFiletoreportbut this may be confusing since the field can represent both a file path or directory path. ConsiderreportPathfor clarity.
report string
aa818d9 to
c91b256
Compare
Signed-off-by: robert-cronin <robert.owen.cronin@gmail.com>
c91b256 to
5e6d3f3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
patch.gologic out into separate files in preparation for buildkit frontend and generate commandOptionsto standardize copacetic optionsCloses #1227