Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Registry upload #14

Merged
merged 7 commits into from
Nov 5, 2021
Merged

Registry upload #14

merged 7 commits into from
Nov 5, 2021

Conversation

mnm678
Copy link
Contributor

@mnm678 mnm678 commented Oct 29, 2021

requires #11
solves #12

This pr doesn't support references yet, as they are not yet merged into the oras-go library. Once that happens, I will update this.

Signed-off-by: Marina Moore <[email protected]>
@mnm678 mnm678 marked this pull request as ready for review November 2, 2021 15:50
@mnm678
Copy link
Contributor Author

mnm678 commented Nov 2, 2021

@sudo-bmitch @trishankatdatadog I think this is ready for review.

return err
}

root_desc, err := tufnotary.UploadTUFMetadata(registry, repository, "root", "")

Choose a reason for hiding this comment

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

The last string is empty because?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it will be used for the reference. I should add some comments about that.

}
fmt.Println("uploaded root " + root_desc.Digest.String())

targets_desc, err := tufnotary.UploadTUFMetadata(registry, repository, "targets", "")

Choose a reason for hiding this comment

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

The last string is empty because?

@@ -0,0 +1 @@
{"signatures":[{"keyid":"05980fceea73b53becb1fd69fbd3007c11c2c594edd33053f0c0d79ac67740e8","sig":"f0c400100f5a4cca8832ddca037adf1c6742b55026a5d92aa281be98e309df9e69c70ace8ee7138a95a0b5b4673b2a403d25394b3946a6d7c7f3556f80e82c02"},{"keyid":"0a7cee9fd46d9bf264d80a7709a90f283995aecf170c4777d3c2f51671e04af3","sig":"6bb75e370051f4946363903fcfcc590843f32972731019198bdb7eb9acd241d8253292870fdbbbae38a64eded2596163fdfa7b639f864b5f43b11adaa915e906"},{"keyid":"0c8ae234e2f1ccc68b95eeb80dc9893bdc08028eef571b48c97002230c3a2257","sig":"b7ef72d8caf1af68d6e81e621491796fb91266e8cf685e8f47f30d1acfdb0bac9ad18a25e1756b7cf845fc9e4b2fed3a18665f4de9e7b6e77066c319204f650b"},{"keyid":"13f399f0c47873571a0b259684832cfd8be13de027c00ec5b9437cfe515319ce","sig":"319b09a373b0337137b1e0c9a53954aeaf7dc6d0d2cd8c47c0d577533262ca04a63d761977b01ff89802ef5d043c79328a6e421ed04986cd36b34f7a340c7501"},{"keyid":"1581362377a3fa9d8acb710774405093bb2c34ace85eaade6f70259a14e9cef1","sig":"860b25b396bfe9af771e7f40bec2d44580f2fdb732d75ba6842b661ce9e218fbe77a9ed34cce074233810a172d39d33bdfcb3bfff714839455ca36d168ce3c03"},{"keyid":"183e5891198f19b080a63017cda8f1139c1f8243610b1eb11c88491440c8c30c","sig":"3d1b004a2f0d2f72c6299704330df93d98c55ee11ab479a40f98297029cde27b4d593e6bcbd72fcaeb76d84388494be47312ee480c5a9e8f60672dedfe458c0f"},{"keyid":"1a703c8c75720368e644db13a163d5b3134956a7cd87e547f1aaa638d78f1a2e","sig":"4e1f60fd3c2c284063c7b34cbfbedddb46a20d0d2e1e311bb7605669d57eeaa33403c71120bd466a0401e07b59611ad2abb33bf28b8e23e2d25e1037f639ca06"},{"keyid":"22b3eb56a41acd91b660d9387a53855a4b8feebbc037f5838b95f386403613d7","sig":"98419cdea172bb4148f840acb4f7cf1aac97a7176869b6884c503af26129022be0bbc206be4bd6ecb974622844729776d817a4a3351dce3a6748a33d3715f10b"},{"keyid":"28fe925299ecc8b8db467387d06b458de6c55e724508f309a1f84ddd25590b21","sig":"af5dcc5ccc89649656282e7f06533e6c8361ed9e7f69f0dadc86744d741a009ee091dcec2931d594b07fc0f546cecb3414fe23b7a5e1362732265aa69ae2a001"},{"keyid":"30ad00ec6d2700a7ca9b3c5301c8d5847fb7feee9b579a6b8b70f5583abebcab","sig":"e2fc61a9cca0e046d6cf71bc34856e04ce9745960a4a3174ba0076782ec90e1b69456497d53e78fab3690c0eb1cb4821b206bfc6c4febaa53e371c82e209860e"},{"keyid":"3cbb496563da79858a677be0be01b6544c02a1aab12bbfb2bcaa8ee031dd65f1","sig":"be333c03e5f4adb5b3eedcd8d4d24cefe7ec1f9653c7c8b177348bbf20a0bfac91d9e21777d19de1ed14d01335e4b424a58fb6b0b5c5c460eeec5ee953a70a0e"},{"keyid":"3d81be0c9c3849c0fa9990fda282cb773fb6230293403c2d7ee7a8cea82b7d4b","sig":"0ee4cec59848c8d5b2da6743a5e178b33e967cacf954665c2fb95893a41ee883a86a5aa2d19577fdc567fa23d073569b3fe6318bf28709bebfe0d4653b7ad00c"},{"keyid":"4d93788e0e18def47864839f33806945fe825424ab5040f763b0809aff21c196","sig":"040e29ad4d5487c9385fce9389c8b1b655e1b980c79d13235abe4b9f600f1c86cc050ee173c0218d1e3bce45f92feb2850999f820bb65f17cd8c6ceef1e37401"},{"keyid":"4e698efb9facc61449aa0baed2091b463ef3f99ea3fd9ce63e8c9a9dbf19521a","sig":"1b8dba279289ef11bcddb87adae4414c5ebec4bd7c8e2887af731dc7bfb3ec08a60dd7e2ca5788d9dd065715fdabfc3a73be0560cbef7104ce9222e63f9f8201"},{"keyid":"65fb89f26602d9de5f133b39c7d06c59c65fa2de4b721dae6b8f9f0fabf93e22","sig":"5a63118d1c2750b4a731793fb9a5a8792d4a81100cee39a89cd234c7ea369b3a3415c0e064ab1a7b7e8a173f1624d8a77d71da2215fe218f8b068e8abe787103"},{"keyid":"67201b99929613345ac65672976b6bcc1f7c343e27638e7ad7d105174b13b2a3","sig":"7768719db6ba95bf9129819e43fcc67af95889f15e5c71972c797ae31b495a33afd95386a57b0df28222e95f18e942cd9ad7020563ae4b382c79f3b6561c6004"},{"keyid":"6dc27394d0614b58a55de604cb136e356227916c2852e57ca7e80fb2f91263c7","sig":"cb34f63df6998bd6440530752ec04215c1b954e872707b340d93ea2555428569057928697ea8e7ea3734d26868b1a64d7eec06e44f3bbec52ac6021e184fef05"},{"keyid":"7112b97a843961af5595a31cfda88dce412b31d07b1ff32bf8cddca159c6523f","sig":"2a7973eec5567fad40cec922ca3359e7b1d4117720589b976f6967aec5bec29f3e4cd49f1c43970a70e6a5aeb01d82bb86dfe96fd9f6927829ff8d73e34b2702"},{"keyid":"7551c0ee99c8553fb5ca81b0333ce6d8557f41615eb8626dcffd7481e93a31ce","sig":"6f5cdacf6320085376d04586b1e788308cf83908b67d04fc9fc87ecb46b9c9753eec345f0daec6c6152867cdbe9ed5869da6f12696d93c11f8ec849c441ff208"},{"keyid":"7662d1e9282a938787ca6fe6dcd866b58c698cfa135b6033a478e40a2b458613","sig":"6fdbb40186d3444f4fa6c9b628bcce9748354711901e942fdf95a389d09de5ffa766ec45df11926f2dc08fa77cbb8882b51523848382e2c82a1bcfa6fd5e5606"},{"keyid":"9e6284d1462293a5d63544d743a0f3994a168d062410891b24869021c105c766","sig":"d795be52dafec5a00961cf49cfc3dd8ed21e23f020082ed5162c46f685458c69e81f5e463b7a71c45152aa61eda5414fe934312dde30a588604b32757cd6550e"},{"keyid":"a6291c84b8cf2ec9246d98a282a8423749b0ef876c73ffc85b9241e062feebad","sig":"2580ddce0d9089975c3bbf40f0252509c644def96fa8b2d154612c8d077bca8ec616dc9668acbd0ca7b0acb589a62d091003912b3244292133252916e88d3d0d"},{"keyid":"aad1bc61164788d5c3ae8e510ffe285047acfff4cd19e81f2d1d6a3e6977c202","sig":"ed3d59b9918bc24733f0eb7a344bbcd33093b191ecb836497e735415c72efeb20cfd41c00ceaf9c9b0875e05b0c243b889425c04cb89f67869df84f01b9dd909"},{"keyid":"b16123f0fec83aab7b52a8d74a54947833211f090344cc6dcdf8aaca374af4ac","sig":"c19be4b37d7101d4372242b204fa246396f4d04be162158e0b0bb1dacd10c84b8bd7c1b8a48bf31ecabcecbe8c28c2da4680837458b9097b5e4848d8aecb800c"},{"keyid":"b38cf9cfd9b4e5fdb4160cb9edd9b6be7bb5d53f8b9d961f30cfc09721befb3c","sig":"6e7aee659ac9632b22f14ade0b4f336dcecba489c877f38e321ac44b9e002172546b91e4624ed776f4867f061f0c32c6bc10773876aea9973287959f71f87a04"},{"keyid":"d8918bdb2e7439b0e503c849e1a6015ee502e163314e1df3b7e329b857db7031","sig":"92a1a7d67fd37a7bcbbd04bccdb1c7082655cbe637426dbd0c3d677f1fb3f4552f4c36d678ef7764f29579995ff86625579d6480177d866afaeed57212b43303"},{"keyid":"e259e697860b4d9480bd48d6bbeec7aee3a74a286c83b962b68b93e6c51fc3a1","sig":"ad8e4136c51f51b453f718e4b1b25ce02e839a94afad215966a836bf2fd2a9063ccbab6260ebea2a4c5774a85346a0341bf3fa34fe5aa4d726ecbf7bc232fb0f"},{"keyid":"eb872300f88fb4314a0803eec978d34a229830e8feef49932d29121acfa63603","sig":"ea5481ce50bcec0eb2bd767382ece527c7f3f757d34be52e78715198faae985c14521f78cfa418427444c7623992f8b2c6bc3f39ba5afb8b99ce80939b4c590f"},{"keyid":"fa677d5eb5e0f98bdd4607c504fddde0579b42744fc102c6dbf7d58b5062f7d3","sig":"b1ef03d53a246a0d4994ad4aeb666d877c256c8593362ac81621cf716c346aa2ac2cb7c4f354dca2f8f7b43d9cec985d2e3a59ce3cbff52855b5c6e205b16a07"}],"signed":{"_type":"root","consistent_snapshot":false,"expires":"2022-11-01T20:09:55Z","keys":{"24645c6c92ae9d97c1532e30b4c009d1cf1b69cbcd1021b70252221a1c9ccf20":{"keyid_hash_algorithms":["sha256","sha512"],"keytype":"ed25519","keyval":{"public":"03a966cded0b6939bb2978bc18d8c3d0d55ceb2ff54d96fc03e8ea3430149efb"},"scheme":"ed25519"},"e259e697860b4d9480bd48d6bbeec7aee3a74a286c83b962b68b93e6c51fc3a1":{"keyid_hash_algorithms":["sha256","sha512"],"keytype":"ed25519","keyval":{"public":"a1dd055764682de537ba838c54113c0671b4f47e5f0533eefa0475bcff89eeb8"},"scheme":"ed25519"},"e92453a2973244aeb4c41e915ed7b3487c74318ab5e947b54df4961ad8ca84bb":{"keyid_hash_algorithms":["sha256","sha512"],"keytype":"ed25519","keyval":{"public":"4f903289df1f8134bbb03e5031e91b3ee06c54962e3d282b2e21a8ca10f3a1fa"},"scheme":"ed25519"},"ef87b52c4f4a0342352239b07a0b58e52cd6e9ee23edd8ce638a97a52b2a0d34":{"keyid_hash_algorithms":["sha256","sha512"],"keytype":"ed25519","keyval":{"public":"2b0c84e9cf07fd72e8ce231839773a59628c03aa76aace50851f65586953e98d"},"scheme":"ed25519"}},"roles":{"root":{"keyids":["e259e697860b4d9480bd48d6bbeec7aee3a74a286c83b962b68b93e6c51fc3a1"],"threshold":1},"snapshot":{"keyids":["ef87b52c4f4a0342352239b07a0b58e52cd6e9ee23edd8ce638a97a52b2a0d34"],"threshold":1},"targets":{"keyids":["24645c6c92ae9d97c1532e30b4c009d1cf1b69cbcd1021b70252221a1c9ccf20"],"threshold":1},"timestamp":{"keyids":["e92453a2973244aeb4c41e915ed7b3487c74318ab5e947b54df4961ad8ca84bb"],"threshold":1}},"spec_version":"1.0","version":1}}

