APP-1673 - Added e2e for updating draft version sources

Author: yurinovo18

apptrust/commands/version/create_app_version_cmd.go

@@ -106,4 +106,3 @@ func GetCreateAppVersionCommand(appContext app.Context) components.Command {
 		Action: cmd.prepareAndRunCommand,
 	}
 }
-

e2e/utils/artifactory_utils.go

@@ -5,6 +5,7 @@ package utils
 import (
 	"fmt"
 	"net/http"
+	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -33,6 +34,30 @@ func createNpmRepo(t *testing.T) string {
 	return repoKey
 }
 
+var genericRepoKey string
+
+func createGenericRepo(t *testing.T) string {
+	servicesManager := getArtifactoryServicesManager(t)
+	genericRepoKey = GetTestProjectKey(t) + "-generic-local"
+	localRepoConfig := services.NewGenericLocalRepositoryParams()
+	localRepoConfig.ProjectKey = GetTestProjectKey(t)
+	localRepoConfig.Key = genericRepoKey
+	err := servicesManager.CreateLocalRepository().Generic(localRepoConfig)
+	require.NoError(t, err)
+	return genericRepoKey
+}
+
+func deleteGenericRepo() {
+	if genericRepoKey == "" || artifactoryServicesManager == nil {
+		return
+	}
+
+	err := artifactoryServicesManager.DeleteRepository(genericRepoKey)
+	if err != nil {
+		log.Error("Failed to delete generic repo", err)
+	}
+}
+
 func deleteNpmRepo() {
 	if testPackageRes == nil || artifactoryServicesManager == nil {
 		return
@@ -100,6 +125,31 @@ func uploadPackageToArtifactory(t *testing.T, repoKey, buildName, buildNumber st
 	return artifactDetails.Checksums.Sha256
 }
 
+func uploadSimpleFileToArtifactory(t *testing.T, repoKey, targetFileName string) string {
+	tmpFile, err := os.CreateTemp("", "e2e-artifact-*.txt")
+	require.NoError(t, err)
+	_, err = tmpFile.WriteString("test-artifact-content")
+	require.NoError(t, err)
+	err = tmpFile.Close()
+	require.NoError(t, err)
+	defer os.Remove(tmpFile.Name())
+
+	targetPath := repoKey + "/" + targetFileName
+	servicesManager := getArtifactoryServicesManager(t)
+	uploadParams := services.NewUploadParams()
+	uploadParams.Pattern = tmpFile.Name()
+	uploadParams.Target = targetPath
+	uploadParams.Flat = true
+	summary, err := servicesManager.UploadFilesWithSummary(artifactory.UploadServiceOptions{FailFast: false}, uploadParams)
+	require.NoError(t, err)
+	require.Equal(t, 1, summary.TotalSucceeded, "Expected exactly one uploaded file")
+	require.Equal(t, 0, summary.TotalFailed, "Expected zero failed uploads")
+	err = summary.Close()
+	require.NoError(t, err)
+
+	return targetPath
+}
+
 func reindexRepo(t *testing.T, repoKey string) {
 	log.Info(fmt.Sprintf("Reindexing repository %s", repoKey))
 

e2e/utils/e2e_utils.go

@@ -37,8 +37,9 @@ var (
 
 	AppTrustCli *coreTests.JfrogCli
 
-	testProjectKey string
-	testPackageRes *TestPackageResources
+	testProjectKey  string
+	testPackageRes  *TestPackageResources
+	testArtifactPath string
 )
 
 func LoadCredentials() string {
@@ -80,6 +81,14 @@ func GetTestPackage(t *testing.T) *TestPackageResources {
 	return testPackageRes
 }
 
+func GetTestArtifact(t *testing.T) string {
+	if testArtifactPath == "" {
+		repoKey := createGenericRepo(t)
+		testArtifactPath = uploadSimpleFileToArtifactory(t, repoKey, "test-artifact.txt")
+	}
+	return testArtifactPath
+}
+
 func GenerateUniqueKey(prefix string) string {
 	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
 	return fmt.Sprintf("%s-%s", prefix, timestamp)

e2e/utils/project_utils.go

@@ -32,6 +32,7 @@ func DeleteTestProject() {
 	}
 	deleteBuild()
 	deleteNpmRepo()
+	deleteGenericRepo()
 	accessManager, err := utils.CreateAccessServiceManager(serverDetails, false)
 	if err != nil {
 		log.Error("Failed to create Access service manager", err)

e2e/version_test.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strings"
 	"testing"
 	"time"
 
@@ -234,6 +235,51 @@ func TestUpdateVersion(t *testing.T) {
 	assert.Equal(t, tag, versionContent.Tag)
 }
 
+func TestUpdateDraftVersionSources(t *testing.T) {
+	appKey := utils.GenerateUniqueKey("app-version-update-sources")
+	utils.CreateBasicApplication(t, appKey)
+	defer utils.DeleteApplication(t, appKey)
+	testPackage := utils.GetTestPackage(t)
+	version := "1.0.6"
+	packageFlag := fmt.Sprintf("--source-type-packages=type=%s, name=%s, version=%s, repo-key=%s",
+		testPackage.PackageType, testPackage.PackageName, testPackage.PackageVersion, testPackage.RepoKey)
+	err := utils.AppTrustCli.Exec("version-create", appKey, version, packageFlag, "--draft")
+	require.NoError(t, err)
+	defer utils.DeleteApplicationVersion(t, appKey, version)
+	artifactPath := utils.GetTestArtifact(t)
+	artifactFlag := fmt.Sprintf("--source-type-artifacts=path=%s", artifactPath)
+
+	err = utils.AppTrustCli.Exec("version-update-sources", appKey, version, artifactFlag)
+	require.NoError(t, err)
+
+	versionContent, statusCode, err := utils.GetApplicationVersion(appKey, version)
+	require.NoError(t, err)
+	assert.Equal(t, http.StatusOK, statusCode)
+	require.NotNil(t, versionContent)
+	assert.Equal(t, appKey, versionContent.ApplicationKey)
+	assert.Equal(t, version, versionContent.Version)
+	assert.Contains(t, utils.StatusDraft, versionContent.Status)
+	var artifactPaths []string
+	for _, r := range versionContent.Releasables {
+		for _, a := range r.Artifacts {
+			artifactPaths = append(artifactPaths, a.Path)
+		}
+	}
+	assert.True(t, containsPath(artifactPaths, testPackage.PackagePath),
+		"expected package path %q in version releasables (got %v)", testPackage.PackagePath, artifactPaths)
+	assert.True(t, containsPath(artifactPaths, artifactPath),
+		"expected artifact path %q in version releasables (got %v)", artifactPath, artifactPaths)
+}
+
+func containsPath(paths []string, target string) bool {
+	for _, path := range paths {
+		if strings.Contains(target, path) {
+			return true
+		}
+	}
+	return false
+}
+
 func TestDeleteVersion(t *testing.T) {
 	// Prepare
 	appKey := utils.GenerateUniqueKey("app-version-delete")