Skip to content

Fix Metadata's description for prettier printing #2185

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.

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
merged 9 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
12 changes: 10 additions & 2 deletions Sources/GRPCCore/Metadata.swift
Original file line number Diff line number Diff line change
Expand Up @@ -494,15 +494,23 @@ extension Metadata.Value: ExpressibleByArrayLiteral {

extension Metadata: CustomStringConvertible {
public var description: String {
String(describing: self.map({ ($0.key, $0.value) }))
var description = "["
description = self.dropLast().reduce(into: description) { partialResult, nextPair in
partialResult += "\"\(nextPair.key)\": \(nextPair.value), "
}
if let lastElement = self.last {
description += "\"\(lastElement.key)\": \(lastElement.value)"
}
description += "]"
return description
}
}

extension Metadata.Value: CustomStringConvertible {
public var description: String {
switch self {
case .string(let stringValue):
return String(describing: stringValue)
return "\"\(stringValue)\""
case .binary(let binaryValue):
return String(describing: binaryValue)
}
Expand Down
13 changes: 13 additions & 0 deletions Tests/GRPCCoreTests/MetadataTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -314,4 +314,17 @@ struct MetadataTests {
)
}
}

@Suite("Description")
struct Description {
@Test("Metadata")
func describeMetadata() async throws {
let metadata: Metadata = [
"key1": "value1",
"key2": "value2",
"key-bin": .binary([1, 2, 3]),
]
#expect("\(metadata)" == #"["key1": "value1", "key2": "value2", "key-bin": [1, 2, 3]]"#)
}
}
}
Loading