Skip to content

Commit 75e205f

Browse files
Use XPackCluster for PutPipeline API tests (#4429) (#4433)
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 Co-authored-by: Russ Cam <russ.cam@elastic.co>
1 parent a42648b commit 75e205f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

tests/Tests.Core/ManagedElasticsearch/Clusters/XPackCluster.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.IO;
33
using Elastic.Managed.Ephemeral;
4+
using Elastic.Stack.Artifacts.Products;
45
using Elastic.Xunit;
56
using Elasticsearch.Net;
67
using Nest;
@@ -15,7 +16,7 @@ public class XPackClusterConfiguration : ClientTestClusterConfiguration
1516
{
1617
public XPackClusterConfiguration() : this(ClusterFeatures.SSL | ClusterFeatures.Security) { }
1718

18-
public XPackClusterConfiguration(ClusterFeatures features) : base(ClusterFeatures.XPack | features)
19+
public XPackClusterConfiguration(ClusterFeatures features) : base(ClusterFeatures.XPack | features, 1, ElasticsearchPlugin.IngestAttachment)
1920
{
2021
// Get license file path from environment variable
2122
var licenseFilePath = Environment.GetEnvironmentVariable("ES_LICENSE_FILE");

tests/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
namespace Tests.Ingest.PutPipeline
1313
{
1414
public class PutPipelineApiTests
15-
: ApiIntegrationTestBase<WritableCluster, PutPipelineResponse, IPutPipelineRequest, PutPipelineDescriptor, PutPipelineRequest>
15+
: ApiIntegrationTestBase<XPackCluster, PutPipelineResponse, IPutPipelineRequest, PutPipelineDescriptor, PutPipelineRequest>
1616
{
1717
private static readonly string _id = "pipeline-1";
1818

19-
public PutPipelineApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
19+
public PutPipelineApiTests(XPackCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
2020

2121
protected override bool ExpectIsValid => true;
2222

0 commit comments

Comments
 (0)