feat: update gitea vendor

package/gitea/source/tests/integration/api_packages_conan_test.go

@@ -11,16 +11,16 @@ import (
 	"testing"
 	"time"
 
-	auth_model "code.gitea.io/gitea/models/auth"
-	"code.gitea.io/gitea/models/packages"
-	conan_model "code.gitea.io/gitea/models/packages/conan"
-	"code.gitea.io/gitea/models/unittest"
-	user_model "code.gitea.io/gitea/models/user"
-	conan_module "code.gitea.io/gitea/modules/packages/conan"
-	"code.gitea.io/gitea/modules/setting"
-	conan_router "code.gitea.io/gitea/routers/api/packages/conan"
-	package_service "code.gitea.io/gitea/services/packages"
-	"code.gitea.io/gitea/tests"
+	auth_model "gitea.dev/models/auth"
+	"gitea.dev/models/packages"
+	conan_model "gitea.dev/models/packages/conan"
+	"gitea.dev/models/unittest"
+	user_model "gitea.dev/models/user"
+	conan_module "gitea.dev/modules/packages/conan"
+	"gitea.dev/modules/setting"
+	conan_router "gitea.dev/routers/api/packages/conan"
+	package_service "gitea.dev/services/packages"
+	"gitea.dev/tests"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -107,8 +107,7 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha
 	}).AddTokenAuth(token)
 	resp := MakeRequest(t, req, http.StatusOK)
 
-	uploadURLs := make(map[string]string)
-	DecodeJSON(t, resp, &uploadURLs)
+	uploadURLs := DecodeJSON(t, resp, map[string]string{})
 
 	assert.Contains(t, uploadURLs, conanfileName)
 	assert.NotContains(t, uploadURLs, "removed.txt")
@@ -143,8 +142,7 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha
 	}).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 
-	uploadURLs = make(map[string]string)
-	DecodeJSON(t, resp, &uploadURLs)
+	uploadURLs = DecodeJSON(t, resp, map[string]string{})
 
 	assert.Contains(t, uploadURLs, conaninfoName)
 	assert.NotContains(t, uploadURLs, "removed.txt")
@@ -158,6 +156,10 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha
 }
 
 func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, channel, recipeRevision, packageRevision string) {
+	type fileList struct {
+		Files map[string]any `json:"files"`
+	}
+
 	contentConanfile := buildConanfileContent(name, version)
 
 	recipeURL := fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s", baseURL, name, version, user, channel, recipeRevision)
@@ -170,10 +172,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
 		AddTokenAuth(token)
 	resp := MakeRequest(t, req, http.StatusOK)
 
-	var list *struct {
-		Files map[string]any `json:"files"`
-	}
-	DecodeJSON(t, resp, &list)
+	list := DecodeJSON(t, resp, &fileList{})
 	assert.Len(t, list.Files, 1)
 	assert.Contains(t, list.Files, conanfileName)
 
@@ -191,8 +190,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
 		AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 
-	list = nil
-	DecodeJSON(t, resp, &list)
+	list = DecodeJSON(t, resp, &fileList{})
 	assert.Len(t, list.Files, 1)
 	assert.Contains(t, list.Files, conaninfoName)
 }
