Skip to content

[WIP] Fix Feed Warnings and add blacklisting #2582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 2 commits into from
Aug 17, 2017
Merged

[WIP] Fix Feed Warnings and add blacklisting #2582

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08d578d
initial scetch at trying to remove repeated feed warnings and blackli…
matthid Aug 3, 2017
609e654
simplify
matthid Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
simplify
  • Loading branch information
@matthid
matthid committed Aug 16, 2017
commit 609e654a15045fc1c6a024f1dd17f25419ca254b
59 changes: 2 additions & 57 deletions src/Paket.Core/Dependencies/NuGetV2.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ let getDetailsFromNuGetViaODataFast nugetSource (packageName:PackageName) (versi
let normalizedVersion = version.Normalize()
let urls =
[ // Nuget feeds should support this.
// By ID needs to be first because TFS/VSTS https://github.com/fsprojects/Paket/issues/2213
UrlToTry.From
(UrlId.GetVersion_ById { LoweredPackageId = true; NormalizedVersion = false })
"1_%s/Packages(Id='%s',Version='%O')"
Expand Down Expand Up @@ -371,60 +372,7 @@ let getDetailsFromNuGetViaODataFast nugetSource (packageName:PackageName) (versi

/// Gets package details from NuGet via OData
let getDetailsFromNuGetViaOData nugetSource (packageName:PackageName) (version:SemVerInfo) =
let queryPackagesProtocol (packageName:PackageName) =
async {
let url = sprintf "%s/Packages(Id='%O',Version='%O')" nugetSource.Url packageName version
let! response = safeGetFromUrl(nugetSource.BasicAuth,url,acceptXml)

let! raw =
match response with
| SafeWebResult.SuccessResponse r -> async { return Some r }
| SafeWebResult.NotFound -> async { return None }
| SafeWebResult.UnknownError err when
urlIsMyGet nugetSource.Url ||
urlIsNugetGallery nugetSource.Url ||
urlSimilarToTfsOrVsts nugetSource.Url ->
raise <|
System.Exception(
sprintf "Could not get package details for %O from %s" packageName nugetSource.Url,
err.SourceException)
| SafeWebResult.UnknownError err ->
traceWarnfn "Failed to find defails '%s' from '%s'. trying again with /odata/Packages. Please report this." err.SourceException.Message url
if verbose then
tracefn "Details of last error (%s): %O" url err.SourceException
async {
try
let url = sprintf "%s/odata/Packages(Id='%O',Version='%O')" nugetSource.Url packageName version
let! raw = getXmlFromUrl(nugetSource.BasicAuth,url)
return Some raw
with e ->
return raise <| System.AggregateException(err.SourceException, e)
}

if verbose then
tracefn "Response from %s:" url
tracefn ""
tracefn "%s" (match raw with Some s -> s | _ -> "NOTFOUND 404")
match raw with
| Some raw ->
let doc = getXmlDoc url raw
return parseODataEntryDetails(url,nugetSource.Url,packageName,version,doc) |> ODataSearchResult.Match
| None -> return ODataSearchResult.EmptyResult }

async {
try
let! result =
// See https://github.com/fsprojects/Paket/issues/2213
// TODO: There is a bug in VSTS, so we can't trust this protocol. Remove when VSTS is fixed
// TODO: TFS has the same bug
if urlSimilarToTfsOrVsts nugetSource.Url then queryPackagesProtocol packageName
else getDetailsFromNuGetViaODataFast nugetSource packageName version
return result
with e when not (urlSimilarToTfsOrVsts nugetSource.Url) ->
traceWarnfn "Failed to get package details '%s'. This feeds implementation might be broken." e.Message
if verbose then tracefn "Details: %O" e
return! queryPackagesProtocol packageName
}
getDetailsFromNuGetViaODataFast nugetSource packageName version

let getDetailsFromNuGet force nugetSource packageName version =
getDetailsFromCacheOr
Expand All @@ -434,9 +382,6 @@ let getDetailsFromNuGet force nugetSource packageName version =
version
(fun () -> getDetailsFromNuGetViaOData nugetSource packageName version)




/// Uses the NuGet v2 API to retrieve all packages with the given prefix.
let FindPackages(auth, nugetURL, packageNamePrefix, maxResults) =
let url = sprintf "%s/Packages()?$filter=IsLatestVersion and IsAbsoluteLatestVersion and substringof('%s',tolower(Id))" nugetURL ((packageNamePrefix:string).ToLowerInvariant())
Expand Down