Skip to content

fix(cp): avoid showing empty descriptor in progress bar#1528

Merged
TerryHowe merged 9 commits into
oras-project:mainfrom
qweeah:jinzha1/1442-zero-length-no-progress
Nov 11, 2024
Merged

fix(cp): avoid showing empty descriptor in progress bar#1528
TerryHowe merged 9 commits into
oras-project:mainfrom
qweeah:jinzha1/1442-zero-length-no-progress

Conversation

@qweeah

@qweeah qweeah commented Nov 8, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:
This PR fixes progress ratio and missing descriptor in the progress output.

Before

> oras cp --to-oci-layout jinzha1.azurecr.io/test:blank-progress .
✓ Copied  application/vnd.docker.container.image.v1+json                                                              0/0  B 100.00%    9ms
  └─ sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
⠋ [....................](   0  B/s) Copying application/vnd.docker.image.rootfs.diff.tar.gzip                      0.00/0  B   0.00%   26ms
  └─ sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
✓ Copied  application/vnd.docker.distribution.manifest.v2+json                                                  6.16/6.16 kB 100.00%   19ms
  └─ sha256:47506275bd97c02cd5f2c8c86d67d1faf8d3816ba0278aae63fb9cd25ec02e6c
Copied [registry] jinzha1.azurecr.io/test:blank-progress => [oci-layout] .
Digest: sha256:47506275bd97c02cd5f2c8c86d67d1faf8d3816ba0278aae63fb9cd25ec02e6c

After

> oras cp --to-oci-layout jinzha1.azurecr.io/test:blank-progress ./debug
✓ Copied  application/vnd.docker.image.rootfs.diff.tar.gzip                                                                                                0/0  B 100.00%    1ms
  └─ sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
✓ Copied  application/vnd.docker.container.image.v1+json                                                                                                   0/0  B 100.00%     0s
  └─ sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
✓ Copied  application/vnd.docker.distribution.manifest.v2+json                                                                                       6.16/6.16 kB 100.00%  808µs
  └─ sha256:47506275bd97c02cd5f2c8c86d67d1faf8d3816ba0278aae63fb9cd25ec02e6c
Copied [registry] jinzha1.azurecr.io/test:blank-progress => [oci-layout] ./debug
Digest: sha256:47506275bd97c02cd5f2c8c86d67d1faf8d3816ba0278aae63fb9cd25ec02e6c

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1442

Please check the following list:

  • Does the affected code have corresponding tests, e.g. unit test, E2E test?
  • Does this change require a documentation update?
  • Does this introduce breaking changes that would require an announcement or bumping the major version?
  • Do all new files have an appropriate license header?

@qweeah
fix(cp): avoid showing empty descriptor in progress bar
00c3d4b 
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
@qweeah
fix ut
ce3362c 
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
@codecov

codecov Bot commented Nov 8, 2024 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.99%. Comparing base (b8db531) to head (793acd1).
Report is 1 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1528      +/-   ##
==========================================
+ Coverage   83.87%   83.99%   +0.12%     
==========================================
  Files         118      118              
  Lines        5166     5174       +8     
==========================================
+ Hits         4333     4346      +13     
+ Misses        592      588       -4     
+ Partials      241      240       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

qweeah and others added 2 commits November 8, 2024 10:04
@qweeah
add e2e
bf60601 
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
@TerryHowe
Merge branch 'main' into jinzha1/1442-zero-length-no-progress
3520635
TerryHowe
TerryHowe approved these changes Nov 8, 2024
View reviewed changes

@TerryHowe TerryHowe left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

shizhMSFT
shizhMSFT reviewed Nov 8, 2024
View reviewed changes
Comment thread cmd/oras/internal/display/status/progress/status.go
@qweeah
Merge remote-tracking branch 'upstream/main' into jinzha1/1442-zero-l…
9ab01ab 
…ength-no-progress
@qweeah
Merge branch 'jinzha1/1442-zero-length-no-progress' of github.com:qwe…
7e535fd 
…eah/oras into jinzha1/1442-zero-length-no-progress
@qweeah
code clean
e7cf4f3 
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
@qweeah
fix ut
084095c 
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
@qweeah
improve code redability
793acd1 
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
shizhMSFT
shizhMSFT approved these changes Nov 11, 2024
View reviewed changes

@shizhMSFT shizhMSFT left a comment

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.

LGTM

TerryHowe
TerryHowe approved these changes Nov 11, 2024
View reviewed changes

@TerryHowe TerryHowe left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

@TerryHowe TerryHowe merged commit b4be9a6 into oras-project:main Nov 11, 2024
qweeah added a commit to qweeah/oras that referenced this pull request Dec 5, 2024
@qweeah @TerryHowe
fix(cp): avoid showing empty descriptor in progress bar (oras-project…
23caac0 
…#1528)

Signed-off-by: Billy Zha <jinzha1@microsoft.com>
Co-authored-by: Terry Howe <terrylhowe@gmail.com>
Signed-off-by: Billy Zha <jinzha1@microsoft.com>
@qweeah qweeah mentioned this pull request Dec 9, 2024
Merged
@Wwwsylvia Wwwsylvia mentioned this pull request Sep 3, 2025
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TerryHowe TerryHowe TerryHowe approved these changes

@shizhMSFT shizhMSFT shizhMSFT approved these changes

@sajayantony sajayantony Awaiting requested review from sajayantony sajayantony is a code owner

@SteveLasker SteveLasker Awaiting requested review from SteveLasker

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

progress bar missing when copying artifact with zero-length layer from registry to OCI layout

3 participants

@qweeah @TerryHowe @shizhMSFT