impl for cosign functions for images & store copy

Signed-off-by: Adam Martin <adam.martin@rancherfederal.com>
This commit is contained in:
Adam Martin
2023-10-11 13:44:21 -04:00
parent 220eeedb2c
commit 96d92e3248
4 changed files with 8 additions and 6 deletions
+2 -2
View File
@@ -78,7 +78,7 @@ func AddImageCmd(ctx context.Context, o *AddImageOpts, s *store.Layout, referenc
// Check if the user provided a key.
if o.Key != "" {
// verify signature using the provided key.
err := cosign.VerifySignature(reference, o.Key)
err := cosign.VerifySignature(ctx, s, o.Key)
if err != nil {
return err
}
@@ -95,7 +95,7 @@ func storeImage(ctx context.Context, s *store.Layout, i v1alpha1.Image) error {
return err
}
err = cosign.SaveImage(s.Root, r.Name())
err = cosign.SaveImage(ctx, s, r.Name())
//desc, err := s.AddOCI(ctx, img, r.Name())
if err != nil {
return err
+1 -1
View File
@@ -56,7 +56,7 @@ func CopyCmd(ctx context.Context, o *CopyOpts, s *store.Layout, targetRef string
PlainHTTP: o.PlainHTTP,
}
err := cosign.LoadImage(s.Root, components[1], ropts)
err := cosign.LoadImage(ctx, s, components[1], ropts)
if err != nil {
return err
}
+4 -2
View File
@@ -2,6 +2,7 @@ package store
import (
"context"
"strings"
"encoding/json"
"fmt"
@@ -36,7 +37,8 @@ func ExtractCmd(ctx context.Context, o *ExtractOpts, s *store.Layout, ref string
found := false
if err := s.Walk(func(reference string, desc ocispec.Descriptor) error {
if reference != r.Name() {
if !strings.Contains(reference, r.Name()) {
return nil
}
found = true
@@ -57,7 +59,7 @@ func ExtractCmd(ctx context.Context, o *ExtractOpts, s *store.Layout, ref string
return err
}
pushedDesc, err := s.Copy(ctx, r.Name(), mapperStore, "")
pushedDesc, err := s.Copy(ctx, reference, mapperStore, "")
if err != nil {
return err
}
+1 -1
View File
@@ -101,7 +101,7 @@ func SyncCmd(ctx context.Context, o *SyncOpts, s *store.Layout) error {
// Check if the user provided a key.
if o.Key != "" {
// verify signature using the provided key.
err := cosign.VerifySignature(i.Name, o.Key)
err := cosign.VerifySignature(ctx, s, o.Key)
if err != nil {
return err
}