smithy-lang · Velfi · Jan 20, 2023 · Jan 19, 2023 · Jan 20, 2023 · Jan 20, 2023
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
+  rev: v4.4.0
   hooks:
   - id: check-yaml
   - id: end-of-file-fixer
@@ -20,7 +20,7 @@ repos:
     files: ^.*$
     pass_filenames: false
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v1.6.1
+  rev: v2.5.0
   hooks:
   - id: pretty-format-kotlin
     args: [--autofix, --ktlint-version, 0.46.1]

@@ -774,4 +774,4 @@
     }
   ],
   "aws-sdk-model": []
-}
+}
@@ -31,7 +31,7 @@ allprojects.forEach {
 
     it.the<JacocoPluginExtension>().apply {
         toolVersion = "0.8.8"
-        reportsDirectory.set(file("${buildDir}/jacoco-reports"))
+        reportsDirectory.set(file("$buildDir/jacoco-reports"))
     }
 }
 

@@ -229,12 +229,12 @@ class InstantiatorTest {
     fun `generate maps of maps`() {
         val data = Node.parse(
             """
-        {
-            "k1": { "map": {} },
-            "k2": { "map": { "k3": {} } },
-            "k3": { }
-        }
-        """,
+            {
+                "k1": { "map": {} },
+                "k2": { "map": { "k3": {} } },
+                "k3": { }
+            }
+            """,
         )
         val sut = Instantiator(
             symbolProvider,
@@ -254,11 +254,11 @@ class InstantiatorTest {
                 }
                 rust(
                     """
-                assert_eq!(result.len(), 3);
-                assert_eq!(result.get("k1").unwrap().map.as_ref().unwrap().len(), 0);
-                assert_eq!(result.get("k2").unwrap().map.as_ref().unwrap().len(), 1);
-                assert_eq!(result.get("k3").unwrap().map, None);
-                """,
+                    assert_eq!(result.len(), 3);
+                    assert_eq!(result.get("k1").unwrap().map.as_ref().unwrap().len(), 0);
+                    assert_eq!(result.get("k2").unwrap().map.as_ref().unwrap().len(), 1);
+                    assert_eq!(result.get("k3").unwrap().map, None);
+                    """,
                 )
             }
         }

