test: resolve comments

Signed-off-by: Junjie Gao <junjiegao@microsoft.com>
notaryproject · Jan 28, 2023 · 76ba572 · 76ba572
1 parent 4e0fcbd
commit 76ba572
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/test/e2e/plugin/verify_signature.go b/test/e2e/plugin/verify_signature.go
@@ -1,10 +1,7 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/notaryproject/notation-go/plugin/proto"
-	"github.com/notaryproject/notation-go/verifier"
 	"github.com/notaryproject/notation/test/e2e/plugin/internal/io"
 	"github.com/spf13/cobra"
 )
@@ -36,21 +33,12 @@ func validateVerifySignatureRequest(req proto.VerifySignatureRequest) error {
 	if err := validateRequiredField(req.Signature.CriticalAttributes, fieldSet(
 		"ContentType",
 		"SigningScheme",
-		"Expiry",
-		"AuthenticSigningTime",
-		"ExtendedAttributes")); err != nil {
+		"Expiry")); err != nil {
 		return err
 	}
 
-	// check required extended attributes
-	if _, ok := req.Signature.CriticalAttributes.ExtendedAttributes[verifier.HeaderVerificationPlugin]; !ok {
-		return fmt.Errorf("missing extended attribute: %s", verifier.HeaderVerificationPlugin)
-	}
-
 	// check req.Signature
-	if err := validateRequiredField(req.Signature, fieldSet(
-		"UnprocessedAttributes",
-		"CertificateChain")); err != nil {
+	if err := validateRequiredField(req.Signature, fieldSet("CertificateChain")); err != nil {
 		return err
 	}
 
@@ -66,7 +54,7 @@ func validateVerifySignatureRequest(req proto.VerifySignatureRequest) error {
 
 func extractVerificationResult(req *proto.VerifySignatureRequest) *proto.VerifySignatureResponse {
 	resp := &proto.VerifySignatureResponse{
-		ProcessedAttributes: []any{verifier.HeaderVerificationPlugin, verifier.HeaderVerificationPluginMinVersion},
+		VerificationResults: make(map[proto.Capability]*proto.VerificationResult),
 	}
 
 	// set verification result based on req.PluginConfig

diff --git a/test/e2e/suite/plugin/verify.go b/test/e2e/suite/plugin/verify.go
@@ -11,15 +11,13 @@ import (
 
 var _ = Describe("notation plugin verify", func() {
 	It("with basic case", func() {
-		Skip("notation plugin version verification is not correct.")
 		Host(BaseOptions(), func(notation *utils.ExecOpts, artifact *Artifact, vhost *utils.VirtualHost) {
 			// setup plugin and plugin-key
 			vhost.SetOption(AddPlugin(NotationE2EPluginPath))
 			notation.Exec("key", "add", "plugin-key", "--id", "key1", "--plugin", "e2e-plugin",
 				// add pluginConfig to enable generating envelope capability and update extended attribute
 				"-c", fmt.Sprintf("%s=true", CapabilityEnvelopeGenerator),
-				"-c", fmt.Sprintf("%s=e2e-plugin", HeaderVerificationPlugin),
-				"-c", fmt.Sprintf("%s=1.0.0", HeaderVerificationPluginMinVersion)).
+				"-c", fmt.Sprintf("%s=e2e-plugin", HeaderVerificationPlugin)).
 				MatchKeyWords("plugin-key")
 
 			// run signing