Swift Package Manager Publishing using commandline throws error (go-gitea#33990)

Author: wgr1984

modules/packages/swift/metadata.go

@@ -107,49 +107,37 @@ func (p Person) String() string {
 	return sb.String()
 }
 
-// ParsePackage parses the Swift package upload
-func ParsePackage(sr io.ReaderAt, size int64, mr io.Reader) (*Package, error) {
-	zr, err := zip.NewReader(sr, size)
-	if err != nil {
-		return nil, err
-	}
-
-	p := &Package{
-		Metadata: &Metadata{
-			Manifests: make(map[string]*Manifest),
-		},
-	}
-
-	for _, file := range zr.File {
+// findManifestInFiles searches for Package.swift files in the given files and adds them to the package metadata
+func findManifestInFiles(files []*zip.File, p *Package) (bool, error) {
+	found := false
+	for _, file := range files {
 		manifestMatch := manifestPattern.FindStringSubmatch(path.Base(file.Name))
 		if len(manifestMatch) == 0 {
 			continue
 		}
 
 		if file.UncompressedSize64 > maxManifestFileSize {
-			return nil, ErrManifestFileTooLarge
+			return false, ErrManifestFileTooLarge
 		}
 
-		f, err := zr.Open(file.Name)
+		f, err := file.Open()
 		if err != nil {
-			return nil, err
+			return false, err
 		}
 
 		content, err := io.ReadAll(f)
-
 		if err := f.Close(); err != nil {
-			return nil, err
+			return false, err
 		}
-
 		if err != nil {
-			return nil, err
+			return false, err
 		}
 
 		swiftVersion := ""
 		if len(manifestMatch) == 2 && manifestMatch[1] != "" {
 			v, err := version.NewSemver(manifestMatch[1])
 			if err != nil {
-				return nil, ErrInvalidManifestVersion
+				return false, ErrInvalidManifestVersion
 			}
 			swiftVersion = TrimmedVersionString(v)
 		}
@@ -162,16 +150,57 @@ func ParsePackage(sr io.ReaderAt, size int64, mr io.Reader) (*Package, error) {
 		if len(toolsMatch) == 2 {
 			v, err := version.NewSemver(toolsMatch[1])
 			if err != nil {
-				return nil, ErrInvalidManifestVersion
+				return false, ErrInvalidManifestVersion
 			}
 
 			manifest.ToolsVersion = TrimmedVersionString(v)
 		}
 
 		p.Metadata.Manifests[swiftVersion] = manifest
+		found = true
+	}
+	return found, nil
+}
+
+// ParsePackage parses the Swift package upload
+func ParsePackage(sr io.ReaderAt, size int64, mr io.Reader) (*Package, error) {
+	zr, err := zip.NewReader(sr, size)
+	if err != nil {
+		return nil, err
+	}
+
+	p := &Package{
+		Metadata: &Metadata{
+			Manifests: make(map[string]*Manifest),
+		},
+	}
+
+	// First try to find Package.swift in the root
+	rootFiles := make([]*zip.File, 0)
+	subdirFiles := make([]*zip.File, 0)
+
+	for _, file := range zr.File {
+		if strings.Contains(file.Name, "/") {
+			subdirFiles = append(subdirFiles, file)
+		} else {
+			rootFiles = append(rootFiles, file)
+		}
+	}
+
+	found, err := findManifestInFiles(rootFiles, p)
+	if err != nil {
+		return nil, err
+	}
+
+	// If no manifest found in root, look in subdirectories
+	if !found {
+		found, err = findManifestInFiles(subdirFiles, p)
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	if _, found := p.Metadata.Manifests[""]; !found {
+	if !found {
 		return nil, ErrMissingManifestFile
 	}
 

modules/packages/swift/metadata_test.go

@@ -101,6 +101,23 @@ func TestParsePackage(t *testing.T) {
 		assert.Equal(t, packageRepositoryURL, p.Metadata.RepositoryURL)
 		assert.ElementsMatch(t, []string{packageRepositoryURL}, p.RepositoryURLs)
 	})
+
+	t.Run("NestedManifest", func(t *testing.T) {
+		content := "// swift-tools-version:5.7\n//\n//  Package.swift"
+		data := createArchive(map[string][]byte{
+			"test.TestLib/Package.swift": []byte(content),
+		})
+
+		p, err := ParsePackage(data, data.Size(), nil)
+		assert.NotNil(t, p)
+		assert.NoError(t, err)
+
+		assert.NotNil(t, p.Metadata)
+		assert.Len(t, p.Metadata.Manifests, 1)
+		m := p.Metadata.Manifests[""]
+		assert.Equal(t, "5.7", m.ToolsVersion)
+		assert.Equal(t, content, m.Content)
+	})
 }
 
 func TestTrimmedVersionString(t *testing.T) {