@@ -39,7 +39,7 @@ private sealed class UnsupportedConstraintMessageKind {
     fun intoLogMessage(ignoreUnsupportedConstraints: Boolean): LogMessage {
         fun buildMessage(intro: String, willSupport: Boolean, trackingIssue: String, canBeIgnored: Boolean = true): String {
             var msg = """
-                    $intro
+                $intro
                     This is not supported in the smithy-rs server SDK."""
             if (willSupport) {
                 msg += """
@@ -161,8 +161,8 @@ fun validateOperationsWithConstrainedInputHaveValidationExceptionAttached(
             LogMessage(
                 Level.SEVERE,
                 """
-                Operation ${it.shape.id} takes in input that is constrained 
-                (https://awslabs.github.io/smithy/2.0/spec/constraint-traits.html), and as such can fail with a 
+                Operation ${it.shape.id} takes in input that is constrained
+                (https://awslabs.github.io/smithy/2.0/spec/constraint-traits.html), and as such can fail with a
                 validation exception. You must model this behavior in the operation shape in your model file.
                 """.trimIndent().replace("\n", "") +
                     """

@@ -10,10 +10,10 @@ package software.amazon.smithy.rust.codegen.server.smithy.generators
  */
 
 fun rustDocsConstrainedTypeEpilogue(typeName: String) = """
-This is a constrained type because its corresponding modeled Smithy shape has one or more 
-[constraint traits]. Use [`$typeName::try_from`] to construct values of this type.
+    This is a constrained type because its corresponding modeled Smithy shape has one or more
+    [constraint traits]. Use [`$typeName::try_from`] to construct values of this type.
 
-[constraint traits]: https://awslabs.github.io/smithy/1.0/spec/core/constraint-traits.html
+    [constraint traits]: https://awslabs.github.io/smithy/1.0/spec/core/constraint-traits.html
 """
 
 fun rustDocsTryFromMethod(typeName: String, inner: String) =

@@ -88,12 +88,12 @@ fun generateFallbackCodeToDefaultValue(
         //  storing the result in a `OnceCell` that could be reused.
         writer.rustTemplate(
             """
-                    .unwrap_or_else(|| 
-                        #{DefaultValue:W}
-                            .try_into()
-                            .expect("this check should have failed at generation time; please file a bug report under https://github.com/awslabs/smithy-rs/issues")
-                    )
-                    """,
+            .unwrap_or_else(||
+                #{DefaultValue:W}
+                    .try_into()
+                    .expect("this check should have failed at generation time; please file a bug report under https://github.com/awslabs/smithy-rs/issues")
+            )
+            """,
             "DefaultValue" to defaultValue,
         )
     } else {

@@ -35,29 +35,29 @@ internal class DeriveEqAndHashSymbolMetadataProviderTest {
             input: TestInputOutput
             output: TestInputOutput
         }
-        
+
         operation StreamingOperation {
             input: StreamingOperationInputOutput
             output: StreamingOperationInputOutput
         }
-        
+
         operation EventStreamOperation {
             input: EventStreamOperationInputOutput
             output: EventStreamOperationInputOutput
         }
-        
+
         structure EventStreamOperationInputOutput {
             @httpPayload
             @required
             union: StreamingUnion
         }
-        
+
         structure StreamingOperationInputOutput {
             @httpPayload
             @required
             blobStream: BlobStream
         }
-        
+
         @streaming
         blob BlobStream
 
@@ -68,14 +68,14 @@ internal class DeriveEqAndHashSymbolMetadataProviderTest {
             containsFloat: ContainsFloat
             containsDouble: ContainsDouble
             containsDocument: ContainsDocument
-            
+
             hasList: HasList
             hasListWithMap: HasListWithMap
             hasMap: HasMap
-            
+
             eqAndHashStruct: EqAndHashStruct
         }
-        
+
         structure EqAndHashStruct {
             blob: Blob
             boolean: Boolean
@@ -86,27 +86,27 @@ internal class DeriveEqAndHashSymbolMetadataProviderTest {
             long: Long
             enum: Enum
             timestamp: Timestamp
-            
+
             list: List
             union: EqAndHashUnion
-            
+
             // bigInteger: BigInteger
             // bigDecimal: BigDecimal
         }
-        
+
         list List {
             member: String
         }
-        
+
         list ListWithMap {
             member: Map
         }
-        
+
         map Map {
             key: String
             value: String
         }
-        
+
         union EqAndHashUnion {
             blob: Blob
             boolean: Boolean
@@ -117,51 +117,51 @@ internal class DeriveEqAndHashSymbolMetadataProviderTest {
             long: Long
             enum: Enum
             timestamp: Timestamp
-            
+
             list: List
         }
-        
+
         @streaming
         union StreamingUnion {
             eqAndHashStruct: EqAndHashStruct
         }
-        
+
         structure HasFloat {
             float: Float
         }
-        
+
         structure HasDouble {
             double: Double
         }
-        
+
         structure HasDocument {
             document: Document
         }
-        
+
         structure HasList {
             list: List
         }
-        
+
         structure HasListWithMap {
             list: ListWithMap
         }
-        
+
         structure HasMap {
             map: Map
         }
-        
+
         structure ContainsFloat {
             hasFloat: HasFloat
         }
-        
+
         structure ContainsDouble {
             hasDouble: HasDouble
         }
-        
+
         structure ContainsDocument {
             containsDocument: HasDocument
         }
-        
+
         enum Enum {
             DIAMOND
             CLUB

@@ -59,13 +59,13 @@ internal class ValidateUnsupportedConstraintsAreNotUsedTest {
 
         // Asserts the exact message, to ensure the formatting is appropriate.
         validationResult.messages[0].message shouldBe """Operation test#TestOperation takes in input that is constrained (https://awslabs.github.io/smithy/2.0/spec/constraint-traits.html), and as such can fail with a validation exception. You must model this behavior in the operation shape in your model file.
-```smithy
-use smithy.framework#ValidationException
+            ```smithy
+            use smithy.framework#ValidationException
 
-operation TestOperation {
-    ...
-    errors: [..., ValidationException] // <-- Add this.
-}
+            operation TestOperation {
+                ...
+                errors: [..., ValidationException] // <-- Add this.
+            }
 ```"""
     }
 

@@ -50,7 +50,7 @@ class ConstrainedMapGeneratorTest {
             TestCase(
                 """
                 namespace test
-                
+
                 $trait
                 map ConstrainedMap {
                     key: String,
@@ -129,13 +129,13 @@ class ConstrainedMapGeneratorTest {
     fun `type should not be constructible without using a constructor`() {
         val model = """
             namespace test
-            
+
             @length(min: 1, max: 69)
             map ConstrainedMap {
                 key: String,
                 value: String
             }
-            """.asSmithyModel().let(ShapesReachableFromOperationInputTagger::transform)
+        """.asSmithyModel().let(ShapesReachableFromOperationInputTagger::transform)
         val constrainedMapShape = model.lookup<MapShape>("test#ConstrainedMap")
 
         val writer = RustWriter.forModule(ModelsModule.name)

@@ -69,7 +69,7 @@ ENTRYPOINT [ "/var/lang/bin/python3.8" ]
 CMD [ "/app.py" ]
 ```
 
-See [https://docs.aws.amazon.com/lambda/latest/dg/images-create.html#images-create-from-base](https://docs.aws.amazon.com/lambda/latest/dg/images-create.html#images-create-from-base) 
+See [https://docs.aws.amazon.com/lambda/latest/dg/images-create.html#images-create-from-base](https://docs.aws.amazon.com/lambda/latest/dg/images-create.html#images-create-from-base)
 for more details on building your custom image.
 
 <!-- anchor_start:footer -->

@@ -22,7 +22,7 @@ ifndef HAS_MATURIN
     $(error "maturin is not available; please install it via 'pip install maturin' or 'cargo install maturin'")
 endif
 
-# Note on `--compatibility linux`: Maturin by default uses `manylinux_x_y` but it is not supported 
+# Note on `--compatibility linux`: Maturin by default uses `manylinux_x_y` but it is not supported
 # by our current CI version (3.7.10), we can drop `--compatibility linux` when we switch to higher Python version.
 # For more detail: https://github.com/pypa/manylinux
 build-wheel: ensure-maturin codegen

@@ -132,7 +132,7 @@ assert headers.get("host") == None
 assert len(headers) == 2
 
 assert set(headers.items()) == set([
-    ("content-length", "45"), 
+    ("content-length", "45"),
     ("content-encoding", "application/json")
 ])
 "#
-Original file line number
+Diff line change
@@ Expand Up / @@ -774,4 +774,4 @@ @@
         }
       ],
       "aws-sdk-model": []
-    }
+    }