Merge branch 'dev' into dockerscan_panic

Author: dortam888

artifactory/utils/commandsummary/buildinfosummary.go

@@ -6,6 +6,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
 	"github.com/jfrog/jfrog-client-go/utils/log"
+	"net/url"
 	"path"
 	"strings"
 )
@@ -249,16 +250,16 @@ func isSupportedModule(module *buildInfo.Module) bool {
 }
 
 func createDockerMultiArchTitle(module *buildInfo.Module) string {
-	parentImageName := strings.Split(module.Parent, ":")[0]
-	var sha256 string
-	for _, artifact := range module.Artifacts {
-		if artifact.Name == container.ManifestJsonFile {
-			sha256 = artifact.Sha256
-			break
-		}
-	}
 	if StaticMarkdownConfig.IsExtendedSummary() {
-		dockerModuleLink := fmt.Sprintf(artifactoryDockerPackagesUiFormat, strings.TrimSuffix(StaticMarkdownConfig.GetPlatformUrl(), "/"), "%2F%2F"+parentImageName, sha256)
+		parentImageName := strings.Split(module.Parent, ":")[0]
+		var sha256 string
+		for _, artifact := range module.Artifacts {
+			if artifact.Name == container.ManifestJsonFile {
+				sha256 = artifact.Sha256
+				break
+			}
+		}
+		dockerModuleLink := fmt.Sprintf(artifactoryDockerPackagesUiFormat, strings.TrimSuffix(StaticMarkdownConfig.GetPlatformUrl(), "/"), "%2F%2F"+url.PathEscape(parentImageName), sha256)
 		return fmt.Sprintf("%s <a href=%s>(🐸 View)</a>", module.Id, dockerModuleLink)
 	}
 	return module.Id

artifactory/utils/container/buildinfo.go

@@ -362,6 +362,10 @@ func (builder *buildInfoBuilder) createMultiPlatformBuildInfo(fatManifest *FatMa
 		Properties: imageProperties,
 		Artifacts:  []buildinfo.Artifact{getFatManifestArtifact(searchResultFatManifest)},
 	}}}
+	imageLongNameWithoutRepo, err := builder.image.GetImageLongNameWithoutRepoWithTag()
+	if err != nil {
+		return nil, err
+	}
 	// Create all image arch modules
 	for _, manifest := range fatManifest.Manifests {
 		image := candidateImages[manifest.Digest]
@@ -378,7 +382,7 @@ func (builder *buildInfoBuilder) createMultiPlatformBuildInfo(fatManifest *FatMa
 			Id:        getModuleIdByManifest(manifest, baseModuleId),
 			Type:      buildinfo.Docker,
 			Artifacts: artifacts,
-			Parent:    baseModuleId,
+			Parent:    imageLongNameWithoutRepo,
 		})
 	}
 	return buildInfo, setBuildProperties(builder.buildName, builder.buildNumber, builder.project, builder.imageLayers, builder.serviceManager)

artifactory/utils/container/image.go

@@ -86,6 +86,21 @@ func (image *Image) GetImageShortNameWithTag() (string, error) {
 	return imageName, nil
 }
 
+// GetImageLongNameWithoutRepoWithTag removes the registry hostname and repository name, returning the organization and image name with the tag.
+// e.g., "docker-local/myorg/hello-world:latest" -> "myorg/hello-world:latest"
+// e.g., "docker-local/hello-world:latest" -> "hello-world:latest"
+func (image *Image) GetImageLongNameWithoutRepoWithTag() (string, error) {
+	longName, err := image.GetImageLongNameWithTag()
+	if err != nil {
+		return "", err
+	}
+	parts := strings.Split(longName, "/")
+	if len(parts) > 1 {
+		return strings.Join(parts[1:], "/"), nil
+	}
+	return longName, nil
+}
+
 // Get image tag name of an image.
 // e.g.: https://my-registry/docker-local/hello-world:latest. -> latest
 func (image *Image) GetImageTag() (string, error) {

artifactory/utils/container/image_test.go

@@ -82,6 +82,28 @@ func TestGetImageLongNameWithTag(t *testing.T) {
 	_, err := NewImage("domain").GetImageLongNameWithTag()
 	assert.Error(t, err)
 }
+
+func TestGetImageLongNameWithoutRepoWithTag(t *testing.T) {
+	var imageTags = []struct {
+		in       string
+		expected string
+	}{
+		{"domain:8080/repo-name/hello-world:latest", "hello-world:latest"},
+		{"domain/repo-name/hello-world:latest", "hello-world:latest"},
+		{"domain/repo-name/org-name/hello-world:latest", "org-name/hello-world:latest"},
+		{"domain/repo-name/org-name/hello-world", "org-name/hello-world:latest"},
+	}
+
+	for _, v := range imageTags {
+		result, err := NewImage(v.in).GetImageLongNameWithoutRepoWithTag()
+		assert.NoError(t, err)
+		assert.Equal(t, v.expected, result)
+	}
+	// Validate failure upon missing image name
+	_, err := NewImage("domain").GetImageLongNameWithoutRepoWithTag()
+	assert.Error(t, err)
+}
+
 func TestGetImageShortNameWithTag(t *testing.T) {
 	var imageTags = []struct {
 		in       string

common/commands/configfile.go

@@ -171,6 +171,8 @@ func handleInteractiveConfigCreation(configFile *ConfigFile, confType project.Pr
 		return configFile.configGradle()
 	case project.Terraform:
 		return configFile.setDeployer(false)
+	case project.Cocoapods:
+		return configFile.setDeployerResolver()
 	}
 	return
 }

common/project/projectconfig.go

@@ -39,6 +39,7 @@ const (
 	Dotnet
 	Build
 	Terraform
+	Cocoapods
 )
 
 type ConfigType string
@@ -62,6 +63,7 @@ var ProjectTypes = []string{
 	"dotnet",
 	"build",
 	"terraform",
+	"cocoapods",
 }
 
 func (projectType ProjectType) String() string {