Refactor: Remove redundant validateSha field and methods from ContainerCommand

Author: agrasth

artifactory/commands/container/buildcreate.go

@@ -1,6 +1,9 @@
 package container
 
 import (
+	"github.com/jfrog/jfrog-client-go/utils/errorutils"
+	"strings"
+
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
 	"github.com/jfrog/jfrog-cli-core/v2/common/build"
@@ -17,7 +20,7 @@ func NewBuildDockerCreateCommand() *BuildDockerCreateCommand {
 }
 
 // Set tag and manifest sha256 of an image in Artifactory.
-// This file can be generated by Kaniko using the'--image-name-with-digest-file' flag
+// This file can be generated by Kaniko using the '--image-name-with-digest-file' flag
 // or by buildx CLI using '--metadata-file' flag.
 // Tag and Sha256 will be used later on to search the image in Artifactory.
 func (bdc *BuildDockerCreateCommand) SetImageNameWithDigest(filePath string) (err error) {
@@ -53,15 +56,23 @@ func (bdc *BuildDockerCreateCommand) Run() error {
 	if err = build.SaveBuildGeneralDetails(buildName, buildNumber, project); err != nil {
 		return err
 	}
-	builder, err := container.NewRemoteAgentBuildInfoBuilder(bdc.image, repo, buildName, buildNumber, project, serviceManager, bdc.manifestSha256)
-	if err != nil {
-		return err
-	}
-	buildInfo, err := builder.Build(bdc.BuildConfiguration().GetModule())
-	if err != nil {
-		return err
+
+	// Handle multiple tags from comma-separated image name
+	images := SplitMultiTagDockerImageStringWithComma(bdc.image)
+	for _, image := range images {
+		builder, err := container.NewRemoteAgentBuildInfoBuilder(image, repo, buildName, buildNumber, project, serviceManager, bdc.manifestSha256)
+		if err != nil {
+			return errorutils.CheckErrorf("build info creation failed: %s", err.Error())
+		}
+		buildInfo, err := builder.Build(bdc.BuildConfiguration().GetModule())
+		if err != nil {
+			return errorutils.CheckErrorf("build info creation failed: %s", err.Error())
+		}
+		if err := build.SaveBuildInfo(buildName, buildNumber, project, buildInfo); err != nil {
+			return errorutils.CheckErrorf("failed to save build info for '%s/%s': %s", buildName, buildNumber, err.Error())
+		}
 	}
-	return build.SaveBuildInfo(buildName, buildNumber, project, buildInfo)
+	return nil
 }
 
 func (bdc *BuildDockerCreateCommand) CommandName() string {
@@ -71,3 +82,19 @@ func (bdc *BuildDockerCreateCommand) CommandName() string {
 func (bdc *BuildDockerCreateCommand) ServerDetails() (*config.ServerDetails, error) {
 	return bdc.serverDetails, nil
 }
+
+func SplitMultiTagDockerImageStringWithComma(image *container.Image) []*container.Image {
+	multiDockerImage := image.Name()
+
+	tags := strings.Split(multiDockerImage, ",")
+	images := make([]*container.Image, 0, len(tags))
+	for _, tag := range tags {
+		trimmed := strings.TrimSpace(tag)
+		if trimmed == "" {
+			continue
+		}
+		nextImage := container.NewImage(trimmed)
+		images = append(images, nextImage)
+	}
+	return images
+}

artifactory/commands/container/containermanagercommand.go

@@ -11,7 +11,6 @@ type ContainerCommand struct {
 	skipLogin            bool
 	cmdParams            []string
 	containerManagerType container.ContainerManagerType
-	validateSha          bool
 }
 
 func NewContainerManagerCommand(containerManagerType container.ContainerManagerType) *ContainerCommand {
@@ -30,15 +29,6 @@ func (cm *ContainerCommand) SetCmdParams(cmdParams []string) *ContainerCommand {
 	return cm
 }
 
-func (cm *ContainerCommand) SetValidateSha(validateSha bool) *ContainerCommand {
-	cm.validateSha = validateSha
-	return cm
-}
-
-func (cm *ContainerCommand) IsValidateSha() bool {
-	return cm.validateSha
-}
-
 func (cm *ContainerCommand) PerformLogin(serverDetails *config.ServerDetails, containerManagerType container.ContainerManagerType) error {
 	if !cm.skipLogin {
 		// Exclude refreshable tokens when working with external tools (build tools, curl, etc)