Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.7.0" />
<PackageVersion Include="FluentAssertions" Version="8.11.0" />
<PackageVersion Include="Fractions" Version="8.3.2" />
<PackageVersion Include="JsonPatch.Net" Version="5.0.3" />
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.7.1" />
Expand Down
1 change: 0 additions & 1 deletion tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" />
<PackageReference Include="System.Reactive" />
Expand Down
29 changes: 14 additions & 15 deletions tests/KubernetesClient.Tests/OidcAuthTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using FluentAssertions;
using k8s.Authentication;
using k8s.Exceptions;
using System;
Expand Down Expand Up @@ -27,16 +26,16 @@ public async Task TestOidcAuth()
// use unexpired id token as bearer, do not attempt to refresh
var auth = new OidcTokenProvider(clientId, clientSecret, idpIssuerUrl, unexpiredIdToken, refreshToken);
var result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true);
result.Scheme.Should().Be("Bearer");
result.Parameter.Should().Be(unexpiredIdToken);
Assert.Equal("Bearer", result.Scheme);
Assert.Equal(unexpiredIdToken, result.Parameter);

try
{
// attempt to refresh id token when expired
auth = new OidcTokenProvider(clientId, clientSecret, idpIssuerUrl, expiredIdToken, refreshToken);
result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true);
result.Scheme.Should().Be("Bearer");
result.Parameter.Should().Be(expiredIdToken);
Assert.Equal("Bearer", result.Scheme);
Assert.Equal(expiredIdToken, result.Parameter);
Assert.Fail("should not be here");
}
catch (KubernetesClientException e)
Expand All @@ -49,8 +48,8 @@ public async Task TestOidcAuth()
// attempt to refresh id token when null
auth = new OidcTokenProvider(clientId, clientSecret, idpIssuerUrl, null, refreshToken);
result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true);
result.Scheme.Should().Be("Bearer");
result.Parameter.Should().Be(expiredIdToken);
Assert.Equal("Bearer", result.Scheme);
Assert.Equal(expiredIdToken, result.Parameter);
Assert.Fail("should not be here");
}
catch (KubernetesClientException e)
Expand Down Expand Up @@ -89,23 +88,23 @@ public async Task TestOidcAuthWithWireMock()
var result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None);

// Assert
result.Scheme.Should().Be("Bearer");
result.Parameter.Should().Be(newIdToken);
Assert.Equal("Bearer", result.Scheme);
Assert.Equal(newIdToken, result.Parameter);

// Verify that the expiry is set correctly
var expectedExpiry = DateTimeOffset.UtcNow.AddSeconds(expiresIn);
var actualExpiry = typeof(OidcTokenProvider)
.GetField("_expiry", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
?.GetValue(auth) as DateTimeOffset?;
actualExpiry.Should().NotBeNull();
actualExpiry.Value.Should().BeCloseTo(expectedExpiry, precision: TimeSpan.FromSeconds(5));
Assert.NotNull(actualExpiry);
Assert.Equal(expectedExpiry, actualExpiry.Value, TimeSpan.FromSeconds(5));

// Verify that the refresh token is set correctly
var actualRefreshToken = typeof(OidcTokenProvider)
.GetField("_refreshToken", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
?.GetValue(auth) as string;
actualRefreshToken.Should().NotBeNull();
actualRefreshToken.Should().Be(refreshToken);
Assert.NotNull(actualRefreshToken);
Assert.Equal(refreshToken, actualRefreshToken);

// Stop the server
server.Stop();
Expand Down Expand Up @@ -134,8 +133,8 @@ public async Task TestOidcAuthWithServerError()
// Act & Assert
var exception = await Assert.ThrowsAsync<KubernetesClientException>(
() => auth.GetAuthenticationHeaderAsync(CancellationToken.None));
exception.Message.Should().StartWith("Unable to refresh OIDC token.");
exception.InnerException.Message.Should().Contain("500");
Assert.StartsWith("Unable to refresh OIDC token.", exception.Message);
Assert.Contains("500", exception.InnerException.Message);

// Stop the server
server.Stop();
Expand Down
13 changes: 6 additions & 7 deletions tests/KubernetesClient.Tests/TokenFileAuthTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using FluentAssertions;
using k8s.Authentication;
using System;
using System.Threading;
Expand All @@ -14,18 +13,18 @@ public async Task TestToken()
{
var auth = new TokenFileAuth("assets/token1");
var result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true);
result.Scheme.Should().Be("Bearer");
result.Parameter.Should().Be("token1");
Assert.Equal("Bearer", result.Scheme);
Assert.Equal("token1", result.Parameter);

auth.TokenFile = "assets/token2";
result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true);
result.Scheme.Should().Be("Bearer");
result.Parameter.Should().Be("token1");
Assert.Equal("Bearer", result.Scheme);
Assert.Equal("token1", result.Parameter);

auth.TokenExpiresAt = DateTime.UtcNow.AddSeconds(-1);
result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true);
result.Scheme.Should().Be("Bearer");
result.Parameter.Should().Be("token2");
Assert.Equal("Bearer", result.Scheme);
Assert.Equal("token2", result.Parameter);
}
}
}
Loading