Skip to content

Commit acbd30c

Browse files
kneekey23kneekey23
authored
fix: shave off 4 mb from sdks (#403)
1 parent 53a97bf commit acbd30c

14 files changed

+120
-133
lines changed

‎smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/CodegenVisitor.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import software.amazon.smithy.model.shapes.StringShape
1818
import software.amazon.smithy.model.shapes.StructureShape
1919
import software.amazon.smithy.model.shapes.UnionShape
2020
import software.amazon.smithy.model.traits.EnumTrait
21+
import software.amazon.smithy.model.traits.SensitiveTrait
2122
import software.amazon.smithy.swift.codegen.core.GenerationContext
2223
import software.amazon.smithy.swift.codegen.integration.CustomDebugStringConvertibleGenerator
2324
import software.amazon.smithy.swift.codegen.integration.ProtocolGenerator
@@ -154,8 +155,10 @@ class CodegenVisitor(context: PluginContext) : ShapeVisitor.Default<Void>() {
154155

155156
override fun structureShape(shape: StructureShape): Void? {
156157
writers.useShapeWriter(shape) { writer: SwiftWriter -> StructureGenerator(model, symbolProvider, writer, shape, settings, protocolGenerator?.serviceErrorProtocolSymbol).render() }
157-
writers.useShapeExtensionWriter(shape, "CustomDebugStringConvertible") { writer: SwiftWriter ->
158-
CustomDebugStringConvertibleGenerator(symbolProvider, writer, shape).render()
158+
if (shape.hasTrait<SensitiveTrait>() || shape.members().any { it.hasTrait<SensitiveTrait>() }) {
159+
writers.useShapeExtensionWriter(shape, "CustomDebugStringConvertible") { writer: SwiftWriter ->
160+
CustomDebugStringConvertibleGenerator(symbolProvider, writer, shape).render()
161+
}
159162
}
160163
return null
161164
}

‎smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/StructureGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class StructureGenerator(
126126
}
127127

128128
writer.writeAvailableAttribute(model, it)
129-
writer.write("public var \$L: \$T", memberName, memberSymbol)
129+
writer.write("var \$L: \$T", memberName, memberSymbol)
130130
}
131131
}
132132

‎smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpBindingProtocolGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ abstract class HttpBindingProtocolGenerator : ProtocolGenerator {
245245
writer.openBlock("struct ${decodeSymbol.name}: \$N {", "}", SwiftTypes.Protocols.Equatable) {
246246
httpBodyMembers.forEach {
247247
val memberSymbol = ctx.symbolProvider.toSymbol(it)
248-
writer.write("public let \$L: \$T", ctx.symbolProvider.toMemberName(it), memberSymbol)
248+
writer.write("let \$L: \$T", ctx.symbolProvider.toMemberName(it), memberSymbol)
249249
}
250250
}
251251
writer.write("")

‎smithy-swift-codegen/src/test/kotlin/HashableShapeTransformerTests.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ class HashableShapeTransformerTests {
7070
Assertions.assertNotNull(hashableShapeInput)
7171
val expected = """
7272
public struct HashableShapesInput: Swift.Equatable {
73-
public var `set`: Swift.Set<ExampleClientTypes.HashableStructure>?
74-
public var bar: Swift.String?
73+
var `set`: Swift.Set<ExampleClientTypes.HashableStructure>?
74+
var bar: Swift.String?
7575
7676
public init (
7777
`set`: Swift.Set<ExampleClientTypes.HashableStructure>? = nil,
@@ -90,7 +90,7 @@ class HashableShapeTransformerTests {
9090
Assertions.assertNotNull(hashableShapeOutput)
9191
val expectedOutput = """
9292
public struct HashableShapesOutputResponse: Swift.Equatable {
93-
public var quz: Swift.String?
93+
var quz: Swift.String?
9494
9595
public init (
9696
quz: Swift.String? = nil
@@ -108,8 +108,8 @@ class HashableShapeTransformerTests {
108108
val expectedStructureShape = """
109109
extension ExampleClientTypes {
110110
public struct HashableStructure: Swift.Equatable, Swift.Hashable {
111-
public var baz: ExampleClientTypes.NestedHashableStructure?
112-
public var foo: Swift.String?
111+
var baz: ExampleClientTypes.NestedHashableStructure?
112+
var foo: Swift.String?
113113
114114
public init (
115115
baz: ExampleClientTypes.NestedHashableStructure? = nil,
@@ -131,8 +131,8 @@ class HashableShapeTransformerTests {
131131
val expectedNestedStructureShape = """
132132
extension ExampleClientTypes {
133133
public struct NestedHashableStructure: Swift.Equatable, Swift.Hashable {
134-
public var bar: Swift.String?
135-
public var quz: Swift.Int?
134+
var bar: Swift.String?
135+
var quz: Swift.Int?
136136
137137
public init (
138138
bar: Swift.String? = nil,

‎smithy-swift-codegen/src/test/kotlin/RecursiveShapeBoxerTests.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ internal class RecursiveShapeBoxerTests {
5151
val expected =
5252
"""
5353
public struct RecursiveShapesInput: Swift.Equatable {
54-
public var nested: ExampleClientTypes.RecursiveShapesInputOutputNested1?
54+
var nested: ExampleClientTypes.RecursiveShapesInputOutputNested1?
5555
5656
public init (
5757
nested: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
@@ -69,7 +69,7 @@ internal class RecursiveShapeBoxerTests {
6969
val expected2 =
7070
"""
7171
public struct RecursiveShapesOutputResponse: Swift.Equatable {
72-
public var nested: ExampleClientTypes.RecursiveShapesInputOutputNested1?
72+
var nested: ExampleClientTypes.RecursiveShapesInputOutputNested1?
7373
7474
public init (
7575
nested: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
@@ -88,8 +88,8 @@ internal class RecursiveShapeBoxerTests {
8888
"""
8989
extension ExampleClientTypes {
9090
public struct RecursiveShapesInputOutputNested1: Swift.Equatable {
91-
public var foo: Swift.String?
92-
public var nested: Box<ExampleClientTypes.RecursiveShapesInputOutputNested2>?
91+
var foo: Swift.String?
92+
var nested: Box<ExampleClientTypes.RecursiveShapesInputOutputNested2>?
9393
9494
public init (
9595
foo: Swift.String? = nil,
@@ -112,8 +112,8 @@ internal class RecursiveShapeBoxerTests {
112112
"""
113113
extension ExampleClientTypes {
114114
public struct RecursiveShapesInputOutputNested2: Swift.Equatable {
115-
public var bar: Swift.String?
116-
public var recursiveMember: ExampleClientTypes.RecursiveShapesInputOutputNested1?
115+
var bar: Swift.String?
116+
var recursiveMember: ExampleClientTypes.RecursiveShapesInputOutputNested1?
117117
118118
public init (
119119
bar: Swift.String? = nil,

‎smithy-swift-codegen/src/test/kotlin/SensitiveTraitGeneratorTests.kt‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,6 @@ class SensitiveTraitGeneratorTests {
4141
extensionWithSensitiveTrait.shouldContainOnlyOnce(expectedContents)
4242
}
4343

44-
@Test
45-
fun `NoSensitiveMemberStruct+CustomDebugStringConvertible`() {
46-
val manifest = setupTest()
47-
var extensionWithSensitiveTrait = manifest
48-
.getFileString("example/models/SensitiveTraitTestRequestInput+CustomDebugStringConvertible.swift").get()
49-
extensionWithSensitiveTrait.shouldSyntacticSanityCheck()
50-
val expectedContents =
51-
"""
52-
extension SensitiveTraitTestRequestInput: Swift.CustomDebugStringConvertible {
53-
public var debugDescription: Swift.String {
54-
"SensitiveTraitTestRequestInput(bar: \(Swift.String(describing: bar)), baz: \(Swift.String(describing: baz)), foo: \(Swift.String(describing: foo)))"}
55-
}
56-
""".trimIndent()
57-
extensionWithSensitiveTrait.shouldContainOnlyOnce(expectedContents)
58-
}
59-
6044
@Test
6145
fun `AllSensitiveMemberStruct+CustomDebugStringConvertible`() {
6246
val manifest = setupTest()

‎smithy-swift-codegen/src/test/kotlin/ServiceRenamesTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ServiceRenamesTests {
2222
val expectedContents =
2323
"""
2424
public struct MyTestOperationInput: Swift.Equatable {
25-
public var bar: ExampleClientTypes.RenamedGreeting?
25+
var bar: ExampleClientTypes.RenamedGreeting?
2626
2727
public init (
2828
bar: ExampleClientTypes.RenamedGreeting? = nil
@@ -50,7 +50,7 @@ class ServiceRenamesTests {
5050
val expectedContents =
5151
"""
5252
public struct MyTestOperationOutputResponse: Swift.Equatable {
53-
public var baz: ExampleClientTypes.GreetingStruct?
53+
var baz: ExampleClientTypes.GreetingStruct?
5454
5555
public init (
5656
baz: ExampleClientTypes.GreetingStruct? = nil
@@ -79,7 +79,7 @@ class ServiceRenamesTests {
7979
"""
8080
extension ExampleClientTypes {
8181
public struct GreetingStruct: Swift.Equatable {
82-
public var hi: Swift.String?
82+
var hi: Swift.String?
8383
8484
public init (
8585
hi: Swift.String? = nil
@@ -111,7 +111,7 @@ class ServiceRenamesTests {
111111
"""
112112
extension ExampleClientTypes {
113113
public struct RenamedGreeting: Swift.Equatable {
114-
public var salutation: Swift.String?
114+
var salutation: Swift.String?
115115
116116
public init (
117117
salutation: Swift.String? = nil

‎smithy-swift-codegen/src/test/kotlin/StructDecodeGenerationTests.kt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ class StructDecodeGenerationTests {
4747
val expectedContents =
4848
"""
4949
struct SmokeTestOutputResponseBody: Swift.Equatable {
50-
public let payload1: Swift.String?
51-
public let payload2: Swift.Int?
52-
public let payload3: ExampleClientTypes.Nested?
50+
let payload1: Swift.String?
51+
let payload2: Swift.Int?
52+
let payload3: ExampleClientTypes.Nested?
5353
}
5454
5555
extension SmokeTestOutputResponseBody: Swift.Decodable {
@@ -170,12 +170,12 @@ class StructDecodeGenerationTests {
170170
val expectedContents =
171171
"""
172172
struct TimestampInputOutputResponseBody: Swift.Equatable {
173-
public let normal: ClientRuntime.Date?
174-
public let dateTime: ClientRuntime.Date?
175-
public let epochSeconds: ClientRuntime.Date?
176-
public let httpDate: ClientRuntime.Date?
177-
public let nestedTimestampList: [[ClientRuntime.Date]]?
178-
public let timestampList: [ClientRuntime.Date]?
173+
let normal: ClientRuntime.Date?
174+
let dateTime: ClientRuntime.Date?
175+
let epochSeconds: ClientRuntime.Date?
176+
let httpDate: ClientRuntime.Date?
177+
let nestedTimestampList: [[ClientRuntime.Date]]?
178+
let timestampList: [ClientRuntime.Date]?
179179
}
180180
181181
extension TimestampInputOutputResponseBody: Swift.Decodable {
@@ -261,12 +261,12 @@ extension TimestampInputOutputResponseBody: Swift.Decodable {
261261
val expectedContents =
262262
"""
263263
struct MapInputOutputResponseBody: Swift.Equatable {
264-
public let intMap: [Swift.String:Swift.Int]?
265-
public let structMap: [Swift.String:ExampleClientTypes.ReachableOnlyThroughMap]?
266-
public let enumMap: [Swift.String:ExampleClientTypes.MyEnum]?
267-
public let blobMap: [Swift.String:ClientRuntime.Data]?
268-
public let nestedMap: [Swift.String:[Swift.String:Swift.Int]]?
269-
public let dateMap: [Swift.String:ClientRuntime.Date]?
264+
let intMap: [Swift.String:Swift.Int]?
265+
let structMap: [Swift.String:ExampleClientTypes.ReachableOnlyThroughMap]?
266+
let enumMap: [Swift.String:ExampleClientTypes.MyEnum]?
267+
let blobMap: [Swift.String:ClientRuntime.Data]?
268+
let nestedMap: [Swift.String:[Swift.String:Swift.Int]]?
269+
let dateMap: [Swift.String:ClientRuntime.Date]?
270270
}
271271
272272
extension MapInputOutputResponseBody: Swift.Decodable {
@@ -370,9 +370,9 @@ extension MapInputOutputResponseBody: Swift.Decodable {
370370
val expectedContents =
371371
"""
372372
struct NestedShapesOutputResponseBody: Swift.Equatable {
373-
public let nestedListInDict: [Swift.String:[ClientRuntime.Date]]?
374-
public let nestedDictInList: [[Swift.String:Swift.String]]?
375-
public let nestedListOfListInDict: [Swift.String:[[Swift.Int]]]?
373+
let nestedListInDict: [Swift.String:[ClientRuntime.Date]]?
374+
let nestedDictInList: [[Swift.String:Swift.String]]?
375+
let nestedListOfListInDict: [Swift.String:[[Swift.Int]]]?
376376
}
377377
378378
extension NestedShapesOutputResponseBody: Swift.Decodable {

‎smithy-swift-codegen/src/test/kotlin/StructEncodeGenerationIsolatedTests.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class StructEncodeGenerationIsolatedTests {
3535
val expectedContents =
3636
"""
3737
public struct EnumInputInput: Swift.Equatable {
38-
public var enumHeader: ExampleClientTypes.MyEnum?
39-
public var nestedWithEnum: ExampleClientTypes.NestedEnum?
38+
var enumHeader: ExampleClientTypes.MyEnum?
39+
var nestedWithEnum: ExampleClientTypes.NestedEnum?
4040
""".trimIndent()
4141
contents.shouldContainOnlyOnce(expectedContents)
4242
}

0 commit comments

Comments
 (0)