Skip to content

Commit ab52d81

Browse files
authored
Add lots of scoping and spi (#1035)
1 parent 98bab6c commit ab52d81

47 files changed

Lines changed: 74 additions & 34 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ import protocol Smithy.LogAgent
1111
import enum Smithy.StreamError
1212
import struct Smithy.SwiftLogger
1313
import enum Smithy.URIScheme
14-
import class SmithyChecksums.ChunkedStream
14+
@_spi(SmithyChecksums) import class SmithyChecksums.ChunkedStream
1515
import enum SmithyHTTPAPI.ALPNProtocol
1616
import struct SmithyHTTPAPI.Endpoint
1717
import struct SmithyHTTPAPI.Headers
1818
import protocol SmithyHTTPAPI.HTTPClient
1919
import class SmithyHTTPAPI.HTTPRequest
2020
import class SmithyHTTPAPI.HTTPResponse
2121
import enum SmithyHTTPAPI.HTTPStatusCode
22-
import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
22+
@_spi(SmithyHTTPClient) import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
23+
@_spi(SmithyHTTPClient) import SmithyHTTPClient
2324
import class SmithyHTTPClientAPI.HttpTelemetry
2425
import class SmithyStreams.BufferedStream
2526
import SmithyTelemetryAPI

Sources/ClientRuntime/Networking/Http/CRT/HTTP2Stream+ByteStream.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import AwsCommonRuntimeKit
99
import struct Smithy.Attributes
1010
import enum Smithy.ByteStream
11-
import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
11+
@_spi(SmithyHTTPClient) import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
1212
import class SmithyHTTPClientAPI.HttpTelemetry
1313

1414
extension HTTP2Stream {

Sources/ClientRuntime/Networking/Http/Middlewares/AuthSchemeMiddleware.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import struct Smithy.Attributes
1010
import enum Smithy.ClientError
1111
import class Smithy.Context
1212
import class SmithyHTTPAPI.HTTPRequestBuilder
13-
import struct SmithyHTTPAuth.DefaultIdentityResolverConfiguration
13+
@_spi(SmithyHTTPAuth) import struct SmithyHTTPAuth.DefaultIdentityResolverConfiguration
1414
import protocol SmithyHTTPAuthAPI.AuthScheme
1515
import struct SmithyHTTPAuthAPI.SelectedAuthScheme
1616

Sources/ClientRuntime/Networking/Http/Middlewares/RequestBody/EventStreamBodyMiddleware.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import struct Foundation.Data
99
import class Smithy.Context
1010
import protocol Smithy.RequestMessageSerializer
11-
import SmithyEventStreams
11+
@_spi(SmithyEventStreams) import SmithyEventStreams
1212
import SmithyEventStreamsAPI
1313
import SmithyEventStreamsAuthAPI
1414
import SmithyHTTPAPI

Sources/ClientRuntime/Networking/Http/URLSession/FoundationStreamBridge.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import class Foundation.Timer
2222
import struct Smithy.Attributes
2323
import protocol Smithy.LogAgent
2424
import protocol Smithy.ReadableStream
25-
import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
25+
@_spi(SmithyHTTPClient) import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
2626
import class SmithyHTTPClientAPI.HttpTelemetry
2727

2828
/// Reads data from a smithy-swift native `ReadableStream` and streams the data through to a Foundation `InputStream`.

Sources/ClientRuntime/Networking/Http/URLSession/URLSessionHTTPClient.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ import protocol SmithyHTTPAPI.HTTPClient
4141
import class SmithyHTTPAPI.HTTPRequest
4242
import class SmithyHTTPAPI.HTTPResponse
4343
import enum SmithyHTTPAPI.HTTPStatusCode
44-
import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
44+
@_spi(SmithyHTTPClient) import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
45+
@_spi(SmithyHTTPClient) import SmithyHTTPClient
4546
import class SmithyHTTPClientAPI.HttpTelemetry
4647
import class SmithyStreams.BufferedStream
4748
import SmithyTelemetryAPI

Sources/ClientRuntime/Networking/Streaming/ByteStream+Validating.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import enum Smithy.ByteStream
99
import protocol Smithy.Stream
10-
import class SmithyChecksums.ValidatingBufferedStream
10+
@_spi(SmithyChecksums) import class SmithyChecksums.ValidatingBufferedStream
1111
import enum SmithyChecksumsAPI.ChecksumAlgorithm
1212
import class SmithyStreams.BufferedStream
1313

Sources/Smithy/ByteStream.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ extension ByteStream: CustomDebugStringConvertible {
7474
}
7575

7676
public enum ByteStreamError: Error, Sendable {
77-
case streamNotSeeakble
77+
case streamNotSeekable
7878
case invalidStreamTypeForChunkedBody(String)
7979
case streamClosedOrEmpty
8080
case streamDoesNotConformToChunkedStream(String)

Sources/Smithy/Context.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,5 @@ public class ContextBuilder {
8585
}
8686

8787
enum AttributeKeys {
88-
public static let logger = AttributeKey<LogAgent>(name: "Logger")
88+
static let logger = AttributeKey<LogAgent>(name: "Logger")
8989
}

Sources/Smithy/URI.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ extension String {
232232
return decoded != nil && decoded != self
233233
}
234234

235-
public func percentEncodePathIncludingSemicolon() -> String {
235+
func percentEncodePathIncludingSemicolon() -> String {
236236
let allowed =
237237
// swiftlint:disable force_cast
238238
(CharacterSet.urlPathAllowed as NSCharacterSet).mutableCopy() as! NSMutableCharacterSet
@@ -241,32 +241,32 @@ extension String {
241241
return self.addingPercentEncoding(withAllowedCharacters: allowed as CharacterSet)!
242242
}
243243

244-
public func percentEncodeQuery() -> String {
244+
func percentEncodeQuery() -> String {
245245
return self.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed as CharacterSet)!
246246
}
247247
}
248248

249249
extension Array where Element == URIQueryItem {
250-
public var queryString: String? {
250+
var queryString: String? {
251251
if self.isEmpty {
252252
return nil
253253
}
254254
return self.map { [$0.name, $0.value].compactMap { $0 }.joined(separator: "=") }.joined(separator: "&")
255255
}
256256

257-
public func toURLQueryItems() -> [URLQueryItem] {
257+
func toURLQueryItems() -> [URLQueryItem] {
258258
return self.map { URLQueryItem(name: $0.name, value: $0.value) }
259259
}
260260

261-
public func containsPercentEncode() -> Bool {
261+
func containsPercentEncode() -> Bool {
262262
return self.contains { item in
263263
return item.name.isPercentEncoded || (item.value?.isPercentEncoded ?? false)
264264
}
265265
}
266266
}
267267

268268
extension Array where Element == URLQueryItem {
269-
public func containsPercentEncode() -> Bool {
269+
func containsPercentEncode() -> Bool {
270270
return self.contains { item in
271271
return item.name.isPercentEncoded || (item.value?.isPercentEncoded ?? false)
272272
}

0 commit comments

Comments
 (0)