From 9187fe62d53c195748b4aab0d948a290c3518b21 Mon Sep 17 00:00:00 2001 From: Russ Cam Date: Mon, 24 Feb 2020 16:16:54 +1100 Subject: [PATCH] Use XPackCluster for PutPipeline API tests (#4429) This commit changes the PutPipelineApiTests to use an X-Pack cluster with security enabled. As part of this change, the ingest attachment plugin must also be installed. This is deemed a better compromise than specifying a new cluster type for this test only. This change also fixes a NPE thrown by set_security_user processor, which appears to happen when security is disabled. See elastic/elasticsearch#52474 Closes #4385 --- .../Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs | 3 ++- tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs b/tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs index 23927a37bb9..56a7676ccec 100644 --- a/tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs +++ b/tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Elastic.Managed.Ephemeral; +using Elastic.Stack.Artifacts.Products; using Elastic.Xunit; using Elasticsearch.Net; using Nest; @@ -15,7 +16,7 @@ public class XPackClusterConfiguration : ClientTestClusterConfiguration { public XPackClusterConfiguration() : this(ClusterFeatures.SSL | ClusterFeatures.Security) { } - public XPackClusterConfiguration(ClusterFeatures features) : base(ClusterFeatures.XPack | features) + public XPackClusterConfiguration(ClusterFeatures features) : base(ClusterFeatures.XPack | features, 1, ElasticsearchPlugin.IngestAttachment) { // Get license file path from environment variable var licenseFilePath = Environment.GetEnvironmentVariable("ES_LICENSE_FILE"); diff --git a/tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs b/tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs index 6e60d9d89bd..eea0a6be0ce 100644 --- a/tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs +++ b/tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs @@ -12,11 +12,11 @@ namespace Tests.Ingest.PutPipeline { public class PutPipelineApiTests - : ApiIntegrationTestBase + : ApiIntegrationTestBase { private static readonly string _id = "pipeline-1"; - public PutPipelineApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { } + public PutPipelineApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { } protected override bool ExpectIsValid => true;