From a287efacb136c582b8712a24f6ef44f63a92931a Mon Sep 17 00:00:00 2001 From: Daniel McCoy Stephenson Date: Thu, 12 Nov 2026 19:53:48 -0700 Subject: [PATCH] Pin a second tags: block and how the tags: line is matched Co-Authored-By: Claude Opus 5.5 --- .../stephenson/trace/TraceClientTest.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/test/java/software/stephenson/trace/TraceClientTest.java b/src/test/java/software/stephenson/trace/TraceClientTest.java index 770a602..99f6b58 100644 --- a/src/test/java/software/stephenson/trace/TraceClientTest.java +++ b/src/test/java/software/stephenson/trace/TraceClientTest.java @@ -1289,6 +1289,45 @@ void serverWideTags_blockEndsAtTheNextUnindentedLineOrEndOfFile() { assertTrue(tagsOf("tags:\nenabled: true\n").isEmpty()); } + @Test + void serverWideTags_aSecondTagsBlockAddsToTheFirstAndTheFirstEntryOfAKeyWins() { + // Arrange + // Two blocks, as an operator might leave after pasting an example + // below their own; the second is indented differently from the first. + String content = "tags:\n" + + " ci: \"true\"\n" + + " env: staging\n" + + "enabled: true\n" + + "tags:\n" + + " env: prod\n" + + " region: eu\n"; + + // Act + TraceClient.ServerWideConfig config = TraceClient.parseServerWideConfig(Arrays.asList(content.split("\n", -1))); + + // Assert + Map expected = new LinkedHashMap<>(); + expected.put("ci", "true"); + expected.put("env", "staging"); + expected.put("region", "eu"); + assertEquals(expected, config.tags, "each block takes its own indent; a key already read is not replaced"); + assertFalse(config.disables); + } + + @Test + void serverWideTags_theTagsLineIsCaseSensitiveAndAllowsSpaceBeforeTheColon() { + // Arrange, Act and Assert + assertEquals(Collections.singletonMap("ci", "true"), tagsOf("tags :\n ci: \"true\"\n")); + assertTrue(tagsOf("Tags:\n ci: \"true\"\n").isEmpty(), "Tags: is not tags:"); + assertTrue(tagsOf("tags: ci\n env: prod\n").isEmpty(), "a value on the tags: line is not a block"); + + // Under a line that does not open a block, an indented enabled: is + // outside any tags: block, so it is the switch. + TraceClient.ServerWideConfig config = TraceClient.parseServerWideConfig(Arrays.asList("Tags:", " enabled: false")); + assertTrue(config.disables); + assertTrue(config.tags.isEmpty()); + } + @Test void serverWideTags_dropEntriesTheServerWouldRejectOrThatAreNotUnderstood() { StringBuilder longText = new StringBuilder();