Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into simple-…

…defer

# Conflicts:
#	go.mod
#	go.sum

npm_test.go

@@ -549,20 +549,7 @@ func TestNpmPublishWithWorkspaces(t *testing.T) {
 	err = commands.Exec(npmpCmd)
 	assert.NoError(t, err)
 
-	result := npmpCmd.Result()
-	assert.NotNil(t, result)
-	reader := result.Reader()
-	readerGetErrorAndAssert(t, reader)
-	defer readerCloseAndAssert(t, reader)
-	// Read result
-	var files []clientutils.FileTransferDetails
-	for transferDetails := new(clientutils.FileTransferDetails); reader.NextRecord(transferDetails) == nil; transferDetails = new(clientutils.FileTransferDetails) {
-		files = append(files, *transferDetails)
-	}
-	if files == nil {
-		assert.NotNil(t, files)
-		return
-	}
+	files := assertNpmPublishResultFiles(t, npmpCmd)
 
 	expectedTars := []string{"nested1", "nested2"}
 	for index, tar := range expectedTars {
@@ -577,6 +564,51 @@ func TestNpmPublishWithWorkspaces(t *testing.T) {
 	}
 }
 
+// Test npm publish command with provided tarball
+func TestNpmPackProvidedTarball(t *testing.T) {
+	// Check npm version
+	npmVersion, _, err := buildutils.GetNpmVersionAndExecPath(log.Logger)
+	if err != nil {
+		assert.NoError(t, err)
+		return
+	}
+	// In npm under v7 skip test
+	if npmVersion.Compare(minimumWorkspacesNpmVersion) > 0 {
+		log.Info("Test skipped as this function in not supported in npm version " + npmVersion.GetVersion())
+		return
+	}
+
+	// Prepare test
+	initNpmTest(t)
+	defer cleanNpmTest(t)
+	tempDirPath, createTempDirCallback := coretests.CreateTempDirWithCallbackAndAssert(t)
+	defer createTempDirCallback()
+	testFolder := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "npm", "npmprovidedtarball")
+	err = biutils.CopyDir(testFolder, tempDirPath, false, []string{})
+	assert.NoError(t, err)
+
+	// CD inside the copied project and create npm config
+	wd, err := os.Getwd()
+	assert.NoError(t, err)
+	chdirCallback := clientTestUtils.ChangeDirWithCallback(t, wd, tempDirPath)
+	defer chdirCallback()
+	err = createConfigFileForTest([]string{tempDirPath}, tests.NpmRemoteRepo, tests.NpmRepo, t, project.Npm, false)
+	assert.NoError(t, err)
+
+	// Init npm project & npmp command for testing
+	configFilePath := filepath.Join(tempDirPath, ".jfrog", "projects", "npm.yaml")
+	args := []string{"jfrog-cli-tests-v1.0.0.tgz", "--detailed-summary=true", "--workspaces", "--verbose"}
+	npmpCmd := npm.NewNpmPublishCommand()
+	npmpCmd.SetConfigFilePath(configFilePath).SetArgs(args)
+	npmpCmd.SetNpmArgs(args)
+	assert.NoError(t, npmpCmd.Init())
+	err = commands.Exec(npmpCmd)
+	assert.NoError(t, err)
+
+	// Check result
+	assertNpmPublishResultFiles(t, npmpCmd)
+}
+
 func TestYarn(t *testing.T) {
 	initNpmTest(t)
 	defer cleanNpmTest(t)
@@ -679,3 +711,16 @@ func runGenericNpm(t *testing.T, args ...string) {
 	jfCli := coretests.NewJfrogCli(execMain, "jf", "")
 	assert.NoError(t, jfCli.WithoutCredentials().Exec(args...))
 }
+
+func assertNpmPublishResultFiles(t *testing.T, npmpCmd *npm.NpmPublishCommand) (files []clientutils.FileTransferDetails) {
+	result := npmpCmd.Result()
+	assert.NotNil(t, result)
+	reader := result.Reader()
+	readerGetErrorAndAssert(t, reader)
+	defer readerCloseAndAssert(t, reader)
+	for transferDetails := new(clientutils.FileTransferDetails); reader.NextRecord(transferDetails) == nil; transferDetails = new(clientutils.FileTransferDetails) {
+		files = append(files, *transferDetails)
+	}
+	assert.NotNil(t, files)
+	return files
+}