Build append fails with special characters

artifactory/commands/buildinfo/buildappend.go

@@ -1,17 +1,20 @@
 package buildinfo
 
 import (
+	"encoding/json"
+	"errors"
 	"fmt"
-	"net/url"
+	"io"
 	"strconv"
 	"time"
 
 	buildinfo "github.com/jfrog/build-info-go/entities"
+	"github.com/jfrog/jfrog-client-go/artifactory"
+	servicesutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
 
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-client-go/artifactory/services"
-	"github.com/jfrog/jfrog-client-go/http/httpclient"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
@@ -45,18 +48,24 @@ func (bac *BuildAppendCommand) Run() error {
 	if err != nil {
 		return err
 	}
-	if err := utils.SaveBuildGeneralDetails(buildName, buildNumber, bac.buildConfiguration.GetProject()); err != nil {
+	if err = utils.SaveBuildGeneralDetails(buildName, buildNumber, bac.buildConfiguration.GetProject()); err != nil {
+		return err
+	}
+
+	// Create services manager to get build-info from Artifactory.
+	servicesManager, err := utils.CreateServiceManager(bac.serverDetails, -1, 0, false)
+	if err != nil {
 		return err
 	}
 
 	// Calculate build timestamp
-	timestamp, err := bac.getBuildTimestamp()
+	timestamp, err := bac.getBuildTimestamp(servicesManager)
 	if err != nil {
 		return err
 	}
 
-	// Get checksum headers from the build info artifact
-	checksumDetails, err := bac.getChecksumDetails(timestamp)
+	// Get checksum values from the build info artifact
+	checksumDetails, err := bac.getChecksumDetails(servicesManager, timestamp)
 	if err != nil {
 		return err
 	}
@@ -99,16 +108,10 @@ func (bac *BuildAppendCommand) SetBuildNumberToAppend(buildNumber string) *Build
 
 // Get build timestamp of the build to append. The build timestamp has to be converted to milliseconds from epoch.
 // For example, start time of: 2020-11-27T14:33:38.538+0200 should be converted to 1606480418538.
-func (bac *BuildAppendCommand) getBuildTimestamp() (int64, error) {
-	// Create services manager to get build-info from Artifactory.
-	sm, err := utils.CreateServiceManager(bac.serverDetails, -1, 0, false)
-	if err != nil {
-		return 0, err
-	}
-
+func (bac *BuildAppendCommand) getBuildTimestamp(servicesManager artifactory.ArtifactoryServicesManager) (int64, error) {
 	// Get published build-info from Artifactory.
 	buildInfoParams := services.BuildInfoParams{BuildName: bac.buildNameToAppend, BuildNumber: bac.buildNumberToAppend, ProjectKey: bac.buildConfiguration.GetProject()}
-	buildInfo, found, err := sm.GetBuildInfo(buildInfoParams)
+	buildInfo, found, err := servicesManager.GetBuildInfo(buildInfoParams)
 	if err != nil {
 		return 0, err
 	}
@@ -133,24 +136,38 @@ func (bac *BuildAppendCommand) getBuildTimestamp() (int64, error) {
 }
 
 // Download MD5 and SHA1 from the build info artifact.
-func (bac *BuildAppendCommand) getChecksumDetails(timestamp int64) (buildinfo.Checksum, error) {
-	serviceDetails, err := bac.serverDetails.CreateArtAuthConfig()
+func (bac *BuildAppendCommand) getChecksumDetails(servicesManager artifactory.ArtifactoryServicesManager, timestamp int64) (buildinfo.Checksum, error) {
+	// Run AQL query for build
+	stringTimestamp := strconv.FormatInt(timestamp, 10)
+	aqlQuery := servicesutils.CreateAqlQueryForBuildInfoJson(bac.buildConfiguration.GetProject(), bac.buildNameToAppend, bac.buildNumberToAppend, stringTimestamp)
+	stream, err := servicesManager.Aql(aqlQuery)
 	if err != nil {
 		return buildinfo.Checksum{}, err
 	}
-	client, err := httpclient.ClientBuilder().SetRetries(3).Build()
+	defer func() {
+		err = errors.Join(err, errorutils.CheckError(stream.Close()))
+	}()
+
+	// Parse AQL results
+	aqlResults, err := io.ReadAll(stream)
 	if err != nil {
 		return buildinfo.Checksum{}, err
 	}
-
-	buildInfoRepo := "artifactory-build-info"
-	if bac.buildConfiguration.GetProject() != "" {
-		buildInfoRepo = url.PathEscape(bac.buildConfiguration.GetProject()) + "-build-info"
+	parsedResult := new(servicesutils.AqlSearchResult)
+	if err = json.Unmarshal(aqlResults, parsedResult); err != nil {
+		return buildinfo.Checksum{}, errorutils.CheckError(err)
 	}
-	buildInfoPath := fmt.Sprintf("%v%v/%v/%v-%v.json", serviceDetails.GetUrl(), buildInfoRepo, url.PathEscape(bac.buildNameToAppend), url.PathEscape(bac.buildNumberToAppend), strconv.FormatInt(timestamp, 10))
-	details, _, err := client.GetRemoteFileDetails(buildInfoPath, serviceDetails.CreateHttpClientDetails())
-	if err != nil {
-		return buildinfo.Checksum{}, err
+	if len(parsedResult.Results) == 0 {
+		return buildinfo.Checksum{}, errorutils.CheckErrorf("Build '%s/%s' could not be found", bac.buildNameToAppend, bac.buildNumberToAppend)
+	}
+
+	// Verify checksum exist
+	sha1 := parsedResult.Results[0].Actual_Sha1
+	md5 := parsedResult.Results[0].Actual_Md5
+	if sha1 == "" || md5 == "" {
+		return buildinfo.Checksum{}, errorutils.CheckErrorf("Missing checksums for build-info: '%s/%s', sha1: '%s', md5: '%s'", bac.buildNameToAppend, bac.buildNumberToAppend, sha1, md5)
 	}
-	return details.Checksum, nil
+
+	// Return checksums
+	return buildinfo.Checksum{Sha1: sha1, Md5: md5}, nil
 }

go.mod

@@ -99,6 +99,6 @@ require (
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
 
-// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go dev
+replace github.com/jfrog/jfrog-client-go => github.com/yahavi/jfrog-client-go v0.1.2-0.20231108103837-bbe8b8980b89
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev

go.sum

@@ -202,8 +202,6 @@ github.com/jfrog/gofrog v1.3.1 h1:QqAwQXCVReT724uga1AYqG/ZyrNQ6f+iTxmzkb+YFQk=
 github.com/jfrog/gofrog v1.3.1/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
 github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
 github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
-github.com/jfrog/jfrog-client-go v1.34.4 h1:Qt6Yniv48N9EaE0rrUZznOohuDRvqp9sUUHiHXAo3Xs=
-github.com/jfrog/jfrog-client-go v1.34.4/go.mod h1:0PVhP6xGvBBaUzOU9LKf5OYkke/gY2IFILHA++iabFM=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
@@ -336,6 +334,8 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
+github.com/yahavi/jfrog-client-go v0.1.2-0.20231108103837-bbe8b8980b89 h1:Zbn8uh75TFtdHFkjjZzVbzxgqr1COtj5M8akUlCyxdU=
+github.com/yahavi/jfrog-client-go v0.1.2-0.20231108103837-bbe8b8980b89/go.mod h1:0PVhP6xGvBBaUzOU9LKf5OYkke/gY2IFILHA++iabFM=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=