Container - Validate docker domain (#87)

Author: Or-Geva

artifactory/utils/container/buildinfo.go

@@ -159,7 +159,11 @@ func getManifestPaths(imagePath, repo string, commandType CommandType) []string
 
 // Search for image manifest and layers in Artifactory.
 func (builder *buildInfoBuilder) getManifestAndLayersDetails() (layers map[string]*utils.ResultItem, manifestContent *manifest, err error) {
-	manifestPathsCandidates := getManifestPaths(builder.image.Path(), builder.getSearchableRepo(), builder.commandType)
+	imagePath, err := builder.image.Path()
+	if err != nil {
+		return nil, nil, err
+	}
+	manifestPathsCandidates := getManifestPaths(imagePath, builder.getSearchableRepo(), builder.commandType)
 	log.Debug("Start searching for image manifest.json")
 	for _, path := range manifestPathsCandidates {
 		log.Debug(`Searching in:"` + path + `"`)
@@ -171,11 +175,6 @@ func (builder *buildInfoBuilder) getManifestAndLayersDetails() (layers map[strin
 	return nil, nil, errorutils.CheckError(errors.New(fmt.Sprintf(imageNotFoundErrorMessage, builder.image.tag)))
 }
 
-func (builder *buildInfoBuilder) buildReverseProxyPathWithLibrary() string {
-	endOfRepoNameIndex := strings.Index(builder.image.Path()[1:], "/")
-	return path.Join(builder.getSearchableRepo(), "library", builder.image.Path()[endOfRepoNameIndex+1:])
-}
-
 func (builder *buildInfoBuilder) handlePull(manifestDependency, configLayerDependency buildinfo.Dependency, imageManifest *manifest, searchResults map[string]*utils.ResultItem) error {
 	// Add dependencies.
 	builder.dependencies = append(builder.dependencies, manifestDependency)
@@ -281,7 +280,11 @@ func (builder *buildInfoBuilder) createBuildInfo(module string) (*buildinfo.Buil
 	imageProperties["docker.image.id"] = builder.imageId
 	imageProperties["docker.image.tag"] = builder.image.Tag()
 	if module == "" {
-		module = builder.image.Name()
+		imageName, err := builder.image.Name()
+		if err != nil {
+			return nil, err
+		}
+		module = imageName
 	}
 	buildInfo := &buildinfo.BuildInfo{Modules: []buildinfo.Module{{
 		Id:           module,

artifactory/utils/container/image.go

@@ -1,8 +1,12 @@
 package container
 
 import (
+	"fmt"
 	"path"
 	"strings"
+
+	"github.com/jfrog/jfrog-client-go/utils/errorutils"
+	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
 type Image struct {
@@ -15,21 +19,36 @@ func (image *Image) Tag() string {
 }
 
 // Get image relative path in Artifactory.
-func (image *Image) Path() string {
+func (image *Image) Path() (string, error) {
+	if err := image.validateTag(); err != nil {
+		return "", err
+	}
 	indexOfFirstSlash := strings.Index(image.tag, "/")
 	indexOfLastColon := strings.LastIndex(image.tag, ":")
 	if indexOfLastColon < 0 || indexOfLastColon < indexOfFirstSlash {
-		return path.Join(image.tag[indexOfFirstSlash:], "latest")
+		log.Info("The image '%s' is does not include tag. Using the 'latest' tag.")
+		return path.Join(image.tag[indexOfFirstSlash:], "latest"), nil
 	}
-	return path.Join(image.tag[indexOfFirstSlash:indexOfLastColon], image.tag[indexOfLastColon+1:])
+	return path.Join(image.tag[indexOfFirstSlash:indexOfLastColon], image.tag[indexOfLastColon+1:]), nil
 }
 
 // Get image name.
-func (image *Image) Name() string {
+func (image *Image) Name() (string, error) {
+	if err := image.validateTag(); err != nil {
+		return "", err
+	}
 	indexOfLastSlash := strings.LastIndex(image.tag, "/")
 	indexOfLastColon := strings.LastIndex(image.tag, ":")
 	if indexOfLastColon < 0 || indexOfLastColon < indexOfLastSlash {
-		return image.tag[indexOfLastSlash+1:] + ":latest"
+		log.Info("The image '%s' is does not include tag. Using the 'latest' tag.")
+		return image.tag[indexOfLastSlash+1:] + ":latest", nil
+	}
+	return image.tag[indexOfLastSlash+1:], nil
+}
+
+func (image *Image) validateTag() error {
+	if !strings.Contains(image.tag, "/") {
+		return errorutils.CheckError(fmt.Errorf("The image '%s' is missing '/' which indicates the image name/tag", image.tag))
 	}
-	return image.tag[indexOfLastSlash+1:]
+	return nil
 }

artifactory/utils/container/image_test.go

@@ -2,6 +2,8 @@ package container
 
 import (
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetImagePath(t *testing.T) {
@@ -18,11 +20,16 @@ func TestGetImagePath(t *testing.T) {
 	}
 
 	for _, v := range imageTags {
-		result := NewImage(v.in).Path()
+		result, err := NewImage(v.in).Path()
+		assert.NoError(t, err)
 		if result != v.expected {
 			t.Errorf("Path(\"%s\") => '%s', want '%s'", v.in, result, v.expected)
 		}
 	}
+	// Validate failure upon missing image name
+	_, err := NewImage("domain").Path()
+	assert.Error(t, err)
+
 }
 
 func TestGetImageName(t *testing.T) {
@@ -39,11 +46,15 @@ func TestGetImageName(t *testing.T) {
 	}
 
 	for _, v := range imageTags {
-		result := NewImage(v.in).Name()
+		result, err := NewImage(v.in).Name()
+		assert.NoError(t, err)
 		if result != v.expected {
 			t.Errorf("Name(\"%s\") => '%s', want '%s'", v.in, result, v.expected)
 		}
 	}
+	// Validate failure upon missing image name
+	_, err := NewImage("domain").Name()
+	assert.Error(t, err)
 }
 
 func TestResolveRegistryFromTag(t *testing.T) {