Skip to content

Commit e315b75

Browse files
committed
Quote generated AgentConfiguration yaml values
1 parent 8bf3e3f commit e315b75

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

manifests/examples/testing/scenarios/cluster/cluster-agent-configuration.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ spec:
1010
enabled: false
1111
foo:
1212
bar: "foobar"
13+
special: "%specialyaml"
1314
initContainer:
1415
securityContext:
1516
runAsUser: 499

src/Contrast.K8s.AgentOperator/Core/Reactions/Defaults/ClusterAgentConfigurationSyncingHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ClusterAgentConfigurationSyncingHandler(IStateContainer state,
4141
foreach (var yamlKey in desiredResource.YamlKeys)
4242
{
4343
// Hard code the new line for Linux.
44-
builder.Append(yamlKey.Key).Append(": ").Append(yamlKey.Value).Append('\n');
44+
builder.Append(yamlKey.Key).Append(": '").Append(yamlKey.Value).Append("'\n");
4545
}
4646

4747
var yaml = builder.ToString();

tests/Contrast.K8s.AgentOperator.FunctionalTests/Scenarios/Injection/ClusterDefaultTests.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,24 @@ public async Task When_injected_then_pod_should_use_generated_configuration()
8383
}
8484
}
8585

86+
[Fact]
87+
public async Task When_injected_then_pod_should_use_generated_valid_configuration()
88+
{
89+
var client = await _context.GetClient();
90+
91+
// Act
92+
var result = await client.GetInjectedPodByPrefix(ScenarioName);
93+
94+
// Assert
95+
using (new AssertionScope())
96+
{
97+
var container = result.Spec.Containers.Single();
98+
99+
//Test that the namespaced AgentConfiguration contains valid yaml (% unquoted in yaml means its a directive line)
100+
container.Env.Should().Contain(x => x.Name == "CONTRAST__SPECIAL").Which.Value.Should().Be("%specialyaml");
101+
}
102+
}
103+
86104
[Fact]
87105
public async Task When_init_container_overrides_exist_then_the_overrides_should_be_merged_and_applied()
88106
{

0 commit comments

Comments
 (0)