adding #Save, #Add, #Push test scenarios

Signed-off-by: Juan Bustamante <jbustamante@vmware.com>

cnb_index.go

@@ -1122,7 +1122,7 @@ func (h *CNBIndex) setImageURLs(img v1.Image, hash v1.Hash, urls []string) error
 //
 // If referencing an ImageIndex, will add Platform Specific Image from the Index.
 // Use IndexAddOptions to alter behaviour for ImageIndex Reference.
-func (h *CNBIndex) Add(ref name.Reference, ops ...func(*IndexAddOptions) error) error {
+func (h *CNBIndex) Add(name string, ops ...func(*IndexAddOptions) error) error {
 	var addOps = &IndexAddOptions{}
 	for _, op := range ops {
 		op(addOps)
@@ -1175,10 +1175,10 @@ func (h *CNBIndex) Add(ref name.Reference, ops ...func(*IndexAddOptions) error)
 	//
 	// This call is returns a v1.Descriptor with `Size`, `MediaType`, `Digest` fields only!!
 	// This is a lightweight call used for checking MediaType of given Reference
+	ref, auth, err := referenceForRepoName(h.KeyChain, name, h.Insecure)
 	desc, err := remote.Head(
 		ref,
-		remote.WithAuthFromKeychain(h.KeyChain),
-		remote.WithTransport(GetTransport(h.Insecure)),
+		remote.WithAuth(auth),
 	)
 	if err != nil {
 		return err
@@ -1193,8 +1193,7 @@ func (h *CNBIndex) Add(ref name.Reference, ops ...func(*IndexAddOptions) error)
 		// Get the Full Image from remote if the given Reference refers an Image
 		img, err := remote.Image(
 			ref,
-			remote.WithAuthFromKeychain(h.KeyChain),
-			remote.WithTransport(GetTransport(h.Insecure)),
+			remote.WithAuth(auth),
 		)
 		if err != nil {
 			return err
@@ -1957,3 +1956,23 @@ func indexMediaType(format types.MediaType) string {
 		return "UNKNOWN"
 	}
 }
+
+// TODO this method is duplicated from remote.new file
+// referenceForRepoName
+func referenceForRepoName(keychain authn.Keychain, ref string, insecure bool) (name.Reference, authn.Authenticator, error) {
+	var auth authn.Authenticator
+	opts := []name.Option{name.WeakValidation}
+	if insecure {
+		opts = append(opts, name.Insecure)
+	}
+	r, err := name.ParseReference(ref, opts...)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	auth, err = keychain.Resolve(r.Context().Registry)
+	if err != nil {
+		return nil, nil, err
+	}
+	return r, auth, nil
+}

index.go

@@ -8,33 +8,32 @@ import (
 type ImageIndex interface {
 	// getters
 
-	OS(digest name.Digest) (os string, err error)
+	Annotations(digest name.Digest) (annotations map[string]string, err error)
 	Architecture(digest name.Digest) (arch string, err error)
-	Variant(digest name.Digest) (osVariant string, err error)
-	OSVersion(digest name.Digest) (osVersion string, err error)
 	Features(digest name.Digest) (features []string, err error)
+	OS(digest name.Digest) (os string, err error)
 	OSFeatures(digest name.Digest) (osFeatures []string, err error)
-	Annotations(digest name.Digest) (annotations map[string]string, err error)
+	OSVersion(digest name.Digest) (osVersion string, err error)
 	URLs(digest name.Digest) (urls []string, err error)
+	Variant(digest name.Digest) (osVariant string, err error)
 
 	// setters
 
-	SetOS(digest name.Digest, os string) error
+	SetAnnotations(digest name.Digest, annotations map[string]string) error
 	SetArchitecture(digest name.Digest, arch string) error
-	SetVariant(digest name.Digest, osVariant string) error
-	SetOSVersion(digest name.Digest, osVersion string) error
 	SetFeatures(digest name.Digest, features []string) error
+	SetOS(digest name.Digest, os string) error
 	SetOSFeatures(digest name.Digest, osFeatures []string) error
-	SetAnnotations(digest name.Digest, annotations map[string]string) error
+	SetOSVersion(digest name.Digest, osVersion string) error
 	SetURLs(digest name.Digest, urls []string) error
+	SetVariant(digest name.Digest, osVariant string) error
 
 	// misc
 
-	// TODO change the name.Reference and expose String?
-	Add(ref name.Reference, ops ...func(options *IndexAddOptions) error) error
-	Save() error
-	Push(ops ...func(options *IndexPushOptions) error) error
+	Add(repoName string, ops ...func(options *IndexAddOptions) error) error
+	Delete() error
 	Inspect() (string, error)
+	Push(ops ...func(options *IndexPushOptions) error) error
 	Remove(ref name.Reference) error
-	Delete() error
+	Save() error
 }