Skip to content

Commit de391e9

Browse files
committed
Fix ClearCachedRealms test
Introduce constants for File and PKI realm names (cherry picked from commit cb6ce33)
1 parent d58e569 commit de391e9

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

src/Tests/Framework/ManagedElasticsearch/Tasks/InstallationTasks/EnsureSecurityRealms.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public override void Run(NodeConfiguration config, NodeFileSystem fileSystem)
2424
" security:",
2525
" authc:",
2626
" realms:",
27-
" file1:",
27+
$" {SecurityRealms.FileRealm}:",
2828
" type: file",
2929
" order: 0",
3030
string.Empty
@@ -42,7 +42,7 @@ public override void Run(NodeConfiguration config, NodeFileSystem fileSystem)
4242
" security:",
4343
" authc:",
4444
" realms:",
45-
" pki1:",
45+
$" {SecurityRealms.PkiRealm}:",
4646
" type: pki",
4747
" order: 1",
4848
string.Empty
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
namespace Tests.Framework.ManagedElasticsearch.Tasks.InstallationTasks
2+
{
3+
public static class SecurityRealms
4+
{
5+
public const string FileRealm = "file1";
6+
7+
public const string PkiRealm = "pki1";
8+
9+
}
10+
}

src/Tests/Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@
301301
<Compile Include="Framework\ManagedElasticsearch\Tasks\InstallationTasks\EnsureWatcherActionConfigurationInElasticsearchYaml.cs" />
302302
<Compile Include="Framework\ManagedElasticsearch\Tasks\InstallationTasks\InstallationTaskBase.cs" />
303303
<Compile Include="Framework\ManagedElasticsearch\Tasks\InstallationTasks\InstallPlugins.cs" />
304+
<Compile Include="Framework\ManagedElasticsearch\Tasks\InstallationTasks\SecurityRealms.cs" />
304305
<Compile Include="Framework\ManagedElasticsearch\Tasks\InstallationTasks\UnzipCurrentElasticsearchDistribution.cs" />
305306
<Compile Include="Framework\ManagedElasticsearch\Tasks\InstallationTasks\WriteAnalysisFiles.cs" />
306307
<Compile Include="Framework\ManagedElasticsearch\Tasks\NodeTaskRunner.cs" />

src/Tests/XPack/Security/ClearCachedRealms/ClearCachedRealmsApiTests.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Tests.Framework;
77
using Tests.Framework.Integration;
88
using Tests.Framework.ManagedElasticsearch.Clusters;
9+
using Tests.Framework.ManagedElasticsearch.Tasks.InstallationTasks;
910
using Xunit;
1011

1112
namespace Tests.XPack.Security.ClearCachedRealms
@@ -26,12 +27,12 @@ protected override LazyResponses ClientUsage() => Calls(
2627
protected override int ExpectStatusCode => 200;
2728
protected override HttpMethod HttpMethod => HttpMethod.POST;
2829

29-
protected override string UrlPath => $"/_xpack/security/realm/{this.Realm}/_clear_cache";
30+
protected override string UrlPath => $"/_xpack/security/realm/{UrlEncode(this.Realm)}/_clear_cache";
3031

3132
protected override bool SupportsDeserialization => false;
3233

3334
//callisolated value can sometimes start with a digit which is not allowed for rolenames
34-
private string Realm => $"default_file";
35+
private string Realm => SecurityRealms.FileRealm;
3536

3637
protected override ClearCachedRealmsRequest Initializer => new ClearCachedRealmsRequest(this.Realm);
3738

@@ -49,4 +50,4 @@ protected override void ExpectResponse(IClearCachedRealmsResponse response)
4950
}
5051
}
5152

52-
}
53+
}

0 commit comments

Comments
 (0)