addressed feedback

Signed-off-by: Pritesh Bandi <pritesb@amazon.com>
notaryproject · Dec 1, 2022 · 6b96103 · 6b96103
1 parent a782858
commit 6b96103
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/notation.go b/notation.go
@@ -54,11 +54,11 @@ type Signer interface {
 func Sign(ctx context.Context, signer Signer, repo registry.Repository, opts SignOptions) (ocispec.Descriptor, error) {
 	// Input validation for expiry duration
 	if opts.ExpiryDuration != nil {
-		expDurInSec := opts.ExpiryDuration.Seconds()
-		if expDurInSec != float64(int64(expDurInSec)) {
+		if *opts.ExpiryDuration % time.Second != 0 {
 			return ocispec.Descriptor{}, fmt.Errorf("expiry duration supports minimum granularity of second")
 		}
-		if expDurInSec <= 0 {
+
+		if *opts.ExpiryDuration <= 0 {
 			return ocispec.Descriptor{}, fmt.Errorf("expiry duration cannot be zero or negative")
 		}
 	}

diff --git a/signer/plugin.go b/signer/plugin.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"time"
 
 	"github.com/notaryproject/notation-core-go/signature"
 	"github.com/notaryproject/notation-go"
@@ -107,7 +108,7 @@ func (s *pluginSigner) generateSignatureEnvelope(ctx context.Context, desc ocisp
 
 	if opts.ExpiryDuration != nil {
 		// expiry duration will always be a positive value
-		req.ExpiryDurationInSeconds = uint64(opts.ExpiryDuration.Seconds())
+		req.ExpiryDurationInSeconds = uint64(*opts.ExpiryDuration / time.Second)
 	}
 
 	resp, err := s.plugin.GenerateEnvelope(ctx, req)