Fix dotnet curation tests after Artifactory CLI migration (#309)

Author: attiasas

Diff for: commands/curation/curationaudit_test.go

@@ -9,7 +9,6 @@ import (
 	"net/http/httptest"
 	"os"
 	"os/exec"
-	"path"
 	"path/filepath"
 	"regexp"
 	"sort"
@@ -799,9 +798,9 @@ func getTestCasesForDoCurationAudit() []testCase {
 			tech:          techutils.Dotnet,
 			pathToProject: filepath.Join("projects", "package-managers", "dotnet", "dotnet-curation"),
 			serveResources: map[string]string{
-				"curated-nuget": filepath.Join("resources", "feed.json"),
-				"index.json":    filepath.Join("resources", "index.json"),
-				"13.0.3":        filepath.Join("resources", "newtonsoft.json.13.0.3.nupkg"),
+				"curated-nuget/index.json": filepath.Join("resources", "feed.json"),
+				"index.json":               filepath.Join("resources", "index.json"),
+				"13.0.3":                   filepath.Join("resources", "newtonsoft.json.13.0.3.nupkg"),
 			},
 			requestToFail: map[string]bool{
 				"/api/nuget/v3/curated-nuget/registration-semver2/Download/newtonsoft.json/13.0.3": false,
@@ -853,7 +852,7 @@ func curationServer(t *testing.T, expectedBuildRequest map[string]bool, expected
 		}
 		if r.Method == http.MethodGet {
 			if resourceToServe != nil {
-				if pathToRes, ok := resourceToServe[path.Base(r.RequestURI)]; ok && strings.Contains(r.RequestURI, "api/curation/audit") {
+				if pathToRes := getResourceToServe(resourceToServe, r.RequestURI); pathToRes != "" && strings.Contains(r.RequestURI, "api/curation/audit") {
 					f, err := fileutils.ReadFile(pathToRes)
 					require.NoError(t, err)
 					f = bytes.ReplaceAll(f, []byte("127.0.0.1:80"), []byte(r.Host))
@@ -880,6 +879,15 @@ func curationServer(t *testing.T, expectedBuildRequest map[string]bool, expected
 	return serverMock, config
 }
 
+func getResourceToServe(resourcesToServe map[string]string, pathToRes string) string {
+	for key, value := range resourcesToServe {
+		if strings.HasSuffix(strings.TrimSuffix(pathToRes, "/"), key) {
+			return value
+		}
+	}
+	return ""
+}
+
 func WriteServerDetailsConfigFileBytes(t *testing.T, url string, configPath string, withoutCreds bool) string {
 	var username, password string
 	if !withoutCreds {

Diff for: go.mod

@@ -113,9 +113,9 @@ require (
 
 // replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go dev
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250128111343-44586261061e
+// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev
 
-replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c
+// replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory main
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev
 

Diff for: go.sum

@@ -128,10 +128,10 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
 github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
 github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
 github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
-github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c h1:9975QDk6vBZG7vjsKVCuQB56r4xxeoYHHjmTzxbd4H8=
-github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c/go.mod h1:/sP5tyuFpH9WJp0+vztczuXcxIYHlMye0CDWCxhy4/M=
-github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250128111343-44586261061e h1:QieRnuB+YDGS8c5QIt5bcJblE8KnomnHn3fpP9bymI8=
-github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250128111343-44586261061e/go.mod h1:ALempEeph7JoZZS2ob7xK+0r9v82z8IBDzQB1hnaxuQ=
+github.com/jfrog/jfrog-cli-artifactory v0.1.12 h1:Nj6D1605/rr097LVQGZjJL4xOFEdATu6O+PIyg/f9T0=
+github.com/jfrog/jfrog-cli-artifactory v0.1.12/go.mod h1:7wqnff7YstYHJbe/T3lKj+fJ5GxImlTjJp8nSZGcYm4=
+github.com/jfrog/jfrog-cli-core/v2 v2.58.0 h1:tPjwJdWNv9PTz1ma5TjrMd9Uu0btcQg8eBCpc5h/rn4=
+github.com/jfrog/jfrog-cli-core/v2 v2.58.0/go.mod h1:Hx2houXADsNv0eRh4w5XCS2uSsPNPn1OmiSDdwGFB7g=
 github.com/jfrog/jfrog-client-go v1.50.0 h1:t7v/zpLkPomHR6ZjVbPQ1WPQJd9IFKESK9Tt6phZz3k=
 github.com/jfrog/jfrog-client-go v1.50.0/go.mod h1:xHxwKBjPSUBd/FyCWgusfHmSWKUZTkfOZkTmntC2F5Y=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=