Fix SecurityApiKey and ApplicationPrivilegesApi integration tests (#3881)

* Simplify SecurityApiKeyTests
* Ensure unique username for ApplicationPrivileges integration test to avoid conflicts with users created in other tests.

(cherry picked from commit 35bf534)

Author: codebrain

src/Tests/Tests/XPack/Security/ApiKey/SecurityApiKeyTests.cs

@@ -14,115 +14,34 @@ namespace Tests.XPack.ApiKey
 	[SkipVersion("<6.7.0", "Security Api Keys are modelled against 6.7.0")]
 	public class SecurityApiKeyTests : CoordinatedIntegrationTestBase<XPackCluster>
 	{
-		private const string PutRoleStep = nameof(PutRoleStep);
 		private const string PutUserStep = nameof(PutUserStep);
-		private const string PutPrivilegesStep = nameof(PutPrivilegesStep);
 		private const string CreateApiKeyWithRolesStep = nameof(CreateApiKeyWithRolesStep);
 		private const string CreateApiKeyWithNoRolesStep = nameof(CreateApiKeyWithNoRolesStep);
 		private const string GetApiKeyStep = nameof(GetApiKeyStep);
 		private const string InvalidateApiKeyStep = nameof(InvalidateApiKeyStep);
 
 		public SecurityApiKeyTests(XPackCluster cluster, EndpointUsage usage) : base(new CoordinatedUsage(cluster, usage)
 		{
-			{
-				PutRoleStep, u =>
-					u.Calls<PutRoleDescriptor, PutRoleRequest, IPutRoleRequest, IPutRoleResponse>(
-						v => new PutRoleRequest($"role-{v}")
-						{
-							Cluster = new[] { "all" },
-							Indices = new IIndicesPrivileges[]
-							{
-								new IndicesPrivileges
-								{
-									Names = "*",
-									Privileges = new [] { "all" }
-								}
-							},
-							Applications = new IApplicationPrivileges[]
-							{
-								new ApplicationPrivileges
-								{
-									Application = $"app-{v}",
-									Privileges = new [] { "*" },
-									Resources = new [] { "*" }
-								}
-							}
-						},
-						(v, d) => d
-							.Cluster("all")
-							.Indices(i => i.Add<object>(p => p.Names("*").Privileges("all")))
-							.Applications(i => i.Add<object>(p => p.Application($"app-{v}").Privileges("*").Resources("*")))
-						,
-						(v, c, f) => c.PutRole($"role-{v}", f),
-						(v, c, f) => c.PutRoleAsync($"role-{v}", f),
-						(v, c, r) => c.PutRole(r),
-						(v, c, r) => c.PutRoleAsync(r)
-					)
-			},
 			{
 				PutUserStep, u =>
 					u.Calls<PutUserDescriptor, PutUserRequest, IPutUserRequest, IPutUserResponse>(
 						v => new PutUserRequest($"user-{v}")
 						{
 							Password = "password",
-							Roles = new[] { $"role-{v}", "superuser" },
-							FullName = "API key user"
+							Roles = new[] { "superuser" },
+							FullName = "API key superuser"
 						},
 						(v, d) => d
 							.Password("password")
-							.Roles($"role-{v}", "superuser")
-							.FullName("API key user")
+							.Roles("superuser")
+							.FullName("API key superuser")
 						,
 						(v, c, f) => c.PutUser($"user-{v}", f),
 						(v, c, f) => c.PutUserAsync($"user-{v}", f),
 						(v, c, r) => c.PutUser(r),
 						(v, c, r) => c.PutUserAsync(r)
 					)
 			},
-			{
-				PutPrivilegesStep, u =>
-					u.Calls<PutPrivilegesDescriptor, PutPrivilegesRequest, IPutPrivilegesRequest, IPutPrivilegesResponse>(
-						v => new PutPrivilegesRequest
-						{
-							Applications = new AppPrivileges
-							{
-								{
-									$"app-{v}", new Privileges
-									{
-										{
-											$"read", new PrivilegesActions
-											{
-												Actions = new[] { "data:read/*" }
-											}
-										},
-										{
-											$"write", new PrivilegesActions
-											{
-												Actions = new[] { "data:write/*" }
-											}
-										}
-									}
-								}
-							}
-						},
-						(v, d) => d
-							.Applications(a => a
-								.Application($"app-{v}", pr => pr
-									.Privilege($"read", ac => ac
-										.Actions("data:read/*")
-									)
-									.Privilege($"write", ac => ac
-										.Actions("data:write/*")
-									)
-								)
-							)
-						,
-						(v, c, f) => c.PutPrivileges(f),
-						(v, c, f) => c.PutPrivilegesAsync(f),
-						(v, c, r) => c.PutPrivileges(r),
-						(v, c, r) => c.PutPrivilegesAsync(r)
-					)
-			},
 			{
 				CreateApiKeyWithRolesStep, u =>
 					u.Calls<CreateApiKeyDescriptor, CreateApiKeyRequest, ICreateApiKeyRequest, ICreateApiKeyResponse>(

src/Tests/Tests/XPack/Security/Privileges/ApplicationPrivilegesApiTests.cs

@@ -86,7 +86,7 @@ public ApplicationPrivilegesApiTests(XPackCluster cluster, EndpointUsage usage)
 				))
 			},
 			{
-				PutUserStep, u => u.Call((v, c) => c.PutUserAsync($"user-{v}",
+				PutUserStep, u => u.Call((v, c) => c.PutUserAsync($"user-ap-{v}",
 					r => r.Roles("admin", $"role-{v}").Password($"pass-{v}")))
 			},
 			{
@@ -97,7 +97,7 @@ public ApplicationPrivilegesApiTests(XPackCluster cluster, EndpointUsage usage)
 						{
 							BasicAuthenticationCredentials = new BasicAuthenticationCredentials
 							{
-								Username = $"user-{v}", Password = $"pass-{v}"
+								Username = $"user-ap-{v}", Password = $"pass-{v}"
 							}
 						},
 						Application = new[]
@@ -111,7 +111,7 @@ public ApplicationPrivilegesApiTests(XPackCluster cluster, EndpointUsage usage)
 						}
 					},
 					(v, d) => d
-						.RequestConfiguration(r=>r.BasicAuthentication($"user-{v}", $"pass-{v}"))
+						.RequestConfiguration(r=>r.BasicAuthentication($"user-ap-{v}", $"pass-{v}"))
 						.Applications(apps => apps
 							.Application(a => a
 								.Name($"app-{v}")
@@ -134,11 +134,11 @@ public ApplicationPrivilegesApiTests(XPackCluster cluster, EndpointUsage usage)
 						{
 							BasicAuthenticationCredentials = new BasicAuthenticationCredentials
 							{
-								Username = $"user-{v}", Password = $"pass-{v}"
-							}
+								Username = $"user-ap-{v}", Password = $"pass-{v}"
+						}
 						}
 					},
-					(v, d) => d.RequestConfiguration(r=>r.BasicAuthentication($"user-{v}", $"pass-{v}")),
+					(v, d) => d.RequestConfiguration(r=>r.BasicAuthentication($"user-ap-{v}", $"pass-{v}")),
 					(v, c, f) => c.GetUserPrivileges(f),
 					(v, c, f) => c.GetUserPrivilegesAsync(f),
 					(v, c, r) => c.GetUserPrivileges(r),
@@ -210,7 +210,7 @@ [I] public async Task HasPrivilegesResponse() => await Assert<HasPrivilegesRespo
 		{
 			r.IsValid.Should().BeTrue();
 			r.ApiCall.HttpStatusCode.Should().Be(200);
-			r.Username.Should().Be($"user-{v}");
+			r.Username.Should().Be($"user-ap-{v}");
 			r.HasAllRequested.Should().Be(true);
 			r.Applications.Should().NotBeEmpty();
 			var app = $"app-{v}";