fix commit- increase coverage

Signed-off-by: Pritesh Bandi <priteshbandi@gmail.com>

dir/path.go

@@ -60,11 +60,11 @@ const (
 	// PathTrustPolicy is the OCI trust policy file relative path.
 	// Deprecated: PathTrustPolicy exists for historical compatibility and should not be used.
 	// To get OCI trust policy path, use PathOCITrustPolicy.
-	PathTrustPolicy = PathOCITrustPolicy
+	PathTrustPolicy = "trustpolicy.json"
 	// PathOCITrustPolicy is the OCI trust policy file relative path.
-	PathOCITrustPolicy = "trustpolicy.json"
+	PathOCITrustPolicy = "trustpolicy.oci.json"
 	// PathBlobTrustPolicy is the Blob trust policy file relative path.
-	PathBlobTrustPolicy = "trustpolicy.json"
+	PathBlobTrustPolicy = "trustpolicy.blob.json"
 	// PathPlugins is the plugins directory relative path.
 	PathPlugins = "plugins"
 	// LocalKeysDir is the directory name for local key relative path.

example_SignBlob_test.go → example_signBlob_test.go

@@ -49,6 +49,7 @@ func Example_signBlob() {
 			SigningAgent:       "example signing agent",
 		},
 		ContentMediaType: exampleContentMediaType,
+		UserMetadata:     map[string]string{"buildId": "101"},
 	}
 
 	// exampleReader reads the data that needs to be signed. This data can be in a file or in memory.
@@ -79,6 +80,6 @@ func Example_signBlob() {
 	// Output:
 	// Successfully signed
 	// signature Payload ContentType: application/vnd.cncf.notary.payload.v1+json
-	// signature Payload Content: {"targetArtifact":{"digest":"sha384:b8ab24dafba5cf7e4c89c562f811cf10493d4203da982d3b1345f366ca863d9c2ed323dbd0fb7ff83a80302ceffa5a61","mediaType":"video/mp4","size":12}}
+	// signature Payload Content: {"targetArtifact":{"annotations":{"buildId":"101"},"digest":"sha384:b8ab24dafba5cf7e4c89c562f811cf10493d4203da982d3b1345f366ca863d9c2ed323dbd0fb7ff83a80302ceffa5a61","mediaType":"video/mp4","size":12}}
 	// signerInfo SigningAgent: example signing agent
 }

example_VerifyBlob_test.go → example_verifyBlob_test.go