@@ -370,8 +368,7 @@ func TestPackageConan(t *testing.T) {
 			req := NewRequest(t, "GET", recipeURL)
 			resp := MakeRequest(t, req, http.StatusOK)
 
-			fileHashes := make(map[string]string)
-			DecodeJSON(t, resp, &fileHashes)
+			fileHashes := DecodeJSON(t, resp, map[string]string{})
 			assert.Len(t, fileHashes, 1)
 			assert.Contains(t, fileHashes, conanfileName)
 			assert.Equal(t, "7abc52241c22090782c54731371847a8", fileHashes[conanfileName])
@@ -379,14 +376,13 @@ func TestPackageConan(t *testing.T) {
 			req = NewRequest(t, "GET", recipeURL+"/digest")
 			resp = MakeRequest(t, req, http.StatusOK)
 
-			downloadURLs := make(map[string]string)
-			DecodeJSON(t, resp, &downloadURLs)
+			downloadURLs := DecodeJSON(t, resp, map[string]string{})
 			assert.Contains(t, downloadURLs, conanfileName)
 
 			req = NewRequest(t, "GET", recipeURL+"/download_urls")
 			resp = MakeRequest(t, req, http.StatusOK)
 
-			DecodeJSON(t, resp, &downloadURLs)
+			downloadURLs = DecodeJSON(t, resp, map[string]string{})
 			assert.Contains(t, downloadURLs, conanfileName)
 
 			req = NewRequest(t, "GET", downloadURLs[conanfileName])
@@ -398,8 +394,7 @@ func TestPackageConan(t *testing.T) {
 			req = NewRequest(t, "GET", packageURL)
 			resp = MakeRequest(t, req, http.StatusOK)
 
-			fileHashes = make(map[string]string)
-			DecodeJSON(t, resp, &fileHashes)
+			fileHashes = DecodeJSON(t, resp, map[string]string{})
 			assert.Len(t, fileHashes, 1)
 			assert.Contains(t, fileHashes, conaninfoName)
 			assert.Equal(t, "7628bfcc5b17f1470c468621a78df394", fileHashes[conaninfoName])
@@ -407,14 +402,13 @@ func TestPackageConan(t *testing.T) {
 			req = NewRequest(t, "GET", packageURL+"/digest")
 			resp = MakeRequest(t, req, http.StatusOK)
 
-			downloadURLs = make(map[string]string)
-			DecodeJSON(t, resp, &downloadURLs)
+			downloadURLs = DecodeJSON(t, resp, map[string]string{})
 			assert.Contains(t, downloadURLs, conaninfoName)
 
 			req = NewRequest(t, "GET", packageURL+"/download_urls")
 			resp = MakeRequest(t, req, http.StatusOK)
 
-			DecodeJSON(t, resp, &downloadURLs)
+			downloadURLs = DecodeJSON(t, resp, map[string]string{})
 			assert.Contains(t, downloadURLs, conaninfoName)
 
 			req = NewRequest(t, "GET", downloadURLs[conaninfoName])
@@ -458,8 +452,7 @@ func TestPackageConan(t *testing.T) {
 					req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/conans/search?q=%s", url, stdurl.QueryEscape(c.Query)))
 					resp := MakeRequest(t, req, http.StatusOK)
 
-					var result *conan_router.SearchResult
-					DecodeJSON(t, resp, &result)
+					result := DecodeJSON(t, resp, &conan_router.SearchResult{})
 
 					assert.ElementsMatch(t, c.Expected, result.Results, "case %d: unexpected result", i)
 				}
@@ -471,8 +464,7 @@ func TestPackageConan(t *testing.T) {
 				req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/conans/%s/%s/%s/%s/search", url, name, version1, user1, channel2))
 				resp := MakeRequest(t, req, http.StatusOK)
 
-				var result map[string]*conan_module.Conaninfo
-				DecodeJSON(t, resp, &result)
+				result := DecodeJSON(t, resp, map[string]*conan_module.Conaninfo{})
 
 				assert.Contains(t, result, conanPackageReference)
 				info := result[conanPackageReference]
@@ -667,16 +659,14 @@ func TestPackageConan(t *testing.T) {
 			req := NewRequest(t, "GET", recipeURL+"/latest")
 			resp := MakeRequest(t, req, http.StatusOK)
 
-			obj := make(map[string]string)
-			DecodeJSON(t, resp, &obj)
+			obj := DecodeJSON(t, resp, map[string]string{})
 			assert.Contains(t, obj, "revision")
 			assert.Equal(t, revision1, obj["revision"])
 
 			req = NewRequest(t, "GET", fmt.Sprintf("%s/revisions/%s/packages/%s/latest", recipeURL, revision1, conanPackageReference))
 			resp = MakeRequest(t, req, http.StatusOK)
 
-			obj = make(map[string]string)
-			DecodeJSON(t, resp, &obj)
+			obj = DecodeJSON(t, resp, map[string]string{})
 			assert.Contains(t, obj, "revision")
 			assert.Equal(t, revision1, obj["revision"])
 		})
@@ -702,8 +692,7 @@ func TestPackageConan(t *testing.T) {
 				Revisions []*RevisionInfo `json:"revisions"`
 			}
 
-			var list *RevisionList
-			DecodeJSON(t, resp, &list)
+			list := DecodeJSON(t, resp, &RevisionList{})
 			assert.Len(t, list.Revisions, 2)
 			revs := make([]string, 0, len(list.Revisions))
 			for _, rev := range list.Revisions {
@@ -714,7 +703,7 @@ func TestPackageConan(t *testing.T) {
 			req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/packages/%s/revisions", recipeURL, revision1, conanPackageReference))
 			resp = MakeRequest(t, req, http.StatusOK)
 
-			DecodeJSON(t, resp, &list)
+			list = DecodeJSON(t, resp, &RevisionList{})
 			assert.Len(t, list.Revisions, 2)
 			revs = make([]string, 0, len(list.Revisions))
 			for _, rev := range list.Revisions {
@@ -754,8 +743,7 @@ func TestPackageConan(t *testing.T) {
 					req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/conans/search?q=%s", url, stdurl.QueryEscape(c.Query)))
 					resp := MakeRequest(t, req, http.StatusOK)
 
-					var result *conan_router.SearchResult
-					DecodeJSON(t, resp, &result)
+					result := DecodeJSON(t, resp, &conan_router.SearchResult{})
 
 					assert.ElementsMatch(t, c.Expected, result.Results, "case %d: unexpected result", i)
 				}
@@ -767,8 +755,7 @@ func TestPackageConan(t *testing.T) {
 				req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/search", url, name, version1, user1, channel1))
 				resp := MakeRequest(t, req, http.StatusOK)
 
-				var result map[string]*conan_module.Conaninfo
-				DecodeJSON(t, resp, &result)
+				result := DecodeJSON(t, resp, map[string]*conan_module.Conaninfo{})
 
 				assert.Contains(t, result, conanPackageReference)
 				info := result[conanPackageReference]
@@ -777,8 +764,7 @@ func TestPackageConan(t *testing.T) {
 				req = NewRequest(t, "GET", fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s/search", url, name, version1, user1, channel1, revision1))
 				resp = MakeRequest(t, req, http.StatusOK)
 
-				result = make(map[string]*conan_module.Conaninfo)
-				DecodeJSON(t, resp, &result)
+				result = DecodeJSON(t, resp, map[string]*conan_module.Conaninfo{})
 
 				assert.Contains(t, result, conanPackageReference)
 				info = result[conanPackageReference]