Detailed summary tests - maven, gradle, goPublish (#1109)

Author: gailazar300

Diff for: buildinfo_test.go

@@ -202,7 +202,7 @@ func TestBuildPublishDetailedSummary(t *testing.T) {
 	defer log.SetLogger(previousLog)
 	// Execute the bp command with --detailed-summary.
 	assert.NoError(t, artifactoryCli.Exec("bp", tests.RtBuildName1, buildNumber, "--detailed-summary=true"))
-	tests.VerifySha256DetailedSummary(t, buffer, previousLog)
+	tests.VerifySha256DetailedSummaryFromBuffer(t, buffer, previousLog)
 
 	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, tests.RtBuildName1, artHttpDetails)
 	cleanArtifactoryTest()

Diff for: distribution_test.go

@@ -480,7 +480,7 @@ func TestReleaseBundleCreateDetailedSummary(t *testing.T) {
 	runRb(t, "rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b2.in", "--sign", "--detailed-summary")
 	inttestutils.VerifyLocalBundleExistence(t, tests.BundleName, bundleVersion, true, distHttpDetails)
 
-	tests.VerifySha256DetailedSummary(t, buffer, previousLog)
+	tests.VerifySha256DetailedSummaryFromBuffer(t, buffer, previousLog)
 
 	// Cleanup
 	cleanDistributionTest(t)
@@ -505,7 +505,7 @@ func TestReleaseBundleUpdateDetailedSummary(t *testing.T) {
 	// Update release bundle to have b1.in
 	runRb(t, "rbu", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign", "--detailed-summary")
 
-	tests.VerifySha256DetailedSummary(t, buffer, previousLog)
+	tests.VerifySha256DetailedSummaryFromBuffer(t, buffer, previousLog)
 
 	// Cleanup
 	cleanDistributionTest(t)
@@ -530,7 +530,7 @@ func TestReleaseBundleSignDetailedSummary(t *testing.T) {
 	// Update release bundle to have b1.in
 	runRb(t, "rbs", tests.BundleName, bundleVersion, "--detailed-summary")
 
-	tests.VerifySha256DetailedSummary(t, buffer, previousLog)
+	tests.VerifySha256DetailedSummaryFromBuffer(t, buffer, previousLog)
 
 	// Cleanup
 	cleanDistributionTest(t)

Diff for: go.mod

@@ -23,9 +23,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v0.23.2-0.20210616180824-7e7eb3eace21
+replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v0.23.2-0.20210617164909-62762d2bc8b2
 
-replace github.com/jfrog/jfrog-cli-core => github.com/jfrog/jfrog-cli-core v1.7.2-0.20210616184017-06f7d34a5734
+replace github.com/jfrog/jfrog-cli-core => github.com/jfrog/jfrog-cli-core v1.7.2-0.20210617173353-f527001c4aad
 
 replace github.com/jfrog/gocmd => github.com/jfrog/gocmd v0.2.1-0.20210616181221-7159cf844cc3
 

Diff for: go.sum

@@ -151,10 +151,10 @@ github.com/jfrog/gocmd v0.2.1-0.20210616181221-7159cf844cc3 h1:aBSJVLX1UcUKdCgA+
 github.com/jfrog/gocmd v0.2.1-0.20210616181221-7159cf844cc3/go.mod h1:TeZBKJw38D3aKpkIH6tCCztECdhNLIkwHbnCZG8umKE=
 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-cli-core v1.7.2-0.20210616184017-06f7d34a5734 h1:vkLfpFdwT5bqkBN4lHSS8oDNLrgsudyP06k6Q5bTD2k=
-github.com/jfrog/jfrog-cli-core v1.7.2-0.20210616184017-06f7d34a5734/go.mod h1:HstXPwf6MmrwsXujF6z5l1bv+9EU1hS4A/WiZvxXLEo=
-github.com/jfrog/jfrog-client-go v0.23.2-0.20210616180824-7e7eb3eace21 h1:xIQYhaugt8Ka6LHZmYibx2Ee9l5jN0UuwcXcldYs3JQ=
-github.com/jfrog/jfrog-client-go v0.23.2-0.20210616180824-7e7eb3eace21/go.mod h1:1XMLr/yzslzV9uABPrX4gpA0Bvc51ZX6LRvu/L0WQPc=
+github.com/jfrog/jfrog-cli-core v1.7.2-0.20210617173353-f527001c4aad h1:vTqolA8nEAN4jBTT78Erzkc40vbOLhzYDI5czw0/bLw=
+github.com/jfrog/jfrog-cli-core v1.7.2-0.20210617173353-f527001c4aad/go.mod h1:I6Sk609q0PzLvMmOUEAgVAGK1Cjp9lJyBZg2ZV7AtFM=
+github.com/jfrog/jfrog-client-go v0.23.2-0.20210617164909-62762d2bc8b2 h1:OfZ5coJSiENCD/7JOFRYRVcRXtOnRh6c4JgDjlWYncg=
+github.com/jfrog/jfrog-client-go v0.23.2-0.20210617164909-62762d2bc8b2/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=

Diff for: go_test.go

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"github.com/jfrog/jfrog-cli-core/artifactory/commands/golang"
+	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/common/commands"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -311,7 +314,7 @@ func runGo(module, buildName, buildNumber string, t *testing.T, args ...string)
 	inttestutils.DeleteBuild(serverDetails.ArtifactoryUrl, buildName, artHttpDetails)
 }
 
-func prepareGoProject(configDestDir string, t *testing.T, copyDirs bool) {
+func prepareGoProject(configDestDir string, t *testing.T, copyDirs bool) string {
 	project1Path := createGoProject(t, "project1", copyDirs)
 	testdataTarget := filepath.Join(tests.Out, "testdata")
 	testdataSrc := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "go", "testdata")
@@ -325,6 +328,7 @@ func prepareGoProject(configDestDir string, t *testing.T, copyDirs bool) {
 	assert.NoError(t, err)
 	assert.NoError(t, os.Chdir(project1Path))
 	log.Info("Using Go project located at ", project1Path)
+	return project1Path
 }
 
 // Testing publishing and resolution capabilities for go projects.
@@ -370,6 +374,51 @@ func TestGoPublishResolve(t *testing.T) {
 	cleanGoTest(t)
 }
 
+func TestGoPublishWithDetailedSummary(t *testing.T) {
+	initGoTest(t)
+
+	// Init environment
+	wd, err := os.Getwd()
+	assert.NoError(t, err)
+	projectPath := prepareGoProject("", t, true)
+
+	// Publish with detailed summary and buildinfo.
+	// Build project
+	buildNumber := "1"
+	artifactoryGoCli := tests.NewJfrogCli(execMain, "jfrog rt", "")
+	assert.NoError(t, execGo(t, artifactoryGoCli, "go", "build", "--build-name="+tests.GoBuildName, "--build-number="+buildNumber, "--module="+ModuleNameJFrogTest))
+
+	// GoPublish with detailed summary without buildinfo.
+	goPublishCmd := golang.NewGoPublishCommand()
+	goPublishCmd.SetConfigFilePath(filepath.Join(projectPath, ".jfrog", "projects", "go.yaml")).SetBuildConfiguration(new(utils.BuildConfiguration)).SetVersion("v1.0.0").SetDetailedSummary(true)
+	assert.NoError(t, commands.Exec(goPublishCmd))
+	tests.VerifySha256DetailedSummaryFromResult(t, goPublishCmd.Result())
+
+	// GoPublish with buildinfo configuration
+	buildConf := utils.BuildConfiguration{BuildName: tests.GoBuildName, BuildNumber: buildNumber, Module: ModuleNameJFrogTest}
+	goPublishCmd.SetBuildConfiguration(&buildConf)
+	assert.NoError(t, commands.Exec(goPublishCmd))
+	tests.VerifySha256DetailedSummaryFromResult(t, goPublishCmd.Result())
+
+	// Build publish
+	assert.NoError(t, artifactoryCli.Exec("bp", tests.GoBuildName, buildNumber))
+	publishedBuildInfo, found, err := tests.GetBuildInfo(serverDetails, tests.GoBuildName, buildNumber)
+	if err != nil {
+		assert.NoError(t, err)
+		return
+	}
+	if !found {
+		assert.True(t, found, "build info was expected to be found")
+		return
+	}
+	buildInfo := publishedBuildInfo.BuildInfo
+	validateBuildInfo(buildInfo, t, 4, 3, ModuleNameJFrogTest, buildinfo.Go)
+
+	// Restore workspace
+	assert.NoError(t, os.Chdir(wd))
+	cleanGoTest(t)
+}
+
 // Testing the fallback mechanism
 // 1. Building a project with a dependency that doesn't exists not in Artifactory and not in VCS.
 // 2. The fallback mechanism will try to download from both VCS and Artifactory and then fail with an error
@@ -433,6 +482,7 @@ func initGoTest(t *testing.T) {
 		t.Skip("Skipping go test. To run go test add the '-test.go=true' option.")
 	}
 	assert.NoError(t, os.Setenv("GONOSUMDB", "github.com/jfrog"))
+	createJfrogHomeConfig(t, true)
 }
 
 func cleanGoTest(t *testing.T) {

Diff for: gradle_test.go

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"github.com/jfrog/jfrog-cli-core/artifactory/commands/gradle"
+	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/common/commands"
 	"os"
 	"path/filepath"
 	"strings"
@@ -87,6 +90,53 @@ func TestNativeGradleBuildWithServerID(t *testing.T) {
 	cleanGradleTest()
 }
 
+func TestNativeGradleBuildWithServerIDAndDetailedSummary(t *testing.T) {
+	initGradleTest(t)
+	buildGradlePath := createGradleProject(t, "gradleproject")
+	configFilePath := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "buildspecs", tests.GradleConfig)
+	destPath := filepath.Join(filepath.Dir(buildGradlePath), ".jfrog", "projects")
+	createConfigFile(destPath, configFilePath, t)
+	oldHomeDir := changeWD(t, filepath.Dir(buildGradlePath))
+	buildNumber := "1"
+	buildGradlePath = strings.Replace(buildGradlePath, `\`, "/", -1) // Windows compatibility.
+
+	// Test gradle with detailed summary without buildinfo props.
+	filteredGradleArgs := []string{"clean artifactoryPublish", "-b" + buildGradlePath}
+	gradleCmd := gradle.NewGradleCommand().SetConfiguration(new(utils.BuildConfiguration)).SetTasks(strings.Join(filteredGradleArgs, " ")).SetConfigPath(filepath.Join(destPath, "gradle.yaml")).SetDetailedSummary(true)
+	assert.NoError(t, commands.Exec(gradleCmd))
+	// Validate sha256
+	tests.VerifySha256DetailedSummaryFromResult(t, gradleCmd.Result())
+
+	// Test gradle with detailed summary + buildinfo.
+	buildConfiguration := &utils.BuildConfiguration{BuildName: tests.GradleBuildName, BuildNumber: buildNumber}
+	gradleCmd = gradle.NewGradleCommand().SetConfiguration(buildConfiguration).SetTasks(strings.Join(filteredGradleArgs, " ")).SetConfigPath(filepath.Join(destPath, "gradle.yaml")).SetDetailedSummary(true)
+	assert.NoError(t, commands.Exec(gradleCmd))
+	// Validate sha256
+	tests.VerifySha256DetailedSummaryFromResult(t, gradleCmd.Result())
+
+	err := os.Chdir(oldHomeDir)
+	assert.NoError(t, err)
+	// Validate build info
+	searchSpec, err := tests.CreateSpec(tests.SearchAllGradle)
+	assert.NoError(t, err)
+	verifyExistInArtifactory(tests.GetGradleDeployedArtifacts(), searchSpec, t)
+	verifyExistInArtifactoryByProps(tests.GetGradleDeployedArtifacts(), tests.GradleRepo+"/*", "build.name="+tests.GradleBuildName+";build.number="+buildNumber, t)
+	assert.NoError(t, artifactoryCli.Exec("bp", tests.GradleBuildName, buildNumber))
+
+	publishedBuildInfo, found, err := tests.GetBuildInfo(serverDetails, tests.GradleBuildName, buildNumber)
+	if err != nil {
+		assert.NoError(t, err)
+		return
+	}
+	if !found {
+		assert.True(t, found, "build info was expected to be found")
+		return
+	}
+	buildInfo := publishedBuildInfo.BuildInfo
+	validateBuildInfo(buildInfo, t, 0, 1, gradleModuleId, buildinfo.Gradle)
+	cleanGradleTest()
+}
+
 func TestGradleBuildWithServerIDWithUsesPlugin(t *testing.T) {
 	initGradleTest(t)
 

Diff for: maven_test.go

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"github.com/jfrog/jfrog-cli-core/artifactory/commands/mvn"
+	"github.com/jfrog/jfrog-cli-core/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/common/commands"
 	"io/ioutil"
 	"net/url"
 	"os"
@@ -61,6 +64,29 @@ func TestNativeMavenBuildWithServerID(t *testing.T) {
 	cleanMavenTest()
 }
 
+func TestNativeMavenBuildWithServerIDAndDetailedSummary(t *testing.T) {
+	initMavenTest(t, false)
+	pomPath := createMavenProject(t)
+	configFilePath := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "buildspecs", tests.MavenConfig)
+	destPath := filepath.Join(filepath.Dir(pomPath), ".jfrog", "projects")
+	createConfigFile(destPath, configFilePath, t)
+	oldHomeDir := changeWD(t, filepath.Dir(pomPath))
+	repoLocalSystemProp := localRepoSystemProperty + localRepoDir
+	pomPath = strings.Replace(pomPath, `\`, "/", -1) // Windows compatibility.
+	filteredMavenArgs := []string{"clean", "install", "-f", pomPath, repoLocalSystemProp}
+	mvnCmd := mvn.NewMvnCommand().SetConfiguration(new(utils.BuildConfiguration)).SetConfigPath(filepath.Join(destPath, tests.MavenConfig)).SetGoals(filteredMavenArgs).SetDetailedSummary(true)
+	assert.NoError(t, commands.Exec(mvnCmd))
+	err := os.Chdir(oldHomeDir)
+	assert.NoError(t, err)
+	// Validate
+	tests.VerifySha256DetailedSummaryFromResult(t, mvnCmd.Result())
+
+	searchSpec, err := tests.CreateSpec(tests.SearchAllMaven)
+	assert.NoError(t, err)
+	verifyExistInArtifactory(tests.GetMavenDeployedArtifacts(), searchSpec, t)
+	cleanMavenTest()
+}
+
 func TestMavenBuildWithoutDeployer(t *testing.T) {
 	initMavenTest(t, false)
 	pomPath := createMavenProject(t)

Diff for: utils/tests/utils.go

@@ -8,6 +8,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/jfrog/jfrog-cli/utils/summary"
+	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"io/ioutil"
 	"math/rand"
 	"os"
@@ -31,6 +32,7 @@ import (
 	"github.com/jfrog/jfrog-cli-core/utils/coreutils"
 	"github.com/stretchr/testify/assert"
 
+	commandutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
 	"github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
@@ -645,7 +647,7 @@ func RedirectLogOutputToNil() (previousLog log.Log) {
 	return previousLog
 }
 
-func VerifySha256DetailedSummary(t *testing.T, buffer *bytes.Buffer, logger log.Log) {
+func VerifySha256DetailedSummaryFromBuffer(t *testing.T, buffer *bytes.Buffer, logger log.Log) {
 	content := buffer.Bytes()
 	buffer.Reset()
 	logger.Output(string(content))
@@ -664,3 +666,13 @@ func VerifySha256DetailedSummary(t *testing.T, buffer *bytes.Buffer, logger log.
 		assert.Equal(t, 64, len(sha256.Sha256Str), "Summary validation failed - invalid sha256 has returned from artifactory")
 	}
 }
+
+func VerifySha256DetailedSummaryFromResult(t *testing.T, result *commandutils.Result) {
+	result.Reader()
+	reader := result.Reader()
+	defer reader.Close()
+	assert.NoError(t, reader.GetError())
+	for transferDetails := new(clientutils.FileTransferDetails); reader.NextRecord(transferDetails) == nil; transferDetails = new(clientutils.FileTransferDetails) {
+		assert.Equal(t, 64, len(transferDetails.Sha256), "Summary validation failed - invalid sha256 has returned from artifactory")
+	}
+}