kubernetes-client/csharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename client cert params to a better name

Browse Source
This commit is contained in:
Boshi Lian
2017-10-13 01:53:25 +08:00
parent eb77c23bb0
commit a323d7d3fe
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Kubernetes.Auth.cs
View File

@@ -73,9 +73,9 @@ namespace k8s
} }
// othwerwise set handler for clinet cert based auth // othwerwise set handler for clinet cert based auth
else if ((!string.IsNullOrWhiteSpace(config.ClientCertificateData) || else if ((!string.IsNullOrWhiteSpace(config.ClientCertificateData) ||
!string.IsNullOrWhiteSpace(config.ClientCertificate)) && !string.IsNullOrWhiteSpace(config.ClientCertificateFilePath)) &&
(!string.IsNullOrWhiteSpace(config.ClientCertificateKey) || (!string.IsNullOrWhiteSpace(config.ClientCertificateKeyData) ||
!string.IsNullOrWhiteSpace(config.ClientKey))) !string.IsNullOrWhiteSpace(config.ClientKeyFilePath)))
{ {
var cert = Utils.GeneratePfx(config); var cert = Utils.GeneratePfx(config);
handler.ClientCertificates.Add(cert); handler.ClientCertificates.Add(cert);

6
src/KubernetesClientConfiguration.ConfigFile.cs
View File

@@ -178,15 +178,15 @@ namespace k8s
!string.IsNullOrWhiteSpace(userDetails.UserCredentials.ClientKeyData)) !string.IsNullOrWhiteSpace(userDetails.UserCredentials.ClientKeyData))
{ {
this.ClientCertificateData = userDetails.UserCredentials.ClientCertificateData; this.ClientCertificateData = userDetails.UserCredentials.ClientCertificateData;
this.ClientCertificateKey = userDetails.UserCredentials.ClientKeyData; this.ClientCertificateKeyData = userDetails.UserCredentials.ClientKeyData;
userCredentialsFound = true; userCredentialsFound = true;
} }
if (!string.IsNullOrWhiteSpace(userDetails.UserCredentials.ClientCertificate) && if (!string.IsNullOrWhiteSpace(userDetails.UserCredentials.ClientCertificate) &&
!string.IsNullOrWhiteSpace(userDetails.UserCredentials.ClientKey)) !string.IsNullOrWhiteSpace(userDetails.UserCredentials.ClientKey))
{ {
this.ClientCertificate = userDetails.UserCredentials.ClientCertificate; this.ClientCertificateFilePath = userDetails.UserCredentials.ClientCertificate;
this.ClientKey = userDetails.UserCredentials.ClientKey; this.ClientKeyFilePath = userDetails.UserCredentials.ClientKey;
userCredentialsFound = true; userCredentialsFound = true;
} }

6
src/KubernetesClientConfiguration.cs
View File

@@ -36,17 +36,17 @@ namespace k8s
/// <summary> /// <summary>
/// Gets ClientCertificate Key /// Gets ClientCertificate Key
/// </summary> /// </summary>
public string ClientCertificateKey { get; set; } public string ClientCertificateKeyData { get; set; }
/// <summary> /// <summary>
/// Gets ClientCertificate filename /// Gets ClientCertificate filename
/// </summary> /// </summary>
public string ClientCertificate { get; set; } public string ClientCertificateFilePath { get; set; }
/// <summary> /// <summary>
/// Gets ClientCertificate Key filename /// Gets ClientCertificate Key filename
/// </summary> /// </summary>
public string ClientKey { get; set; } public string ClientKeyFilePath { get; set; }
/// <summary> /// <summary>
/// Gets a value indicating whether to skip ssl server cert validation /// Gets a value indicating whether to skip ssl server cert validation

12
src/Utils.cs
View File

