Support legacy package format in conan upload parser

Add support for the legacy package format so that `name/version@user/channel`
parses into a valid path

Author: anders-zpt

artifactory/commands/conan/upload.go

@@ -130,9 +130,9 @@ func (up *UploadProcessor) parseUploadedArtifactPaths(output string) []string {
 	lines := strings.Split(output, "\n")
 
 	// State tracking for hierarchical parsing
-	var currentPkg string       // Current package name/version (e.g., "multideps/1.0.0")
-	var currentRecipeRev string // Current recipe revision hash (MD5, 32 chars)
-	var currentPkgId string     // Current package ID (SHA1, 40 chars)
+	var currentPkg *ConanPackageInfo = nil // Current package name/version (e.g., "multideps/1.0.0")
+	var currentRecipeRev string            // Current recipe revision hash (MD5, 32 chars)
+	var currentPkgId string                // Current package ID (SHA1, 40 chars)
 	inUploadSection := false
 
 	for _, line := range lines {
@@ -156,7 +156,13 @@ func (up *UploadProcessor) parseUploadedArtifactPaths(output string) []string {
 		// Match package name/version line: "multideps/1.0.0"
 		// Must contain "/" but not be a path or special marker
 		if up.isPackageNameLine(trimmed) {
-			currentPkg = trimmed
+			pkgInfo, err := ParsePackageReference(trimmed)
+			if err != nil {
+				// Fall back to Conan 2 defaults if parsing fails on unexpected output shape.
+				currentPkg = &ConanPackageInfo{Name: trimmed, User: "_", Channel: "_"}
+			} else {
+				currentPkg = pkgInfo
+			}
 			currentRecipeRev = ""
 			currentPkgId = ""
 			continue
@@ -176,14 +182,14 @@ func (up *UploadProcessor) parseUploadedArtifactPaths(output string) []string {
 				if currentPkgId == "" {
 					// This is a recipe revision
 					currentRecipeRev = rev
-					if currentPkg != "" {
-						path := fmt.Sprintf("_/%s/_/%s/export", currentPkg, rev)
+					if currentPkg != nil {
+						path := fmt.Sprintf("%s/%s/%s/%s/%s/export", currentPkg.User, currentPkg.Name, currentPkg.Version, currentPkg.Channel, rev)
 						paths = append(paths, path)
 					}
 				} else if currentRecipeRev != "" {
 					// This is a package revision
-					if currentPkg != "" {
-						path := fmt.Sprintf("_/%s/_/%s/package/%s/%s", currentPkg, currentRecipeRev, currentPkgId, rev)
+					if currentPkg != nil {
+						path := fmt.Sprintf("%s/%s/%s/%s/%s/package/%s/%s", currentPkg.User, currentPkg.Name, currentPkg.Version, currentPkg.Channel, currentRecipeRev, currentPkgId, rev)
 						paths = append(paths, path)
 					}
 					currentPkgId = "" // Reset for next package

artifactory/commands/conan/upload_test.go

@@ -114,6 +114,87 @@ Upload completed in 3s
 	}
 }
 
+func TestUploadProcessor_ParseUploadedArtifactPaths(t *testing.T) {
+	tests := []struct {
+		name     string
+		output   string
+		expected []string
+	}{
+		{
+			name: "Conan 2.x upload summary with recipe and package revision",
+			output: `
+======== Uploading to remote conan-local ========
+
+-------- Upload summary --------
+conan-local
+  multideps/1.0.0
+    revisions
+      797d134a8590a1bfa06d846768443f48 (Uploaded)
+        packages
+          594ed0eb2e9dfcc60607438924c35871514e6c2a
+            revisions
+              ca858ea14c32f931e49241df0b52bec9 (Uploaded)
+`,
+			expected: []string{
+				"_/multideps/1.0.0/_/797d134a8590a1bfa06d846768443f48/export",
+				"_/multideps/1.0.0/_/797d134a8590a1bfa06d846768443f48/package/594ed0eb2e9dfcc60607438924c35871514e6c2a/ca858ea14c32f931e49241df0b52bec9",
+			},
+		},
+		{
+			name: "includes skipped artifacts that already exist in server",
+			output: `
+-------- Upload summary --------
+conan-local
+  zlib/1.2.13
+    revisions
+      11111111111111111111111111111111 (Skipped, already in server)
+        packages
+          aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+            revisions
+              22222222222222222222222222222222 (Skipped, package is up to date)
+`,
+			expected: []string{
+				"_/zlib/1.2.13/_/11111111111111111111111111111111/export",
+				"_/zlib/1.2.13/_/11111111111111111111111111111111/package/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22222222222222222222222222222222",
+			},
+		},
+		{
+			name: "Conan 1.x upload summary with user and channel",
+			output: `
+-------- Upload summary --------
+conan-local
+  boost/1.82.0@myuser/stable
+    revisions
+      33333333333333333333333333333333 (Uploaded)
+        packages
+          bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+            revisions
+              44444444444444444444444444444444 (Uploaded)
+`,
+			expected: []string{
+				"myuser/boost/1.82.0/stable/33333333333333333333333333333333/export",
+				"myuser/boost/1.82.0/stable/33333333333333333333333333333333/package/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/44444444444444444444444444444444",
+			},
+		},
+		{
+			name: "no upload section returns no paths",
+			output: `
+Checking server for existing packages
+No changes detected
+`,
+			expected: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			processor := &UploadProcessor{}
+			result := processor.parseUploadedArtifactPaths(tt.output)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
+
 func TestNewUploadProcessor(t *testing.T) {
 	workingDir := "/test/path"