diff --git a/OpenSearch.sln b/OpenSearch.sln index 42571182e0..0ba2002dd5 100644 --- a/OpenSearch.sln +++ b/OpenSearch.sln @@ -76,7 +76,7 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Net.Auth.AwsSigV4", "src\OpenSearch.Net.Auth.AwsSigV4\OpenSearch.Net.Auth.AwsSigV4.csproj", "{2BDA50C8-767A-4560-9547-15AFC972A6E3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Auth.AwsSigV4", "tests\Tests.Auth.AwsSigV4\Tests.Auth.AwsSigV4.csproj", "{2BCE8150-C16C-4226-B216-C7A0463ADC56}" -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Stack.ArtifactsApiTests", "abstractions\src\OpenSearch.Stack.ArtifactsApiTests\OpenSearch.Stack.ArtifactsApiTests.csproj", "{1F5A7B1A-2566-481F-91B5-A63D7F939973}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Stack.ArtifactsApiTests", "abstractions\tests\OpenSearch.Stack.ArtifactsApiTests\OpenSearch.Stack.ArtifactsApiTests.csproj", "{1F5A7B1A-2566-481F-91B5-A63D7F939973}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "abstractions", "{87ABA679-F3F4-48CE-82B3-1AAE5D0A5935}" ProjectSection(SolutionItems) = preProject @@ -87,7 +87,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ABE3B7EE-5B3 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.Ephemeral", "abstractions\src\OpenSearch.OpenSearch.Ephemeral\OpenSearch.OpenSearch.Ephemeral.csproj", "{31668B33-6157-4A5B-8D4C-18AF760DCA1B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.EphemeralTests", "abstractions\src\OpenSearch.OpenSearch.EphemeralTests\OpenSearch.OpenSearch.EphemeralTests.csproj", "{C80D225C-F072-4B24-9ACE-82EFD9362237}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.EphemeralTests", "abstractions\tests\OpenSearch.OpenSearch.EphemeralTests\OpenSearch.OpenSearch.EphemeralTests.csproj", "{C80D225C-F072-4B24-9ACE-82EFD9362237}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.Managed", "abstractions\src\OpenSearch.OpenSearch.Managed\OpenSearch.OpenSearch.Managed.csproj", "{A9125BAC-71B5-4DC8-879D-1154A0A7DE5C}" EndProject @@ -95,6 +95,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.Xunit EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Stack.ArtifactsApi", "abstractions\src\OpenSearch.Stack.ArtifactsApi\OpenSearch.Stack.ArtifactsApi.csproj", "{E7C0BDC2-28AD-4582-8FEA-0F6327A42C0E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{22DF419F-9A90-4317-957D-E239EB3F95DF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -128,10 +130,12 @@ Global {2BCE8150-C16C-4226-B216-C7A0463ADC56} = {6C4A2627-AF22-4388-9DF7-7A9AEACFD635} {ABE3B7EE-5B31-4C9A-976A-AD28D257B147} = {87ABA679-F3F4-48CE-82B3-1AAE5D0A5935} {31668B33-6157-4A5B-8D4C-18AF760DCA1B} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147} - {C80D225C-F072-4B24-9ACE-82EFD9362237} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147} {A9125BAC-71B5-4DC8-879D-1154A0A7DE5C} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147} {39B7E62B-BDDF-46F2-9306-CE5FC68573A2} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147} {E7C0BDC2-28AD-4582-8FEA-0F6327A42C0E} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147} + {22DF419F-9A90-4317-957D-E239EB3F95DF} = {87ABA679-F3F4-48CE-82B3-1AAE5D0A5935} + {C80D225C-F072-4B24-9ACE-82EFD9362237} = {22DF419F-9A90-4317-957D-E239EB3F95DF} + {1F5A7B1A-2566-481F-91B5-A63D7F939973} = {22DF419F-9A90-4317-957D-E239EB3F95DF} EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {5B393962-7586-49BA-BD99-3B1E35F48E94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/EphemeralCluster.cs b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/EphemeralCluster.cs index 5f6cae0882..bba2455f5f 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/EphemeralCluster.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/EphemeralCluster.cs @@ -41,7 +41,7 @@ namespace OpenSearch.OpenSearch.Ephemeral public class EphemeralCluster : EphemeralCluster { public EphemeralCluster(OpenSearchVersion version, int numberOfNodes = 1) - : base(new EphemeralClusterConfiguration(version, ServerType.DEFAULT, ClusterFeatures.None, numberOfNodes: numberOfNodes)) + : base(new EphemeralClusterConfiguration(version, ClusterFeatures.None, numberOfNodes: numberOfNodes)) { } diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/EphemeralClusterConfiguration.cs b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/EphemeralClusterConfiguration.cs index 748763faff..77aaef02c4 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/EphemeralClusterConfiguration.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/EphemeralClusterConfiguration.cs @@ -40,15 +40,15 @@ namespace OpenSearch.OpenSearch.Ephemeral { public class EphemeralClusterConfiguration : ClusterConfiguration { - public EphemeralClusterConfiguration(OpenSearchVersion version, ServerType serverType, OpenSearchPlugins plugins = null, + public EphemeralClusterConfiguration(OpenSearchVersion version, OpenSearchPlugins plugins = null, int numberOfNodes = 1) - : this(version, serverType, ClusterFeatures.None, plugins, numberOfNodes) + : this(version, ClusterFeatures.None, plugins, numberOfNodes) { } - public EphemeralClusterConfiguration(OpenSearchVersion version, ServerType serverType, ClusterFeatures features, + public EphemeralClusterConfiguration(OpenSearchVersion version, ClusterFeatures features, OpenSearchPlugins plugins = null, int numberOfNodes = 1) - : base(version, serverType, (v, s) => new EphemeralFileSystem(v, s), numberOfNodes, EphemeralClusterName) + : base(version, (v, s) => new EphemeralFileSystem(v, s), numberOfNodes, EphemeralClusterName) { Features = features; diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/IClusterComposeTask.cs b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/IClusterComposeTask.cs index 3117162100..22cf4e0abc 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/IClusterComposeTask.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/IClusterComposeTask.cs @@ -191,10 +191,6 @@ private static void ExecuteBinaryInternal(EphemeralClusterConfiguration config, { {config.FileSystem.ConfigEnvironmentVariableName, config.FileSystem.ConfigPath}, {"OPENSEARCH_HOME", config.FileSystem.OpenSearchHome}, - // Duplicate all env vars for ES_* prefix for backward compatibility with OpenDistro and ElasticSearch; - // unused env vars would be just ignored. - {config.FileSystem.ConfigEnvironmentVariableName.Replace("OPENSEARCH", "ES"), config.FileSystem.ConfigPath}, - {"ES_HOME", config.FileSystem.OpenSearchHome} } }; diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/InstallationTasks/InitialConfiguration.cs b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/InstallationTasks/InitialConfiguration.cs index c806617546..cc9c204e20 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/InstallationTasks/InitialConfiguration.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/InstallationTasks/InitialConfiguration.cs @@ -26,7 +26,6 @@ * under the License. */ -using System; using System.IO; using OpenSearch.OpenSearch.Managed.ConsoleWriters; using OpenSearch.Stack.ArtifactsApi; @@ -39,19 +38,10 @@ public override void Run(IEphemeralCluster cluste { if (cluster.CachingAndCachedHomeExists()) return; - if (cluster.ClusterConfiguration.Artifact.ServerType == ServerType.ElasticSearch) - { - cluster.Writer?.WriteDiagnostic($"{{{nameof(Run)}}} skipping for ElasticSearch"); - return; - } - var fs = cluster.FileSystem; var script = Path.Combine(fs.OpenSearchHome, "server-initial-config.sh"); - if (cluster.ClusterConfiguration.Artifact.ServerType == ServerType.OpenSearch) - File.WriteAllText(script, InitialConfigurationOpenSearch.GetConfigurationScript(cluster.ClusterConfiguration.Version)); - if (cluster.ClusterConfiguration.Artifact.ServerType == ServerType.OpenDistro) - File.WriteAllText(script, InitialConfigurationOpenDistro.GetConfigurationScript()); + File.WriteAllText(script, InitialConfigurationOpenSearch.GetConfigurationScript(cluster.ClusterConfiguration.Version)); cluster.Writer?.WriteDiagnostic($"{{{nameof(Run)}}} going to run [server-initial-config.sh]"); @@ -62,16 +52,9 @@ public override void Run(IEphemeralCluster cluste "run initial cluster configuration", script); - if (!cluster.ClusterConfiguration.EnableSsl) - { - if (cluster.ClusterConfiguration.Artifact.ServerType == ServerType.OpenSearch) - File.AppendAllText(Path.Combine(fs.OpenSearchHome, "config", "opensearch.yml"), "plugins.security.disabled: true"); - if (cluster.ClusterConfiguration.Artifact.ServerType == ServerType.OpenDistro) - File.AppendAllText(Path.Combine(fs.OpenSearchHome, "config", "elasticsearch.yml"), "opendistro_security.disabled: true"); - } + if (cluster.ClusterConfiguration.EnableSsl) return; - if (cluster.ClusterConfiguration.Artifact.ServerType == ServerType.ElasticSearch && cluster.ClusterConfiguration.EnableSsl) - throw new NotImplementedException("ElasticSearch with SSL is not supported"); + File.AppendAllText(Path.Combine(fs.OpenSearchHome, "config", "opensearch.yml"), "plugins.security.disabled: true"); } } } diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/InstallationTasks/InitialConfigurationOpenDistro.cs b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/InstallationTasks/InitialConfigurationOpenDistro.cs deleted file mode 100644 index 43647a60b9..0000000000 --- a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/InstallationTasks/InitialConfigurationOpenDistro.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 -* -* The OpenSearch Contributors require contributions made to -* this file be licensed under the Apache-2.0 license or a -* compatible open source license. -*/ -/* -* Modifications Copyright OpenSearch Contributors. See -* GitHub history for details. -* -* Licensed to Elasticsearch B.V. under one or more contributor -* license agreements. See the NOTICE file distributed with -* this work for additional information regarding copyright -* ownership. Elasticsearch B.V. licenses this file to you under -* the Apache License, Version 2.0 (the "License"); you may -* not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -namespace OpenSearch.OpenSearch.Ephemeral.Tasks.InstallationTasks -{ - internal class InitialConfigurationOpenDistro - { - // Actually, it is content of file `opendistro-tar-install.sh` shipped - // in the tarball, but due to (1) this file might be changed and - // (2) we have to modify the file before execution, because it launches - // the server what we want to do on our own, it is decided to have a - // snapshot of this file. - // The script is taken from v.1.13.3, last 3 lines omitted. - public static string GetConfigurationScript() => -@"#!/bin/bash - -ES_HOME=`dirname $(realpath $0)`; cd $ES_HOME -ES_KNN_LIB_DIR=$ES_HOME/plugins/opendistro-knn/knn-lib -##Security Plugin -bash $ES_HOME/plugins/opendistro_security/tools/install_demo_configuration.sh -y -i -s - -##Perf Plugin -chmod 755 $ES_HOME/plugins/opendistro-performance-analyzer/pa_bin/performance-analyzer-agent -chmod 755 $ES_HOME/bin/performance-analyzer-agent-cli -echo ""done security"" -PA_AGENT_JAVA_OPTS=""-Dlog4j.configurationFile=$ES_HOME/plugins/opendistro-performance-analyzer/pa_config/log4j2.xml \ - -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \ - -XX:InitialBootClassLoaderMetaspaceSize=30720 -XX:MaxRAM=400m"" - -ES_MAIN_CLASS=""com.amazon.opendistro.elasticsearch.performanceanalyzer.PerformanceAnalyzerApp"" \ -ES_ADDITIONAL_CLASSPATH_DIRECTORIES=plugins/opendistro-performance-analyzer \ -ES_JAVA_OPTS=$PA_AGENT_JAVA_OPTS - -if ! grep -q '## OpenDistro Performance Analyzer' $ES_HOME/config/jvm.options; then - CLK_TCK=`/usr/bin/getconf CLK_TCK` - echo >> $ES_HOME/config/jvm.options - echo '## OpenDistro Performance Analyzer' >> $ES_HOME/config/jvm.options - echo ""-Dclk.tck=$CLK_TCK"" >> $ES_HOME/config/jvm.options - echo ""-Djdk.attach.allowAttachSelf=true"" >> $ES_HOME/config/jvm.options - echo ""-Djava.security.policy=$ES_HOME/plugins/opendistro-performance-analyzer/pa_config/es_security.policy"" >> $ES_HOME/config/jvm.options -fi -echo ""done plugins"" - -##Check KNN lib existence in ES TAR distribution -echo ""Checking kNN library"" -FILE=`ls $ES_KNN_LIB_DIR/libKNNIndex*.so` -if test -f ""$FILE""; then - echo ""FILE EXISTS $FILE"" -else - echo ""TEST FAILED OR FILE NOT EXIST $FILE"" -fi - -##Set KNN Dylib Path for macOS and *nix systems -if echo ""$OSTYPE"" | grep -qi ""darwin""; then - if echo ""$JAVA_LIBRARY_PATH"" | grep -q ""$ES_KNN_LIB_DIR""; then - echo ""KNN lib path has been set"" - else - export JAVA_LIBRARY_PATH=$JAVA_LIBRARY_PATH:$ES_KNN_LIB_DIR - echo ""KNN lib path not found, set new path"" - echo $JAVA_LIBRARY_PATH - fi -else - if echo ""$LD_LIBRARY_PATH"" | grep -q ""$ES_KNN_LIB_DIR""; then - echo ""KNN lib path has been set"" - else - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ES_KNN_LIB_DIR - echo ""KNN lib path not found, set new path"" - echo $LD_LIBRARY_PATH - fi -fi -"; - } -} diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/ValidationTasks/ValidateRunningVersion.cs b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/ValidationTasks/ValidateRunningVersion.cs index 286e0cb294..3dba4bd000 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/ValidationTasks/ValidateRunningVersion.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/ValidationTasks/ValidateRunningVersion.cs @@ -31,7 +31,6 @@ using System.Net.Http; using System.Threading; using OpenSearch.OpenSearch.Managed.ConsoleWriters; -using OpenSearch.Stack.ArtifactsApi; namespace OpenSearch.OpenSearch.Ephemeral.Tasks.ValidationTasks { @@ -42,10 +41,6 @@ public override void Run(IEphemeralCluster cluste void WriteDiagnostic(string message) => cluster.Writer?.WriteDiagnostic($"{{{nameof(ValidateRunningVersion)}}} {message}"); var requestedVersion = cluster.ClusterConfiguration.Version; - if (cluster.ClusterConfiguration.Artifact.ServerType == ServerType.OpenDistro) - //All supported version of OpenDistro are based on ElasticSearch v.7.10.2 - requestedVersion = OpenSearchVersion.From("7.10.2"); - WriteDiagnostic($"validating the cluster is running the requested version: {requestedVersion}"); diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/packages.lock.json b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/packages.lock.json index f8bdb40018..0378ca5fc6 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/packages.lock.json +++ b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/packages.lock.json @@ -147,7 +147,7 @@ "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } @@ -930,7 +930,7 @@ "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } diff --git a/abstractions/src/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj b/abstractions/src/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj deleted file mode 100644 index d14069227a..0000000000 --- a/abstractions/src/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - false - net5.0 - false - - - diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/ClusterBase.cs b/abstractions/src/OpenSearch.OpenSearch.Managed/ClusterBase.cs index 4643374b8c..6b55e4aadf 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Managed/ClusterBase.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Managed/ClusterBase.cs @@ -120,7 +120,7 @@ NodeConfiguration Modify(NodeConfiguration n, int p) public IDisposable Start(TimeSpan waitForStarted) { var nodes = Nodes.Select(n => n.NodeConfiguration.DesiredNodeName).ToArray(); - var lineHighlightWriter = new LineHighlightWriter(nodes, LineOutParser.From(ClusterConfiguration.ServerType)); + var lineHighlightWriter = new LineHighlightWriter(nodes, LineOutParser.OpenSearch); return Start(lineHighlightWriter, waitForStarted); } diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/Configuration/ClusterConfiguration.cs b/abstractions/src/OpenSearch.OpenSearch.Managed/Configuration/ClusterConfiguration.cs index dc301f30b5..e74d8bd116 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Managed/Configuration/ClusterConfiguration.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Managed/Configuration/ClusterConfiguration.cs @@ -42,7 +42,6 @@ public interface IClusterConfiguration where TFileSystem : INod string ClusterName { get; } NodeSettings DefaultNodeSettings { get; } OpenSearchVersion Version { get; } - ServerType ServerType { get; } int NumberOfNodes { get; } int StartingPortNumber { get; set; } bool NoCleanupAfterNodeStopped { get; set; } @@ -55,17 +54,14 @@ public interface IClusterConfiguration where TFileSystem : INod public class ClusterConfiguration : ClusterConfiguration { - public ClusterConfiguration(OpenSearchVersion version, ServerType serverType, string openSearchHome, int numberOfNodes = 1) - : base(version, serverType, (v, s) => new NodeFileSystem(v, openSearchHome), numberOfNodes, null) - { - } - - public ClusterConfiguration(OpenSearchVersion version, ServerType serverType, - Func fileSystem = null, int numberOfNodes = 1, - string clusterName = null) - : base(version, serverType, fileSystem ?? ((v, s) => new NodeFileSystem(v, s)), numberOfNodes, clusterName) - { - } + public ClusterConfiguration(OpenSearchVersion version, string openSearchHome, int numberOfNodes = 1) + : base(version, (v, s) => new NodeFileSystem(v, openSearchHome), numberOfNodes, null) { } + + public ClusterConfiguration(OpenSearchVersion version, Func fileSystem = null, + int numberOfNodes = 1, + string clusterName = null + ) + : base(version, fileSystem ?? ((v, s) => new NodeFileSystem(v, s)), numberOfNodes, clusterName) { } } public class ClusterConfiguration : IClusterConfiguration @@ -81,15 +77,15 @@ public class ClusterConfiguration : IClusterConfiguration /// The number of nodes in the cluster /// The name of the cluster - public ClusterConfiguration(OpenSearchVersion version, ServerType serverType, Func fileSystem, - int numberOfNodes = 1, string clusterName = null) + public ClusterConfiguration(OpenSearchVersion version, Func fileSystem, + int numberOfNodes = 1, string clusterName = null + ) { if (fileSystem == null) throw new ArgumentException(nameof(fileSystem)); ClusterName = clusterName; Version = version; - ServerType = serverType; - Artifact = version.Artifact(Product.From("opensearch", serverType: serverType)); + Artifact = version.Artifact(Product.From("opensearch")); FileSystem = fileSystem(Version, ClusterName); NumberOfNodes = numberOfNodes; @@ -112,7 +108,6 @@ public ClusterConfiguration(OpenSearchVersion version, ServerType serverType, Fu public string ClusterName { get; } public OpenSearchVersion Version { get; } - public ServerType ServerType { get; } public TFileSystem FileSystem { get; } public int NumberOfNodes { get; } public int StartingPortNumber { get; set; } = 9200; @@ -138,7 +133,7 @@ public virtual string CreateNodeName(int? node) => /// /// Calculates the quorum given the number of instances /// - private static int Quorum(int instanceCount) => Math.Max(1, (int) Math.Floor((double) instanceCount / 2) + 1); + private static int Quorum(int instanceCount) => Math.Max(1, (int)Math.Floor((double)instanceCount / 2) + 1); /// /// Creates a node attribute for the version of OpenSearch @@ -155,6 +150,7 @@ public string AttributeKey(string attribute) protected void Add(string key, string value) { if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value)) return; + DefaultNodeSettings.Add(key, value); } @@ -165,6 +161,7 @@ protected void Add(string key, string value) protected void Add(string key, string value, string range) { if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value)) return; + if (string.IsNullOrWhiteSpace(range) || Version.InRange(range)) DefaultNodeSettings.Add(key, value, range); } diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/Configuration/NodeConfiguration.cs b/abstractions/src/OpenSearch.OpenSearch.Managed/Configuration/NodeConfiguration.cs index 6758c71c06..1e379e1470 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Managed/Configuration/NodeConfiguration.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Managed/Configuration/NodeConfiguration.cs @@ -38,7 +38,7 @@ public class NodeConfiguration { private Action _defaultStartArgs = s => { }; - public NodeConfiguration(OpenSearchVersion version, int? port = null) : this(new ClusterConfiguration(version, ServerType.DEFAULT), + public NodeConfiguration(OpenSearchVersion version, int? port = null) : this(new ClusterConfiguration(version), port) { } @@ -85,7 +85,6 @@ public Action ModifyStartArguments public INodeFileSystem FileSystem => ClusterConfiguration.FileSystem; public OpenSearchVersion Version => ClusterConfiguration.Version; - public ServerType ServerType => ClusterConfiguration.ServerType; public string[] CommandLineArguments => Settings.ToCommandLineArguments(Version); public void InitialMasterNodes(string initialMasterNodes) => diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/ConsoleWriters/LineOutParser.cs b/abstractions/src/OpenSearch.OpenSearch.Managed/ConsoleWriters/LineOutParser.cs index 28d3053902..1acfc8c6a0 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Managed/ConsoleWriters/LineOutParser.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Managed/ConsoleWriters/LineOutParser.cs @@ -39,23 +39,6 @@ private LineOutParser() { } public static readonly LineOutParser OpenSearch = new(shortNamePrefix: "o.o", fullNamePrefix: "org.opensearch", securityPluginName: "OpenSearchSecurityPlugin"); - public static readonly LineOutParser OpenDistro = new(shortNamePrefix: "o.e", fullNamePrefix: "org.elastic", - securityPluginName: "OpenDistroSecurityPlugin"); - public static LineOutParser From(ServerType serverType) - { - switch (serverType) - { - case ServerType.OpenDistro: - case ServerType.ElasticSearch: - return LineOutParser.OpenDistro; - case ServerType.OpenSearch: - return LineOutParser.OpenSearch; - default: - throw new ApplicationException( - $"Unexpected value for {nameof(serverType)} -- {serverType}"); - } - } - /* [2016-09-26T11:43:17,314][INFO ][o.e.n.Node ] [readonly-node-a9c5f4] initializing ... [2016-09-26T11:43:17,470][INFO ][o.e.e.NodeEnvironment ] [readonly-node-a9c5f4] using [1] data paths, mounts [[BOOTCAMP (C:)]], net usable_space [27.7gb], net total_space [129.7gb], spins? [unknown], types [NTFS] @@ -118,10 +101,7 @@ public bool TryParse(string line, return true; } - private bool TryGetStartedConfirmation(string section, string message) - { - return section == ShortName("n.Node") && message == "started"; - } + private bool TryGetStartedConfirmation(string section, string message) => section == ShortName("n.Node") && message == "started"; public bool TryGetPortNumber(string section, string message, out int port) { diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/FileSystem/NodeFileSystem.cs b/abstractions/src/OpenSearch.OpenSearch.Managed/FileSystem/NodeFileSystem.cs index fdca8d4681..8a1c091bfb 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Managed/FileSystem/NodeFileSystem.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Managed/FileSystem/NodeFileSystem.cs @@ -58,26 +58,10 @@ public NodeFileSystem(OpenSearchVersion version, string openSearchHome = null) protected static string BinarySuffix => IsMono || Path.DirectorySeparatorChar == '/' ? "" : ".bat"; /// - public string Binary - { - get - { - if (Artifact.ServerType == ServerType.OpenSearch) - return Path.Combine(OpenSearchHome, "bin", "opensearch") + BinarySuffix; - return Path.Combine(OpenSearchHome, "bin", "elasticsearch") + BinarySuffix; - } - } + public string Binary => Path.Combine(OpenSearchHome, "bin", "opensearch") + BinarySuffix; /// - public string PluginBinary - { - get - { - if (Artifact.ServerType == ServerType.OpenSearch) - return Path.Combine(OpenSearchHome, "bin", "opensearch-plugin") + BinarySuffix; - return Path.Combine(OpenSearchHome, "bin", "elasticsearch-plugin") + BinarySuffix; - } - } + public string PluginBinary => Path.Combine(OpenSearchHome, "bin", "opensearch-plugin") + BinarySuffix; /// public string OpenSearchHome { get; } diff --git a/abstractions/src/OpenSearch.OpenSearch.Managed/OpenSearchNode.cs b/abstractions/src/OpenSearch.OpenSearch.Managed/OpenSearchNode.cs index 8da8e33026..e5177337a1 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Managed/OpenSearchNode.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Managed/OpenSearchNode.cs @@ -44,12 +44,10 @@ public class OpenSearchNode : ObservableProcess private readonly ManualResetEvent _startedHandle = new ManualResetEvent(false); public OpenSearchNode(OpenSearchVersion version, string openSearchHome = null) - : this(new NodeConfiguration(new ClusterConfiguration(version, ServerType.DEFAULT, - (v, s) => new NodeFileSystem(v, openSearchHome)))) - { - } + : this(new NodeConfiguration(new ClusterConfiguration(version, (v, s) => new NodeFileSystem(v, openSearchHome)))) { } public OpenSearchNode(NodeConfiguration config) : base(StartArgs(config)) => NodeConfiguration = config; + public string Version { get; private set; } public int? Port { get; private set; } public bool NodeStarted { get; private set; } @@ -88,31 +86,23 @@ private static StartArguments StartArgs(NodeConfiguration config) private static Dictionary EnvVars(NodeConfiguration config) { - var environmentVariables = new Dictionary {{"OPENSEARCH_JAVA_OPTS", "-Xms1g -Xmx1g"}}; + var environmentVariables = new Dictionary { { "OPENSEARCH_JAVA_OPTS", "-Xms1g -Xmx1g" } }; if (!string.IsNullOrWhiteSpace(config.FileSystem.ConfigPath)) environmentVariables.Add(config.FileSystem.ConfigEnvironmentVariableName, config.FileSystem.ConfigPath); if (!string.IsNullOrWhiteSpace(config.FileSystem.OpenSearchHome)) environmentVariables.Add("OPENSEARCH_HOME", config.FileSystem.OpenSearchHome); - // Duplicate all env vars for ES_* prefix for backward compatibility with OpenDistro and ElasticSearch; - // unused env vars would be just ignored. - environmentVariables.Add("ES_JAVA_OPTS", "-Xms1g -Xmx1g"); - if (!string.IsNullOrWhiteSpace(config.FileSystem.ConfigPath)) - environmentVariables.Add(config.FileSystem.ConfigEnvironmentVariableName.Replace("OPENSEARCH", "ES"), config.FileSystem.ConfigPath); - - if (!string.IsNullOrWhiteSpace(config.FileSystem.OpenSearchHome)) - environmentVariables.Add("ES_HOME", config.FileSystem.OpenSearchHome); - return environmentVariables; } private bool AssumedStartedStateChecker(string section, string message) { if (AssumeStartedOnNotEnoughMasterPing - && section.Contains("ZenDiscovery") - && message.Contains("not enough master nodes discovered during pinging")) + && section.Contains("ZenDiscovery") + && message.Contains("not enough master nodes discovered during pinging")) return true; + return false; } @@ -125,6 +115,7 @@ public IDisposable Start(IConsoleLineHandler writer, TimeSpan waitForStarted) var node = NodeConfiguration.DesiredNodeName; var subscription = SubscribeLines(writer); if (WaitForStarted(waitForStarted)) return subscription; + subscription.Dispose(); throw new OpenSearchCleanExitException( $"Failed to start node: {node} before the configured timeout of: {waitForStarted}"); @@ -139,11 +130,13 @@ public IDisposable SubscribeLines(IConsoleLineHandler writer, Action on SubscribeLines(writer, onNext, delegate { }, delegate { }); public IDisposable SubscribeLines(IConsoleLineHandler writer, Action onNext, - Action onError) => + Action onError + ) => SubscribeLines(writer, onNext, onError, delegate { }); public IDisposable SubscribeLines(IConsoleLineHandler writer, Action onNext, Action onError, - Action onCompleted) + Action onCompleted + ) { Writer = writer; var node = NodeConfiguration.DesiredNodeName; @@ -197,19 +190,19 @@ protected override void OnBeforeWaitForEndOfStreamsError(TimeSpan waited) private static void HardKill(int? processId) { if (!processId.HasValue) return; + try { var p = Process.GetProcessById(processId.Value); p.Kill(); } - catch (Exception) - { - } + catch (Exception) { } } protected override bool ContinueReadingFromProcessReaders() { if (!NodeStarted) return true; + return true; // some how if we return false here it leads to Task starvation in Proc and tests in e.g will OpenSearch.OpenSearch.Xunit will start @@ -220,7 +213,7 @@ protected override bool ContinueReadingFromProcessReaders() protected override bool KeepBufferingLines(LineOut c) { - var lineOutParser = LineOutParser.From(NodeConfiguration.ServerType); + var lineOutParser = LineOutParser.OpenSearch; //if the node is already started only keep buffering lines while we have a writer and the nodeconfiguration wants output after started if (NodeStarted) { @@ -255,12 +248,14 @@ protected override bool KeepBufferingLines(LineOut c) if (!Port.HasValue) throw new OpenSearchCleanExitException( $"Node started but OpenSearchNode did not grab its port number"); + NodeStarted = true; _startedHandle.Set(); } // if we have dont a writer always return true if (Writer != null) return true; + //otherwise only keep buffering if we are not started return !started; } diff --git a/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitClusterConfiguration.cs b/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitClusterConfiguration.cs index 058ed676a8..f852ee7820 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitClusterConfiguration.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitClusterConfiguration.cs @@ -37,11 +37,10 @@ public class XunitClusterConfiguration : EphemeralClusterConfiguration { public XunitClusterConfiguration( OpenSearchVersion version, - ServerType serverType, ClusterFeatures features = ClusterFeatures.None, OpenSearchPlugins plugins = null, int numberOfNodes = 1) - : base(version, serverType, features, plugins, numberOfNodes) => + : base(version, features, plugins, numberOfNodes) => AdditionalAfterStartedTasks.Add(new PrintXunitAfterStartedTask()); /// diff --git a/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/OpenSearchTestCaseDiscoverer.cs b/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/OpenSearchTestCaseDiscoverer.cs index d3e16b90cb..41f694101d 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/OpenSearchTestCaseDiscoverer.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/OpenSearchTestCaseDiscoverer.cs @@ -41,22 +41,26 @@ namespace OpenSearch.OpenSearch.Xunit.XunitPlumbing public abstract class OpenSearchTestCaseDiscoverer : IXunitTestCaseDiscoverer { protected readonly IMessageSink DiagnosticMessageSink; + private readonly FactDiscoverer _factDiscoverer; - protected OpenSearchTestCaseDiscoverer(IMessageSink diagnosticMessageSink) => + protected OpenSearchTestCaseDiscoverer(IMessageSink diagnosticMessageSink) + { DiagnosticMessageSink = diagnosticMessageSink; + _factDiscoverer = new FactDiscoverer(diagnosticMessageSink); + } /// public IEnumerable Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute) => SkipMethod(discoveryOptions, testMethod, out var skipReason) ? string.IsNullOrEmpty(skipReason) - ? new IXunitTestCase[] { } + ? Enumerable.Empty() : new IXunitTestCase[] {new SkippingTestCase(skipReason, testMethod, null)} - : new[] - { - new XunitTestCase(DiagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), - discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod) - }; + : DiscoverImpl(discoveryOptions, testMethod, factAttribute); + + protected virtual IEnumerable DiscoverImpl(ITestFrameworkDiscoveryOptions discoveryOptions, + ITestMethod testMethod, IAttributeInfo factAttribute + ) => _factDiscoverer.Discover(discoveryOptions, testMethod, factAttribute); /// /// Detemines whether a test method should be skipped, and the reason why diff --git a/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/TheoryUnitTestDiscoverer.cs b/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/TheoryUnitTestDiscoverer.cs new file mode 100644 index 0000000000..29ef1b6475 --- /dev/null +++ b/abstractions/src/OpenSearch.OpenSearch.Xunit/XunitPlumbing/TheoryUnitTestDiscoverer.cs @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: Apache-2.0 +* +* The OpenSearch Contributors require contributions made to +* this file be licensed under the Apache-2.0 license or a +* compatible open source license. +*/ + +using System.Collections.Generic; +using Xunit; +using Xunit.Abstractions; +using Xunit.Sdk; + +namespace OpenSearch.OpenSearch.Xunit.XunitPlumbing +{ + /// + /// An Xunit theory unit test + /// + [XunitTestCaseDiscoverer("OpenSearch.OpenSearch.Xunit.XunitPlumbing.TheoryUnitTestDiscoverer", + "OpenSearch.OpenSearch.Xunit")] + public class TU : TheoryAttribute + { + } + + public class TheoryUnitTestDiscoverer : UnitTestDiscoverer + { + private readonly TheoryDiscoverer _discoverer; + + public TheoryUnitTestDiscoverer(IMessageSink diagnosticMessageSink) : base(diagnosticMessageSink) => + _discoverer = new TheoryDiscoverer(diagnosticMessageSink); + + protected override IEnumerable DiscoverImpl(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, + IAttributeInfo factAttribute + ) => _discoverer.Discover(discoveryOptions, testMethod, factAttribute); + } +} diff --git a/abstractions/src/OpenSearch.OpenSearch.Xunit/packages.lock.json b/abstractions/src/OpenSearch.OpenSearch.Xunit/packages.lock.json index 8009e82b8e..ddebaa4593 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Xunit/packages.lock.json +++ b/abstractions/src/OpenSearch.OpenSearch.Xunit/packages.lock.json @@ -196,7 +196,7 @@ "opensearch.opensearch.ephemeral": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", "SharpZipLib.NETStandard": "1.0.7", "System.Runtime.InteropServices.RuntimeInformation": "4.3.0" } @@ -204,7 +204,7 @@ "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } @@ -1042,14 +1042,14 @@ "opensearch.opensearch.ephemeral": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", "SharpZipLib.NETStandard": "1.0.7" } }, "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApi/Artifact.cs b/abstractions/src/OpenSearch.Stack.ArtifactsApi/Artifact.cs index 5c235a16c7..dd1e248305 100644 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApi/Artifact.cs +++ b/abstractions/src/OpenSearch.Stack.ArtifactsApi/Artifact.cs @@ -41,13 +41,7 @@ public class Artifact internal Artifact(Product product, Version version, string downloadUrl, ArtifactBuildState state, string buildHash) { - ServerType = product.ServerType; - switch (ServerType) - { - case ServerType.OpenSearch: ProductName = "opensearch"; break; // actually = product.ProductName - case ServerType.OpenDistro: ProductName = "opendistroforelasticsearch"; break; - case ServerType.ElasticSearch: ProductName = "elasticsearch"; break; - } + ProductName = product?.ProductName ?? "opensearch"; Version = version; DownloadUrl = product?.PatchDownloadUrl(downloadUrl); State = state; @@ -98,7 +92,6 @@ public string Archive } // ReSharper disable UnusedAutoPropertyAccessor.Global - public ServerType ServerType { get; } public string ProductName { get; } public Version Version { get; } public string DownloadUrl { get; } diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApi/OpenSearchVersion.cs b/abstractions/src/OpenSearch.Stack.ArtifactsApi/OpenSearchVersion.cs index 9393a8cd16..456bc20b67 100644 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApi/OpenSearchVersion.cs +++ b/abstractions/src/OpenSearch.Stack.ArtifactsApi/OpenSearchVersion.cs @@ -62,6 +62,7 @@ public Artifact Artifact(Product product) var cacheKey = product.ToString(); if (_resolved.TryGetValue(cacheKey, out var artifact)) return artifact; + var currentPlatform = OsMonikers.CurrentPlatform(); switch (ArtifactBuildState) { @@ -87,43 +88,9 @@ public Artifact Artifact(Product product) /// /// Resolves an OpenSearch version using either format '$version' or '$ServerType-$version', where version could be 'x.y.z' or 'latest' or even 'latest-x' /// - public static OpenSearchVersion From(string managedVersionString) - { - if (managedVersionString == null) - return null; - - var serverType = ServerType.DEFAULT; - var hasServerType = Enum.GetNames(typeof(ServerType)).Any(s => managedVersionString.StartsWith(s, StringComparison.InvariantCultureIgnoreCase)); - if (hasServerType) - { - var parts = managedVersionString.Split('-'); - serverType = (ServerType)Enum.Parse(typeof(ServerType), parts[0], true); - managedVersionString = string.Join("-", parts.Skip(1)); - } - - if (managedVersionString.StartsWith("latest") && serverType == ServerType.OpenDistro) - // No releases for OpenDistro after 1.13.3 - all deveploment afterwards goes to OpenSearch - managedVersionString = "1.13.3"; - if (managedVersionString.StartsWith("latest") && serverType == ServerType.ElasticSearch) - // OpenDistro (1.13.x - another not supported) and OpenSearch both based on Elasticsearch v.7.10.2, other versions are incompatible - managedVersionString = "7.10.2"; - + public static OpenSearchVersion From(string managedVersionString) => // TODO resolve `latest` and `latest-x` for OpenSearch - - return new OpenSearchVersion(managedVersionString, ArtifactBuildState.Released, ""); - } - - internal static bool TryParseBuildCandidate(string passedVersion, out string version, out string gitHash) - { - version = null; - gitHash = null; - var tokens = passedVersion.Split(':'); - if (tokens.Length < 2) - return false; - version = tokens[1].Trim(); - gitHash = tokens[0].Trim(); - return true; - } + managedVersionString == null ? null : new OpenSearchVersion(managedVersionString, ArtifactBuildState.Released, ""); public bool InRange(string range) { @@ -147,26 +114,33 @@ public bool InRange(Range versionRange) public static implicit operator OpenSearchVersion(string version) => From(version); public static bool operator <(OpenSearchVersion first, string second) => first < (OpenSearchVersion)second; + public static bool operator >(OpenSearchVersion first, string second) => first > (OpenSearchVersion)second; public static bool operator <(string first, OpenSearchVersion second) => (OpenSearchVersion)first < second; + public static bool operator >(string first, OpenSearchVersion second) => (OpenSearchVersion)first > second; public static bool operator <=(OpenSearchVersion first, string second) => first <= (OpenSearchVersion)second; + public static bool operator >=(OpenSearchVersion first, string second) => first >= (OpenSearchVersion)second; public static bool operator <=(string first, OpenSearchVersion second) => (OpenSearchVersion)first <= second; + public static bool operator >=(string first, OpenSearchVersion second) => (OpenSearchVersion)first >= second; public static bool operator ==(OpenSearchVersion first, string second) => first == (OpenSearchVersion)second; + public static bool operator !=(OpenSearchVersion first, string second) => first != (OpenSearchVersion)second; public static bool operator ==(string first, OpenSearchVersion second) => (OpenSearchVersion)first == second; + public static bool operator !=(string first, OpenSearchVersion second) => (OpenSearchVersion)first != second; // ReSharper disable once UnusedMember.Local private bool Equals(OpenSearchVersion other) => base.Equals(other); + public override bool Equals(object obj) => base.Equals(obj); public override int GetHashCode() => base.GetHashCode(); diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApi/Products/Product.cs b/abstractions/src/OpenSearch.Stack.ArtifactsApi/Products/Product.cs index bd515ae829..71e8863e3a 100644 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApi/Products/Product.cs +++ b/abstractions/src/OpenSearch.Stack.ArtifactsApi/Products/Product.cs @@ -40,11 +40,9 @@ public class Product private Product(string productName) => ProductName = productName; - protected Product(string productName, SubProduct relatedProduct, ServerType serverType, - OpenSearchVersion platformVersionSuffixAfter = null) : this(productName) + protected Product(string productName, SubProduct relatedProduct, OpenSearchVersion platformVersionSuffixAfter = null) : this(productName) { SubProduct = relatedProduct; - ServerType = serverType; PlatformSuffixAfter = platformVersionSuffixAfter ?? DefaultIncludePlatformSuffix; } @@ -56,8 +54,6 @@ protected Product(string productName, SubProduct relatedProduct, ServerType serv public string ProductName { get; } - public ServerType ServerType { get; } - public bool PlatformDependent => SubProduct?.PlatformDependent ?? true; public OpenSearchVersion PlatformSuffixAfter { get; } @@ -66,10 +62,9 @@ protected Product(string productName, SubProduct relatedProduct, ServerType serv public static Product OpenSearchDashboards { get; } = From("opensearch-dashboards", platformInZipAfter: "1.0.0"); - public static Product From(string product, SubProduct subProduct = null, ServerType serverType = ServerType.DEFAULT, - OpenSearchVersion platformInZipAfter = null) => - CachedProducts.GetOrAdd(subProduct == null ? $"{product}-{serverType}" : $"{product}/{subProduct.SubProductName}", - k => new Product(product, subProduct, serverType, platformInZipAfter)); + public static Product From(string product, SubProduct subProduct = null, OpenSearchVersion platformInZipAfter = null) => + CachedProducts.GetOrAdd(subProduct == null ? $"{product}" : $"{product}/{subProduct.SubProductName}", + k => new Product(product, subProduct, platformInZipAfter)); public static Product OpenSearchPlugin(OpenSearchPlugin plugin) => From("opensearch-plugins", plugin); diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApi/Resolvers/ReleasedVersionResolver.cs b/abstractions/src/OpenSearch.Stack.ArtifactsApi/Resolvers/ReleasedVersionResolver.cs index 6533e4a6b4..720c104a00 100644 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApi/Resolvers/ReleasedVersionResolver.cs +++ b/abstractions/src/OpenSearch.Stack.ArtifactsApi/Resolvers/ReleasedVersionResolver.cs @@ -26,7 +26,6 @@ * under the License. */ -using System; using System.Runtime.InteropServices; using OpenSearch.Stack.ArtifactsApi.Platform; using OpenSearch.Stack.ArtifactsApi.Products; @@ -40,44 +39,12 @@ public static class ReleasedVersionResolver public static bool TryResolve(Product product, Version version, OSPlatform platform, Architecture architecture, out Artifact artifact) { - var downloadUrl = ""; - switch (product.ServerType) - { - case ServerType.OpenSearch: - var productMoniker = product.Moniker; - var platformMoniker = OsMonikers.GetOpenSearchPlatformMoniker(platform, architecture); - var downloadPath = $"{ArtifactsUrl}/releases/bundle/{product}/{version}"; - var extension = OsMonikers.GetPlatformArchiveExtension(platform); - var archive = $"{productMoniker}-{version}-{platformMoniker}.{extension}"; - downloadUrl = $"{downloadPath}/{archive}"; - break; - case ServerType.OpenDistro: - if (platform == OSPlatform.Linux) - { - // Only version 1.13.x supported, because it is based on elasticsearch 7.10.2: https://opendistro.github.io/for-elasticsearch-docs/version-history/ - if (version < new Version("1.13.0")) - throw new ArgumentOutOfRangeException($"This OpenDistro version {version} is not supported, only 1.13.0 to 1.13.3 are supported"); - downloadUrl = $"https://d3g5vo6xdbdb9a.cloudfront.net/tarball/opendistro-elasticsearch/opendistroforelasticsearch-{version}-linux-x64.{product.Extension}"; - } - else if (platform == OSPlatform.Windows) - { - // No Windows package for version < 1.3.0 - if (version < new Version("1.13.0")) - throw new ArgumentOutOfRangeException($"This OpenDistro version {version} is not supported, only 1.13.0 to 1.13.3 are supported"); - downloadUrl = $"https://d3g5vo6xdbdb9a.cloudfront.net/downloads/odfe-windows/ode-windows-zip/opendistroforelasticsearch-{version}-windows-x64.{product.Extension}"; - } - else - throw new ArgumentOutOfRangeException($"OS {platform} is not supported by OpenDistro"); - break; - case ServerType.ElasticSearch: - // Only Elasticsearch v.7.10.2 is supported - if (version != new Version("7.10.2")) - throw new ArgumentOutOfRangeException($"Elasticsearch version {version} is not supported, the only supported version is 7.10.2"); - if (platform == OSPlatform.Windows) downloadUrl = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.10.2-windows-x86_64.zip"; - if (platform == OSPlatform.Linux) downloadUrl = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.10.2-linux-x86_64.tar.gz"; - if (platform == OSPlatform.OSX) downloadUrl = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.10.2-darwin-x86_64.tar.gz"; - break; - } + var productMoniker = product.Moniker; + var platformMoniker = OsMonikers.GetOpenSearchPlatformMoniker(platform, architecture); + var downloadPath = $"{ArtifactsUrl}/releases/bundle/{product}/{version}"; + var extension = OsMonikers.GetPlatformArchiveExtension(platform); + var archive = $"{productMoniker}-{version}-{platformMoniker}.{extension}"; + var downloadUrl = $"{downloadPath}/{archive}"; artifact = new Artifact(product, version, downloadUrl, ArtifactBuildState.Released, null); return true; diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApi/Resolvers/StagingVersionResolver.cs b/abstractions/src/OpenSearch.Stack.ArtifactsApi/Resolvers/StagingVersionResolver.cs index c5a49525f2..a6f51fe837 100644 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApi/Resolvers/StagingVersionResolver.cs +++ b/abstractions/src/OpenSearch.Stack.ArtifactsApi/Resolvers/StagingVersionResolver.cs @@ -26,8 +26,6 @@ * under the License. */ -using System; -using OpenSearch.Stack.ArtifactsApi.Platform; using OpenSearch.Stack.ArtifactsApi.Products; using Version = SemVer.Version; @@ -38,10 +36,6 @@ public static class StagingVersionResolver public static bool TryResolve(Product product, Version version, string buildHash, out Artifact artifact) { artifact = null; - // Tests are not supposed to run on any staging server except OpenSearch - if (product.ServerType != ServerType.OpenSearch) - throw new ArgumentOutOfRangeException($"Tests are not supposed to run on staging {product.ServerType} regardless of version"); - // Only Linux and only x64 is supported now var downloadUrl = $"https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/{version}/latest/linux/x64/dist/opensearch/opensearch-{version}-linux-x64.{product.Extension}"; artifact = new Artifact(product, version, downloadUrl, ArtifactBuildState.BuildCandidate, buildHash); diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApi/ServerType.cs b/abstractions/src/OpenSearch.Stack.ArtifactsApi/ServerType.cs deleted file mode 100644 index 25ae3e9555..0000000000 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApi/ServerType.cs +++ /dev/null @@ -1,38 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 -* -* The OpenSearch Contributors require contributions made to -* this file be licensed under the Apache-2.0 license or a -* compatible open source license. -*/ -/* -* Modifications Copyright OpenSearch Contributors. See -* GitHub history for details. -* -* Licensed to Elasticsearch B.V. under one or more contributor -* license agreements. See the NOTICE file distributed with -* this work for additional information regarding copyright -* ownership. Elasticsearch B.V. licenses this file to you under -* the Apache License, Version 2.0 (the "License"); you may -* not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -namespace OpenSearch.Stack.ArtifactsApi -{ - public enum ServerType - { - OpenSearch, - OpenDistro, - ElasticSearch, - DEFAULT = OpenSearch - } -} diff --git a/abstractions/src/OpenSearch.OpenSearch.EphemeralTests/EphemeralClusterTests.cs b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/EphemeralClusterTests.cs similarity index 78% rename from abstractions/src/OpenSearch.OpenSearch.EphemeralTests/EphemeralClusterTests.cs rename to abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/EphemeralClusterTests.cs index 48dc376658..e67cf97164 100644 --- a/abstractions/src/OpenSearch.OpenSearch.EphemeralTests/EphemeralClusterTests.cs +++ b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/EphemeralClusterTests.cs @@ -29,6 +29,7 @@ using System.Collections; using System.Collections.Generic; using OpenSearch.OpenSearch.Ephemeral; +using OpenSearch.OpenSearch.Xunit.XunitPlumbing; using OpenSearch.Stack.ArtifactsApi; using Xunit; @@ -36,13 +37,13 @@ namespace OpenSearch.OpenSearch.EphemeralTests { public class EphemeralClusterTests { - [Theory] + [TU] [ClassData(typeof(SampleClusters))] - public void TestEphemeralCluster(OpenSearchVersion version, ServerType serverType, ClusterFeatures features) + public void TestEphemeralCluster(OpenSearchVersion version, ClusterFeatures features) { - var numberOfNodes = 1; + const int numberOfNodes = 1; var clusterConfiguration = - new EphemeralClusterConfiguration(version, serverType, features, null, numberOfNodes) + new EphemeralClusterConfiguration(version, features, null, numberOfNodes) { ShowOpenSearchOutputAfterStarted = true }; @@ -63,16 +64,10 @@ private class SampleClusters : IEnumerable { public IEnumerator GetEnumerator() { - yield return new object[] {OpenSearchVersion.From("1.2.0"), ServerType.OpenSearch, ClusterFeatures.None}; - yield return new object[] - { - OpenSearchVersion.From("opendistro-latest"), ServerType.OpenDistro, ClusterFeatures.None - }; - yield return new object[] {OpenSearchVersion.From("1.2.0"), ServerType.OpenSearch, ClusterFeatures.SSL}; - yield return new object[] - { - OpenSearchVersion.From("opendistro-latest"), ServerType.OpenDistro, ClusterFeatures.SSL - }; + yield return new object[] {OpenSearchVersion.From("1.2.0"), ClusterFeatures.None}; + yield return new object[] {OpenSearchVersion.From("2.2.0"), ClusterFeatures.None}; + yield return new object[] {OpenSearchVersion.From("1.2.0"), ClusterFeatures.SSL}; + yield return new object[] {OpenSearchVersion.From("2.2.0"), ClusterFeatures.SSL}; } IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); diff --git a/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj new file mode 100644 index 0000000000..6e51cc53fe --- /dev/null +++ b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/OpenSearch.OpenSearch.EphemeralTests.csproj @@ -0,0 +1,22 @@ + + + + + net5.0 + false + false + + + + + + + + + + + + + + + diff --git a/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/XunitBootstrap.cs b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/XunitBootstrap.cs new file mode 100644 index 0000000000..55f37d3efb --- /dev/null +++ b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/XunitBootstrap.cs @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: Apache-2.0 +* +* The OpenSearch Contributors require contributions made to +* this file be licensed under the Apache-2.0 license or a +* compatible open source license. +*/ + +using OpenSearch.OpenSearch.Xunit; +using Tests.Core.Xunit; +using Xunit; + +[assembly: TestFramework("OpenSearch.OpenSearch.Xunit.Sdk.OpenSearchTestFramework", "OpenSearch.OpenSearch.Xunit")] +[assembly: OpenSearchXunitConfiguration(typeof(OpenSearchClientXunitRunOptions))] diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApiTests/packages.lock.json b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/packages.lock.json similarity index 68% rename from abstractions/src/OpenSearch.Stack.ArtifactsApiTests/packages.lock.json rename to abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/packages.lock.json index 55c65b1632..020638f28e 100644 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApiTests/packages.lock.json +++ b/abstractions/tests/OpenSearch.OpenSearch.EphemeralTests/packages.lock.json @@ -2,12 +2,6 @@ "version": 1, "dependencies": { ".NETCoreApp,Version=v5.0": { - "coverlet.collector": { - "type": "Direct", - "requested": "[3.1.0, )", - "resolved": "3.1.0", - "contentHash": "YzYqSRrjoP5lULBhTDcTOjuM4IDPPi6PhFsl4w8EI4WdZhE6llt7E38Tg4CHyrS+QKwyu1+9OwkdDgluOdoBTw==" - }, "Microsoft.NET.Test.Sdk": { "type": "Direct", "requested": "[16.5.0, )", @@ -24,22 +18,34 @@ "resolved": "1.0.0-preview.2", "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, - "xunit": { + "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.1, )", - "resolved": "2.4.1", - "contentHash": "XNR3Yz9QTtec16O0aKcO6+baVNpXmOnPUxDkCY97J+8krUYxPvXT1szYYEUdKk4sB8GOI2YbAjRIOm8ZnXRfzQ==", + "requested": "[2.4.5, )", + "resolved": "2.4.5", + "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + }, + "Bogus": { + "type": "Transitive", + "resolved": "22.1.2", + "contentHash": "FnYg++zOsFkN3wQJcPT6U4bmZoW/zDWp474QsZG2KX/ClCiEOwIfUxJ9xuKgwv46K0LvVoicQD09hgPke0FG1A==" + }, + "DiffPlex": { + "type": "Transitive", + "resolved": "1.7.1", + "contentHash": "a0fSO2p8ykrcfzgG0sjpZAMZPthXXz4l6UIVuM9uyIYIh5yga4sq3aydSGt6n+MkdSBKvMurjjaKnxIqZtfG1g==" + }, + "FluentAssertions": { + "type": "Transitive", + "resolved": "5.10.3", + "contentHash": "gVPEVp1hLVqcv+7Q2wiDf7kqCNn7+bQcQ0jbJ2mcRT6CeRoZl1tNkqvzSIhvekyldDptk77j1b03MXTTRIqqpg==", "dependencies": { - "xunit.analyzers": "0.10.0", - "xunit.assert": "[2.4.1]", - "xunit.core": "[2.4.1]" + "System.Configuration.ConfigurationManager": "4.4.0" } }, - "xunit.runner.visualstudio": { - "type": "Direct", - "requested": "[2.4.3, )", - "resolved": "2.4.3", - "contentHash": "kZZSmOmKA8OBlAJaquPXnJJLM9RwQ27H7BMVqfMLUcTi9xHinWGJiWksa3D4NEtz0wZ/nxd2mogObvBgJKCRhQ==" + "JunitXml.TestLogger": { + "type": "Transitive", + "resolved": "2.1.78", + "contentHash": "4y4FSfKWxlked8ilQdqBBSeRMf5jD/Hkvyp744hc54yQcABLt4rR2Q+4hNqAqrSo+mhwAlusj2rpXpN/5TICCA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", @@ -48,26 +54,8 @@ }, "Microsoft.CSharp": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "17h8b5mXa87XYKrrVqdgZ38JefSUqLChUQpXgSnpzsM0nDOhE40FTeNWOJ/YmySGV6tG6T8+hjz6vxbknHJr6A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11" - } + "resolved": "4.6.0", + "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -106,91 +94,48 @@ "System.Runtime": "4.3.0" } }, - "NETStandard.Library": { + "Microsoft.Win32.Registry": { "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", + "resolved": "4.3.0", + "contentHash": "Lw1/VwLH1yxz6SfFEjVRCN0pnflLEsWgnV4qsdJ512/HhTwnKXUG+zDQ4yTO3K/EJQemGoNaBHX5InISNKTzUQ==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.AppContext": "4.3.0", "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.Compression.ZipFile": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", "System.Resources.ResourceManager": "4.3.0", "System.Runtime": "4.3.0", "System.Runtime.Extensions": "4.3.0", "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Timer": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0" + "System.Runtime.InteropServices": "4.3.0" } }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", - "dependencies": { - "Microsoft.CSharp": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Text.Encoding": "4.0.11", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XDocument": "4.0.11" - } + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, "NuGet.Frameworks": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" }, + "Nullean.VsTest.Pretty.TestLogger": { + "type": "Transitive", + "resolved": "0.3.0", + "contentHash": "11Cklf+kZ1JS+l3CRZaWQaQHmRm0Je/iIrci6bwY5c9/QXrCuYgWe/A2w0G1eYe33QU5sgUmds48Y7HQFK89mw==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "15.8.0" + } + }, + "Proc": { + "type": "Transitive", + "resolved": "0.6.1", + "contentHash": "xRSCfgQNoGy60MOuvD2X1euzqvWDoyfpB8NAfVs2E5K5U1I8cA9MvVY6NbUkp5ApbOmVXls2JEPrOn8rQi2Pzg==", + "dependencies": { + "System.Diagnostics.Process": "[4.3.0]", + "System.Threading.Thread": "[4.3.0]" + } + }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", "resolved": "4.3.2", @@ -215,15 +160,6 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, - "runtime.native.System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, "runtime.native.System.Net.Http": { "type": "Transitive", "resolved": "4.3.0", @@ -306,25 +242,18 @@ "NETStandard.Library": "1.6.0" } }, - "System.AppContext": { + "SharpZipLib.NETStandard": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", + "resolved": "1.0.7", + "contentHash": "mYKPizF2CY32RQB8FITYy0e30gVgItFA63SFquruaxq+votwL1T+yOfssK10v4enBcxklr8ks48hS1emw5TTXg==", "dependencies": { - "System.Runtime": "4.3.0" + "NETStandard.Library": "1.6.1" } }, "System.Buffers": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.Collections": { "type": "Transitive", @@ -353,16 +282,12 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Console": { + "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", + "resolved": "4.4.0", + "contentHash": "gWwQv/Ug1qWJmHCmN17nAbxJYmQBM/E94QxKLksvUiiKB1Ld3Sc/eK1lgmbSjDFxkQhVuayI/cGFZhpBSodLrg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" + "System.Security.Cryptography.ProtectedData": "4.4.0" } }, "System.Diagnostics.Debug": { @@ -377,24 +302,35 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "5.0.0", + "contentHash": "tCQTzPsGZh/A9LhhA6zrqCRV4hOHsK90/G7q3Khxmn6tnB1PuNU0cRaKANP2AWcF9bn0zsuOoZOSrHuJk6oNBA==" }, - "System.Diagnostics.Tools": { + "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", + "contentHash": "J0wOX07+QASQblsfxmIMFc9Iq7KTXYL3zs2G/Xc704Ylv3NpuVdo6gij6V3PGiptTxqsK0K7CdXenRvKUnkA2g==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" + "Microsoft.Win32.Primitives": "4.3.0", + "Microsoft.Win32.Registry": "4.3.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Threading.ThreadPool": "4.3.0", + "runtime.native.System": "4.3.0" } }, "System.Diagnostics.Tracing": { @@ -407,28 +343,6 @@ "System.Runtime": "4.3.0" } }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -475,44 +389,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.IO.Compression": "4.3.0" - } - }, - "System.IO.Compression.ZipFile": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", - "dependencies": { - "System.Buffers": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, "System.IO.FileSystem": { "type": "Transitive", "resolved": "4.3.0", @@ -548,30 +424,6 @@ "System.Runtime.Extensions": "4.3.0" } }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Net.Http": { "type": "Transitive", "resolved": "4.3.4", @@ -616,31 +468,6 @@ "System.Runtime.Handles": "4.3.0" } }, - "System.Net.Sockets": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -653,39 +480,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Reflection.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -707,15 +501,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -800,15 +585,6 @@ "System.Runtime.Extensions": "4.3.0" } }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "HZ6Du5QrTG8MNJbf4e4qMO3JRAkIboGT5Fk804uZtg3Gq516S7hAqTm2UZKUHa7/6HUGdVy3AqMQKbns06G/cg==", - "dependencies": { - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0" - } - }, "System.Security.Cryptography.Algorithms": { "type": "Transitive", "resolved": "4.3.0", @@ -921,6 +697,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" + }, "System.Security.Cryptography.X509Certificates": { "type": "Transitive", "resolved": "4.3.0", @@ -991,14 +772,6 @@ "System.Text.Encodings.Web": "6.0.0" } }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, "System.Threading": { "type": "Transitive", "resolved": "4.3.0", @@ -1018,65 +791,31 @@ "System.Runtime": "4.3.0" } }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Threading.Timer": { + "System.Threading.Thread": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", + "contentHash": "OHmbT+Zz065NKII/ZHcH9XO1dEuLGI1L2k7uYss+9C1jLxTC9kTZZuzUOyXHayRk+dft9CiDf3I/QZ0t8JKyBQ==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", "System.Runtime": "4.3.0" } }, - "System.Xml.ReaderWriter": { + "System.Threading.ThreadPool": { "type": "Transitive", "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "contentHash": "k/+g4b7vjdd4aix83sTgC9VG6oXYKAktSfNIJUNGxPEj7ryEOfzHHhfnmsZvjxawwcD9HyWXKCXmPjX8U4zeSw==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" + "System.Runtime.Handles": "4.3.0" } }, - "System.Xml.XDocument": { + "xunit": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", + "resolved": "2.4.2", + "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" + "xunit.analyzers": "1.0.0", + "xunit.assert": "2.4.2", + "xunit.core": "[2.4.2]" } }, "xunit.abstractions": { @@ -1086,30 +825,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "0.10.0", - "contentHash": "4/IDFCJfIeg6bix9apmUtIMwvOsiwqdEexeO/R2D4GReIGPLIRODTpId/l4LRSrAJk9lEO3Zx1H0Zx6uohJDNg==" + "resolved": "1.0.0", + "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "O/Oe0BS5RmSsM+LQOb041TzuPo5MdH2Rov+qXGS37X+KFG1Hxz7kopYklM5+1Y+tRGeXrOx5+Xne1RuqLFQoyQ==", + "resolved": "2.4.2", + "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "Zsj5OMU6JasNGERXZy8s72+pcheG6Q15atS5XpZXqAtULuyQiQ6XNnUsp1gyfC6WgqScqMvySiEHmHcOG6Eg0Q==", + "resolved": "2.4.2", + "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", "dependencies": { - "xunit.extensibility.core": "[2.4.1]", - "xunit.extensibility.execution": "[2.4.1]" + "xunit.extensibility.core": "[2.4.2]", + "xunit.extensibility.execution": "[2.4.2]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "yKZKm/8QNZnBnGZFD9SewkllHBiK0DThybQD/G4PiAmQjKtEZyHi6ET70QPU9KtSMJGRYS6Syk7EyR2EVDU4Kg==", + "resolved": "2.4.2", + "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1117,11 +856,54 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "7e/1jqBpcb7frLkB6XDrHCGXAbKN4Rtdb88epYxCSRQuZDRW8UtTfdTEVpdTl8s4T56e07hOBVd4G0OdCxIY2A==", + "resolved": "2.4.2", + "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.1]" + "xunit.extensibility.core": "[2.4.2]" + } + }, + "opensearch.client": { + "type": "Project", + "dependencies": { + "OpenSearch.Net": "1.1.0" + } + }, + "opensearch.client.jsonnetserializer": { + "type": "Project", + "dependencies": { + "Newtonsoft.Json": "13.0.1", + "OpenSearch.Client": "1.1.0" + } + }, + "opensearch.net": { + "type": "Project", + "dependencies": { + "Microsoft.CSharp": "4.6.0", + "System.Buffers": "4.5.1", + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, + "opensearch.opensearch.ephemeral": { + "type": "Project", + "dependencies": { + "OpenSearch.OpenSearch.Managed": "1.1.0", + "SharpZipLib.NETStandard": "1.0.7" + } + }, + "opensearch.opensearch.managed": { + "type": "Project", + "dependencies": { + "OpenSearch.Stack.ArtifactsApi": "1.1.0", + "Proc": "0.6.1", + "System.Net.Http": "4.3.4" + } + }, + "opensearch.opensearch.xunit": { + "type": "Project", + "dependencies": { + "OpenSearch.OpenSearch.Ephemeral": "1.1.0", + "xunit": "2.4.2" } }, "opensearch.stack.artifactsapi": { @@ -1132,6 +914,37 @@ "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", "System.Text.Json": "6.0.5" } + }, + "tests.configuration": { + "type": "Project", + "dependencies": { + "OpenSearch.OpenSearch.Managed": "1.1.0" + } + }, + "tests.core": { + "type": "Project", + "dependencies": { + "DiffPlex": "1.7.1", + "FluentAssertions": "5.10.3", + "JunitXml.TestLogger": "2.1.78", + "Microsoft.NET.Test.Sdk": "16.5.0", + "Nullean.VsTest.Pretty.TestLogger": "0.3.0", + "OpenSearch.Client.JsonNetSerializer": "1.1.0", + "OpenSearch.OpenSearch.Xunit": "1.1.0", + "Proc": "0.6.1", + "Tests.Domain": "1.1.0", + "xunit": "2.4.2" + } + }, + "tests.domain": { + "type": "Project", + "dependencies": { + "Bogus": "22.1.2", + "Newtonsoft.Json": "13.0.1", + "OpenSearch.Client": "1.1.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", + "Tests.Configuration": "1.1.0" + } } } } diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj similarity index 51% rename from abstractions/src/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj rename to abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj index 9a1e672dce..e267a417ef 100644 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj +++ b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/OpenSearch.Stack.ArtifactsApiTests.csproj @@ -9,17 +9,13 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + - + + diff --git a/abstractions/src/OpenSearch.Stack.ArtifactsApiTests/ReleasedVersionResolverTests.cs b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/ReleasedVersionResolverTests.cs similarity index 98% rename from abstractions/src/OpenSearch.Stack.ArtifactsApiTests/ReleasedVersionResolverTests.cs rename to abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/ReleasedVersionResolverTests.cs index e7acd2bf45..c9fa3b1cfb 100644 --- a/abstractions/src/OpenSearch.Stack.ArtifactsApiTests/ReleasedVersionResolverTests.cs +++ b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/ReleasedVersionResolverTests.cs @@ -30,6 +30,7 @@ using System; using System.Net; using System.Runtime.InteropServices; +using OpenSearch.OpenSearch.Xunit.XunitPlumbing; using OpenSearch.Stack.ArtifactsApi; using OpenSearch.Stack.ArtifactsApi.Products; using OpenSearch.Stack.ArtifactsApi.Resolvers; @@ -43,7 +44,8 @@ public class ReleasedVersionResolverTests public ReleasedVersionResolverTests(ITestOutputHelper traceSink) => _traceSink = traceSink ?? throw new NullReferenceException(nameof(traceSink)); private readonly ITestOutputHelper _traceSink; - [Fact] + + [U] public void Does_Resolver_Construct_Valid_DownloadUrl_Test() { var testCases = new[] diff --git a/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/XunitBootstrap.cs b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/XunitBootstrap.cs new file mode 100644 index 0000000000..55f37d3efb --- /dev/null +++ b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/XunitBootstrap.cs @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: Apache-2.0 +* +* The OpenSearch Contributors require contributions made to +* this file be licensed under the Apache-2.0 license or a +* compatible open source license. +*/ + +using OpenSearch.OpenSearch.Xunit; +using Tests.Core.Xunit; +using Xunit; + +[assembly: TestFramework("OpenSearch.OpenSearch.Xunit.Sdk.OpenSearchTestFramework", "OpenSearch.OpenSearch.Xunit")] +[assembly: OpenSearchXunitConfiguration(typeof(OpenSearchClientXunitRunOptions))] diff --git a/abstractions/src/OpenSearch.OpenSearch.EphemeralTests/packages.lock.json b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/packages.lock.json similarity index 67% rename from abstractions/src/OpenSearch.OpenSearch.EphemeralTests/packages.lock.json rename to abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/packages.lock.json index 60ab2b8fff..020638f28e 100644 --- a/abstractions/src/OpenSearch.OpenSearch.EphemeralTests/packages.lock.json +++ b/abstractions/tests/OpenSearch.Stack.ArtifactsApiTests/packages.lock.json @@ -18,22 +18,34 @@ "resolved": "1.0.0-preview.2", "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, - "xunit": { + "xunit.runner.visualstudio": { "type": "Direct", - "requested": "[2.4.1, )", - "resolved": "2.4.1", - "contentHash": "XNR3Yz9QTtec16O0aKcO6+baVNpXmOnPUxDkCY97J+8krUYxPvXT1szYYEUdKk4sB8GOI2YbAjRIOm8ZnXRfzQ==", + "requested": "[2.4.5, )", + "resolved": "2.4.5", + "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw==" + }, + "Bogus": { + "type": "Transitive", + "resolved": "22.1.2", + "contentHash": "FnYg++zOsFkN3wQJcPT6U4bmZoW/zDWp474QsZG2KX/ClCiEOwIfUxJ9xuKgwv46K0LvVoicQD09hgPke0FG1A==" + }, + "DiffPlex": { + "type": "Transitive", + "resolved": "1.7.1", + "contentHash": "a0fSO2p8ykrcfzgG0sjpZAMZPthXXz4l6UIVuM9uyIYIh5yga4sq3aydSGt6n+MkdSBKvMurjjaKnxIqZtfG1g==" + }, + "FluentAssertions": { + "type": "Transitive", + "resolved": "5.10.3", + "contentHash": "gVPEVp1hLVqcv+7Q2wiDf7kqCNn7+bQcQ0jbJ2mcRT6CeRoZl1tNkqvzSIhvekyldDptk77j1b03MXTTRIqqpg==", "dependencies": { - "xunit.analyzers": "0.10.0", - "xunit.assert": "[2.4.1]", - "xunit.core": "[2.4.1]" + "System.Configuration.ConfigurationManager": "4.4.0" } }, - "xunit.runner.visualstudio": { - "type": "Direct", - "requested": "[2.4.3, )", - "resolved": "2.4.3", - "contentHash": "kZZSmOmKA8OBlAJaquPXnJJLM9RwQ27H7BMVqfMLUcTi9xHinWGJiWksa3D4NEtz0wZ/nxd2mogObvBgJKCRhQ==" + "JunitXml.TestLogger": { + "type": "Transitive", + "resolved": "2.1.78", + "contentHash": "4y4FSfKWxlked8ilQdqBBSeRMf5jD/Hkvyp744hc54yQcABLt4rR2Q+4hNqAqrSo+mhwAlusj2rpXpN/5TICCA==" }, "Microsoft.CodeCoverage": { "type": "Transitive", @@ -42,26 +54,8 @@ }, "Microsoft.CSharp": { "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "17h8b5mXa87XYKrrVqdgZ38JefSUqLChUQpXgSnpzsM0nDOhE40FTeNWOJ/YmySGV6tG6T8+hjz6vxbknHJr6A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11" - } + "resolved": "4.6.0", + "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, "Microsoft.NETCore.Platforms": { "type": "Transitive", @@ -115,91 +109,24 @@ "System.Runtime.InteropServices": "4.3.0" } }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "1.6.1", - "contentHash": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.AppContext": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Console": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.Compression.ZipFile": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Net.Sockets": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Timer": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Xml.XDocument": "4.3.0" - } - }, "Newtonsoft.Json": { "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", - "dependencies": { - "Microsoft.CSharp": "4.0.1", - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Extensions": "4.0.1", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Text.Encoding": "4.0.11", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Text.RegularExpressions": "4.1.0", - "System.Threading": "4.0.11", - "System.Threading.Tasks": "4.0.11", - "System.Xml.ReaderWriter": "4.0.11", - "System.Xml.XDocument": "4.0.11" - } + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, "NuGet.Frameworks": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" }, + "Nullean.VsTest.Pretty.TestLogger": { + "type": "Transitive", + "resolved": "0.3.0", + "contentHash": "11Cklf+kZ1JS+l3CRZaWQaQHmRm0Je/iIrci6bwY5c9/QXrCuYgWe/A2w0G1eYe33QU5sgUmds48Y7HQFK89mw==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "15.8.0" + } + }, "Proc": { "type": "Transitive", "resolved": "0.6.1", @@ -233,15 +160,6 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, - "runtime.native.System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, "runtime.native.System.Net.Http": { "type": "Transitive", "resolved": "4.3.0", @@ -332,25 +250,10 @@ "NETStandard.Library": "1.6.1" } }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, "System.Buffers": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, "System.Collections": { "type": "Transitive", @@ -379,16 +282,12 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Console": { + "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", + "resolved": "4.4.0", + "contentHash": "gWwQv/Ug1qWJmHCmN17nAbxJYmQBM/E94QxKLksvUiiKB1Ld3Sc/eK1lgmbSjDFxkQhVuayI/cGFZhpBSodLrg==", "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" + "System.Security.Cryptography.ProtectedData": "4.4.0" } }, "System.Diagnostics.Debug": { @@ -403,15 +302,8 @@ }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "5.0.0", + "contentHash": "tCQTzPsGZh/A9LhhA6zrqCRV4hOHsK90/G7q3Khxmn6tnB1PuNU0cRaKANP2AWcF9bn0zsuOoZOSrHuJk6oNBA==" }, "System.Diagnostics.Process": { "type": "Transitive", @@ -441,16 +333,6 @@ "runtime.native.System": "4.3.0" } }, - "System.Diagnostics.Tools": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, "System.Diagnostics.Tracing": { "type": "Transitive", "resolved": "4.3.0", @@ -461,28 +343,6 @@ "System.Runtime": "4.3.0" } }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -529,44 +389,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.IO.Compression": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Buffers": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.IO.Compression": "4.3.0" - } - }, - "System.IO.Compression.ZipFile": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", - "dependencies": { - "System.Buffers": "4.3.0", - "System.IO": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, "System.IO.FileSystem": { "type": "Transitive", "resolved": "4.3.0", @@ -602,30 +424,6 @@ "System.Runtime.Extensions": "4.3.0" } }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Net.Http": { "type": "Transitive", "resolved": "4.3.4", @@ -670,31 +468,6 @@ "System.Runtime.Handles": "4.3.0" } }, - "System.Net.Sockets": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } - }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -707,39 +480,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Reflection.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -761,15 +501,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -854,15 +585,6 @@ "System.Runtime.Extensions": "4.3.0" } }, - "System.Runtime.Serialization.Primitives": { - "type": "Transitive", - "resolved": "4.1.1", - "contentHash": "HZ6Du5QrTG8MNJbf4e4qMO3JRAkIboGT5Fk804uZtg3Gq516S7hAqTm2UZKUHa7/6HUGdVy3AqMQKbns06G/cg==", - "dependencies": { - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0" - } - }, "System.Security.Cryptography.Algorithms": { "type": "Transitive", "resolved": "4.3.0", @@ -975,6 +697,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" + }, "System.Security.Cryptography.X509Certificates": { "type": "Transitive", "resolved": "4.3.0", @@ -1045,14 +772,6 @@ "System.Text.Encodings.Web": "6.0.0" } }, - "System.Text.RegularExpressions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", - "dependencies": { - "System.Runtime": "4.3.0" - } - }, "System.Threading": { "type": "Transitive", "resolved": "4.3.0", @@ -1072,16 +791,6 @@ "System.Runtime": "4.3.0" } }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, "System.Threading.Thread": { "type": "Transitive", "resolved": "4.3.0", @@ -1099,55 +808,14 @@ "System.Runtime.Handles": "4.3.0" } }, - "System.Threading.Timer": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Xml.ReaderWriter": { + "xunit": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "resolved": "2.4.2", + "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Tasks.Extensions": "4.3.0" - } - }, - "System.Xml.XDocument": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tools": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0" + "xunit.analyzers": "1.0.0", + "xunit.assert": "2.4.2", + "xunit.core": "[2.4.2]" } }, "xunit.abstractions": { @@ -1157,30 +825,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "0.10.0", - "contentHash": "4/IDFCJfIeg6bix9apmUtIMwvOsiwqdEexeO/R2D4GReIGPLIRODTpId/l4LRSrAJk9lEO3Zx1H0Zx6uohJDNg==" + "resolved": "1.0.0", + "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "O/Oe0BS5RmSsM+LQOb041TzuPo5MdH2Rov+qXGS37X+KFG1Hxz7kopYklM5+1Y+tRGeXrOx5+Xne1RuqLFQoyQ==", + "resolved": "2.4.2", + "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "Zsj5OMU6JasNGERXZy8s72+pcheG6Q15atS5XpZXqAtULuyQiQ6XNnUsp1gyfC6WgqScqMvySiEHmHcOG6Eg0Q==", + "resolved": "2.4.2", + "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", "dependencies": { - "xunit.extensibility.core": "[2.4.1]", - "xunit.extensibility.execution": "[2.4.1]" + "xunit.extensibility.core": "[2.4.2]", + "xunit.extensibility.execution": "[2.4.2]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "yKZKm/8QNZnBnGZFD9SewkllHBiK0DThybQD/G4PiAmQjKtEZyHi6ET70QPU9KtSMJGRYS6Syk7EyR2EVDU4Kg==", + "resolved": "2.4.2", + "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1188,28 +856,56 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "7e/1jqBpcb7frLkB6XDrHCGXAbKN4Rtdb88epYxCSRQuZDRW8UtTfdTEVpdTl8s4T56e07hOBVd4G0OdCxIY2A==", + "resolved": "2.4.2", + "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.1]" + "xunit.extensibility.core": "[2.4.2]" + } + }, + "opensearch.client": { + "type": "Project", + "dependencies": { + "OpenSearch.Net": "1.1.0" + } + }, + "opensearch.client.jsonnetserializer": { + "type": "Project", + "dependencies": { + "Newtonsoft.Json": "13.0.1", + "OpenSearch.Client": "1.1.0" + } + }, + "opensearch.net": { + "type": "Project", + "dependencies": { + "Microsoft.CSharp": "4.6.0", + "System.Buffers": "4.5.1", + "System.Diagnostics.DiagnosticSource": "5.0.0" } }, "opensearch.opensearch.ephemeral": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", "SharpZipLib.NETStandard": "1.0.7" } }, "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } }, + "opensearch.opensearch.xunit": { + "type": "Project", + "dependencies": { + "OpenSearch.OpenSearch.Ephemeral": "1.1.0", + "xunit": "2.4.2" + } + }, "opensearch.stack.artifactsapi": { "type": "Project", "dependencies": { @@ -1218,6 +914,37 @@ "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", "System.Text.Json": "6.0.5" } + }, + "tests.configuration": { + "type": "Project", + "dependencies": { + "OpenSearch.OpenSearch.Managed": "1.1.0" + } + }, + "tests.core": { + "type": "Project", + "dependencies": { + "DiffPlex": "1.7.1", + "FluentAssertions": "5.10.3", + "JunitXml.TestLogger": "2.1.78", + "Microsoft.NET.Test.Sdk": "16.5.0", + "Nullean.VsTest.Pretty.TestLogger": "0.3.0", + "OpenSearch.Client.JsonNetSerializer": "1.1.0", + "OpenSearch.OpenSearch.Xunit": "1.1.0", + "Proc": "0.6.1", + "Tests.Domain": "1.1.0", + "xunit": "2.4.2" + } + }, + "tests.domain": { + "type": "Project", + "dependencies": { + "Bogus": "22.1.2", + "Newtonsoft.Json": "13.0.1", + "OpenSearch.Client": "1.1.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", + "Tests.Configuration": "1.1.0" + } } } } diff --git a/build/scripts/Testing.fs b/build/scripts/Testing.fs index 4312966e86..5c2ac9edf8 100644 --- a/build/scripts/Testing.fs +++ b/build/scripts/Testing.fs @@ -95,7 +95,7 @@ module Tests = Tooling.DotNet.ExecIn "tests/Tests" ["clean";] |> ignore // needs forced eval because it picks up local nuget packages not part of package.lock.json Tooling.DotNet.ExecIn "tests/Tests" ["restore"; "--force-evaluate"] |> ignore - dotnetTest "tests/Tests/Tests.csproj" args + dotnetTest "tests/tests.proj" args let RunUnitTests args = dotnetTest "tests/tests.proj" args @@ -108,4 +108,4 @@ module Tests = for opensearchVersion in opensearchVersions do Environment.setEnvironVar "OSC_INTEGRATION_TEST" "1" Environment.setEnvironVar "OSC_INTEGRATION_VERSION" opensearchVersion - dotnetTest "tests/Tests/Tests.csproj" args + dotnetTest "tests/tests.proj" args diff --git a/build/scripts/packages.lock.json b/build/scripts/packages.lock.json index a32015abb5..bd07ffcc4c 100644 --- a/build/scripts/packages.lock.json +++ b/build/scripts/packages.lock.json @@ -77,10 +77,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Newtonsoft.Json": { "type": "Direct", @@ -166,11 +163,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1245,7 +1237,7 @@ "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } diff --git a/src/ApiGenerator/packages.lock.json b/src/ApiGenerator/packages.lock.json index d0621b8980..42a66abd8e 100644 --- a/src/ApiGenerator/packages.lock.json +++ b/src/ApiGenerator/packages.lock.json @@ -25,10 +25,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Newtonsoft.Json": { "type": "Direct", @@ -209,11 +206,6 @@ "resolved": "5.0.0", "contentHash": "cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", diff --git a/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json b/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json index 4fb7bdf65a..981ff320bc 100644 --- a/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json +++ b/src/OpenSearch.Client.JsonNetSerializer/packages.lock.json @@ -90,7 +90,7 @@ "opensearch.client": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.net": { @@ -113,10 +113,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -163,11 +160,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -306,7 +298,7 @@ "opensearch.client": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.net": { diff --git a/src/OpenSearch.Client/Cluster/NodesInfo/NodeInfo.cs b/src/OpenSearch.Client/Cluster/NodesInfo/NodeInfo.cs index b9e1036831..21032d220b 100644 --- a/src/OpenSearch.Client/Cluster/NodesInfo/NodeInfo.cs +++ b/src/OpenSearch.Client/Cluster/NodesInfo/NodeInfo.cs @@ -51,9 +51,6 @@ public class NodeInfo [DataMember(Name = "version")] public string Version { get; internal set; } - [DataMember(Name = "build_flavor")] - public string BuildFlavor { get; internal set; } - [DataMember(Name = "build_type")] public string BuildType { get; internal set; } diff --git a/src/OpenSearch.Client/CommonAbstractions/Response/OpenSearchVersionInfo.cs b/src/OpenSearch.Client/CommonAbstractions/Response/OpenSearchVersionInfo.cs index c7451a8e38..646afd3557 100644 --- a/src/OpenSearch.Client/CommonAbstractions/Response/OpenSearchVersionInfo.cs +++ b/src/OpenSearch.Client/CommonAbstractions/Response/OpenSearchVersionInfo.cs @@ -42,9 +42,6 @@ public class OpenSearchVersionInfo [DataMember(Name ="number")] public string Number { get; set; } - [DataMember(Name ="build_flavor")] - public string BuildFlavor { get; set; } - [DataMember(Name ="build_type")] public string BuildType { get; set; } diff --git a/src/OpenSearch.Client/packages.lock.json b/src/OpenSearch.Client/packages.lock.json index 9d41efe07f..024bad7c5a 100644 --- a/src/OpenSearch.Client/packages.lock.json +++ b/src/OpenSearch.Client/packages.lock.json @@ -101,10 +101,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -145,11 +142,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", diff --git a/src/OpenSearch.Net.VirtualizedCluster/packages.lock.json b/src/OpenSearch.Net.VirtualizedCluster/packages.lock.json index 9d41efe07f..024bad7c5a 100644 --- a/src/OpenSearch.Net.VirtualizedCluster/packages.lock.json +++ b/src/OpenSearch.Net.VirtualizedCluster/packages.lock.json @@ -101,10 +101,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -145,11 +142,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", diff --git a/src/OpenSearch.Net/packages.lock.json b/src/OpenSearch.Net/packages.lock.json index ed7061e682..60079f4566 100644 --- a/src/OpenSearch.Net/packages.lock.json +++ b/src/OpenSearch.Net/packages.lock.json @@ -102,10 +102,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -182,11 +179,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -303,10 +295,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -339,11 +328,6 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", diff --git a/tests/Tests.ClusterLauncher/packages.lock.json b/tests/Tests.ClusterLauncher/packages.lock.json index 13efba377e..b8cd843cd7 100644 --- a/tests/Tests.ClusterLauncher/packages.lock.json +++ b/tests/Tests.ClusterLauncher/packages.lock.json @@ -6,10 +6,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Bogus": { "type": "Transitive", @@ -63,11 +60,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "16.5.0", @@ -867,14 +859,14 @@ "opensearch.client": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.client.jsonnetserializer": { "type": "Project", "dependencies": { "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0" + "OpenSearch.Client": "1.1.0" } }, "opensearch.net": { @@ -888,14 +880,14 @@ "opensearch.opensearch.ephemeral": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", "SharpZipLib.NETStandard": "1.0.7" } }, "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } @@ -903,7 +895,7 @@ "opensearch.opensearch.xunit": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Ephemeral": "1.0.0", + "OpenSearch.OpenSearch.Ephemeral": "1.1.0", "xunit": "2.4.2" } }, @@ -919,7 +911,7 @@ "tests.configuration": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0" + "OpenSearch.OpenSearch.Managed": "1.1.0" } }, "tests.core": { @@ -930,10 +922,10 @@ "JunitXml.TestLogger": "2.1.78", "Microsoft.NET.Test.Sdk": "16.5.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", - "OpenSearch.Client.JsonNetSerializer": "1.0.0", - "OpenSearch.OpenSearch.Xunit": "1.0.0", + "OpenSearch.Client.JsonNetSerializer": "1.1.0", + "OpenSearch.OpenSearch.Xunit": "1.1.0", "Proc": "0.6.1", - "Tests.Domain": "1.0.0", + "Tests.Domain": "1.1.0", "xunit": "2.4.2" } }, @@ -942,9 +934,9 @@ "dependencies": { "Bogus": "22.1.2", "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0", - "OpenSearch.OpenSearch.Managed": "1.0.0", - "Tests.Configuration": "1.0.0" + "OpenSearch.Client": "1.1.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", + "Tests.Configuration": "1.1.0" } } } diff --git a/tests/Tests.Configuration/EnvironmentConfiguration.cs b/tests/Tests.Configuration/EnvironmentConfiguration.cs index 9a12fca191..ba7d9e67d3 100644 --- a/tests/Tests.Configuration/EnvironmentConfiguration.cs +++ b/tests/Tests.Configuration/EnvironmentConfiguration.cs @@ -41,7 +41,6 @@ public EnvironmentConfiguration(YamlConfiguration yamlConfiguration) var version = Environment.GetEnvironmentVariable("OSC_INTEGRATION_VERSION"); OpenSearchVersion = string.IsNullOrWhiteSpace(version) ? yamlConfiguration.OpenSearchVersion : version; - ParseServerType(version); if (OpenSearchVersion == null) throw new Exception("OpenSearch Version could not be determined from env var OSC_INTEGRATION_VERSION nor the test yaml configuration"); diff --git a/tests/Tests.Configuration/TestConfigurationBase.cs b/tests/Tests.Configuration/TestConfigurationBase.cs index 8486cda89f..35a918e793 100644 --- a/tests/Tests.Configuration/TestConfigurationBase.cs +++ b/tests/Tests.Configuration/TestConfigurationBase.cs @@ -27,7 +27,6 @@ */ using System; -using System.Linq; using OpenSearch.Stack.ArtifactsApi; namespace Tests.Configuration @@ -81,8 +80,6 @@ public abstract class TestConfigurationBase /// When specified will only run one overload in API tests, helpful when debugging locally public bool TestOnlyOne { get; protected set; } - public ServerType ServerType { get; protected set; } - private static int CurrentSeed { get; } = new Random().Next(1, 1_00_000); protected void SetExternalSeed(int? seed, out Random randomizer) @@ -91,21 +88,6 @@ protected void SetExternalSeed(int? seed, out Random randomizer) Seed = seed.GetValueOrDefault(CurrentSeed); randomizer = new Random(Seed); } - - protected void ParseServerType(string version) - { - if (string.IsNullOrEmpty(version)) - return; - // Assuming received string might be in format '$version' or '$ServerType-$version' - var hasServerType = Enum.GetNames(ServerType.GetType()).Any(s => version.StartsWith(s, StringComparison.InvariantCultureIgnoreCase)); - if (hasServerType) - { - var parts = version.Split('-'); - ServerType = (ServerType)Enum.Parse(ServerType.GetType(), parts[0], true); - } - else - ServerType = ServerType.OpenSearch; - } } public class RandomConfiguration diff --git a/tests/Tests.Configuration/YamlConfiguration.cs b/tests/Tests.Configuration/YamlConfiguration.cs index 11fa4a0eb6..7c24de9c1a 100644 --- a/tests/Tests.Configuration/YamlConfiguration.cs +++ b/tests/Tests.Configuration/YamlConfiguration.cs @@ -48,7 +48,6 @@ public YamlConfiguration(string configurationFile) Mode = GetTestMode(_config["mode"]); var version = _config["opensearch_version"]; OpenSearchVersion = version; - ParseServerType(version); if (string.IsNullOrWhiteSpace(version)) throw new Exception("No default version was set in test.yaml or test.default.yaml"); ForceReseed = BoolConfig("force_reseed", false); diff --git a/tests/Tests.Configuration/packages.lock.json b/tests/Tests.Configuration/packages.lock.json index b412476b51..5ce3f8cb71 100644 --- a/tests/Tests.Configuration/packages.lock.json +++ b/tests/Tests.Configuration/packages.lock.json @@ -6,10 +6,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "NETStandard.Library": { "type": "Direct", @@ -38,11 +35,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -768,7 +760,7 @@ "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } diff --git a/tests/Tests.Core/ManagedOpenSearch/Clusters/ClientTestClusterBase.cs b/tests/Tests.Core/ManagedOpenSearch/Clusters/ClientTestClusterBase.cs index 7394efe427..292a5bd360 100644 --- a/tests/Tests.Core/ManagedOpenSearch/Clusters/ClientTestClusterBase.cs +++ b/tests/Tests.Core/ManagedOpenSearch/Clusters/ClientTestClusterBase.cs @@ -70,7 +70,7 @@ public ClientTestClusterConfiguration(params OpenSearchPlugin[] plugins) : this( public ClientTestClusterConfiguration(ClusterFeatures features = ClusterFeatures.SSL, int numberOfNodes = 1, params OpenSearchPlugin[] plugins ) - : base(TestClient.Configuration.OpenSearchVersion, Configuration.TestConfiguration.Instance.ServerType, features, new OpenSearchPlugins(plugins), numberOfNodes) + : base(TestClient.Configuration.OpenSearchVersion, features, new OpenSearchPlugins(plugins), numberOfNodes) { TestConfiguration = TestClient.Configuration; diff --git a/tests/Tests.Core/packages.lock.json b/tests/Tests.Core/packages.lock.json index a8b70a72f9..49a087af83 100644 --- a/tests/Tests.Core/packages.lock.json +++ b/tests/Tests.Core/packages.lock.json @@ -27,19 +27,13 @@ "type": "Direct", "requested": "[16.5.0, )", "resolved": "16.5.0", - "contentHash": "yHZOhVSPuGqgHi+KhHiAZqNY08avkQraXKvgKgDU8c/ztmGzw7gmukkv49EaTq6T3xmp4XroWk3gAlbJHMxl8w==", - "dependencies": { - "Microsoft.CodeCoverage": "16.5.0" - } + "contentHash": "yHZOhVSPuGqgHi+KhHiAZqNY08avkQraXKvgKgDU8c/ztmGzw7gmukkv49EaTq6T3xmp4XroWk3gAlbJHMxl8w==" }, "Microsoft.NETFramework.ReferenceAssemblies": { "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "NETStandard.Library": { "type": "Direct", @@ -93,11 +87,6 @@ "System.Threading.Tasks.Extensions": "4.5.4" } }, - "Microsoft.CodeCoverage": { - "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "PM5YLtyN45EyUGePJpaNogndlaQPrMgQQXHKMhMESC6KfSVvt+j7+dxBi8NYC6X6dZVysf7ngwhSW3wwvPJRSQ==" - }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.6.0", @@ -113,11 +102,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "15.8.0", @@ -1278,14 +1262,14 @@ "opensearch.client": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.client.jsonnetserializer": { "type": "Project", "dependencies": { "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0" + "OpenSearch.Client": "1.1.0" } }, "opensearch.net": { @@ -1301,14 +1285,14 @@ "opensearch.opensearch.ephemeral": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", "SharpZipLib.NETStandard": "1.0.7" } }, "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } @@ -1316,7 +1300,7 @@ "opensearch.opensearch.xunit": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Ephemeral": "1.0.0", + "OpenSearch.OpenSearch.Ephemeral": "1.1.0", "xunit": "2.4.2" } }, @@ -1332,7 +1316,7 @@ "tests.configuration": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0" + "OpenSearch.OpenSearch.Managed": "1.1.0" } }, "tests.domain": { @@ -1340,9 +1324,9 @@ "dependencies": { "Bogus": "22.1.2", "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0", - "OpenSearch.OpenSearch.Managed": "1.0.0", - "Tests.Configuration": "1.0.0" + "OpenSearch.Client": "1.1.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", + "Tests.Configuration": "1.1.0" } } } diff --git a/tests/Tests.Domain/packages.lock.json b/tests/Tests.Domain/packages.lock.json index 21352e24a3..24418979ff 100644 --- a/tests/Tests.Domain/packages.lock.json +++ b/tests/Tests.Domain/packages.lock.json @@ -12,10 +12,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "NETStandard.Library": { "type": "Direct", @@ -55,11 +52,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -815,7 +807,7 @@ "opensearch.client": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.net": { @@ -831,7 +823,7 @@ "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } @@ -848,7 +840,7 @@ "tests.configuration": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0" + "OpenSearch.OpenSearch.Managed": "1.1.0" } } } diff --git a/tests/Tests.Reproduce/GithubIssue2306.cs b/tests/Tests.Reproduce/GithubIssue2306.cs index 8d1c45f1d6..37220301e0 100644 --- a/tests/Tests.Reproduce/GithubIssue2306.cs +++ b/tests/Tests.Reproduce/GithubIssue2306.cs @@ -51,7 +51,7 @@ public void DeleteNonExistentDocumentReturnsNotFound() response.Result.Should().Be(Result.NotFound); response.Index.Should().Be("project"); if (_cluster.ClusterConfiguration.Version < "2.0.0") - response.Type.Should().Be("doc"); + response.Type.Should().Be("_doc"); response.Id.Should().Be("non-existent-id"); } } diff --git a/tests/Reproduce/GithubIssue3311.cs b/tests/Tests.Reproduce/GithubIssue3311.cs similarity index 85% rename from tests/Reproduce/GithubIssue3311.cs rename to tests/Tests.Reproduce/GithubIssue3311.cs index 3a259dd6fb..ff58143293 100644 --- a/tests/Reproduce/GithubIssue3311.cs +++ b/tests/Tests.Reproduce/GithubIssue3311.cs @@ -27,13 +27,11 @@ */ using System; -using System.Collections.Generic; using System.Linq; -using OpenSearch.Xunit.XunitPlumbing; -using OpenSearch.Net; using FluentAssertions; -using Osc; -using Tests.Framework.ManagedOpenSearch.Clusters; +using OpenSearch.Client; +using OpenSearch.OpenSearch.Xunit.XunitPlumbing; +using Tests.Core.ManagedOpenSearch.Clusters; namespace Tests.Reproduce { @@ -47,17 +45,17 @@ public void ValueAggregateWhenNullShouldStillReturn() { var indexName = "max-bucket-reproduce"; - var ec = this._cluster.Client; + var ec = _cluster.Client; var now = DateTime.Now; - var testdata = new DateTime[] { } + var testdata = Enumerable.Empty() .Concat(Enumerable.Repeat(now.AddMinutes(1), 3)) .Concat(Enumerable.Repeat(now.AddMinutes(2), 4)) .Concat(Enumerable.Repeat(now.AddMinutes(3), 1)) - .Select((d, i) => new MyClass() { Id = i, Time = d, Message = "test", MessageType = 1 }) + .Select((d, i) => new MyClass { Id = i, Time = d, Message = "test", MessageType = 1 }) .ToArray(); - ec.DeleteIndex(indexName); + ec.Indices.Delete(indexName); ec.IndexMany(testdata, indexName); - ec.Refresh(indexName); + ec.Indices.Refresh(indexName); var res = ec .Search(s => s @@ -71,7 +69,7 @@ public void ValueAggregateWhenNullShouldStillReturn() .Aggregations(agg => agg .DateHistogram("hist", dh => dh .Field(ff => ff.Time) - .Interval(new Time(TimeSpan.FromMinutes(1))) + .FixedInterval(new Time(TimeSpan.FromMinutes(1))) ) .MaxBucket("max", mb => mb .BucketsPath("hist>_count") diff --git a/tests/Tests.Reproduce/GithubIssue4197.cs b/tests/Tests.Reproduce/GithubIssue4197.cs index 0803ad08c6..3ff604f0c2 100644 --- a/tests/Tests.Reproduce/GithubIssue4197.cs +++ b/tests/Tests.Reproduce/GithubIssue4197.cs @@ -48,7 +48,7 @@ public void CanDeserializeAnonymousFiltersAggregation() _client.Indices.Create(index); - _client.Index(new Doc { ModificationDate = DateTime.Parse("2019-10-09T10:43:07.8633456+02:00") }, + _client.Index(new Doc { ModificationDate = DateTime.Now }, i => i.Index(index).Refresh(Refresh.WaitFor)); var searchResponse = _client.Search(s => s @@ -66,8 +66,8 @@ public void CanDeserializeAnonymousFiltersAggregation() ); var filtersAggregate = searchResponse.Aggregations.Filters("Modification date"); - filtersAggregate.AnonymousBuckets().Count.Should().Be(1); - filtersAggregate.AnonymousBuckets()[0].DocCount.Should().Be(1); + filtersAggregate.AnonymousBuckets().Count.Should().Be(1, "there should be exactly one anonymous bucket"); + filtersAggregate.AnonymousBuckets()[0].DocCount.Should().Be(1, "there should be exactly one document"); } private class Doc diff --git a/tests/Tests.Reproduce/GithubIssue4243.cs b/tests/Tests.Reproduce/GithubIssue4243.cs index 6f9fc326ad..8bdefd27f5 100644 --- a/tests/Tests.Reproduce/GithubIssue4243.cs +++ b/tests/Tests.Reproduce/GithubIssue4243.cs @@ -44,8 +44,7 @@ public class GithubIssue4243 : IClusterFixture [I] public async Task UsingFormatJsonIsSuccessfulResponse() { - var connectionConfiguration = new ConnectionConfiguration(_cluster.Client.ConnectionSettings.ConnectionPool); - var lowLevelClient = new OpenSearchLowLevelClient(connectionConfiguration); + var lowLevelClient = _cluster.Client.LowLevel; var response = _cluster.ClusterConfiguration.Version < "2.0.0" ? await lowLevelClient.Cat.MasterAsync(new CatMasterRequestParameters { Format = "JSON" }) diff --git a/tests/Tests.Reproduce/Tests.Reproduce.csproj b/tests/Tests.Reproduce/Tests.Reproduce.csproj index 0a57c943c8..28988f8e7f 100644 --- a/tests/Tests.Reproduce/Tests.Reproduce.csproj +++ b/tests/Tests.Reproduce/Tests.Reproduce.csproj @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/tests/Tests.Reproduce/packages.lock.json b/tests/Tests.Reproduce/packages.lock.json index 145d27b7f4..020638f28e 100644 --- a/tests/Tests.Reproduce/packages.lock.json +++ b/tests/Tests.Reproduce/packages.lock.json @@ -16,10 +16,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "xunit.runner.visualstudio": { "type": "Direct", @@ -70,11 +67,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "16.5.0", @@ -874,14 +866,14 @@ "opensearch.client": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.client.jsonnetserializer": { "type": "Project", "dependencies": { "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0" + "OpenSearch.Client": "1.1.0" } }, "opensearch.net": { @@ -895,14 +887,14 @@ "opensearch.opensearch.ephemeral": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", "SharpZipLib.NETStandard": "1.0.7" } }, "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } @@ -910,7 +902,7 @@ "opensearch.opensearch.xunit": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Ephemeral": "1.0.0", + "OpenSearch.OpenSearch.Ephemeral": "1.1.0", "xunit": "2.4.2" } }, @@ -926,7 +918,7 @@ "tests.configuration": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0" + "OpenSearch.OpenSearch.Managed": "1.1.0" } }, "tests.core": { @@ -937,10 +929,10 @@ "JunitXml.TestLogger": "2.1.78", "Microsoft.NET.Test.Sdk": "16.5.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", - "OpenSearch.Client.JsonNetSerializer": "1.0.0", - "OpenSearch.OpenSearch.Xunit": "1.0.0", + "OpenSearch.Client.JsonNetSerializer": "1.1.0", + "OpenSearch.OpenSearch.Xunit": "1.1.0", "Proc": "0.6.1", - "Tests.Domain": "1.0.0", + "Tests.Domain": "1.1.0", "xunit": "2.4.2" } }, @@ -949,9 +941,9 @@ "dependencies": { "Bogus": "22.1.2", "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0", - "OpenSearch.OpenSearch.Managed": "1.0.0", - "Tests.Configuration": "1.0.0" + "OpenSearch.Client": "1.1.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", + "Tests.Configuration": "1.1.0" } } } diff --git a/tests/Tests.ScratchPad/packages.lock.json b/tests/Tests.ScratchPad/packages.lock.json index eab77e1ac3..acf9532705 100644 --- a/tests/Tests.ScratchPad/packages.lock.json +++ b/tests/Tests.ScratchPad/packages.lock.json @@ -29,10 +29,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "System.Diagnostics.DiagnosticSource": { "type": "Direct", @@ -200,11 +197,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "16.5.0", @@ -1377,14 +1369,14 @@ "opensearch.client": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.client.jsonnetserializer": { "type": "Project", "dependencies": { "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0" + "OpenSearch.Client": "1.1.0" } }, "opensearch.net": { @@ -1398,14 +1390,14 @@ "opensearch.opensearch.ephemeral": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", "SharpZipLib.NETStandard": "1.0.7" } }, "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } @@ -1413,7 +1405,7 @@ "opensearch.opensearch.xunit": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Ephemeral": "1.0.0", + "OpenSearch.OpenSearch.Ephemeral": "1.1.0", "xunit": "2.4.2" } }, @@ -1429,7 +1421,7 @@ "tests.configuration": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0" + "OpenSearch.OpenSearch.Managed": "1.1.0" } }, "tests.core": { @@ -1440,10 +1432,10 @@ "JunitXml.TestLogger": "2.1.78", "Microsoft.NET.Test.Sdk": "16.5.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", - "OpenSearch.Client.JsonNetSerializer": "1.0.0", - "OpenSearch.OpenSearch.Xunit": "1.0.0", + "OpenSearch.Client.JsonNetSerializer": "1.1.0", + "OpenSearch.OpenSearch.Xunit": "1.1.0", "Proc": "0.6.1", - "Tests.Domain": "1.0.0", + "Tests.Domain": "1.1.0", "xunit": "2.4.2" } }, @@ -1452,9 +1444,9 @@ "dependencies": { "Bogus": "22.1.2", "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0", - "OpenSearch.OpenSearch.Managed": "1.0.0", - "Tests.Configuration": "1.0.0" + "OpenSearch.Client": "1.1.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", + "Tests.Configuration": "1.1.0" } } } diff --git a/tests/Tests.YamlRunner/packages.lock.json b/tests/Tests.YamlRunner/packages.lock.json index 8ce7399c8c..7aa8ae06dd 100644 --- a/tests/Tests.YamlRunner/packages.lock.json +++ b/tests/Tests.YamlRunner/packages.lock.json @@ -31,10 +31,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "Newtonsoft.Json": { "type": "Direct", @@ -81,11 +78,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", diff --git a/tests/Tests/Cat/CatHealth/CatHealthApiTests.cs b/tests/Tests/Cat/CatHealth/CatHealthApiTests.cs index 3cbf66e0d8..96f4d6dfba 100644 --- a/tests/Tests/Cat/CatHealth/CatHealthApiTests.cs +++ b/tests/Tests/Cat/CatHealth/CatHealthApiTests.cs @@ -37,16 +37,6 @@ namespace Tests.Cat.CatHealth { - // OpenDistro v.1.13.0 with security plugin activated gets exception when `_cat/health` server API called and returns it to a user: - // "type" : "security_exception", - // "reason" : "Unexpected exception cluster:monitor/health", - // "stack_trace" : "ElasticsearchSecurityException[Unexpected exception cluster:monitor/health] - // at com.amazon.opendistroforelasticsearch.security.filter.OpenDistroSecurityFilter.apply0(OpenDistroSecurityFilter.java:361) - // .... - // See forum threads about this bug: https://discuss.opendistrocommunity.dev/t/analyze-api-error/5640, - // https://discuss.opendistrocommunity.dev/t/exception-while-calling-cluster-health/6129 - // Fixed in OpenDistro 1.13.1. - [SkipVersion("1.13.0", "OpenDistro 1.13.0 with security malfunction with these API's. See code comments for detailed description.")] public class CatHealthApiTests : ApiIntegrationTestBase, ICatHealthRequest, CatHealthDescriptor, CatHealthRequest> { @@ -68,7 +58,6 @@ protected override void ExpectResponse(CatResponse response) => response.Records.Should().NotBeEmpty().And.Contain(a => !string.IsNullOrEmpty(a.Status)); } - [SkipVersion("1.13.0", "OpenDistro 1.13.0 with security malfunction with these API's. See code comments for detailed description.")] public class CatHealthNoTimestampApiTests : ApiIntegrationTestBase, ICatHealthRequest, CatHealthDescriptor, CatHealthRequest> { diff --git a/tests/Tests/ClientConcepts/HighLevel/Analysis/TestingAnalyzers.doc.cs b/tests/Tests/ClientConcepts/HighLevel/Analysis/TestingAnalyzers.doc.cs index 6584a2d320..ff0c5faba6 100644 --- a/tests/Tests/ClientConcepts/HighLevel/Analysis/TestingAnalyzers.doc.cs +++ b/tests/Tests/ClientConcepts/HighLevel/Analysis/TestingAnalyzers.doc.cs @@ -44,15 +44,6 @@ namespace Tests.ClientConcepts.HighLevel.Analysis * does what we expect it to. This is where the {ref_current}/indices-analyze.html[Analyze API] comes in. * */ - // OpenDistro v.1.13.0 with security plugin activated gets exception when `_analyze` server API called and returns it to a user: - // "type" : "security_exception", - // "reason": "Unexpected exception indices:admin/analyze" - // "stack_trace": "ElasticsearchSecurityException[Unexpected exception indices:admin/analyze] - // at com.amazon.opendistroforelasticsearch.security.filter.OpenDistroSecurityFilter.apply0(OpenDistroSecurityFilter.java:361) - // .... - // See forum thread about this bug: https://discuss.opendistrocommunity.dev/t/analyze-api-error/5640 - // Fixed in OpenDistro 1.13.1. - [SkipVersion("1.13.0", "OpenDistro 1.13.0 with security malfunction with these API's. See code comments for detailed description.")] public class TestingAnalyzers : IntegrationDocumentationTestBase, IClusterFixture { //hide diff --git a/tests/Tests/Cluster/RootNodeInfo/RootNodeInfoApiTests.cs b/tests/Tests/Cluster/RootNodeInfo/RootNodeInfoApiTests.cs index 77bfb9b508..b1ad106021 100644 --- a/tests/Tests/Cluster/RootNodeInfo/RootNodeInfoApiTests.cs +++ b/tests/Tests/Cluster/RootNodeInfo/RootNodeInfoApiTests.cs @@ -62,22 +62,13 @@ protected override void ExpectResponse(RootNodeInfoResponse response) response.Version.Should().NotBeNull(); response.Version.Number.Should().NotBeNullOrWhiteSpace(); response.Version.BuildDate.Should().BeAfter(default); - if (TestConfiguration.Instance.ServerType == OpenSearch.Stack.ArtifactsApi.ServerType.OpenSearch) - response.Version.Distribution.Should().NotBeNullOrWhiteSpace(); - else - response.Version.BuildFlavor.Should().NotBeNullOrWhiteSpace(); + response.Version.Distribution.Should().NotBeNullOrWhiteSpace(); response.Version.BuildHash.Should().NotBeNullOrWhiteSpace(); response.Version.BuildSnapshot.Should().Be(TestConfiguration.Instance.OpenSearchVersionIsSnapshot); response.Version.BuildType.Should().NotBeNullOrWhiteSpace(); response.Version.MinimumIndexCompatibilityVersion.Should().NotBeNullOrWhiteSpace(); response.Version.MinimumWireCompatibilityVersion.Should().NotBeNullOrWhiteSpace(); - - // ODFE contains BuildFlavor while OpenSearch does not - // OpenSearch contains Distribution while ODFE does not - if (response.Version.BuildFlavor == null) - response.Version.Distribution.Should().NotBeNullOrWhiteSpace(); - else - response.Version.BuildFlavor.Should().NotBeNullOrWhiteSpace(); + response.Version.Distribution.Should().NotBeNullOrWhiteSpace(); } } } diff --git a/tests/Tests/Indices/Analyze/AnalyzeApiTests.cs b/tests/Tests/Indices/Analyze/AnalyzeApiTests.cs index c90de9a301..b8246380f8 100644 --- a/tests/Tests/Indices/Analyze/AnalyzeApiTests.cs +++ b/tests/Tests/Indices/Analyze/AnalyzeApiTests.cs @@ -38,15 +38,6 @@ namespace Tests.Indices.Analyze { - // OpenDistro v.1.13.0 with security plugin activated gets exception when `_analyze` server API called and returns it to a user: - // "type" : "security_exception", - // "reason": "Unexpected exception indices:admin/analyze", - // "stack_trace": "ElasticsearchSecurityException[Unexpected exception indices:admin/analyze] - // at com.amazon.opendistroforelasticsearch.security.filter.OpenDistroSecurityFilter.apply0(OpenDistroSecurityFilter.java:361) - // .... - // See forum thread about this bug: https://discuss.opendistrocommunity.dev/t/analyze-api-error/5640 - // Fixed in OpenDistro 1.13.1. - [SkipVersion("1.13.0", "OpenDistro 1.13.0 with security malfunction with these API's. See code comments for detailed description.")] public class AnalyzeApiTests : ApiIntegrationTestBase { public AnalyzeApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } @@ -89,7 +80,6 @@ protected override LazyResponses ClientUsage() => Calls( ); } - [SkipVersion("1.13.0", "OpenDistro 1.13.0 with security malfunction with these API's. See code comments for detailed description.")] public class AnalyzeInlineAnalyzerApiTests : ApiIntegrationTestBase { @@ -165,7 +155,6 @@ protected override void ExpectResponse(AnalyzeResponse response) } } - [SkipVersion("1.13.0", "OpenDistro 1.13.0 with security malfunction with these API's. See code comments for detailed description.")] public class AnalyzeInlineNormalizerApiTests : ApiIntegrationTestBase { @@ -231,7 +220,6 @@ protected override void ExpectResponse(AnalyzeResponse response) } } - [SkipVersion("1.13.0", "OpenDistro 1.13.0 with security malfunction with these API's. See code comments for detailed description.")] public class AnalyzeExplainApiTests : AnalyzeInlineAnalyzerApiTests { public AnalyzeExplainApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } diff --git a/tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs b/tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs index 08b33b036b..3cccc1072a 100644 --- a/tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs +++ b/tests/Tests/Modules/Scripting/ExecutePainlessScript/ExecutePainlessScriptApiTests.cs @@ -40,16 +40,6 @@ namespace Tests.Modules.Scripting.ExecutePainlessScript { - // OpenDistro v.1.13.0 with security plugin activated gets exception when `_scripts/painless` server API called and returns it to a user: - // "type" : "security_exception", - // "reason": "Unexpected exception cluster:admin/scripts/painless/execute", - // "stack_trace": "ElasticsearchSecurityException[Unexpected exception cluster:admin/scripts/painless/execute] - // at com.amazon.opendistroforelasticsearch.security.filter.OpenDistroSecurityFilter.apply0(OpenDistroSecurityFilter.java:361) - // .... - // See forum threads about this bug: https://discuss.opendistrocommunity.dev/t/analyze-api-error/5640, - // https://discuss.opendistrocommunity.dev/t/exception-while-calling-cluster-health/6129 - // Fixed in OpenDistro 1.13.1. - [SkipVersion("1.13.0", "OpenDistro 1.13.0 with security malfunction with these API's. See code comments for detailed description.")] public class ExecutePainlessScriptApiTests : ApiIntegrationTestBase, IExecutePainlessScriptRequest, ExecutePainlessScriptDescriptor, ExecutePainlessScriptRequest> diff --git a/tests/Tests/packages.lock.json b/tests/Tests/packages.lock.json index d1d8f230b0..b879d81be3 100644 --- a/tests/Tests/packages.lock.json +++ b/tests/Tests/packages.lock.json @@ -31,10 +31,7 @@ "type": "Direct", "requested": "[1.0.0-preview.2, )", "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } + "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" }, "SemanticVersioning": { "type": "Direct", @@ -103,11 +100,6 @@ "resolved": "1.1.0", "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "16.5.0", @@ -1280,14 +1272,14 @@ "opensearch.client": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.client.jsonnetserializer": { "type": "Project", "dependencies": { "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0" + "OpenSearch.Client": "1.1.0" } }, "opensearch.net": { @@ -1301,20 +1293,20 @@ "opensearch.net.virtualizedcluster": { "type": "Project", "dependencies": { - "OpenSearch.Net": "1.0.0" + "OpenSearch.Net": "1.1.0" } }, "opensearch.opensearch.ephemeral": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", "SharpZipLib.NETStandard": "1.0.7" } }, "opensearch.opensearch.managed": { "type": "Project", "dependencies": { - "OpenSearch.Stack.ArtifactsApi": "1.0.0", + "OpenSearch.Stack.ArtifactsApi": "1.1.0", "Proc": "0.6.1", "System.Net.Http": "4.3.4" } @@ -1322,7 +1314,7 @@ "opensearch.opensearch.xunit": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Ephemeral": "1.0.0", + "OpenSearch.OpenSearch.Ephemeral": "1.1.0", "xunit": "2.4.2" } }, @@ -1338,7 +1330,7 @@ "tests.configuration": { "type": "Project", "dependencies": { - "OpenSearch.OpenSearch.Managed": "1.0.0" + "OpenSearch.OpenSearch.Managed": "1.1.0" } }, "tests.core": { @@ -1349,10 +1341,10 @@ "JunitXml.TestLogger": "2.1.78", "Microsoft.NET.Test.Sdk": "16.5.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", - "OpenSearch.Client.JsonNetSerializer": "1.0.0", - "OpenSearch.OpenSearch.Xunit": "1.0.0", + "OpenSearch.Client.JsonNetSerializer": "1.1.0", + "OpenSearch.OpenSearch.Xunit": "1.1.0", "Proc": "0.6.1", - "Tests.Domain": "1.0.0", + "Tests.Domain": "1.1.0", "xunit": "2.4.2" } }, @@ -1361,9 +1353,9 @@ "dependencies": { "Bogus": "22.1.2", "Newtonsoft.Json": "13.0.1", - "OpenSearch.Client": "1.0.0", - "OpenSearch.OpenSearch.Managed": "1.0.0", - "Tests.Configuration": "1.0.0" + "OpenSearch.Client": "1.1.0", + "OpenSearch.OpenSearch.Managed": "1.1.0", + "Tests.Configuration": "1.1.0" } } } diff --git a/tests/tests.proj b/tests/tests.proj index c11c09d781..fba9135ce4 100644 --- a/tests/tests.proj +++ b/tests/tests.proj @@ -5,5 +5,6 @@ +