Skip to content

Commit

Permalink
Update abstractions package - patch to support OpenSearch 2.0. Update…
Browse files Browse the repository at this point in the history
… integration workflow to run tests on OpenSearch 2.0.

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
  • Loading branch information
Yury-Fridlyand committed Jun 10, 2022
1 parent b9a0f40 commit e1641fa
Show file tree
Hide file tree
Showing 42 changed files with 142 additions and 132 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
# 1.0.1 is skipped because it doesn't have a tag in OpenSearch repo, we can't check out to compile plugins
version: [1.3.1, 1.3.0, 1.2.4, 1.2.3, 1.2.2, 1.2.1, 1.2.0, 1.1.0, 1.0.0]
version: [2.0.0, 1.3.1, 1.3.0, 1.2.4, 1.2.3, 1.2.2, 1.2.1, 1.2.0, 1.1.0, 1.0.0]

steps:
# Due to https://github.com/opensearch-project/project-website/issues/737
Expand Down
12 changes: 6 additions & 6 deletions build/scripts/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@
},
"OpenSearch.OpenSearch.Managed": {
"type": "Direct",
"requested": "[0.1.0-canary.0.276, )",
"resolved": "0.1.0-canary.0.276",
"contentHash": "hnHFIbPj61dcxhgmfs5MszOTgeQHu33do569UNOcpuDMBxSue7rZWcSrkaa65+Ya86Zq9a8UUSMFg0vRhkgggQ==",
"requested": "[0.1.0-canary.0.277, )",
"resolved": "0.1.0-canary.0.277",
"contentHash": "d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==",
"dependencies": {
"OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.276",
"OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.277",
"Proc": "0.6.1",
"System.Net.Http": "4.3.1"
}
Expand Down Expand Up @@ -252,8 +252,8 @@
},
"OpenSearch.Stack.ArtifactsApi": {
"type": "Transitive",
"resolved": "0.1.0-canary.0.276",
"contentHash": "YpoxP/GJ8RFPdedJ9O3Yv8EQNSaGPOK1skSUY043zcRDLwU6vbhZCAXzFc5lvbao22JXWFKVYan05voGU5o/jA==",
"resolved": "0.1.0-canary.0.277",
"contentHash": "xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==",
"dependencies": {
"SemanticVersioning": "0.8.0",
"System.Text.Json": "4.6.0"
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<PackageReference Include="FSharp.Core" Version="5.0.0" />

<PackageReference Include="Bullseye" Version="3.3.0" />
<PackageReference Include="OpenSearch.OpenSearch.Managed" Version="0.1.0-canary.0.276" />
<PackageReference Include="OpenSearch.OpenSearch.Managed" Version="0.1.0-canary.0.277" />

<PackageReference Include="Fake.Core.Environment" Version="5.15.0" />
<PackageReference Include="Fake.Core.SemVer" Version="5.15.0" />
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "76uDTVvMlMqIw47JMlnMXAYoYjMocRgirue/XJP+YQ2p/UGtWD9m8OTvhwCKWHtEO5pZG8+YqAzjEiUYLbKZwg==",
"source": null
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
76uDTVvMlMqIw47JMlnMXAYoYjMocRgirue/XJP+YQ2p/UGtWD9m8OTvhwCKWHtEO5pZG8+YqAzjEiUYLbKZwg==
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OpenSearch.OpenSearch.Ephemeral</id>
<version>0.1.0-canary.0.276</version>
<version>0.1.0-canary.0.277</version>
<authors>OpenSearch Project and contributors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,15 +12,15 @@
<releaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</releaseNotes>
<copyright>OpenSearch</copyright>
<tags>opensearch,opensearch,cluster,ephemeral</tags>
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="b98f1caf704bdc34ad31ae4f57dc7a43306f0f40" />
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="4dd48042f150113ae2fba8d6faf7b1737334a97b" />
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="OpenSearch.OpenSearch.Managed" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.OpenSearch.Managed" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="SharpZipLib.NETStandard" version="1.0.7" exclude="Build,Analyzers" />
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="OpenSearch.OpenSearch.Managed" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.OpenSearch.Managed" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="SharpZipLib.NETStandard" version="1.0.7" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==",
"source": null
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OpenSearch.OpenSearch.Managed</id>
<version>0.1.0-canary.0.276</version>
<version>0.1.0-canary.0.277</version>
<authors>OpenSearch Project and contributors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -13,15 +13,15 @@
<releaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</releaseNotes>
<copyright>OpenSearch</copyright>
<tags>opensearch,opensearch,cluster,observable,rx</tags>
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="b98f1caf704bdc34ad31ae4f57dc7a43306f0f40" />
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="4dd48042f150113ae2fba8d6faf7b1737334a97b" />
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="OpenSearch.Stack.ArtifactsApi" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.Stack.ArtifactsApi" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="Proc" version="0.6.1" exclude="Build,Analyzers" />
<dependency id="System.Net.Http" version="4.3.1" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="OpenSearch.Stack.ArtifactsApi" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.Stack.ArtifactsApi" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="Proc" version="0.6.1" exclude="Build,Analyzers" />
<dependency id="System.Net.Http" version="4.3.1" exclude="Build,Analyzers" />
</group>
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "ZI7vWwWba6OdFA4KhrF8Nt0n45E+eSa/6OQx+WJ2lQqZ0ccmyu7gfQ1S8rvAImJ7PofqII5wWwtX+TGO5Im3wA==",
"source": null
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ZI7vWwWba6OdFA4KhrF8Nt0n45E+eSa/6OQx+WJ2lQqZ0ccmyu7gfQ1S8rvAImJ7PofqII5wWwtX+TGO5Im3wA==
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OpenSearch.OpenSearch.Xunit</id>
<version>0.1.0-canary.0.276</version>
<version>0.1.0-canary.0.277</version>
<authors>OpenSearch Project and contributors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,14 +12,14 @@
<releaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</releaseNotes>
<copyright>OpenSearch</copyright>
<tags>opensearch,opensearch,xunit,cluster,integration,test,ephemeral</tags>
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="b98f1caf704bdc34ad31ae4f57dc7a43306f0f40" />
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="4dd48042f150113ae2fba8d6faf7b1737334a97b" />
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="OpenSearch.OpenSearch.Ephemeral" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.OpenSearch.Ephemeral" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="xunit" version="2.3.1" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="OpenSearch.OpenSearch.Ephemeral" version="0.1.0-canary.0.276" exclude="Build,Analyzers" />
<dependency id="OpenSearch.OpenSearch.Ephemeral" version="0.1.0-canary.0.277" exclude="Build,Analyzers" />
<dependency id="xunit" version="2.3.1" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==",
"source": null
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>OpenSearch.Stack.ArtifactsApi</id>
<version>0.1.0-canary.0.276</version>
<version>0.1.0-canary.0.277</version>
<authors>OpenSearch Project and contributors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,7 +12,7 @@
<releaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</releaseNotes>
<copyright>OpenSearch</copyright>
<tags>opensearch,opensearch,stack,versioning,artifacts</tags>
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="b98f1caf704bdc34ad31ae4f57dc7a43306f0f40" />
<repository type="Git" url="https://github.com/opensearch-project/opensearch-net-abstractions" commit="4dd48042f150113ae2fba8d6faf7b1737334a97b" />
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="SemanticVersioning" version="0.8.0" exclude="Build,Analyzers" />
Expand Down
28 changes: 14 additions & 14 deletions tests/Tests.ClusterLauncher/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,36 +125,36 @@
},
"OpenSearch.OpenSearch.Ephemeral": {
"type": "Transitive",
"resolved": "0.1.0-canary.0.276",
"contentHash": "Ws9CcKvUOsFM7jMwK9w7px5gdSylPMBxfxuh2tXNDfmfHMNnG1eFPAbUj1UZwnn+H5kwHowknb1LgvLVBrqoag==",
"resolved": "0.1.0-canary.0.277",
"contentHash": "76uDTVvMlMqIw47JMlnMXAYoYjMocRgirue/XJP+YQ2p/UGtWD9m8OTvhwCKWHtEO5pZG8+YqAzjEiUYLbKZwg==",
"dependencies": {
"OpenSearch.OpenSearch.Managed": "0.1.0-canary.0.276",
"OpenSearch.OpenSearch.Managed": "0.1.0-canary.0.277",
"SharpZipLib.NETStandard": "1.0.7"
}
},
"OpenSearch.OpenSearch.Managed": {
"type": "Transitive",
"resolved": "0.1.0-canary.0.276",
"contentHash": "hnHFIbPj61dcxhgmfs5MszOTgeQHu33do569UNOcpuDMBxSue7rZWcSrkaa65+Ya86Zq9a8UUSMFg0vRhkgggQ==",
"resolved": "0.1.0-canary.0.277",
"contentHash": "d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==",
"dependencies": {
"OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.276",
"OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.277",
"Proc": "0.6.1",
"System.Net.Http": "4.3.1"
}
},
"OpenSearch.OpenSearch.Xunit": {
"type": "Transitive",
"resolved": "0.1.0-canary.0.276",
"contentHash": "1aQCdd2GmlKonog5nLXyDNL0obTtGRSlb2UW6NE6nHEsp4G0yQo9GbrY647lFpLH9MCuzeL6jkXjervzfZL1cQ==",
"resolved": "0.1.0-canary.0.277",
"contentHash": "ZI7vWwWba6OdFA4KhrF8Nt0n45E+eSa/6OQx+WJ2lQqZ0ccmyu7gfQ1S8rvAImJ7PofqII5wWwtX+TGO5Im3wA==",
"dependencies": {
"OpenSearch.OpenSearch.Ephemeral": "0.1.0-canary.0.276",
"OpenSearch.OpenSearch.Ephemeral": "0.1.0-canary.0.277",
"xunit": "2.3.1"
}
},
"OpenSearch.Stack.ArtifactsApi": {
"type": "Transitive",
"resolved": "0.1.0-canary.0.276",
"contentHash": "YpoxP/GJ8RFPdedJ9O3Yv8EQNSaGPOK1skSUY043zcRDLwU6vbhZCAXzFc5lvbao22JXWFKVYan05voGU5o/jA==",
"resolved": "0.1.0-canary.0.277",
"contentHash": "xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==",
"dependencies": {
"SemanticVersioning": "0.8.0",
"System.Text.Json": "4.6.0"
Expand Down Expand Up @@ -881,7 +881,7 @@
"tests.configuration": {
"type": "Project",
"dependencies": {
"OpenSearch.OpenSearch.Managed": "0.1.0-canary.0.276"
"OpenSearch.OpenSearch.Managed": "0.1.0-canary.0.277"
}
},
"tests.core": {
Expand All @@ -893,7 +893,7 @@
"Microsoft.NET.Test.Sdk": "16.5.0",
"Nullean.VsTest.Pretty.TestLogger": "0.3.0",
"OpenSearch.Client.JsonNetSerializer": "1.0.0",
"OpenSearch.OpenSearch.Xunit": "0.1.0-canary.0.276",
"OpenSearch.OpenSearch.Xunit": "0.1.0-canary.0.277",
"Proc": "0.6.1",
"Tests.Domain": "1.0.0",
"xunit": "2.3.1"
Expand All @@ -905,7 +905,7 @@
"Bogus": "22.1.2",
"Newtonsoft.Json": "12.0.1",
"OpenSearch.Client": "1.0.0",
"OpenSearch.OpenSearch.Managed": "0.1.0-canary.0.276",
"OpenSearch.OpenSearch.Managed": "0.1.0-canary.0.277",
"Tests.Configuration": "1.0.0"
}
}
Expand Down
10 changes: 10 additions & 0 deletions tests/Tests.Configuration/ConfigurationLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,23 @@
*/

using System;
using System.Diagnostics;
using System.IO;
using System.Threading;

namespace Tests.Configuration
{
public static class TestConfiguration
{
/*
static TestConfiguration()
{
int c = 0;
while (!Debugger.IsAttached && c++ < 20)
Thread.Sleep(5000);
}
//*/

private static readonly Lazy<TestConfigurationBase> Lazy
= new Lazy<TestConfigurationBase>(LoadConfiguration, LazyThreadSafetyMode.ExecutionAndPublication);

Expand Down
2 changes: 1 addition & 1 deletion tests/Tests.Configuration/Tests.Configuration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenSearch.OpenSearch.Managed" Version="0.1.0-canary.0.276" />
<PackageReference Include="OpenSearch.OpenSearch.Managed" Version="0.1.0-canary.0.277" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions tests/Tests.Configuration/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
},
"OpenSearch.OpenSearch.Managed": {
"type": "Direct",
"requested": "[0.1.0-canary.0.276, )",
"resolved": "0.1.0-canary.0.276",
"contentHash": "hnHFIbPj61dcxhgmfs5MszOTgeQHu33do569UNOcpuDMBxSue7rZWcSrkaa65+Ya86Zq9a8UUSMFg0vRhkgggQ==",
"requested": "[0.1.0-canary.0.277, )",
"resolved": "0.1.0-canary.0.277",
"contentHash": "d2mEKkGQXXXWTvqqCO0eqwLbFBzlKvh1zdHtbn5Feg1rNX+6gpfMwZUkXCyQjRTDtTOYWz5MyCO42KaYFli98w==",
"dependencies": {
"OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.276",
"OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.277",
"Proc": "0.6.1",
"System.Net.Http": "4.3.1"
}
Expand Down Expand Up @@ -73,8 +73,8 @@
},
"OpenSearch.Stack.ArtifactsApi": {
"type": "Transitive",
"resolved": "0.1.0-canary.0.276",
"contentHash": "YpoxP/GJ8RFPdedJ9O3Yv8EQNSaGPOK1skSUY043zcRDLwU6vbhZCAXzFc5lvbao22JXWFKVYan05voGU5o/jA==",
"resolved": "0.1.0-canary.0.277",
"contentHash": "xsPBSZyg5QDV4+y9dBFlds0xHmG4GBv+jZQ88r/4aRqIj0qh5eJTNplz3EwZZyFW7Q6uvxrZR/oQ5fnugWaBPg==",
"dependencies": {
"SemanticVersioning": "0.8.0",
"System.Text.Json": "4.6.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests.Core/Tests.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="OpenSearch.OpenSearch.Xunit" Version="0.1.0-canary.0.276" />
<PackageReference Include="OpenSearch.OpenSearch.Xunit" Version="0.1.0-canary.0.277" />
<PackageReference Include="JunitXml.TestLogger" Version="2.1.78" />

<PackageReference Include="Nullean.VsTest.Pretty.TestLogger" Version="0.3.0" />
Expand Down
Loading

0 comments on commit e1641fa

Please sign in to comment.