Skip to content

Commit eabe1a2

Browse files
Update String representations
1 parent 105fe54 commit eabe1a2

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

Sources/GRPCProtobuf/Errors/ErrorDetails+CustomStringConvertible.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ extension ErrorDetails.DebugInfo: CustomStringConvertible {
6464
@available(gRPCSwiftProtobuf 2.0, *)
6565
extension ErrorDetails.QuotaFailure.Violation: CustomStringConvertible {
6666
public var description: String {
67-
"\(Self.self)(subject: \"\(self.subject)\", violationDescription: \"\(self.violationDescription)\")"
67+
"\(Self.self)(subject: \"\(self.subject)\", violationDescription: \"\(self.violationDescription)\", apiService: \"\(self.apiService)\", quotaMetric: \"\(self.quotaMetric)\", quotaID: \"\(self.quotaID)\", quotaDimensions: [\(self.quotaDimensions.map({ "\"\($0)\": \"\($1)\"" }).joined(separator: ", "))], quotaValue: \(self.quotaValue), futureQuotaValue: \(self.futureQuotaValue.map({ String(describing: $0) }) ?? "nil"))"
6868
}
6969
}
7070

@@ -78,7 +78,7 @@ extension ErrorDetails.PreconditionFailure.Violation: CustomStringConvertible {
7878
@available(gRPCSwiftProtobuf 2.0, *)
7979
extension ErrorDetails.BadRequest.FieldViolation: CustomStringConvertible {
8080
public var description: String {
81-
"\(Self.self)(field: \"\(self.field)\", violationDescription: \"\(self.violationDescription)\")"
81+
"\(Self.self)(field: \"\(self.field)\", violationDescription: \"\(self.violationDescription)\", reason: \"\(self.reason)\", localizedMessage: \(self.localizedMessage.map({ String(describing: $0) }) ?? "nil"))"
8282
}
8383
}
8484

Tests/GRPCProtobufTests/Errors/DetailedErrorTests.swift

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ struct DetailedErrorTests {
7777
(.debugInfo(.testValue), #"DebugInfo(stack: ["foo.foo()", "foo.bar()"], detail: "detail")"#),
7878
(
7979
.quotaFailure(.testValue),
80-
#"QuotaFailure(violations: [Violation(subject: "s", violationDescription: "d")])"#
80+
#"QuotaFailure(violations: [Violation(subject: "s", violationDescription: "d", apiService: "a", quotaMetric: "m", quotaID: "i", quotaDimensions: ["k": "v"], quotaValue: 1, futureQuotaValue: 2)])"#
8181
),
8282
(
8383
.preconditionFailure(.testValue),
8484
#"PreconditionFailure(violations: [Violation(subject: "s", type: "t", violationDescription: "d")])"#
8585
),
8686
(
8787
.badRequest(.testValue),
88-
#"BadRequest(violations: [FieldViolation(field: "f", violationDescription: "d")])"#
88+
#"BadRequest(violations: [FieldViolation(field: "f", violationDescription: "d", reason: "r", localizedMessage: LocalizedMessage(locale: "l", message: "m"))])"#
8989
),
9090
(.requestInfo(.testValue), #"RequestInfo(requestID: "id", servingData: "d")"#),
9191
(
@@ -209,7 +209,16 @@ extension ErrorDetails.DebugInfo {
209209
extension ErrorDetails.QuotaFailure {
210210
fileprivate static let testValue = Self(
211211
violations: [
212-
Violation(subject: "s", description: "d")
212+
Violation(
213+
subject: "s",
214+
description: "d",
215+
apiService: "a",
216+
quotaMetric: "m",
217+
quotaID: "i",
218+
quotaDimensions: ["k": "v"],
219+
quotaValue: 1,
220+
futureQuotaValue: 2
221+
)
213222
]
214223
)
215224
}
@@ -227,7 +236,12 @@ extension ErrorDetails.PreconditionFailure {
227236
extension ErrorDetails.BadRequest {
228237
fileprivate static let testValue = Self(
229238
violations: [
230-
FieldViolation(field: "f", description: "d")
239+
FieldViolation(
240+
field: "f",
241+
description: "d",
242+
reason: "r",
243+
localizedMessage: .init(locale: "l", message: "m")
244+
)
231245
]
232246
)
233247
}

0 commit comments

Comments
 (0)