Skip to content

Commit 34eb9d0

Browse files
authored
Enable and fix AuthTests.ExternalToken (#484)
* Enable and fix AuthTests.ExternalToken * Try to fix osx
1 parent c47babf commit 34eb9d0

File tree

1 file changed

+27
-40
lines changed

1 file changed

+27
-40
lines changed

tests/KubernetesClient.Tests/AuthTests.cs

Lines changed: 27 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -270,60 +270,44 @@ public void Cert()
270270

271271
#endif // NETCOREAPP2_1
272272

273-
#if NETSTANDARD2_0
274273
[Fact]
275274
public void ExternalToken()
276275
{
277-
const string token
278-
= "testingtoken";
279-
const string name
280-
= "testing_irrelevant";
276+
const string token = "testingtoken";
277+
const string name = "testing_irrelevant";
281278

282-
using (var server
283-
= new MockKubeApiServer(testOutput, cxt =>
284-
{
285-
var header
286-
= cxt.Request.Headers["Authorization"].FirstOrDefault();
279+
using (var server = new MockKubeApiServer(testOutput, cxt =>
280+
{
281+
var header = cxt.Request.Headers["Authorization"].FirstOrDefault();
287282

288-
var expect
289-
= new AuthenticationHeaderValue("Bearer", token).ToString();
283+
var expect = new AuthenticationHeaderValue("Bearer", token).ToString();
290284

291-
if (header != expect)
292-
{
293-
cxt.Response.StatusCode
294-
= (int) HttpStatusCode.Unauthorized;
295-
return Task.FromResult(false);
296-
}
285+
if (header != expect)
286+
{
287+
cxt.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
288+
return Task.FromResult(false);
289+
}
297290

298-
return Task.FromResult(true);
299-
}))
291+
return Task.FromResult(true);
292+
}))
300293
{
301294
{
302-
var kubernetesConfig
303-
= GetK8SConfiguration(server.Uri.ToString(), token, name);
304-
var clientConfig
305-
= KubernetesClientConfiguration.BuildConfigFromConfigObject(kubernetesConfig, name);
306-
var client
307-
= new Kubernetes(clientConfig);
308-
var listTask
309-
= ExecuteListPods(client);
295+
var kubernetesConfig = GetK8SConfiguration(server.Uri.ToString(), token, name);
296+
var clientConfig = KubernetesClientConfiguration.BuildConfigFromConfigObject(kubernetesConfig, name);
297+
var client = new Kubernetes(clientConfig);
298+
var listTask = ExecuteListPods(client);
310299
Assert.True(listTask.Response.IsSuccessStatusCode);
311300
Assert.Equal(1, listTask.Body.Items.Count);
312301
}
313302
{
314-
var kubernetesConfig
315-
= GetK8SConfiguration(server.Uri.ToString(), "wrong token", name);
316-
var clientConfig
317-
= KubernetesClientConfiguration.BuildConfigFromConfigObject(kubernetesConfig, name);
318-
var client
319-
= new Kubernetes(clientConfig);
320-
var listTask
321-
= ExecuteListPods(client);
303+
var kubernetesConfig = GetK8SConfiguration(server.Uri.ToString(), "wrong token", name);
304+
var clientConfig = KubernetesClientConfiguration.BuildConfigFromConfigObject(kubernetesConfig, name);
305+
var client = new Kubernetes(clientConfig);
306+
var listTask = ExecuteListPods(client);
322307
Assert.Equal(HttpStatusCode.Unauthorized, listTask.Response.StatusCode);
323308
}
324309
}
325310
}
326-
#endif // NETSTANDARD2_0
327311

328312
[Fact]
329313
public void Token()
@@ -447,12 +431,15 @@ private K8SConfiguration GetK8SConfiguration(string serverUri, string token, str
447431
arguments = ($"/c echo {responseJson}").Split(" ");
448432
}
449433

450-
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
451-
RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
434+
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
452435
{
453-
arguments = new[] { responseJson };
436+
arguments = new[] { responseJson.Replace("\"", "\\\"") };
454437
}
455438

439+
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
440+
{
441+
arguments = new[] { "\"%s\"", responseJson.Replace("\"", "\\\"") };
442+
}
456443

457444
var users = new List<User>
458445
{

0 commit comments

Comments
 (0)