Merge branch 'dev'

Author: eyalbe4

artifactory/commands/buildinfo/publish.go

@@ -148,17 +148,21 @@ func extractBuildInfoData(partials buildinfo.Partials, includeFilter, excludeFil
 	var vcs []buildinfo.Vcs
 	var issues buildinfo.Issues
 	env := make(map[string]string)
-	partialModules := make(map[string]partialModule)
+	partialModules := make(map[string]*partialModule)
 	issuesMap := make(map[string]*buildinfo.AffectedIssue)
 	for _, partial := range partials {
+		moduleId := partial.ModuleId
+		if partialModules[moduleId] == nil {
+			partialModules[moduleId] = &partialModule{moduleType: partial.ModuleType}
+		}
 		switch {
 		case partial.Artifacts != nil:
 			for _, artifact := range partial.Artifacts {
-				addArtifactToPartialModule(artifact, partial.ModuleId, partialModules)
+				addArtifactToPartialModule(artifact, moduleId, partialModules)
 			}
 		case partial.Dependencies != nil:
 			for _, dependency := range partial.Dependencies {
-				addDependencyToPartialModule(dependency, partial.ModuleId, partialModules)
+				addDependencyToPartialModule(dependency, moduleId, partialModules)
 			}
 		case partial.VcsList != nil:
 			for _, partialVcs := range partial.VcsList {
@@ -190,16 +194,13 @@ func extractBuildInfoData(partials buildinfo.Partials, includeFilter, excludeFil
 				env[k] = v
 			}
 		case partial.ModuleType == buildinfo.Build:
-			partialModules[partial.ModuleId] = partialModule{
-				moduleType: partial.ModuleType,
-				checksum:   partial.Checksum,
-			}
+			partialModules[moduleId].checksum = partial.Checksum
 		}
 	}
 	return partialModulesToModules(partialModules), env, vcs, issuesMapToArray(issues, issuesMap), nil
 }
 
-func partialModulesToModules(partialModules map[string]partialModule) []buildinfo.Module {
+func partialModulesToModules(partialModules map[string]*partialModule) []buildinfo.Module {
 	var modules []buildinfo.Module
 	for moduleId, singlePartialModule := range partialModules {
 		moduleArtifacts := artifactsMapToList(singlePartialModule.artifacts)
@@ -216,23 +217,19 @@ func issuesMapToArray(issues buildinfo.Issues, issuesMap map[string]*buildinfo.A
 	return issues
 }
 
-func addDependencyToPartialModule(dependency buildinfo.Dependency, moduleId string, partialModules map[string]partialModule) {
+func addDependencyToPartialModule(dependency buildinfo.Dependency, moduleId string, partialModules map[string]*partialModule) {
 	// init map if needed
 	if partialModules[moduleId].dependencies == nil {
-		partialModules[moduleId] =
-			partialModule{artifacts: partialModules[moduleId].artifacts,
-				dependencies: make(map[string]buildinfo.Dependency)}
+		partialModules[moduleId].dependencies = make(map[string]buildinfo.Dependency)
 	}
 	key := fmt.Sprintf("%s-%s-%s-%s", dependency.Id, dependency.Sha1, dependency.Md5, dependency.Scopes)
 	partialModules[moduleId].dependencies[key] = dependency
 }
 
-func addArtifactToPartialModule(artifact buildinfo.Artifact, moduleId string, partialModules map[string]partialModule) {
+func addArtifactToPartialModule(artifact buildinfo.Artifact, moduleId string, partialModules map[string]*partialModule) {
 	// init map if needed
 	if partialModules[moduleId].artifacts == nil {
-		partialModules[moduleId] =
-			partialModule{artifacts: make(map[string]buildinfo.Artifact),
-				dependencies: partialModules[moduleId].dependencies}
+		partialModules[moduleId].artifacts = make(map[string]buildinfo.Artifact)
 	}
 	key := fmt.Sprintf("%s-%s-%s", artifact.Name, artifact.Sha1, artifact.Md5)
 	partialModules[moduleId].artifacts[key] = artifact

artifactory/commands/npm/installorci.go

@@ -112,8 +112,8 @@ func (nic *NpmInstallOrCiCommand) Run() error {
 	if err != nil {
 		return err
 	}
-	threads, jsonOutput, filteredNpmArgs, buildConfiguration, err := npm.ExtractNpmOptionsFromArgs(nic.npmArgs)
-	nic.SetRepoConfig(resolverParams).SetArgs(filteredNpmArgs).SetThreads(threads).SetJsonOutput(jsonOutput).SetBuildConfiguration(buildConfiguration)
+	threads, filteredNpmArgs, buildConfiguration, err := npm.ExtractNpmOptionsFromArgs(nic.npmArgs)
+	nic.SetRepoConfig(resolverParams).SetArgs(filteredNpmArgs).SetThreads(threads).SetBuildConfiguration(buildConfiguration)
 	if err != nil {
 		return err
 	}
@@ -125,11 +125,6 @@ func (nca *NpmCommandArgs) SetThreads(threads int) *NpmCommandArgs {
 	return nca
 }
 
-func (nca *NpmCommandArgs) SetJsonOutput(jsonOutput bool) *NpmCommandArgs {
-	nca.jsonOutput = jsonOutput
-	return nca
-}
-
 func NewNpmCommandArgs(npmCommand string) *NpmCommandArgs {
 	return &NpmCommandArgs{command: npmCommand}
 }
@@ -186,6 +181,10 @@ func (nca *NpmCommandArgs) preparePrerequisites(repo string) error {
 		return err
 	}
 
+	if err := nca.setJsonOutput(); err != nil {
+		return err
+	}
+
 	if err := nca.setWorkingDirectory(); err != nil {
 		return err
 	}
@@ -249,6 +248,17 @@ func (nca *NpmCommandArgs) setWorkingDirectory() error {
 	return nil
 }
 
+func (nca *NpmCommandArgs) setJsonOutput() error {
+	jsonOutput, err := npm.ConfigGet(nca.npmArgs, "json", nca.executablePath)
+	if err != nil {
+		return err
+	}
+
+	// In case of --json=<not boolean>, the value of json is set to 'true', but the result from the command is not 'true'
+	nca.jsonOutput = jsonOutput != "false"
+	return nil
+}
+
 // In order to make sure the install/ci downloads the dependencies from Artifactory, we are creating a.npmrc file in the project's root directory.
 // If such a file already exists, we are copying it aside.
 // This method restores the backed up file and deletes the one created by the command.

artifactory/commands/npm/publish.go

@@ -76,7 +76,7 @@ func (npc *NpmPublishCommand) Run() error {
 		if err != nil {
 			return err
 		}
-		_, _, filteredNpmArgs, buildConfiguration, err := npm.ExtractNpmOptionsFromArgs(npc.NpmPublishCommandArgs.npmArgs)
+		_, filteredNpmArgs, buildConfiguration, err := npm.ExtractNpmOptionsFromArgs(npc.NpmPublishCommandArgs.npmArgs)
 		if err != nil {
 			return err
 		}

artifactory/utils/dotnet/dependencies/assetsjson.go

@@ -4,18 +4,22 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"strings"
+
 	"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
-	"io/ioutil"
-	"path/filepath"
-	"strings"
 )
 
-var assetsFilePath = filepath.Join("obj", "project.assets.json")
+var assetsFilePath = filepath.Join(AssetDirName, AssetFileName)
 
-const AssetFileName = "project.assets.json"
+const (
+	AssetFileName = "project.assets.json"
+	AssetDirName  = "obj"
+)
 
 // Register project.assets.json extractor
 func init() {

artifactory/utils/dotnet/solution/solution.go

@@ -4,6 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+
 	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/dependencies"
 	"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/solution/project"
 	"github.com/jfrog/jfrog-cli-core/utils/ioutils"
@@ -12,11 +18,6 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
 )
 
 type Solution interface {
@@ -133,13 +134,14 @@ func (solution *solution) loadSingleProjectFromDir() error {
 
 func (solution *solution) loadSingleProject(projectName, projFilePath string) {
 	// First we wil find the project's dependencies source.
-	// It can be located in the project's root directory or in a directory with the project name under the solution root.
+	// It can be located directly in the project's root directory or in a directory with the project name under the solution root
+	// or under obj directory (in case of assets.json file)
 	projectRootPath := filepath.Dir(projFilePath)
-	projectPathPattern := projectRootPath + string(filepath.Separator)
+	projectPathPattern := filepath.Join(projectRootPath, dependencies.AssetDirName) + string(filepath.Separator)
 	projectNamePattern := string(filepath.Separator) + projectName + string(filepath.Separator)
 	var dependenciesSource string
 	for _, source := range solution.dependenciesSources {
-		if strings.Contains(source, projectPathPattern) || strings.Contains(source, projectNamePattern) {
+		if projectRootPath == filepath.Dir(source) || strings.Contains(source, projectPathPattern) || strings.Contains(source, projectNamePattern) {
 			dependenciesSource = source
 			break
 		}

artifactory/utils/npm/args.go

@@ -8,7 +8,7 @@ import (
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 )
 
-func ExtractNpmOptionsFromArgs(args []string) (threads int, jsonOutput bool, cleanArgs []string, buildConfig *utils.BuildConfiguration, err error) {
+func ExtractNpmOptionsFromArgs(args []string) (threads int, cleanArgs []string, buildConfig *utils.BuildConfiguration, err error) {
 	threads = 3
 	// Extract threads information from the args.
 	flagIndex, valueIndex, numOfThreads, err := coreutils.FindFlag("--threads", args)
@@ -24,15 +24,6 @@ func ExtractNpmOptionsFromArgs(args []string) (threads int, jsonOutput bool, cle
 		}
 	}
 
-	// Since we use --json flag for retrieving the npm config for writing the temp .npmrc, json=true is written to the config list.
-	// We don't want to force the json output for all users, so we check whether the json output was explicitly required.
-	flagIndex, jsonOutput, err = coreutils.FindBooleanFlag("--json", args)
-	if err != nil {
-		return
-	}
-	// Since boolean flag might appear as --flag or --flag=value, the value index is the same as the flag index.
-	coreutils.RemoveFlagFromCommand(&args, flagIndex, flagIndex)
-
 	cleanArgs, buildConfig, err = utils.ExtractBuildDetailsFromArgs(args)
 	return
 }

artifactory/utils/npm/config-get.go

@@ -0,0 +1,28 @@
+package npm
+
+import (
+	gofrogcmd "github.com/jfrog/gofrog/io"
+	"github.com/jfrog/jfrog-client-go/utils/errorutils"
+	"strings"
+)
+
+func ConfigGet(npmFlags []string, confName, executablePath string) (string, error) {
+	configGetCmdConfig := createConfigGetCmdConfig(executablePath, confName, npmFlags)
+	output, err := gofrogcmd.RunCmdOutput(configGetCmdConfig)
+	if err != nil {
+		return "", errorutils.CheckError(err)
+	}
+	confValue := strings.TrimSpace(output)
+
+	return confValue, nil
+}
+
+func createConfigGetCmdConfig(executablePath, confName string, splitFlags []string) *NpmConfig {
+	return &NpmConfig{
+		Npm:          executablePath,
+		Command:      []string{"config", "get", confName},
+		CommandFlags: append(splitFlags),
+		StrWriter:    nil,
+		ErrWriter:    nil,
+	}
+}

artifactory/utils/npm/config.go renamed to artifactory/utils/npm/config-list.go

@@ -14,6 +14,7 @@ func GetConfigList(npmFlags []string, executablePath string) ([]byte, error) {
 	pipeReader, pipeWriter := io.Pipe()
 	defer pipeReader.Close()
 
+	npmFlags = append(npmFlags, "--json=false")
 	configListCmdConfig := createConfigListCmdConfig(executablePath, npmFlags, pipeWriter)
 	var npmError error
 	go func() {

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/codegangsta/cli v1.20.0
 	github.com/jfrog/gocmd v0.2.0
 	github.com/jfrog/gofrog v1.0.6
-	github.com/jfrog/jfrog-client-go v0.22.2
+	github.com/jfrog/jfrog-client-go v0.22.3
 	github.com/magiconair/properties v1.8.1
 	github.com/manifoldco/promptui v0.8.0
 	github.com/mattn/go-shellwords v1.0.3

go.sum

@@ -135,8 +135,8 @@ github.com/jfrog/gocmd v0.2.0/go.mod h1:TeZBKJw38D3aKpkIH6tCCztECdhNLIkwHbnCZG8u
 github.com/jfrog/gofrog v1.0.6 h1:yUDxSCw8gTK6vC4PvtG0HTnEOQJSZ+O4lWGCgkev1nU=
 github.com/jfrog/gofrog v1.0.6/go.mod h1:HkDzg+tMNw23UryoOv0+LB94BzYcl6MCIoz8Tmlb+s8=
 github.com/jfrog/jfrog-client-go v0.21.0/go.mod h1:0RYDrQKCIdJbx6pjopwtwXh4/PaEW9FqFc4b4ox8fl0=
-github.com/jfrog/jfrog-client-go v0.22.2 h1:dwIwKrgzwkYwZK+BBOma2+WlTEbwnFlzyNi6mEKMvBo=
-github.com/jfrog/jfrog-client-go v0.22.2/go.mod h1:1XMLr/yzslzV9uABPrX4gpA0Bvc51ZX6LRvu/L0WQPc=
+github.com/jfrog/jfrog-client-go v0.22.3 h1:CqircVnWso+EbpYymsLq1CplHlQ8zxHdy/VOhaAX6Bs=
+github.com/jfrog/jfrog-client-go v0.22.3/go.mod h1:1XMLr/yzslzV9uABPrX4gpA0Bvc51ZX6LRvu/L0WQPc=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=