@@ -45,7 +45,7 @@ var exampleBlobPolicyDocument = trustpolicy.BlobDocument{
 // ExampleLocalVerify demonstrates how to use verifier.Verify to verify a
 // signature of the target artifact at local (without using a
 // registry.Repository).
-func Example_BlobVerify() {
+func Example_verifyBlob() {
 	// Both COSE ("application/cose") and JWS ("application/jose+json")
 	// signature mediaTypes are supported.
 	exampleSignatureMediaType := jws.MediaTypeEnvelope
@@ -114,30 +114,30 @@ func createTrustStoreForBlobVerify() error {
 	// Notary certificate requirements:
 	// https://github.com/notaryproject/notaryproject/blob/v1.0.0/specs/signature-specification.md#certificate-requirements
 	exampleX509Certificate := `-----BEGIN CERTIFICATE-----
-MIIEajCCAtKgAwIBAgIBUzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJVUzEL
+MIIEbDCCAtSgAwIBAgIBUzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJVUzEL
 MAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxDzANBgNVBAoTBk5vdGFyeTEl
-MCMGA1UEAxMcTm90YXRpb24gRXhhbXBsZSBzZWxmLXNpZ25lZDAeFw0yNDA0MDIw
-MjU2MzJaFw0yNDA0MDMwMjU2MzJaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJX
-QTEQMA4GA1UEBxMHU2VhdHRsZTEPMA0GA1UEChMGTm90YXJ5MSUwIwYDVQQDExxO
-b3RhdGlvbiBFeGFtcGxlIHNlbGYtc2lnbmVkMIIBojANBgkqhkiG9w0BAQEFAAOC
-AY8AMIIBigKCAYEApZbB7U2x+XnucIVUoFEjUkNnjkZ0jpNfndHF49rTpqJTstsP
-slW/d3qRlrTvsT61iaerLfFoIMkAq2G8KIOY0tCijyr3witWaeyd9sIvGggj770u
-wngVpmASUuRZfmltHcTkn7m2gwJATuUc1ugHvxRE2+A7jbd2m7CfjGmwN+THg0Xe
-5MggOKKd/2nEvePUsNedMF2Po5hzHG3rNQVxNyzbseIiDUq4qGl7h6zUIuYoSP0k
-IPhsAPq9zhPkdXTQw39Ch3iDrVN/D+xOYuTukURFX45SnSTaqiFZEBoDEKIqfAwz
-GUIm+yL5eNk6OOCZlmffXVadwdCnhwGMit8TUQQQOPtE3ALSRiXfdKUeBnkDIhcV
-3MGLcrPy7kyq3IK7WwHhdfhhxGmJVAaZ/FuseeVT881UVD2Opj1j+MRWSurEiyiM
-G/sTLEO53fIpp4eTP78CD6dYTrMC277C6X91WtCxQSnsYThP2miZHwZZY2jYt+hT
-DpmWBP3i4ijl+75/AgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAK
-BggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAYEARLg5VcXNRdWaEuM01iheXzBL
-AtGmZLf+fA4nl8j4FktNfYci1GtqwJqDmfXj74xXGgltnX4uMG+dTPln3c+tHJn3
-OJBgvCeB2sZWMoV4wjLZo1XOcIszdxUY7rI3PA/2ZRm75v7Qf0Yvg5DQRUgMMlvo
-7Wu07mZoNLVccABndvj6nCntKaRu48YexXFWX+Y3qn8rCidH61Q8rmScdrSnYCwT
-0TM23GoszeCtgdShgA0/NqqTefpC90zoKISze3K0zyIfsn9+kw3JHbw+PnqSQ/z8
-NqG/FGiv0x4fk0FZ9yOpT+4CoVGgnCub7YEYtUGQL70GbTjPXMto+hnXK3maWzBz
-tOQxZrHLSIdOXaLfnRE+vGEDQ29hxQJj/S9H6WbXz6Gx1UpHp8y5RjWiphHV555F
-/Ham1A4O1H2mK8l4b7oufB1u3cah1uQZ64xzr0VHVQnzmCm1MwQUkmF+5B/Ce9mC
-IqbYJlmoCQWeDVqVSpPJrZgTmcA+djqsvhTi7zbr
+MCMGA1UEAxMcTm90YXRpb24gRXhhbXBsZSBzZWxmLXNpZ25lZDAgFw0yNDA0MDQy
+MTIwMjBaGA8yMTI0MDQwNDIxMjAyMFowZDELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
+AldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZOb3RhcnkxJTAjBgNVBAMT
+HE5vdGF0aW9uIEV4YW1wbGUgc2VsZi1zaWduZWQwggGiMA0GCSqGSIb3DQEBAQUA
+A4IBjwAwggGKAoIBgQDGIiN4yCjSVqFELZwxK/BMb8BokP587L8oPrZ1g8H7LudB
+moLNDT7vF9xccbCfU3yNuOd0WaOgnENiCs81VHidyJsj1Oz3u+0Zn3ng7V+uZr6m
+AIO74efA9ClMiY4i4HIt8IAZF57AL2mzDnCITgSWxikf030Il85MI42STvA+qYuz
+ZEOp3XvKo8bDgQFvbtgK0HYYMfrka7VDmIWVo0rBMGm5btI8HOYQ0r9aqsrCxLAv
+1AQeOQm+wbRcp4R5PIUJr+REGn7JCbOyXg/7qqHXKKmvV5yrGaraw8gZ5pqP/RHK
+XUJIfvD0Vf2epJmsvC+6vXkSWtz+cA8J4GQx4J4SXL57hoYkC5qv39SOLzlWls3I
+6fgeO+SZ0sceMd8NKlom/L5eOJBfB3bTQB83hq/3bRtjT7/qCMsL3VcndKkS+vGF
+JPw5uTH+pmBgHrLr6tRoRRjwRFuZ0dO05AbdjCaxgVDtFI3wNbaXn/1VlRGySQIS
+UNWxCrUsSzndeqwmjqsCAwEAAaMnMCUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM
+MAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBCwUAA4IBgQBdi0SaJAaeKBB0I+Fjcbmc
+4zRvHE4GDSMSDnAK97nrZCZ9iwKuY4x6mv9lwQe2P3VXROoL9JmONNf0yaObOwQj
+ILGnbe2rzYtUardz2gzh+6KNzJHspRvk1f06mp4496XQ3STMRSr8kno1svKQMy0Y
+FRsGMKs4fWHavIAqNXg9ymrZvvXiatN2UiVtAA/jBFScZAWskeb2WHNzORi7H5Z1
+mp5+IlNYQpzdIu/dvLVxzhh2UvkRdsQqsMgt/MOU84RncwUNZM4yI5EGPoaSJdsj
+AGNd+UV6ur7QmVI2Q9EZNRlaDJtaoZmKns5j1SlmDXWKbdRmw42ORDudODj/pHA9
++u+ca9t3uLsbqO9yPm8m+6fyxffWS11QAH6O7EjydJWcEe5tYkPpL6kcaEyQKESm
+5CDlsk+W3ElpaUu6tsnGKODvgdAN3m0noC+qxzCMqoCM4+M5V6OptR98MDl2FK0B
+5+WF6YHBxf/uqDvFktUczjrIWuyfECywp05bpGAErGE=
 -----END CERTIFICATE-----`
 
 	// Adding the certificate into the trust store.
@@ -148,5 +148,5 @@ IqbYJlmoCQWeDVqVSpPJrZgTmcA+djqsvhTi7zbr
 }
 
 func getSignatureEnvelope() string {
-	return `{"payload":"eyJ0YXJnZXRBcnRpZmFjdCI6eyJkaWdlc3QiOiJzaGEzODQ6YjhhYjI0ZGFmYmE1Y2Y3ZTRjODljNTYyZjgxMWNmMTA0OTNkNDIwM2RhOTgyZDNiMTM0NWYzNjZjYTg2M2Q5YzJlZDMyM2RiZDBmYjdmZjgzYTgwMzAyY2VmZmE1YTYxIiwibWVkaWFUeXBlIjoidmlkZW8vbXA0Iiwic2l6ZSI6MTJ9fQ","protected":"eyJhbGciOiJQUzM4NCIsImNyaXQiOlsiaW8uY25jZi5ub3Rhcnkuc2lnbmluZ1NjaGVtZSJdLCJjdHkiOiJhcHBsaWNhdGlvbi92bmQuY25jZi5ub3RhcnkucGF5bG9hZC52MStqc29uIiwiaW8uY25jZi5ub3Rhcnkuc2lnbmluZ1NjaGVtZSI6Im5vdGFyeS54NTA5IiwiaW8uY25jZi5ub3Rhcnkuc2lnbmluZ1RpbWUiOiIyMDI0LTA0LTAxVDE5OjU2OjMzLTA3OjAwIn0","header":{"x5c":["MIIEajCCAtKgAwIBAgIBUzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxDzANBgNVBAoTBk5vdGFyeTElMCMGA1UEAxMcTm90YXRpb24gRXhhbXBsZSBzZWxmLXNpZ25lZDAeFw0yNDA0MDIwMjU2MzJaFw0yNDA0MDMwMjU2MzJaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJXQTEQMA4GA1UEBxMHU2VhdHRsZTEPMA0GA1UEChMGTm90YXJ5MSUwIwYDVQQDExxOb3RhdGlvbiBFeGFtcGxlIHNlbGYtc2lnbmVkMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEApZbB7U2x+XnucIVUoFEjUkNnjkZ0jpNfndHF49rTpqJTstsPslW/d3qRlrTvsT61iaerLfFoIMkAq2G8KIOY0tCijyr3witWaeyd9sIvGggj770uwngVpmASUuRZfmltHcTkn7m2gwJATuUc1ugHvxRE2+A7jbd2m7CfjGmwN+THg0Xe5MggOKKd/2nEvePUsNedMF2Po5hzHG3rNQVxNyzbseIiDUq4qGl7h6zUIuYoSP0kIPhsAPq9zhPkdXTQw39Ch3iDrVN/D+xOYuTukURFX45SnSTaqiFZEBoDEKIqfAwzGUIm+yL5eNk6OOCZlmffXVadwdCnhwGMit8TUQQQOPtE3ALSRiXfdKUeBnkDIhcV3MGLcrPy7kyq3IK7WwHhdfhhxGmJVAaZ/FuseeVT881UVD2Opj1j+MRWSurEiyiMG/sTLEO53fIpp4eTP78CD6dYTrMC277C6X91WtCxQSnsYThP2miZHwZZY2jYt+hTDpmWBP3i4ijl+75/AgMBAAGjJzAlMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAYEARLg5VcXNRdWaEuM01iheXzBLAtGmZLf+fA4nl8j4FktNfYci1GtqwJqDmfXj74xXGgltnX4uMG+dTPln3c+tHJn3OJBgvCeB2sZWMoV4wjLZo1XOcIszdxUY7rI3PA/2ZRm75v7Qf0Yvg5DQRUgMMlvo7Wu07mZoNLVccABndvj6nCntKaRu48YexXFWX+Y3qn8rCidH61Q8rmScdrSnYCwT0TM23GoszeCtgdShgA0/NqqTefpC90zoKISze3K0zyIfsn9+kw3JHbw+PnqSQ/z8NqG/FGiv0x4fk0FZ9yOpT+4CoVGgnCub7YEYtUGQL70GbTjPXMto+hnXK3maWzBztOQxZrHLSIdOXaLfnRE+vGEDQ29hxQJj/S9H6WbXz6Gx1UpHp8y5RjWiphHV555F/Ham1A4O1H2mK8l4b7oufB1u3cah1uQZ64xzr0VHVQnzmCm1MwQUkmF+5B/Ce9mCIqbYJlmoCQWeDVqVSpPJrZgTmcA+djqsvhTi7zbr"],"io.cncf.notary.signingAgent":"example signing agent"},"signature":"JRz9B-yzx-DLrHuwHMuR4Nqn82t2r8TxBXSnMxZfCSexcD6Q2eo8XC_OUuWwrLlwT07kE9RmoseOyp3YUVFR-VuIGr1vaL8lE8DfQTJOhMPg2AwUzqPtXrKTat8r3FYqWCDchCpUt7ZvxGCjgstqbp2xrxfFxvwfEtJgT9dhPB8C3AoFA-8ZpWRb61YH_SJNhjfsn2YmPq_YCPVH7hhgJA-7lG49whIdwNT0E4RGKa58gvxa4gA4jld1-f87Bamp_oWMiByvmZwwR_zNtnn1OoefWrld6uDW1ahr5pP56QIDLEfhYEmYk7Zf_V2HTGKZ6j6-48jgemqwdqe3moX6QeTJRhEo-MYtvhlj4Q1oCWSbfgnspX2UMelygl1MmmlUNUeeP93crE5T09hW8uFCcnOuF9gRN5yN5rgpXr68DlSMXwFZJEMvbBCEwdtYI8xQoLi9F1bIQ97RfQLwPeqXgPMkAeQOtWB238LhETP5jyHc4fuoR-w62H3n7j-quY7l"}`
+	return `{"payload":"eyJ0YXJnZXRBcnRpZmFjdCI6eyJkaWdlc3QiOiJzaGEzODQ6YjhhYjI0ZGFmYmE1Y2Y3ZTRjODljNTYyZjgxMWNmMTA0OTNkNDIwM2RhOTgyZDNiMTM0NWYzNjZjYTg2M2Q5YzJlZDMyM2RiZDBmYjdmZjgzYTgwMzAyY2VmZmE1YTYxIiwibWVkaWFUeXBlIjoidmlkZW8vbXA0Iiwic2l6ZSI6MTJ9fQ","protected":"eyJhbGciOiJQUzM4NCIsImNyaXQiOlsiaW8uY25jZi5ub3Rhcnkuc2lnbmluZ1NjaGVtZSJdLCJjdHkiOiJhcHBsaWNhdGlvbi92bmQuY25jZi5ub3RhcnkucGF5bG9hZC52MStqc29uIiwiaW8uY25jZi5ub3Rhcnkuc2lnbmluZ1NjaGVtZSI6Im5vdGFyeS54NTA5IiwiaW8uY25jZi5ub3Rhcnkuc2lnbmluZ1RpbWUiOiIyMDI0LTA0LTA0VDE0OjIwOjIxLTA3OjAwIn0","header":{"x5c":["MIIEbDCCAtSgAwIBAgIBUzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxDzANBgNVBAoTBk5vdGFyeTElMCMGA1UEAxMcTm90YXRpb24gRXhhbXBsZSBzZWxmLXNpZ25lZDAgFw0yNDA0MDQyMTIwMjBaGA8yMTI0MDQwNDIxMjAyMFowZDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZOb3RhcnkxJTAjBgNVBAMTHE5vdGF0aW9uIEV4YW1wbGUgc2VsZi1zaWduZWQwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDGIiN4yCjSVqFELZwxK/BMb8BokP587L8oPrZ1g8H7LudBmoLNDT7vF9xccbCfU3yNuOd0WaOgnENiCs81VHidyJsj1Oz3u+0Zn3ng7V+uZr6mAIO74efA9ClMiY4i4HIt8IAZF57AL2mzDnCITgSWxikf030Il85MI42STvA+qYuzZEOp3XvKo8bDgQFvbtgK0HYYMfrka7VDmIWVo0rBMGm5btI8HOYQ0r9aqsrCxLAv1AQeOQm+wbRcp4R5PIUJr+REGn7JCbOyXg/7qqHXKKmvV5yrGaraw8gZ5pqP/RHKXUJIfvD0Vf2epJmsvC+6vXkSWtz+cA8J4GQx4J4SXL57hoYkC5qv39SOLzlWls3I6fgeO+SZ0sceMd8NKlom/L5eOJBfB3bTQB83hq/3bRtjT7/qCMsL3VcndKkS+vGFJPw5uTH+pmBgHrLr6tRoRRjwRFuZ0dO05AbdjCaxgVDtFI3wNbaXn/1VlRGySQISUNWxCrUsSzndeqwmjqsCAwEAAaMnMCUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBCwUAA4IBgQBdi0SaJAaeKBB0I+Fjcbmc4zRvHE4GDSMSDnAK97nrZCZ9iwKuY4x6mv9lwQe2P3VXROoL9JmONNf0yaObOwQjILGnbe2rzYtUardz2gzh+6KNzJHspRvk1f06mp4496XQ3STMRSr8kno1svKQMy0YFRsGMKs4fWHavIAqNXg9ymrZvvXiatN2UiVtAA/jBFScZAWskeb2WHNzORi7H5Z1mp5+IlNYQpzdIu/dvLVxzhh2UvkRdsQqsMgt/MOU84RncwUNZM4yI5EGPoaSJdsjAGNd+UV6ur7QmVI2Q9EZNRlaDJtaoZmKns5j1SlmDXWKbdRmw42ORDudODj/pHA9+u+ca9t3uLsbqO9yPm8m+6fyxffWS11QAH6O7EjydJWcEe5tYkPpL6kcaEyQKESm5CDlsk+W3ElpaUu6tsnGKODvgdAN3m0noC+qxzCMqoCM4+M5V6OptR98MDl2FK0B5+WF6YHBxf/uqDvFktUczjrIWuyfECywp05bpGAErGE="],"io.cncf.notary.signingAgent":"example signing agent"},"signature":"liOjdgQ9BKuQTZGXRh3o6P8AMUIq_MKQReEcqA5h8M4RYs3DV_wXfaLCr2x_NRcwjTZsoO1_J77hmzkkk4L0IuFP8Qw0KKtmc83G0yFi4yYV5fwzrIbnhC2GRLuqLPnK-C4qYmv52ld3ebvo7XWwRHu30-VXePmTRFp6iG-eSAgkNgwhxSZ0ZmTFLG3ceNiX2bxpLHlXdPwA3aFKbd6nKrzo4CZ1ZyLNmAIaoA5-kmc0Hyt45trpxaaiWusI_pcTLw71YCqEAs32tEq3q6hRAgAZZN-Qvm9GyNp9EuaPiKjMbJFqtjome5ITxyNd-5t09dDCUgSe3t-iqv2Blm4E080AP1TYwUKLYklGniUP1dAtOau5G2juZLpl7tr4LQ99mycflnAmV7e79eEWXffvy5EAl77dW4_vM7lEemm08m2wddGuDOWXYb1j1r2_a5Xb92umHq6ZMhAp200A0pUkm9640x8z5jdudi_7KeezdqUK7ZMmSxHohiylyKD_20Cy"}`
 }