resolve conflicts and update depes

Author: reshmifrog

artifactory/commands/container/dockerfileutils/parser.go

@@ -47,7 +47,7 @@ func newDockerfileParser() *dockerfileParser {
 //   - FROM --platform=linux/amd64 ubuntu:20.04
 //   - FROM --platform=linux/amd64 ubuntu:20.04 AS builder
 //   - FROM builder (skipped - references previous stage)
-func ParseDockerfileBaseImages(dockerfilePath string) ([]ocicontainer.BaseImage, error) {
+func ParseDockerfileBaseImages(dockerfilePath string) ([]ocicontainer.DockerImage, error) {
 	file, err := os.Open(dockerfilePath)
 	if err != nil {
 		return nil, err
@@ -103,8 +103,8 @@ func readDockerfileLines(file *os.File) ([]string, error) {
 }
 
 // extractBaseImages processes all lines and extracts base images from FROM instructions
-func (p *dockerfileParser) extractBaseImages(lines []string) []ocicontainer.BaseImage {
-	var baseImages []ocicontainer.BaseImage
+func (p *dockerfileParser) extractBaseImages(lines []string) []ocicontainer.DockerImage {
+	var baseImages []ocicontainer.DockerImage
 
 	for _, line := range lines {
 		if !isFromInstruction(line) {
@@ -130,7 +130,7 @@ func (p *dockerfileParser) extractBaseImages(lines []string) []ocicontainer.Base
 		}
 
 		p.seenImages[fromInfo.image] = true
-		baseImages = append(baseImages, ocicontainer.BaseImage{
+		baseImages = append(baseImages, ocicontainer.DockerImage{
 			Image:        fromInfo.image,
 			OS:           fromInfo.os,
 			Architecture: fromInfo.arch,

artifactory/commands/container/pull.go

@@ -6,6 +6,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/common/build"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
+	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
 type PullCommand struct {
@@ -76,7 +77,12 @@ func (pc *PullCommand) Run() error {
 	if err != nil || buildInfoModule == nil {
 		return err
 	}
-	return build.SaveBuildInfo(buildName, buildNumber, project, buildInfoModule)
+	err = build.SaveBuildInfo(buildName, buildNumber, project, buildInfoModule)
+	if err != nil {
+		return err
+	}
+	log.Info("Successfully Saved build info for " + buildName + "/" + buildNumber)
+	return nil
 }
 
 func (pc *PullCommand) CommandName() string {

artifactory/commands/helm/buildinfo.go

@@ -12,23 +12,29 @@ import (
 
 // CollectHelmBuildInfoWithFlexPack collects Helm build info using FlexPack
 func CollectHelmBuildInfoWithFlexPack(workingDir, buildName, buildNumber, project, commandName string, helmArgs []string, serverDetails *config.ServerDetails) error {
-	buildInfo, err := collectBuildInfoWithFlexPack(workingDir, buildName, buildNumber)
+	serviceManager, err := utils.CreateServiceManager(serverDetails, -1, 0, false)
 	if err != nil {
-		return fmt.Errorf("failed to collect build info: %w", err)
+		return fmt.Errorf("failed to create services manager: %w", err)
 	}
-	if buildInfo == nil {
-		log.Debug("No build info collected, skipping further processing")
-		return nil
+	buildInfoService := buildtool.CreateBuildInfoService()
+	build, err := buildInfoService.GetOrCreateBuildWithProject(buildName, buildNumber, project)
+	if err != nil {
+		return fmt.Errorf("failed to create build info: %w", err)
 	}
-	serviceManager, err := utils.CreateServiceManager(serverDetails, -1, 0, false)
+	buildInfo, err := build.ToBuildInfo()
 	if err != nil {
-		return fmt.Errorf("failed to create services manager: %w", err)
+		return fmt.Errorf("failed to build info: %w", err)
 	}
-	updateDependencyOCILayersInBuildInfo(buildInfo, serviceManager)
-	if commandName == "push" {
-		handlePushCommand(buildInfo, helmArgs, serviceManager)
+	switch commandName {
+	case "push":
+		return handlePushCommand(buildInfo, helmArgs, serviceManager, buildName, buildNumber, project)
+	case "package":
+		return handlePackageCommand(buildInfo, helmArgs, serviceManager, buildName, buildNumber, project)
+	case "dependency":
+		return handleDependencyCommand(buildInfo, helmArgs, serviceManager, workingDir, buildName, buildNumber, project)
 	}
-	return saveBuildInfo(buildInfo, buildName, buildNumber, project)
+	log.Info("Skipping helm build info because", commandName, "command is not collecting build info")
+	return nil
 }
 
 // collectBuildInfoWithFlexPack collects build info using FlexPack
@@ -53,6 +59,6 @@ func saveBuildInfo(buildInfo *entities.BuildInfo, buildName, buildNumber, projec
 		log.Warn("Failed to save build info for jfrog-cli compatibility: ", err.Error())
 		return err
 	}
-	log.Info("Build info saved locally. Use 'jf rt bp ", buildName, " ", buildNumber, "' to publish it to Artifactory.")
+	log.Info("Build info saved locally. Use 'jf rt bp", buildName, buildNumber, "' to publish it to Artifactory.")
 	return nil
 }

artifactory/commands/helm/dependency.go

@@ -0,0 +1,32 @@
+package helm
+
+import (
+	"fmt"
+	"github.com/jfrog/build-info-go/entities"
+	"github.com/jfrog/jfrog-client-go/artifactory"
+)
+
+func handleDependencyCommand(buildInfoOld *entities.BuildInfo, args []string, serviceManager artifactory.ArtifactoryServicesManager, workingDir, buildName, buildNumber, project string) error {
+	chartPath := workingDir
+	chartPaths := getPaths(args)
+	if len(chartPaths) >= 2 {
+		chartPath = chartPaths[1]
+	}
+	buildInfo, err := collectBuildInfoWithFlexPack(chartPath, buildName, buildNumber)
+	if err != nil {
+		return fmt.Errorf("failed to collect build info: %w", err)
+	}
+	if buildInfo == nil {
+		return fmt.Errorf("no build info collected, skipping further processing")
+	}
+	updateDependencyOCILayersInBuildInfo(buildInfo, serviceManager)
+	if len(buildInfo.Modules) > 0 {
+		appendModuleInExistingBuildInfo(buildInfoOld, &buildInfo.Modules[0])
+	}
+	removeDuplicateDependencies(buildInfoOld)
+	err = saveBuildInfo(buildInfoOld, buildName, buildNumber, project)
+	if err != nil {
+		return fmt.Errorf("failed to save build info")
+	}
+	return nil
+}

artifactory/commands/helm/helmcommand.go

@@ -2,16 +2,15 @@ package helm
 
 import (
 	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"os/exec"
-
 	buildUtils "github.com/jfrog/jfrog-cli-core/v2/common/build"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
+	"io"
+	"net/url"
+	"os"
+	"os/exec"
 )
 
 // HelmCommand represents a Helm command execution
@@ -91,13 +90,7 @@ func (hc *HelmCommand) ServerDetails() (*config.ServerDetails, error) {
 
 // Run executes the Helm command
 func (hc *HelmCommand) Run() error {
-	if hc.requiresCredentialsInArguments() {
-		hc.appendCredentialsInArguments()
-	}
-	err := hc.performRegistryLogin()
-	if err != nil {
-		return err
-	}
+	hc.appendCredentialsInArguments()
 	if err := hc.executeHelmCommand(); err != nil {
 		return errorutils.CheckErrorf("helm %s failed: %w", hc.cmdName, err)
 	}
@@ -107,21 +100,23 @@ func (hc *HelmCommand) Run() error {
 	return nil
 }
 
-// requiresCredentialsInArguments checks if the command requires credentials to be appended to arguments
-func (hc *HelmCommand) requiresCredentialsInArguments() bool {
-	cmdName := hc.cmdName
-	return cmdName == "registry" || cmdName == "repo" || cmdName == "dependency" || cmdName == "upgrade" || cmdName == "install" || cmdName == "pull" || cmdName == "push"
-}
-
 // appendCredentialsInArguments appends the username and password to arguments
 func (hc *HelmCommand) appendCredentialsInArguments() {
-	user, pass := hc.getCredentials()
-	if user == "" || pass == "" {
+	if hc.username != "" && hc.password != "" {
+		hc.helmArgs = append(hc.helmArgs, "--username", hc.username)
+		hc.helmArgs = append(hc.helmArgs, "--password", hc.password)
+		return
+	}
+	if hc.cmdName != "registry" && hc.serverId == "" {
+		return
+	}
+	username, password := hc.getCredentials()
+	if username == "" || password == "" {
 		log.Debug("No credentials available for helm registry login")
 		return
 	}
-	hc.helmArgs = append(hc.helmArgs, fmt.Sprintf("--username=%s", user))
-	hc.helmArgs = append(hc.helmArgs, fmt.Sprintf("--password=%s", pass))
+	hc.helmArgs = append(hc.helmArgs, fmt.Sprintf("--username=%s", username))
+	hc.helmArgs = append(hc.helmArgs, fmt.Sprintf("--password=%s", password))
 }
 
 // executeHelmCommand executes the native Helm command

artifactory/commands/helm/helmcommand_test.go

@@ -62,80 +62,6 @@ func TestHelmCommandSetters(t *testing.T) {
 	assert.Equal(t, buildConfig, cmd.buildConfiguration)
 }
 
-// TestRequiresCredentialsInArguments tests the requiresCredentialsInArguments method
-func TestRequiresCredentialsInArguments(t *testing.T) {
-	tests := []struct {
-		name     string
-		cmdName  string
-		expected bool
-	}{
-		{
-			name:     "Registry command requires credentials",
-			cmdName:  "registry",
-			expected: true,
-		},
-		{
-			name:     "Repo command requires credentials",
-			cmdName:  "repo",
-			expected: true,
-		},
-		{
-			name:     "Dependency command requires credentials",
-			cmdName:  "dependency",
-			expected: true,
-		},
-		{
-			name:     "Upgrade command requires credentials",
-			cmdName:  "upgrade",
-			expected: true,
-		},
-		{
-			name:     "Install command requires credentials",
-			cmdName:  "install",
-			expected: true,
-		},
-		{
-			name:     "Pull command requires credentials",
-			cmdName:  "pull",
-			expected: true,
-		},
-		{
-			name:     "Push command requires credentials",
-			cmdName:  "push",
-			expected: true,
-		},
-		{
-			name:     "Package command does not require credentials",
-			cmdName:  "package",
-			expected: false,
-		},
-		{
-			name:     "Template command does not require credentials",
-			cmdName:  "template",
-			expected: false,
-		},
-		{
-			name:     "List command does not require credentials",
-			cmdName:  "list",
-			expected: false,
-		},
-		{
-			name:     "Empty command does not require credentials",
-			cmdName:  "",
-			expected: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cmd := NewHelmCommand()
-			cmd.SetHelmCmdName(tt.cmdName)
-			result := cmd.requiresCredentialsInArguments()
-			assert.Equal(t, tt.expected, result)
-		})
-	}
-}
-
 // TestAppendCredentialsInArguments tests the appendCredentialsInArguments method
 func TestAppendCredentialsInArguments(t *testing.T) {
 	tests := []struct {
@@ -150,7 +76,7 @@ func TestAppendCredentialsInArguments(t *testing.T) {
 			username:      "cmduser",
 			password:      "cmdpass",
 			serverDetails: &config.ServerDetails{},
-			expectedArgs:  []string{"--username=cmduser", "--password=cmdpass"},
+			expectedArgs:  []string{"--username", "cmduser", "--password", "cmdpass"},
 		},
 		{
 			name: "Append credentials from server details",

artifactory/commands/helm/layers.go

@@ -2,16 +2,16 @@ package helm
 
 import (
 	"fmt"
-	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/ocicontainer"
-	artutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
-	"strings"
-
 	"github.com/jfrog/build-info-go/entities"
 	ioutils "github.com/jfrog/gofrog/io"
+	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/ocicontainer"
+	artutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-client-go/artifactory"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
 	servicesUtils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
+	"github.com/jfrog/jfrog-client-go/utils/io/content"
 	"github.com/jfrog/jfrog-client-go/utils/log"
+	"strings"
 )
 
 type manifest struct {
@@ -76,7 +76,7 @@ func addOCILayersForDependency(dep entities.Dependency, serviceManager artifacto
 		return
 	}
 	searchPattern := fmt.Sprintf("%s/%s/*", repoName, versionPath)
-	resultMap, err := searchDependencyOCIFilesByPath(serviceManager, searchPattern)
+	resultMap, err := searchDependencyOCIFilesByPath(serviceManager, searchPattern, "")
 	if err != nil {
 		log.Debug("Failed to search OCI artifacts for dependency ", dep.Id, " : ", err)
 		return
@@ -108,7 +108,6 @@ func addOCILayersForDependency(dep entities.Dependency, serviceManager artifacto
 	for _, depLayer := range dependencyLayers {
 		*processedDependencies = append(*processedDependencies, entities.Dependency{
 			Id:         depLayer.Name,
-			Type:       depLayer.Type,
 			Repository: depLayer.Repo,
 			Checksum: entities.Checksum{
 				Sha1:   depLayer.Actual_Sha1,
@@ -184,7 +183,7 @@ func searchClassicHelmChart(serviceManager artifactory.ArtifactoryServicesManage
 }
 
 // searchDependencyOCIFilesByPath searches for OCI artifacts using a search pattern
-func searchDependencyOCIFilesByPath(serviceManager artifactory.ArtifactoryServicesManager, searchPattern string) (map[string]*servicesUtils.ResultItem, error) {
+func searchDependencyOCIFilesByPath(serviceManager artifactory.ArtifactoryServicesManager, searchPattern string, buildProperties string) (map[string]*servicesUtils.ResultItem, error) {
 	log.Debug("Searching for OCI artifacts with pattern: ", searchPattern)
 	searchParams := services.NewSearchParams()
 	searchParams.Pattern = searchPattern
@@ -193,6 +192,9 @@ func searchDependencyOCIFilesByPath(serviceManager artifactory.ArtifactoryServic
 	if err != nil {
 		return nil, fmt.Errorf("failed to search for OCI artifacts: %w", err)
 	}
+	if buildProperties != "" {
+		addBuildPropertiesOnArtifacts(serviceManager, reader, buildProperties, searchPattern)
+	}
 	var closeErr error
 	defer func() {
 		if closeErr != nil {
@@ -223,8 +225,30 @@ func getManifest(resultMap map[string]*servicesUtils.ResultItem, serviceManager
 	return
 }
 
+func getManifestSha256(resultMap map[string]*servicesUtils.ResultItem) (string, error) {
+	if len(resultMap) == 0 {
+		return "", fmt.Errorf("no manifest found")
+	}
+	manifestResult, ok := resultMap["manifest.json"]
+	if !ok || manifestResult == nil {
+		return "", fmt.Errorf("no manifest found")
+	}
+	return manifestResult.Sha256, nil
+}
+
 // Download the content of layer search result.
 func downloadLayer(searchResult servicesUtils.ResultItem, result interface{}, serviceManager artifactory.ArtifactoryServicesManager, repo string) error {
 	searchResult.Repo = repo
 	return artutils.RemoteUnmarshal(serviceManager, searchResult.GetItemRelativePath(), result)
 }
+
+func addBuildPropertiesOnArtifacts(serviceManager artifactory.ArtifactoryServicesManager, reader *content.ContentReader, buildProps, searchPattern string) {
+	propsParams := services.PropsParams{
+		Reader: reader,
+		Props:  buildProps,
+	}
+	_, err := serviceManager.SetProps(propsParams)
+	if err != nil {
+		log.Warn(fmt.Sprintf("Failed to set properties on %s: %s", searchPattern, err))
+	}
+}