Skip to content

feat: update existing index (index update)#1476

Merged
shizhMSFT merged 16 commits into
oras-project:mainfrom
wangxiaoxuan273:index-update-add
Sep 13, 2024
Merged

feat: update existing index (index update)#1476
shizhMSFT merged 16 commits into
oras-project:mainfrom
wangxiaoxuan273:index-update-add

Conversation

@wangxiaoxuan273

@wangxiaoxuan273 wangxiaoxuan273 commented Aug 13, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

oras manifest index update

Current status output:

root# oras manifest index update 
wxxdevreg.azurecr.io/test@sha256:2b8bab8c7d73d178fa66c391458e5a441e09ab47bb85c3b4936bd94ac07c9132 --add s390x --add sha256:89fa64341cccaf9b1ede4d06abf5217c785adb6cbb40827f7488db5d97f3d3c8 --remove sha256:a1f5af96aa0a2d2e77bb6f18174353d7fa96700a5fac76a9f460a44f6999330c --merge temp02 --tag temp03 --tag temp04
Fetching  sha256:2b8bab8c7d73d178fa66c391458e5a441e09ab47bb85c3b4936bd94ac07c9132
Fetched   sha256:2b8bab8c7d73d178fa66c391458e5a441e09ab47bb85c3b4936bd94ac07c9132
Fetching  s390x
Fetched   sha256:fd0201b8b0d7cdde2b9e8bcf5278b49668f1dd377a01ec1e2ef0e57382c25a0d s390x
Added     sha256:fd0201b8b0d7cdde2b9e8bcf5278b49668f1dd377a01ec1e2ef0e57382c25a0d s390x
Fetching  sha256:89fa64341cccaf9b1ede4d06abf5217c785adb6cbb40827f7488db5d97f3d3c8
Fetched   sha256:89fa64341cccaf9b1ede4d06abf5217c785adb6cbb40827f7488db5d97f3d3c8
Added     sha256:89fa64341cccaf9b1ede4d06abf5217c785adb6cbb40827f7488db5d97f3d3c8
Fetching  temp02
Fetched   sha256:a4c7b57cea489149bc30e7ecce464ea16ac44ea7dcf734ccfeadd4f6846b175c temp02
Merged    sha256:a4c7b57cea489149bc30e7ecce464ea16ac44ea7dcf734ccfeadd4f6846b175c temp02
Removed   sha256:a1f5af96aa0a2d2e77bb6f18174353d7fa96700a5fac76a9f460a44f6999330c
Updated   sha256:79812a00bb50fc45e56e1744a5201a40364a417bfe444156f3209f3d451b7ecc
Pushed    [registry] wxxdevreg.azurecr.io/test
Tagged temp04
Tagged temp03
Digest: sha256:79812a00bb50fc45e56e1744a5201a40364a417bfe444156f3209f3d451b7ecc

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

This PR builds on #1475

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?

@codecov

codecov Bot commented Aug 13, 2024 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 91.78082% with 12 lines in your changes missing coverage. Please review.

Project coverage is 86.00%. Comparing base (2808ea1) to head (229d4c8).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
cmd/oras/root/manifest/index/update.go 92.42% 5 Missing and 5 partials ⚠️
cmd/oras/root/manifest/index/create.go 81.81% 1 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1476      +/-   ##
==========================================
+ Coverage   85.83%   86.00%   +0.17%     
==========================================
  Files         116      117       +1     
  Lines        4073     4210     +137     
==========================================
+ Hits         3496     3621     +125     
- Misses        345      351       +6     
- Partials      232      238       +6

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

shizhMSFT
shizhMSFT reviewed Aug 13, 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.

Please mark oras manifest index command set as "experimental".

@wangxiaoxuan273 wangxiaoxuan273 changed the title feat: add manifests to index (index update --add) feat: add manifests to index (index update) Aug 16, 2024
@wangxiaoxuan273 wangxiaoxuan273 force-pushed the index-update-add branch 2 times, most recently from ef20bdf to c2ecf10 Compare August 20, 2024 10:31
@wangxiaoxuan273 wangxiaoxuan273 changed the title feat: add manifests to index (index update) feat: update existing index (index update) Aug 21, 2024
@wangxiaoxuan273 wangxiaoxuan273 force-pushed the index-update-add branch 3 times, most recently from e939b85 to f20427d Compare August 27, 2024 04:56
Wwwsylvia
Wwwsylvia reviewed Sep 6, 2024
View reviewed changes
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Wwwsylvia
Wwwsylvia requested changes Sep 9, 2024
View reviewed changes
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Wwwsylvia
Wwwsylvia reviewed Sep 9, 2024
View reviewed changes
Comment thread cmd/oras/root/manifest/index/update.go Outdated
@qweeah

