Swift files can be passed either as file or as form value

[wgr1984]

Fix #33990

[KN4CK3R]

Alternative fix with minimal changes:

@@ -304,10 +304,18 @@ func UploadPackageFile(ctx *context.Context) {
 
        packageVersion := v.Core().String()
 
-       file, _, err := ctx.Req.FormFile("source-archive")
+       var file io.ReadCloser
+       multipartFile, _, err := ctx.Req.FormFile("source-archive")
        if err != nil {
-               apiError(ctx, http.StatusBadRequest, err)
-               return
+               content := ctx.Req.FormValue("source-archive")
+               if content != "" {
+                       file = io.NopCloser(strings.NewReader(content))
+               } else {
+                       apiError(ctx, http.StatusBadRequest, err)
+                       return
+               }
+       } else {
+               file = multipartFile
        }
        defer file.Close()

+ tests

[hiifong]

hi @wgr1984, would you be interested in continuing to complete the pr?

[wgr1984]

sure, will finish it once i find a minute to get local build running, in order to confirm impl. and update test (in case needed) Am Do., 3. Apr. 2025 um 12:04 Uhr schrieb hiifong ***@***.***

…

: hi @wgr1984 <https://github.com/wgr1984>, would you be interested in continuing to complete the pr? — Reply to this email directly, view it on GitHub <#34068 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AADEBZPEB6PIYRVWM734MXD2XUBRZAVCNFSM6AAAAAB2B5CUJCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDONZVGE3DQNZYGI> . You are receiving this because you were mentioned.Message ID: ***@***.***> [image: hiifong]*hiifong* left a comment (go-gitea/gitea#34068) <#34068 (comment)> hi @wgr1984 <https://github.com/wgr1984>, would you be interested in continuing to complete the pr? — Reply to this email directly, view it on GitHub <#34068 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AADEBZPEB6PIYRVWM734MXD2XUBRZAVCNFSM6AAAAAB2B5CUJCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDONZVGE3DQNZYGI> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[wgr1984]

updated + test. Metadata looks good, too 👍

curl -k --location 'https://127.0.0.1:3000/api/packages/tet/swift/test/TestLib/1.3.19' \
--header 'Accept: application/vnd.swift.registry.v1+json' \
--header 'Authorization: Basic dGV0OmRlZmF1bHQ=' \
--header 'Cookie: _csrf=BuZq7gKCTbJRLox5fIJSVlw_BNI6MTc0Mzk2NDIwODc2MTI2OTAwMA; i_like_gitea=497d7722fdfa170e'

{
   "id":"test.TestLib",
   "version":"1.3.19",
   "resources":[
      {
         "name":"source-archive",
         "type":"application/zip",
         "checksum":"3d4247adb875f627f5afd3ac860ff027ede1bb45f883059d4ceb5a8a025676df"
      }
   ],
   "metadata":{
      "@context":[
         "http://schema.org/"
      ],
      "@type":"SoftwareSourceCode",
      "name":"TestLib",
      "version":"1.3.19",
      "description":"A test Swift package",
      "keywords":[
         "test",
         "swift"
      ],
      "license":"MIT",
      "author":{
         "@type":"Person"
      },
      "programmingLanguage":{
         "@type":"ComputerLanguage",
         "name":"Swift",
         "url":"https://swift.org"
      }
   }
}

[wxiaoguang]

CI failure seems related.

[hiifong]

I was going to run the MySQL tests locally, but very unfortunately I can't.

[wxiaoguang]

Need to figure out the root problem and fix.

=== TestPackageSwift/LookupPackageIdentifiers (tests/integration/api_packages_swift_test.go:411)
--- FAIL: TestPackageSwift (0.76s)
    testlogger.go:61: 2025/04/13 23:02:49 modules/storage/local.go:33:NewLocalStorage() [I] Creating new Local Storage at /home/runner/work/gitea/gitea/tests/gitea-lfs-meta
    --- FAIL: TestPackageSwift/UploadMultipart (0.04s)
        testlogger.go:61: 2025/04/13 23:02:50 HTTPRequest [I] router: completed PUT /api/packages/user2/swift/test-scope/test_package/1.0.4 for test-mock:12345, 401 Unauthorized in 1.4ms @ packages/api.go:43(packages.reqPackageAccess)
        testlogger.go:61: 2025/04/13 23:02:50 HTTPRequest [I] router: completed PUT /api/packages/user2/swift/test-scope/test_package/1.0.4 for test-mock:12345, 201 Created in 16.8ms @ swift/swift.go:294(swift.UploadPackageFile)
        api_packages_swift_test.go:248: 
            	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/api_packages_swift_test.go:248
            	Error:      	Not equal: 
            	            	expected: "1.0.4"
            	            	actual  : "1.0.3"
            	            	
            	            	Diff:
            	            	--- Expected
            	            	+++ Actual
            	            	@@ -1 +1 @@
            	            	-1.0.4
            	            	+1.0.3
            	Test:       	TestPackageSwift/UploadMultipart
        api_packages_swift_test.go:261: 
            	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/api_packages_swift_test.go:261
            	Error:      	Not equal: 
            	            	expected: "test_package-1.0.4.zip"
            	            	actual  : "test_package-1.0.3.zip"
            	            	
            	            	Diff:
            	            	--- Expected
            	            	+++ Actual
            	            	@@ -1 +1 @@
            	            	-test_package-1.0.4.zip
            	            	+test_package-1.0.3.zip
            	Test:       	TestPackageSwift/UploadMultipart
        testlogger.go:61: 2025/04/13 23:02:50 .../packages/packages.go:168:createPackageAndVersion() [E] Error inserting package: package version already exists
        testlogger.go:61: 2025/04/13 23:02:50 HTTPRequest [I] router: completed PUT /api/packages/user2/swift/test-scope/test_package/1.0.4 for test-mock:12345, 409 Conflict in 5.3ms @ swift/swift.go:294(swift.UploadPackageFile)

[wxiaoguang]

CI fails, need to figure out the root problem and fix.

[wgr1984]

I know why because the test cases rely on each other. To test that went need to get the. Independent, but it's a bigger change ... wxiaoguang ***@***.***> schrieb am Mo. 14. Apr. 2025 um 02:18:

…

***@***.**** requested changes on this pull request. CI fails, need to figure out the root problem and fix. — Reply to this email directly, view it on GitHub <#34068 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AADEBZIP6ZS4Q3KTGOEZBT32ZL5F7AVCNFSM6AAAAAB2B5CUJCVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDONRSHA4TQMRXGQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[KN4CK3R]

Just move the upload test to the bottom or remove the package after uploading.

[wgr1984]

more fixing the symptom than the issue but sure, will do

[wxiaoguang]

Strange, it doesn't explain why only MySQL fails, other databases succeed ..... anyway we need to make the CI pass to merge .......

dismiss

[wxiaoguang]

OK, I fixed the tests. Will merge.