Update GetFile, GetFiles in registry pkg to take full image as param

Author: Anuj Chaudhari

pkg/v1/cli/carvelhelpers/registry.go

@@ -27,11 +27,7 @@ func GetFilesMapFromImage(imageWithTag string) (map[string][]byte, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "unable to initialize registry")
 	}
-	image, tag, err := getImageRepoAndTag(imageWithTag)
-	if err != nil {
-		return nil, err
-	}
-	return reg.GetFiles(image, tag)
+	return reg.GetFiles(imageWithTag)
 }
 
 // ReadImageAndSaveFilesToTempDir reads OCI image and saves file to temp dir
@@ -56,15 +52,7 @@ func ReadImageAndSaveFilesToTempDir(imageWithTag string) (string, error) {
 	return tmpDir, nil
 }
 
-func getImageRepoAndTag(imageWithTag string) (string, string, error) {
-	// Support providing image with tag as well as support image with sha256
-	idx := strings.LastIndex(imageWithTag, ":")
-	if idx == -1 {
-		return "", "", errors.Errorf("invalid artifact image '%s'", imageWithTag)
-	}
-	return imageWithTag[0:idx], imageWithTag[idx+1:], nil
-}
-
+// newRegistry returns new
 func newRegistry() (registry.Registry, error) {
 	verifyCerts := true
 	skipVerifyCerts := os.Getenv(constants.ConfigVariableCustomImageRepositorySkipTLSVerify)

pkg/v1/tkg/tkgconfigbom/bom.go

@@ -436,7 +436,7 @@ func (c *client) DownloadDefaultBOMFilesFromRegistry(bomRegistry registry.Regist
 	}
 
 	log.Infof("Downloading the TKG Bill of Materials (BOM) file from '%s'", fmt.Sprintf("%s:%s", tkgBOMImagePath, tkgBOMImageTag))
-	tkgBOMContent, err := bomRegistry.GetFile(tkgBOMImagePath, tkgBOMImageTag, "")
+	tkgBOMContent, err := bomRegistry.GetFile(fmt.Sprintf("%s:%s", tkgBOMImagePath, tkgBOMImageTag), "")
 	if err != nil {
 		return errors.Errorf(errorDownloadingDefaultBOMFiles, fmt.Sprintf("%s:%s", tkgBOMImagePath, tkgBOMImageTag), err, tkgconfigpath)
 	}
@@ -473,7 +473,7 @@ func (c *client) DownloadDefaultBOMFilesFromRegistry(bomRegistry registry.Regist
 	defaultTKRImagePath := tkrBOMImageRepo + "/" + bomConfiguration.TKRBOM.ImagePath
 
 	log.Infof("Downloading the TKr Bill of Materials (BOM) file from '%s'", fmt.Sprintf("%s:%s", defaultTKRImagePath, tkrBOMTagName))
-	tkrBOMContent, err := bomRegistry.GetFile(defaultTKRImagePath, tkrBOMTagName, "")
+	tkrBOMContent, err := bomRegistry.GetFile(fmt.Sprintf("%s:%s", defaultTKRImagePath, tkrBOMTagName), "")
 	if err != nil {
 		return errors.Errorf(errorDownloadingDefaultBOMFiles, fmt.Sprintf("%s:%s", defaultTKRImagePath, tkrBOMTagName), err, tkgconfigpath)
 	}
@@ -531,7 +531,7 @@ func (c *client) DownloadTKGCompatibilityFileFromRegistry(bomRegistry registry.R
 		return err
 	}
 
-	tkgCompatibilityContent, err := bomRegistry.GetFile(tkgCompatibilityImagePath, tagName, "")
+	tkgCompatibilityContent, err := bomRegistry.GetFile(fmt.Sprintf("%s:%s", tkgCompatibilityImagePath, tagName), "")
 	if err != nil {
 		return errors.Errorf(errorDownloadingTKGCompatibilityFile, fmt.Sprintf("%s:%s", tkgCompatibilityImagePath, tagName), err, tkgconfigpath)
 	}

pkg/v1/tkg/tkgconfigupdater/ensure.go

@@ -297,7 +297,7 @@ func (c *client) saveProvidersFromRemoteRepo(providerDirPath string) error {
 
 	fullImagePath := tkgconfigbom.GetFullImagePath(providerTemplateImage, tkgBomConfig.ImageConfig.ImageRepository)
 	imageTag := providerTemplateImage.Tag
-	filesMap, err := bomRegistry.GetFiles(fullImagePath, imageTag)
+	filesMap, err := bomRegistry.GetFiles(fmt.Sprintf("%s:%s", fullImagePath, imageTag))
 	if err != nil {
 		return errors.Wrap(err, "failed to get providers files from repository")
 	}

pkg/v1/tkr/controllers/source/tkr_source_controller.go

@@ -176,7 +176,7 @@ func eventFilter(p func(eventMeta metav1.Object) bool) *predicate.Funcs {
 
 func (r *reconciler) createBOMConfigMap(ctx context.Context, tag string) error {
 	r.log.Info("Fetching BOM", "image", r.bomImage, "tag", tag)
-	bomContent, err := r.registry.GetFile(r.bomImage, tag, "")
+	bomContent, err := r.registry.GetFile(fmt.Sprintf("%s:%s", r.bomImage, tag), "")
 	if err != nil {
 		return errors.Wrapf(err, "failed to get the BOM file from image %s:%s", r.bomImage, tag)
 	}
@@ -387,7 +387,7 @@ func (r *reconciler) fetchCompatibilityMetadata() (*types.CompatibilityMetadata,
 	for i := len(tagNum) - 1; i >= 0; i-- {
 		tagName := fmt.Sprintf("v%d", tagNum[i])
 		r.log.Info("Fetching BOM metadata image", "image", r.compatibilityMetadataImage, "tag", tagName)
-		metadataContent, err = r.registry.GetFile(r.compatibilityMetadataImage, tagName, "")
+		metadataContent, err = r.registry.GetFile(fmt.Sprintf("%s:%s", r.compatibilityMetadataImage, tagName), "")
 		if err == nil {
 			if err = yaml.Unmarshal(metadataContent, &metadata); err == nil {
 				break

pkg/v1/tkr/pkg/registry/client.go

@@ -5,7 +5,6 @@ package registry
 
 import (
 	"archive/tar"
-	"fmt"
 	"io"
 
 	regname "github.com/google/go-containerregistry/pkg/name"
@@ -43,8 +42,8 @@ func (r *registry) ListImageTags(imageName string) ([]string, error) {
 
 // GetFile gets the file content bundled in the given image:tag.
 // If filename is empty, it will get the first file.
-func (r *registry) GetFile(image, tag, filename string) ([]byte, error) {
-	ref, err := regname.ParseReference(fmt.Sprintf("%s:%s", image, tag), regname.WeakValidation)
+func (r *registry) GetFile(imageWithTag, filename string) ([]byte, error) {
+	ref, err := regname.ParseReference(imageWithTag, regname.WeakValidation)
 	if err != nil {
 		return nil, err
 	}
@@ -115,8 +114,8 @@ func getFileFromLayer(stream io.Reader, files map[string][]byte) error {
 }
 
 // GetFiles get all the files content bundled in the given image:tag.
-func (r *registry) GetFiles(image, tag string) (map[string][]byte, error) {
-	ref, err := regname.ParseReference(fmt.Sprintf("%s:%s", image, tag), regname.WeakValidation)
+func (r *registry) GetFiles(imageWithTag string) (map[string][]byte, error) {
+	ref, err := regname.ParseReference(imageWithTag, regname.WeakValidation)
 	if err != nil {
 		return nil, err
 	}

pkg/v1/tkr/pkg/registry/client_integ_test.go

@@ -4,6 +4,7 @@
 package registry
 
 import (
+	"fmt"
 	"os"
 	"strconv"
 	"testing"
@@ -45,7 +46,7 @@ func TestRegistryPullBOM(t *testing.T) {
 
 	t.Log(tags[0])
 
-	content, err := reg.GetFile(bomRegistry, tags[0], "")
+	content, err := reg.GetFile(fmt.Sprintf("%s:%s", bomRegistry, tags[0]), "")
 	if err != nil {
 		t.Fatalf("error getting image content should not occurs %s", err.Error())
 	}

pkg/v1/tkr/pkg/registry/interface.go

@@ -11,7 +11,7 @@ type Registry interface {
 	ListImageTags(imageName string) ([]string, error)
 	// GetFile gets the file content bundled in the given image:tag.
 	// If filename is empty, it will get the first file.
-	GetFile(image string, tag string, filename string) ([]byte, error)
+	GetFile(imageWithTag string, filename string) ([]byte, error)
 	// GetFiles get all the files content bundled in the given image:tag.
-	GetFiles(image string, tag string) (map[string][]byte, error)
+	GetFiles(imageWithTag string) (map[string][]byte, error)
 }