Choose a reason for hiding this comment

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

Why is this committed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is for the test

@@ -3,10 +3,70 @@ module github.com/notaryproject/tuf/tuf-notary
go 1.17

require (

Choose a reason for hiding this comment

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

NBD, but why not include go.sum too?


// TODO: add reference once it's supported in oras-go: https://github.com/oras-project/oras-go/pull/35

memoryStore := content.NewMemory()

Choose a reason for hiding this comment

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

Nit: indentation kinda funny... would you mind running the source code against gofmt in an automated GitHub check going fwd? Also, using an IDE like VScode or Goland will go a long way.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

opened #16

@@ -14,5 +14,47 @@ func Init(repository string) error {
}

//not using consistent snapshots
return repo.Init(false)
err = repo.Init(false)

Choose a reason for hiding this comment

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

What is the point of this file, sorry? Totally not clear.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it sets up the TUF repository locally.

Signed-off-by: Marina Moore <[email protected]>
@sudo-bmitch
Copy link
Contributor

A visual scan LGTM. If we want to support some registries that filter other media types, we may want to consider the option to push with an image config media type and include a blank config. Cosign is doing this today to avoid filters from Hub and ECR. I wouldn't want that to be the default since it's against the OCI Artifact design, but a degraded behavior may be needed for some users.

@mnm678 mnm678 merged commit de67afd into notaryproject:main Nov 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants