Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ e2e-covdata:
rm -rf $$GOCOVERDIR; \
mkdir -p $$GOCOVERDIR; \
export GO_INSTRUMENT_FLAGS='-coverpkg "github.com/notaryproject/notation/internal/...,github.com/notaryproject/notation/pkg/...,github.com/notaryproject/notation/cmd/..."'; \
$(MAKE) e2e; \
go tool covdata textfmt -i=$$GOCOVERDIR -o "$(CURDIR)/test/e2e/coverage.txt"
$(MAKE) e2e && go tool covdata textfmt -i=$$GOCOVERDIR -o "$(CURDIR)/test/e2e/coverage.txt"

.PHONY: clean
clean:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if [ ! -f "$NOTATION_E2E_OLD_BINARY_PATH" ]; then
fi

# install dependency
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.3.0
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.9.5

# build e2e plugin
PLUGIN_NAME=e2e-plugin
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suite/command/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var _ = Describe("notation list", func() {
notation.Exec("list", "--oci-layout", ociLayout.ReferenceWithDigest()).
MatchKeyWords(
"└── application/vnd.cncf.notary.signature",
"└── sha256:273243a7a64e9312761ca0aa8f43b6ba805e677a561558143b6e92981c487339",
"└── sha256:90ceaff260d657d797c408ac73564a9c7bb9d86055877c2a811f0e63b8c6524f",
)
})
})
Expand Down
38 changes: 19 additions & 19 deletions test/e2e/testdata/config/localkeys/expired_e2e.crt
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDeDCCAmCgAwIBAgIUHrGJvCPvxE55ZKOZklGLtkG8H2QwDQYJKoZIhvcNAQEL
BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMjEyMjcwOTM1MDJaFw0yMjEy
MjgwOTM1MDJaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQDA2sojOkRIORjspqH6xYp5cM0TvJQFqpbnxzIy2SmT
39DpAtud0zF23xWMPfLhtIGFlct1SRbRLiFI1ldDCRibfKijEleP644j02cQ+3+A
CQ9iuLhN0qlMVIHMTi4nQetgMFSKvcNquz8JeK6yZ0KdJYqyCbTki2Qd0cQa2ivv
XppZ2ca4U2/LMnJoLdcsWmjU7ATBPLF/hiLHhS2/A0MHhM4lEfzhq9KgUK5rzFtG
mIEnRChfrNjRiv2pu8wFAhyalDe5Y6IR5UwONETRfOGJZJ69V9lM8lximwDIFMkY
kshwdTskxifAo/ojNSDlPnz2W9FUPu6niwALuLM4obM9AgMBAAGjYDBeMB0GA1Ud
DgQWBBTPRFfNEvc5FlaPn+sjIrc2UEOaoDAfBgNVHSMEGDAWgBTPRFfNEvc5FlaP
n+sjIrc2UEOaoDAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG
9w0BAQsFAAOCAQEAlFE2mvqyBog7ZUO54EvJA422g/9JgXVW4c5Vp7UkNoRIZIM2
HVmBySrdz+xM9j7f9yk9sP2wDN7OJaQGM/54Uld0b4Hm/Jcw1zZG+qMCjM7LR9Z2
TXHr1mwSfZTkUITJJ+9pzDzJoea/2yGlHDPiSeXW6Y50rOYIIH2BTL07vNFeMT6H
O0l/GWcT8S/eWZlvmLyYc368BSjSaGacuPvh3EO0AXpKJGjgH13NFEUKwqrvpdyR
pwN+9y2bUJtiC++t3VKgi9pb69IWmv2GuvPZOewwpQDSFOegbp6pH57Eo17R5QcM
p0Ib2JUOyypEwsVcuRYchBGjghtKwQ+LQKpoaA==
MIIDeDCCAmCgAwIBAgIUOmmr4z226FR1IU/HHg29TVLTYk8wDQYJKoZIhvcNAQEL
BQAwRTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRMwEQYDVQQI
DApTb21lLVN0YXRlMQswCQYDVQQGEwJBVTAeFw0yMzA2MjYwNjEwMDBaFw0yMzA2
MjcwNjEwMDBaMEUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDET
MBEGA1UECAwKU29tZS1TdGF0ZTELMAkGA1UEBhMCQVUwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQDAm29HFRPQOpSgfjdYGmX+/UgE2vD36Y5U9AwEyMGP
WAgHdRCCFPe0RkQic15HjwZRp9AkaJN+SGdkcpjaYdWVphBeDInu+9o7CmhaA5z8
yonm7UfQVO2813AZoXOdAyhiuVTN2CqPAhRk94yCONVtWrCsQqgEuPqSl61sB6+4
t2EY20xPFGsGJu/y9D5ihnqBsIAcohVh3mRTcQ3IRi1VvWiPApCD9CN5eyKZO07I
RNANeKRn+yX+o0M7pDfL5b6lZhHTxihhfZXSw/9JEDbucBzWLvQ8nvn/VA+CNCQO
OTcCfPCYTjTeCvyuskxwJJ1p3KNdHMgP28RsQiIq4ynfAgMBAAGjYDBeMB0GA1Ud
DgQWBBR8Nz1AyK8YixMB+6CaZzVIk9NQ4zAfBgNVHSMEGDAWgBR8Nz1AyK8YixMB
+6CaZzVIk9NQ4zAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG
9w0BAQsFAAOCAQEAkM+lfszmhNWVV17A0in4B3Uw3gOSOLbhMYlpRuJQXXwNQV44
m5UE5xFChjB7mzYbRu2+aClTqoOdoz8C1VcYwkSfcr9y/3IyH2d0FJr+QIDWm32G
RC7DMnl/cpGeJgw2/qoxyZ5xmodpneGdRGFc93nO1Bxp2oyB7WC3hBZtbufjE+Kr
t4uOhsun8/KtrCXX9JBmpD1GmP6rfml1bIguEW0Ga3jeNloDXk/KanHoJxlteNF6
SJBN4BHfFsDzAWyOdzoU98MgEBbsoJradfM7Js5gZe3bXI3jt4vy97q73C9USbUv
SCPUyf6klJDTo1IvyCjWE+VRbOrgG46L6PULNQ==
-----END CERTIFICATE-----

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"application/vnd.cncf.notary.signature","digest":"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a","size":2},"layers":[{"mediaType":"application/jose+json","digest":"sha256:b5f927564088f65dad86c81bcdd0b55415a8b4c9a0a5391107210e0cdb305cc7","size":2171}],"subject":{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:b8479de3f88fb259a0a9ea82a5b2a052a1ef3c4ebbcfc61482d5ae4c831f8af9","size":517},"annotations":{"io.cncf.notary.x509chain.thumbprint#S256":"[\"e38aea13f2b051f7183cca64a51ee676f4d4456f41d9fecf15eb367efc7343b9\"]","org.opencontainers.image.created":"2023-06-27T05:20:21Z"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
awesome notation

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:3829708badae8e4b14e1adbc2fac7182bc0c27c5b6f54153e8b68a12eab10a1e","size":728,"annotations":{"io.cncf.notary.x509chain.thumbprint#S256":"[\"e38aea13f2b051f7183cca64a51ee676f4d4456f41d9fecf15eb367efc7343b9\"]","org.opencontainers.image.created":"2023-06-27T05:20:21Z"},"artifactType":"application/vnd.cncf.notary.signature"}]}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"payload":"eyJ0YXJnZXRBcnRpZmFjdCI6eyJkaWdlc3QiOiJzaGEyNTY6Yjg0NzlkZTNmODhmYjI1OWEwYTllYTgyYTViMmEwNTJhMWVmM2M0ZWJiY2ZjNjE0ODJkNWFlNGM4MzFmOGFmOSIsIm1lZGlhVHlwZSI6ImFwcGxpY2F0aW9uL3ZuZC5vY2kuaW1hZ2UubWFuaWZlc3QudjEranNvbiIsInNpemUiOjUxN319","protected":"eyJhbGciOiJQUzI1NiIsImNyaXQiOlsiaW8uY25jZi5ub3Rhcnkuc2lnbmluZ1NjaGVtZSIsImlvLmNuY2Yubm90YXJ5LmV4cGlyeSJdLCJjdHkiOiJhcHBsaWNhdGlvbi92bmQuY25jZi5ub3RhcnkucGF5bG9hZC52MStqc29uIiwiaW8uY25jZi5ub3RhcnkuZXhwaXJ5IjoiMjAyMy0wNi0yN1QxMzoyMToyMSswODowMCIsImlvLmNuY2Yubm90YXJ5LnNpZ25pbmdTY2hlbWUiOiJub3RhcnkueDUwOSIsImlvLmNuY2Yubm90YXJ5LnNpZ25pbmdUaW1lIjoiMjAyMy0wNi0yN1QxMzoyMDoyMSswODowMCJ9","header":{"x5c":["MIIDOjCCAiKgAwIBAgIBUTANBgkqhkiG9w0BAQsFADBLMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxDzANBgNVBAoTBk5vdGFyeTEMMAoGA1UEAxMDZTJlMCAXDTIyMTIxOTAyNDMzOVoYDzIxMjIxMjE5MDI0MzM5WjBLMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxDzANBgNVBAoTBk5vdGFyeTEMMAoGA1UEAxMDZTJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwNrKIzpESDkY7Kah+sWKeXDNE7yUBaqW58cyMtkpk9/Q6QLbndMxdt8VjD3y4bSBhZXLdUkW0S4hSNZXQwkYm3yooxJXj+uOI9NnEPt/gAkPYri4TdKpTFSBzE4uJ0HrYDBUir3Dars/CXiusmdCnSWKsgm05ItkHdHEGtor716aWdnGuFNvyzJyaC3XLFpo1OwEwTyxf4Yix4UtvwNDB4TOJRH84avSoFCua8xbRpiBJ0QoX6zY0Yr9qbvMBQIcmpQ3uWOiEeVMDjRE0XzhiWSevVfZTPJcYpsAyBTJGJLIcHU7JMYnwKP6IzUg5T589lvRVD7up4sAC7izOKGzPQIDAQABoycwJTAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAKacaJ+O9rTIdfLHCdneLQ6RN92Id5dl8PGh/Xig3AWSOtLgIiRRsdxVH5PZkGOHosellQG5fCvQOwB0x8O+2YDKLOfgVIJWd6X85NdvyCdX2ElYRmvX9ON5WVguGLluwkOfJ26M8d8ftXrcc97qaKk4EHS8R/LCWqZNDRiRCA0OtNP9cUkKFaIG1hgWgEieVWnxrCyUDbTX3uCiJKNzSOmI3psF3WIhabU7/7gBm95nWhgwS91qAxavccVkY6hqAPj9tjJH5UPI5RR8kDB5rWiCIx1YHuH+z1eAYUHWVvZvneVniNBI8qGoGBz9HkrX5ecf+V7zaxyy0FoWlEX1z8k="],"io.cncf.notary.signingAgent":"Notation/1.0.0"},"signature":"OPdBj-46T0vYIyrxz4mtD0OFCMOn6rdqy8qMe4n2ShFGtcWqrA4LZbMTO5fBLRw-Z7SA6DCHKGP_sNBAMRC62R5TyMD53M8UmDweJs7rCQyBbATlTqXQFlLO8OCvANdASKPgQYsbADkVimA5Tp4srCxUyTT64a0vzCrgdCBcd_GIX9u-sNuVOvwQrRvHrA4-GPvTkwNoRDrXhVcgN_5IDpGLvAqHumPl-g7tZ-NrMLljzcdJ6uKDBJhAH4HRc64SnkPmTNWqNfzt9kIa9T3LBDSqVUJGw84BotRisz7Mj3it7BDnCh_5sJWBW-czYzUYu51FrRjLGRLEZM2kqcXF1w"}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"application/vnd.notation.config","digest":"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a","size":2},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar","digest":"sha256:6de5fe1f75e4b1094c98086f403d5fd8117776ebe5aad1609281403d13dea070","size":17,"annotations":{"org.opencontainers.image.title":"e2e.txt"}}],"annotations":{"org.opencontainers.image.created":"2023-06-27T05:01:36Z"}}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"schemaVersion":2,"manifests":[{"mediaType":"application/vnd.oci.artifact.manifest.v1+json","digest":"sha256:cc2ae4e91a31a77086edbdbf4711de48e5fa3ebdacad3403e61777a9e1a53b6f","size":417,"annotations":{"org.opencontainers.image.ref.name":"v1"}},{"mediaType":"application/vnd.oci.artifact.manifest.v1+json","digest":"sha256:92e4214e2cf605eb19e199a1a87dc3927434a833e239ecd02cebc0c2e12555a9","size":618}]}
{"schemaVersion":2,"manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:b8479de3f88fb259a0a9ea82a5b2a052a1ef3c4ebbcfc61482d5ae4c831f8af9","size":517,"annotations":{"org.opencontainers.image.ref.name":"v1"}},{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:3829708badae8e4b14e1adbc2fac7182bc0c27c5b6f54153e8b68a12eab10a1e","size":728},{"mediaType":"application/vnd.oci.image.index.v1+json","digest":"sha256:9567ef95679c34ba6deedf8ff1a43e17f889f83ee4276c070f7f5c97bad66030","size":485,"annotations":{"org.opencontainers.image.ref.name":"sha256-b8479de3f88fb259a0a9ea82a5b2a052a1ef3c4ebbcfc61482d5ae4c831f8af9"}}]}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"application/vnd.cncf.notary.signature","digest":"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a","size":2},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar","digest":"sha256:9a8decdf3775708f4eed16859f19561d730cad40b1af0dcfc37ac1e5f879a934","size":18,"annotations":{"org.opencontainers.image.title":"invalid_signature.txt"}}],"subject":{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:b8479de3f88fb259a0a9ea82a5b2a052a1ef3c4ebbcfc61482d5ae4c831f8af9","size":517},"annotations":{"org.opencontainers.image.created":"2023-06-27T05:57:43Z"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
awesome notation
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
invalid signature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:321fcc674d6771dd0e5bd21e599f2df3a482de99a400fd3a3fe371221b97a9c9","size":700,"annotations":{"org.opencontainers.image.created":"2023-06-27T05:57:43Z"},"artifactType":"application/vnd.cncf.notary.signature"}]}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"application/vnd.notation.config","digest":"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a","size":2},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar","digest":"sha256:6de5fe1f75e4b1094c98086f403d5fd8117776ebe5aad1609281403d13dea070","size":17,"annotations":{"org.opencontainers.image.title":"e2e.txt"}}],"annotations":{"org.opencontainers.image.created":"2023-06-27T05:01:36Z"}}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"schemaVersion":2,"manifests":[{"mediaType":"application/vnd.oci.artifact.manifest.v1+json","digest":"sha256:cc2ae4e91a31a77086edbdbf4711de48e5fa3ebdacad3403e61777a9e1a53b6f","size":417,"annotations":{"org.opencontainers.image.ref.name":"v1"}},{"mediaType":"application/vnd.oci.artifact.manifest.v1+json","digest":"sha256:a9d65231508f0380baac361b466a46233407628ca4d4ad53da4f6d7877db8eb1","size":618}]}
{"schemaVersion":2,"manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:b8479de3f88fb259a0a9ea82a5b2a052a1ef3c4ebbcfc61482d5ae4c831f8af9","size":517,"annotations":{"org.opencontainers.image.ref.name":"v1"}},{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:321fcc674d6771dd0e5bd21e599f2df3a482de99a400fd3a3fe371221b97a9c9","size":700},{"mediaType":"application/vnd.oci.image.index.v1+json","digest":"sha256:a045c6c6d90c1183b27b6759500aa5996b90701759d4d149f7b540e59f0b632a","size":369,"annotations":{"org.opencontainers.image.ref.name":"sha256-b8479de3f88fb259a0a9ea82a5b2a052a1ef3c4ebbcfc61482d5ae4c831f8af9"}}]}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:90ceaff260d657d797c408ac73564a9c7bb9d86055877c2a811f0e63b8c6524f","size":728,"annotations":{"io.cncf.notary.x509chain.thumbprint#S256":"[\"e38aea13f2b051f7183cca64a51ee676f4d4456f41d9fecf15eb367efc7343b9\"]","org.opencontainers.image.created":"2023-06-27T05:30:33Z"},"artifactType":"application/vnd.cncf.notary.signature"}]}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
awesome notation
Loading