@@ -60,13 +60,13 @@ namespace k8s
byte[] keyData = null; byte[] keyData = null;
byte[] certData = null; byte[] certData = null;
if (!string.IsNullOrWhiteSpace(config.ClientCertificateKey)) if (!string.IsNullOrWhiteSpace(config.ClientCertificateKeyData))
{ {
keyData = Convert.FromBase64String(config.ClientCertificateKey); keyData = Convert.FromBase64String(config.ClientCertificateKeyData);
} }
if (!string.IsNullOrWhiteSpace(config.ClientKey)) if (!string.IsNullOrWhiteSpace(config.ClientKeyFilePath))
{ {
keyData = File.ReadAllBytes(config.ClientKey); keyData = File.ReadAllBytes(config.ClientKeyFilePath);
} }
if (keyData == null) if (keyData == null)
@@ -78,9 +78,9 @@ namespace k8s
{ {
certData = Convert.FromBase64String(config.ClientCertificateData); certData = Convert.FromBase64String(config.ClientCertificateData);
} }
if (!string.IsNullOrWhiteSpace(config.ClientCertificate)) if (!string.IsNullOrWhiteSpace(config.ClientCertificateFilePath))
{ {
certData = File.ReadAllBytes(config.ClientCertificate); certData = File.ReadAllBytes(config.ClientCertificateFilePath);
} }
if (certData == null) if (certData == null)

8
tests/AuthTests.cs
View File

@@ -185,7 +185,7 @@ namespace k8s.Tests
{ {
Host = server.Uri.ToString(), Host = server.Uri.ToString(),
ClientCertificateData = clientCertificateData, ClientCertificateData = clientCertificateData,
ClientCertificateKey = clientCertificateKeyData, ClientCertificateKeyData = clientCertificateKeyData,
SslCaCert = serverCertificate, SslCaCert = serverCertificate,
SkipTlsVerify = false SkipTlsVerify = false
}); });
@@ -203,7 +203,7 @@ namespace k8s.Tests
{ {
Host = server.Uri.ToString(), Host = server.Uri.ToString(),
ClientCertificateData = clientCertificateData, ClientCertificateData = clientCertificateData,
ClientCertificateKey = clientCertificateKeyData, ClientCertificateKeyData = clientCertificateKeyData,
SkipTlsVerify = true SkipTlsVerify = true
}); });
@@ -219,8 +219,8 @@ namespace k8s.Tests
var client = new Kubernetes(new KubernetesClientConfiguration var client = new Kubernetes(new KubernetesClientConfiguration
{ {
Host = server.Uri.ToString(), Host = server.Uri.ToString(),
ClientCertificate = "assets/client.crt", // TODO amazoning why client.crt != client-data.txt ClientCertificateFilePath = "assets/client.crt", // TODO amazoning why client.crt != client-data.txt
ClientKey = "assets/client.key", // TODO bad naming param ClientKeyFilePath = "assets/client.key",
SkipTlsVerify = true SkipTlsVerify = true
}); });

6
tests/KubernetesClientConfigurationTests.cs
View File

@@ -120,8 +120,8 @@ namespace k8s.Tests
var fi = new FileInfo(kubeConfigFileName); var fi = new FileInfo(kubeConfigFileName);
var cfg = new KubernetesClientConfiguration(fi, context); var cfg = new KubernetesClientConfiguration(fi, context);
Assert.Equal(context, cfg.CurrentContext); Assert.Equal(context, cfg.CurrentContext);
Assert.Equal(cfg.ClientCertificate, clientCert); Assert.Equal(cfg.ClientCertificateFilePath, clientCert);
Assert.Equal(cfg.ClientKey, clientCertKey); Assert.Equal(cfg.ClientKeyFilePath, clientCertKey);
} }
/// <summary> /// <summary>
@@ -137,7 +137,7 @@ namespace k8s.Tests
Assert.Equal(context, cfg.CurrentContext); Assert.Equal(context, cfg.CurrentContext);
Assert.NotNull(cfg.SslCaCert); Assert.NotNull(cfg.SslCaCert);
Assert.Equal(readLine("assets/client-certificate-data.txt"), cfg.ClientCertificateData); Assert.Equal(readLine("assets/client-certificate-data.txt"), cfg.ClientCertificateData);
Assert.Equal(readLine("assets/client-key-data.txt"), cfg.ClientCertificateKey); Assert.Equal(readLine("assets/client-key-data.txt"), cfg.ClientCertificateKeyData);
} }