Skip to content

209 Secrets generated as Helm output should be data rather than stringData #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prom3theu5 merged 2 commits into from
Jun 1, 2024
Merged

209 Secrets generated as Helm output should be data rather than stringData #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78fd0f4
Fix helm chart secrets
prom3theu5 Jun 1, 2024
dade719
Fix k8s tests
prom3theu5 Jun 1, 2024
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
14 changes: 5 additions & 9 deletions src/Aspirate.Shared/Extensions/KubernetesDeploymentDataExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,12 @@ public static V1Secret ToKubernetesSecret(this KubernetesDeploymentData data, bo
labels ??= data.ToKubernetesLabels();
var metadata = data.ToKubernetesObjectMetaData(labels);

var secrets = new Dictionary<string, byte[]>();

foreach (var secret in data.Secrets.Where(secret => !string.IsNullOrEmpty(secret.Value)))
{
if (encodeSecrets == true)
{
data.Secrets[secret.Key] = Convert.ToBase64String(Encoding.UTF8.GetBytes(secret.Value));
continue;
}

data.Secrets[secret.Key] = secret.Value;

var secretValueBytes = Encoding.UTF8.GetBytes(secret.Value);
secrets[secret.Key] = encodeSecrets == true ? Encoding.UTF8.GetBytes(Convert.ToBase64String(secretValueBytes)) : secretValueBytes;
}

return new V1Secret
Expand All @@ -58,7 +54,7 @@ public static V1Secret ToKubernetesSecret(this KubernetesDeploymentData data, bo
Kind = "Secret",
Metadata = metadata,
Type = "Opaque",
StringData = data.Secrets,
Data = secrets,
};
}

Expand Down
10 changes: 6 additions & 4 deletions tests/Aspirate.Tests/ExtensionTests/KubernetesDeploymentDataExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System.Text;

namespace Aspirate.Tests.ExtensionTests;

public class KubernetesDeploymentDataExtensionTests
Expand Down Expand Up @@ -61,8 +63,8 @@ public void ToKubernetesSecret_ShouldReturnCorrectSecret()
var result = data.ToKubernetesSecret();

// Assert
result.StringData.Should().ContainKey("key");
result.StringData["key"].Should().Be("dmFsdWU=");
result.Data.Should().ContainKey("key");
result.Data["key"].Should().NotBeEmpty().And.BeEquivalentTo("dmFsdWU="u8.ToArray());
}

[Fact]
Expand Down Expand Up @@ -147,8 +149,8 @@ public void ToKubernetesObjects_ShouldReturnCorrectObjects()
configMap.Data["key"].Should().Be("envvalue");

var secret = result.OfType<V1Secret>().First();
secret.StringData.Should().ContainKey("key");
secret.StringData["key"].Should().Be("c2VjcmV0dmFsdWU=");
secret.Data.Should().ContainKey("key");
secret.Data["key"].Should().NotBeEmpty().And.BeEquivalentTo("c2VjcmV0dmFsdWU="u8.ToArray());
}

[Fact]
Expand Down