Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Elastic.Transport" Version="0.10.1" />
<PackageReference Include="Elastic.Transport" Version="0.10.2" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/Elastic.Stack.ArtifactsApi/Resolvers/ApiResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static string LatestBuildHash(string version)
try
{
// if packages is empty it turns into an array[] otherwise its a dictionary :/
var packages = JsonSerializer.Deserialize<ArtifactsSearchResponse>(json).Packages;
var packages = JsonSerializer.Deserialize(json, ApiResolverSerializerContext.Default.ArtifactsSearchResponse).Packages;
if (packages.Count == 0)
throw new Exception("Can not get build hash for: " + version);
return GetBuildHash(packages.First().Value.DownloadUrl);
Expand Down Expand Up @@ -123,4 +123,8 @@ internal class SearchPackage
[JsonPropertyName("os")] public string[] OperatingSystem { get; set; }
[JsonPropertyName("classifier")] public string Classifier { get; set; }
}

[JsonSerializable(typeof(ArtifactsVersionsResponse))]
[JsonSerializable(typeof(ArtifactsSearchResponse))]
internal sealed partial class ApiResolverSerializerContext : JsonSerializerContext;
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static bool TryResolve(Product product, Version version, OSPlatform os, s
{
var json = ApiResolver.FetchJson($"search/{version}/{query}");
// if packages is empty it turns into an array[] otherwise its a dictionary :/
packages = JsonSerializer.Deserialize<ArtifactsSearchResponse>(json).Packages;
packages = JsonSerializer.Deserialize(json, ApiResolverSerializerContext.Default.ArtifactsSearchResponse).Packages;
}
catch
{
Expand Down Expand Up @@ -82,7 +82,7 @@ public static bool TryResolve(Product product, Version version, OSPlatform os, s
private static IReadOnlyCollection<Version> LoadVersions()
{
var json = ApiResolver.FetchJson("versions");
var versions = JsonSerializer.Deserialize<ArtifactsVersionsResponse>(json).Versions;
var versions = JsonSerializer.Deserialize(json, ApiResolverSerializerContext.Default.ArtifactsVersionsResponse).Versions;

return new List<Version>(versions.Select(v => new Version(v)));
}
Expand Down