Skip to content

Commit ed50fc2

Browse files
committed
Add tests.
1 parent f38305b commit ed50fc2

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

src/Kubernetes.Auth.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public Kubernetes(KubernetesClientConfiguration config)
4141
};
4242

4343
// set credentails for the kubernernet client
44-
this.SetCredentialsAsync(config, handler).Wait();
44+
this.SetCredentials(config, handler);
4545
this.InitializeHttpClient(handler);
4646
}
4747

@@ -53,7 +53,7 @@ public Kubernetes(KubernetesClientConfiguration config)
5353
/// <param name="config">k8s client configuration</param>
5454
/// <param name="handler">http client handler for the rest client</param>
5555
/// <returns>Task</returns>
56-
private async Task SetCredentialsAsync(KubernetesClientConfiguration config, HttpClientHandler handler)
56+
private void SetCredentials(KubernetesClientConfiguration config, HttpClientHandler handler)
5757
{
5858
// set the Credentails for token based auth
5959
if (!string.IsNullOrWhiteSpace(config.AccessToken))
@@ -70,7 +70,7 @@ private async Task SetCredentialsAsync(KubernetesClientConfiguration config, Htt
7070
(!string.IsNullOrWhiteSpace(config.ClientCertificateKey) ||
7171
!string.IsNullOrWhiteSpace(config.ClientKey)))
7272
{
73-
var cert = await Utils.GeneratePfxAsync(config).ConfigureAwait(false);
73+
var cert = Utils.GeneratePfx(config);
7474
handler.ClientCertificates.Add(cert);
7575
}
7676
else

src/Utils.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ public static string Base64Decode(string text)
4242
/// </summary>
4343
/// <param name="config">Kuberentes Client Configuration</param>
4444
/// <returns>Generated Pfx Path</returns>
45-
/// TODO: kabhishek8260 Remplace the method with X509 Certificate with private key(in dotnet 2.0)
46-
public static async Task<X509Certificate2> GeneratePfxAsync(KubernetesClientConfiguration config)
45+
public static X509Certificate2 GeneratePfx(KubernetesClientConfiguration config)
4746
{
4847
var keyData = new byte[]{};
4948
var certData = new byte[]{};
@@ -75,8 +74,12 @@ public static X509Certificate2 addPrivateKey(X509Certificate2 cert, byte[] keyDa
7574
{
7675
using (var reader = new StreamReader(new MemoryStream(keyData)))
7776
{
78-
var cipherKey = (AsymmetricCipherKeyPair)new PemReader(reader).ReadObject();
79-
var rsaKeyParams = (RsaPrivateCrtKeyParameters)cipherKey.Private;
77+
var obj = new PemReader(reader).ReadObject();
78+
if (obj is AsymmetricCipherKeyPair) {
79+
var cipherKey = (AsymmetricCipherKeyPair)obj;
80+
obj = cipherKey.Private;
81+
}
82+
var rsaKeyParams = (RsaPrivateCrtKeyParameters)obj;
8083
var rsaKey = RSA.Create(DotNetUtilities.ToRSAParameters(rsaKeyParams));
8184
return cert.CopyWithPrivateKey(rsaKey);
8285
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlEUkRDQ0FpeWdBd0lCQWdJSUVIVm8zVzZXcnJjd0RRWUpLb1pJaHZjTkFRRUxCUUF3RXpFUk1BOEdBMVVFQXd3SVlXTnphemh6DQpZMkV3SGhjTk1UY3dOREU1TURBd01EQXdXaGNOTVRrd05ERTVNREF3TURBd1dqQVZNUk13RVFZRFZRUUREQXByZFdKbFkyOXVabWxuDQpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXVEZ0ttVUxsU0ZSTStCN0pNMWMxUEJqS25mWlZpL1d1DQpSUks2TE9xNHpzL1UxanUyN21TbE9HbWJxRWVYTlpCRVFCblYvVGptQXpqM0Zwd2VKbW5PdDY0TTFIeXZRUW8yTC9LS2JlOVlPbUxNDQpRWXZyeE9QeFRnZHVJeDYzTGxKSUJRZERqdVFhWUhBc0FqTllhbTB3UmQwZTNhVkUxeEJnVDA4QkVWZnVwZmUrUnpXUWhVemJXYkhDDQpydmU2b2s4aHQzRk9LYjNxRzhyR3UrYzN4bGM1MXNVa2ovMGhMK0xrZVBWOTBRYVVCRjF6czlDMVZGaVhoT1Z6WlRjQ0lWQThSTDNvDQpxRTdGUEwvczBNc0RsdkRoNkZ3ZFkvUWhwSUtRMkdKTHQ0ZGRobk5yYW5GbS9pM1RzQ3FJSWxieHl5TVRsT09YYytOUG9mZW9EUUcvDQpvQldjTVFJREFRQUJvNEdaTUlHV01FSUdBMVVkSXdRN01EbUFGSmcrY0p4ZHpaUzNabzdjajFjQXJFWjNxREh1b1Jla0ZUQVRNUkV3DQpEd1lEVlFRRERBaGhZM05yT0hOallZSUlGTjZKejlmRStOVXdIUVlEVlIwT0JCWUVGTmJxZURyeHRvbWZFYnd5bmFUaXp4WXVmeVRXDQpNQXdHQTFVZEV3RUIvd1FDTUFBd0RnWURWUjBQQVFIL0JBUURBZ1dnTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01BMEdDU3FHDQpTSWIzRFFFQkN3VUFBNElCQVFCYkFKdjJDRzRnTDJtNlpiQmJKSEtqMVF5MGtmbUFJdWgyZHNISU5vUHZ4V0lqY3VXeHZlbUpRcndUDQpuUEZPeWFMY3VtNmVmcGZhWG04T2hxNWxjT3NldUtYaDVya2ZuRUp1VmNWYk9UNXY2aUU3TEY5eGMrelVlTkZDWjA1a1QwbU52eW9lDQpIVmhkYlljeG8yOXVwbGVqa3RqZXd0eGZBZjM2a25hQytOVGE3dVZyNVQ0aTd4MUNQMGkvcUY5ZVgwVHJqZ0diM09MTHVwcVhMSzd5DQpUWUllK3NCajNjOGZRNit6RUJDVFNib05DRlRldXpjOTMxclltc1VyZGtIdEp2SkI2aSthMG5iRjB4MnRYY3ZRbVJ6aUwzTGR0UG84DQptSWh0bDRRWXBQZG5Qdk1RWk1MMlZ4T0FqN3V0RnhNMW44OEpKV0NaTkNyUUdYZjBLSDFpdHhwNg0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0K
1+
LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlEUkRDQ0FpeWdBd0lCQWdJSUxzVmNxZ0pmOWdZd0RRWUpLb1pJaHZjTkFRRUxCUUF3RXpFUk1BOEdBMVVFQXd3SVlXTnphemh6DQpZMkV3SGhjTk1UY3dPVEl3TURBd01EQXdXaGNOTVRrd09USXdNREF3TURBd1dqQVZNUk13RVFZRFZRUUREQXByZFdKbFkyOXVabWxuDQpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXJQVjB0Rmp3ZkxVL0p6M3RaUXRRblNSRG5aMGpLTGtjDQpRcnJ2a2pwbEhpVkFVOVNkRG9nT0VneUVWQjJoMU0xSWNYSVZYM2lCTGFHS04rSTl2dGZQSFQ2QmViTzVKNzFaOHRGMytJU1pNRzBLDQpzSWwzQS94VEJWKzlwRHVEU3pXTGNVTVoxbnhWV1Bma0paRkVTQTNCakxFT1NGWWYySUF4V0g2cjJDRHp0SDMySzVLbUNaLzR1NFFsDQpCT204YWoxVkFUbUZvK3BJaTNmUXVKcm1TblBSRGRlSW5HVGYwaEYyQ3oybzYrNU1TSzAxbURuaERyZVF5eTJHNXZXRnlWUjNxZ3pGDQpOMHFyaUEvSFRGcklSazdtbFZtaEpPM3A5cU0wRGdJc29XdHg0Ukdqc1lycTBmOTBnREhna1YvS0E3UEhZQlhheVVnQjhLcTUwS2xHDQpxczRyYVFJREFRQUJvNEdaTUlHV01FSUdBMVVkSXdRN01EbUFGS0FXL3JnbWJ4YUtWcUZoaFl4bEl5TEhQbEkyb1Jla0ZUQVRNUkV3DQpEd1lEVlFRRERBaGhZM05yT0hOallZSUlSbWp6U3h0U2d5TXdIUVlEVlIwT0JCWUVGSk5mZDNaZlJZZnlQdGJZbE1NUDYvKzcrU3dIDQpNQXdHQTFVZEV3RUIvd1FDTUFBd0RnWURWUjBQQVFIL0JBUURBZ1dnTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01BMEdDU3FHDQpTSWIzRFFFQkN3VUFBNElCQVFCRVd0U1JMU0lTODhFUWpRdWp4bitQdmQ0OVNxSkdTUmRFNnlraUkwcXZ5RmY1c1lnV2FlYTdaME43DQpuK3k3SmlQQXQ1MEFkdGdvYTF1bWV4bG9VZE02WDJQYTB4RUpDaklGOFArcjhPOU41U0N5NVRXYTd0VTFrWkdoZHJFOERMS2RJbXk4DQpqblhnUlBjUHVlVnRkam50TFdUMGpETDI5YVg3ZUhLcllTMWQ2dkUyWXE3djZVNFNKN2JLU0NGbFNjS1h0VjhxUFVteXFlbXd5WHNBDQpVdEtBelRKS0l0UGw3eG5icXduVm5tY3Q0a0Q1VHZBUEFTdmZGTkR0eEU0WTU1ZHNYTERSVEc3NU5VK044bi94ZnBzcnlBZkQrUGZ6DQpNR05OWVhLb0hwbm93R1Z4V3UxRHZNY2kxQTl4STF6VnFsS2FpVTZSNm9qWmx6Q2xsVU54QUhzZA0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0K

tests/assets/client-key-data.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQ0KTUlJRXBBSUJBQUtDQVFFQWtweU5GZ1F0N1Yxbml6U0N6TzdodmhLQXVyUFlSR2ExZEd3OXNQQVU4d2ovd1E4dA0KZUVGRTBwejRJTmxuUHhvQVZhUnRSVXowUHVnRmhLSUVVWEZCUnF1bEF5VS8ySjhMbzFWVWVUK2V1TTZ1cWdMUQ0KdFRqVlIxMUh3YU9jMktoUGl1VUlZaDMxNm5BSHVaMnBUbnpqTFBBM2lqY2RndVZxSUJydnpJTXVLU25lMmJQZA0KT2pqN2dBa3RIQ2Z0VHlTUlorOE94TzMzVFRqTEpDQ1RJZUYrUkFWQnl6VWUybDd5WDkrSzFjekwrbFh1TWh6Lw0KeSt6cFp1NW9VeUJXenA4T0M4aXNSNmxURFVmaCtGNU5zckxmcXIwV21wVlVlalV4VDU0ODNJeGp5SEJ2SENuUg0KYWdVZ3JOd080aWNEMzA4WmZYQjQ3TGk1TGJnRmlZdzNhMGhKOHdJREFRQUJBb0lCQVFDSExQSmtUend0TTBhSg0Kc2NPN3diQy9kLzNhcG9FTEtBdTdxU1VFSTRlZFFUblZ2ZkcxZzdBNTQrSmZIek96bVh5ZmVmZ0p3bGNjUFA4Qg0KZUFRMU53L3hZY2JGN0swK1EvNE4vVm5pWlFjcDY5NWRBRFdBTVVOc0JoUm45RHRrQTJNN2M4cFQ5TDNOQnJnSQ0KcXRYMGVPOVllcThxcjRCMU5LS3hzVVJSc3MxM3d5d2R4bzMwbFJ1WlhjMnUvS1EweFRRbTR4M1RRRVpIUWhBNg0KN2E2UWM3MThPMW1ISWQrRERTbStab2l0YnZpR24ySnQ1aWsrUFNIajhVY01ITkoxYVUvMyt5YmVGUU93L3MrTg0KMWMxZDJsS0c1K0k0UW9FeEFEUWxrWEZQeUFISGg3bWhmdGNJT3lXUUdMYVcraVQrSklGYUMyS3dBSCtmM1g0TA0KWTVJUTlzVzVBb0dCQU50NjFtTlNYTWlncVdvSVdzM1pMN1hpWDdJOThOU1ZrMjJGRHNLcldKSzN1bkRWSlVnbg0KbEpzaGo0L2cwc1IvSlRLT2FiUTFVNWJCSFpzRmF3UGd1K2RPWWp3TWtkL0tUcThmT2tUSXhpaHBvYVNvcDF0WA0KS001ZUpVcitjSVpRcXloc3dvUzg5R3ZGSnNFSXo5WUpzOHlIOGlvdElLL2N5ZnpnTTVZQmUzL25Bb0dCQUtzQg0KdjhIVzNkenEwTW1QY1VhTTk5L1VlOG9QYmcrOElaSFl2M0Jicm43TEM5czNVVUVRY1cxTUMrYXdYSHd0YXg0OA0KNjdvWWRaY2YzbWZxR2M1NlIwUWpBdm1jcGt4dXY2bVpWYzk1Z1p5TnoyV0Z4ZXdTdWlQQUQrSjZwLzE3WkF4ag0KU1NZejRSRDZ0bk1HNXhYd1BZcVRGdlNiajNJdlAzWjN1bVhlZVZRVkFvR0FJUklpU2JiNFdoYXpVRkhQOU9KNw0KNk9raVNFWkRDcFU3TUs1eTZleE5uVlhuMXVhWEJvZElRaFBOZ1AxOFpMVlAwbzFZNmhsNjdlVk5ZN1Z1U1poTQ0KVis4Y3FEV3dxVXJmamsyalJ3Z0ZxOE0yNHd1eW8vVy9KVkZVUnplTmx2K0N1c1dnamNXM0FxSWpVOFRUSkVveg0KK0dhbm02bFBHcENuTXQ1Smg1blRsUk1DZ1lCaDAyOVNRVXZNWEZ3eVlpZW45MjY1a2dGNjF4YmNVNEJVd2N6Sw0KUnZoc3VsVS9BOGNzMUc0KzJ6a1hzQjVJUDJjKzloVFg4YlFiVHZUWk4xZXFBZE9SREFKZ3J4ZUhNL2ZhMnNmMw0KRjRobytjc0NSZU95cUFmcCthNWNubFJKc3ZQS0RtWkRQM3hxVFRKZ1hUdUhGbGJ1VmpUVW04VVV5aWlnNmQ4cw0KOVhjcy9RS0JnUUMyZDdSSDc2VFBodFNCV1I3UVhJcVJqYitIeDBVcFk3WkJBRCtzZ1lXakZRZVBNVVE1V2JUbA0KTERZekl6WDNyQnlIVEF2TXptcHFoWTY3b28rRi9DazhmN3JCOS9IckduSUowY2pIL2twbnZLZWpqSnZDdWhOdA0KNUxsaFE4NDVteXIrVWlkVEc1cWVReXloaHZMVDFqNzhLRmRGdnpMRzZGWEREZ1d2emxBQXVRPT0NCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tDQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
1+
LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQ0KTUlJRW93SUJBQUtDQVFFQXJQVjB0Rmp3ZkxVL0p6M3RaUXRRblNSRG5aMGpLTGtjUXJydmtqcGxIaVZBVTlTZA0KRG9nT0VneUVWQjJoMU0xSWNYSVZYM2lCTGFHS04rSTl2dGZQSFQ2QmViTzVKNzFaOHRGMytJU1pNRzBLc0lsMw0KQS94VEJWKzlwRHVEU3pXTGNVTVoxbnhWV1Bma0paRkVTQTNCakxFT1NGWWYySUF4V0g2cjJDRHp0SDMySzVLbQ0KQ1ovNHU0UWxCT204YWoxVkFUbUZvK3BJaTNmUXVKcm1TblBSRGRlSW5HVGYwaEYyQ3oybzYrNU1TSzAxbURuaA0KRHJlUXl5Mkc1dldGeVZSM3FnekZOMHFyaUEvSFRGcklSazdtbFZtaEpPM3A5cU0wRGdJc29XdHg0Ukdqc1lycQ0KMGY5MGdESGdrVi9LQTdQSFlCWGF5VWdCOEtxNTBLbEdxczRyYVFJREFRQUJBb0lCQUJpaUpPc0N0ODJyS3NGMg0KQ25lWHN2V09rcXJDRkozYUwzSTVtYUZqKzc3ZFkxb05NQWsveTNFNm95WXZ5anE2dWhTZVFQa0YrcS83RCtxQg0KcUhXajJ2VzVUMHQ4RTJUYmpSSU9UMTN2MUxtVzdpelNoMGJrQ3hiNjJkR29RRHpYOVhJK01sSGdCMi9TYm9ZRA0KT0l4aW1TeG1remd1Ty83ajB5TmRkekFqRVZLbFdoYkZ6ajBFV01lazJ4L0VtWXBKSGlYdktZTjA3dXlxcTVMRA0KRlRNSjN1T2dsWis3U1E3eGtQcHl1OW1yMWxVZzVPeXdTV0dRVWR4Mk9IcTZXMlVHNFU4QTNXTFVwSFlLWEhqRQ0KVmg5UVNzdnNvUmptRWNaRllSRlpsRk9raVVCRC9HWm9Ya1doc3BCYU5mODRmUVdJenkzaFpyZ0MwWFc2MmszMQ0KRklVczhMa0NnWUVBMVBTRjR4MitYSnVqU2N1RXBhZWhLS2E3dmt6TXo2SlVlWHFJQlFRbmV1TE5QaVJlUThCWQ0KTVBTajNMV3ZZVzNEenNFQXBQVmMvSDNXZ0Q3V2s1bW1Dbm56elo0eDZ0eE1zaW5vVzZtNk8wWUd4b040YmZ1bg0KblliVFRucFRyRTEvS1VSZUJ6c2JaWmR1SGxwWUtocldMdmJNOW95UEJPbVNvcWk2MEdLQjNhOENnWUVBeit0TQ0KNlhYdVNWbnNUTExLNmx3U1FxWmZTNkVaa1RpOXZ2eEpaN2R1V1BxNm5CVHZtcjhZL2F0Q3l0UlhZY0FjRmF0Yw0KMVNURmdRYjJCUW82K1FGRW12NVhSUThqMmphODBMT2ZET2NCVkpTNmphOC8rK09IWDBWWGFjYUhDMkh6Y01MeA0KMlNyVXNhaEtkL1dUbW5xQmJDQTBUaDY3Q0UvOFIyZVQvdmc2Sm1jQ2dZQXV5YmFzNnJrTFljcWppUXFRMXQ2cQ0KcnM5ckJUYXVtK3pSYitGNHNLdjM3T0xKTjNaYWptVVNCSDRJSFFiMmNnWm1ZN00vaXdVdUdIdkxXNE1MbE9PTg0KUTdRVVJpQ1RpR2wxYjQyMHJmclQwUlBtQTdhdSsyNmRScVVnaGZIaVZuaU0yWStMS1NwZ3pMK04vYTJIT3JRNg0KUjFGTERpRFNKSHRxTDRZMENLQ2Qwd0tCZ0NGRWJ0dno2SnFIN3MwZTFtVEZNbzdEZS8vbjJPVnBoTUtvTHo2UA0KRlBMYnV6djZCWlJtK3lLcllsWjl2elYrdlgraUdZcHBCY2p0U2pQb1BTTldWcG5PRkR5U2ZaUU9xZ3Rpa2hKSQ0KYStnU20vN0xpWnROL256NTVWQ2hXVDR5Ly9hTTJwRjZ6dWxXR2dRem9OaFl2WmlGVnBraFJaL0EzSWE0UmUvSA0KMjlZRkFvR0JBSU81QVV6V3V1SHN5Wi9MeXMyZTg5d0w4OU5hVE1OVFcwQVlEZjhVQndMeWhyNEsrUmVsOHdiNw0KOXZ2L04wVTE0WURNT0c2S0lGQ05nZjRKZWJDOGIyOGp4cXFmTzV4clFRZWRsemU2TFFmMUhzUDJ5WVlOVkRjeg0KUWZ6bG9EOE96bmp5Y3pJY0doMkszU0cvWnJmWWtXWUxlUkVZRGpiU0VUN1cybERBa1FsVA0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0NCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=

0 commit comments

Comments
 (0)