qweeah commented Sep 9, 2024

Copy link
Copy Markdown
Contributor

Found two lines in the demo output very misleading:

...
Updated   sha256:79812a00bb50fc45e56e1744a5201a40364a417bfe444156f3209f3d451b7ecc
Pushed    [registry] wxxdevreg.azurecr.io/test@sha256:2b8bab8c7d73d178fa66c391458e5a441e09ab47bb85c3b4936bd94ac07c9132
...

Shouldn't sha256:79812a00bb50fc45e56e1744a5201a40364a417bfe444156f3209f3d451b7ecc be pushed?

@wangxiaoxuan273

wangxiaoxuan273 commented Sep 10, 2024

Copy link
Copy Markdown
Contributor Author

Found two lines in the demo output very misleading:

...
Updated   sha256:79812a00bb50fc45e56e1744a5201a40364a417bfe444156f3209f3d451b7ecc
Pushed    [registry] wxxdevreg.azurecr.io/test@sha256:2b8bab8c7d73d178fa66c391458e5a441e09ab47bb85c3b4936bd94ac07c9132
...

Shouldn't sha256:79812a00bb50fc45e56e1744a5201a40364a417bfe444156f3209f3d451b7ecc be pushed?

Thanks for catching!

shizhMSFT
shizhMSFT reviewed Sep 10, 2024
View reviewed changes
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
@wangxiaoxuan273

wangxiaoxuan273 commented Sep 11, 2024

Copy link
Copy Markdown
Contributor Author

Found two lines in the demo output very misleading:

...
Updated   sha256:79812a00bb50fc45e56e1744a5201a40364a417bfe444156f3209f3d451b7ecc
Pushed    [registry] wxxdevreg.azurecr.io/test@sha256:2b8bab8c7d73d178fa66c391458e5a441e09ab47bb85c3b4936bd94ac07c9132
...

Shouldn't sha256:79812a00bb50fc45e56e1744a5201a40364a417bfe444156f3209f3d451b7ecc be pushed?

Fixed the push path output by adding and using a new function getPushPath.

Wwwsylvia
Wwwsylvia reviewed Sep 11, 2024
View reviewed changes
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update_test.go
shizhMSFT
shizhMSFT reviewed Sep 11, 2024
View reviewed changes
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Wwwsylvia
Wwwsylvia approved these changes Sep 11, 2024
View reviewed changes

@Wwwsylvia Wwwsylvia 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 with nit

Comment thread cmd/oras/root/manifest/index/update.go Outdated
Wwwsylvia
Wwwsylvia approved these changes Sep 12, 2024
View reviewed changes

@Wwwsylvia Wwwsylvia 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 requested changes Sep 12, 2024
View reviewed changes
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Xiaoxuan Wang and others added 15 commits September 13, 2024 14:31
rebase
093a327 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
@wangxiaoxuan273
fix rebase
61d61c6 
Signed-off-by: wangxiaoxuan273 <wangxiaoxuan119@gmail.com>
resolved some comments
d1ec933 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
resolved some comments
11b0176 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
changed remove behavior
52ce1d2 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
refactored remove
c7130dd 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
fix failed test
6ce1444 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
fix failed test
b3575d6 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
fix push path
fd0ba93 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
refinement
6053336 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
updated description
c45ad80 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
resolve comments
6b40848 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
removed redundant oci layout test
1e0765a 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
renamed function
3a2f5bc 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
resolved comments
a8a5e21 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
shizhMSFT
shizhMSFT reviewed Sep 13, 2024
View reviewed changes
Comment thread cmd/oras/root/manifest/index/update.go
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
Comment thread cmd/oras/root/manifest/index/update.go Outdated
resolved comments
229d4c8 
Signed-off-by: Xiaoxuan Wang <xiaoxuanwang@microsoft.com>
shizhMSFT
shizhMSFT approved these changes Sep 13, 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

@shizhMSFT shizhMSFT merged commit 071f060 into oras-project:main Sep 13, 2024
@wangxiaoxuan273 wangxiaoxuan273 deleted the index-update-add branch September 13, 2024 07:51
@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

@Wwwsylvia Wwwsylvia Wwwsylvia 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

@qweeah qweeah Awaiting requested review from qweeah

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

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@wangxiaoxuan273 @qweeah @Wwwsylvia @shizhMSFT