Batch sync API models from upstream (#1752)

Syncs API models from upstream pulling in model updates that did not get published via the SDK's standard release flow.
aws · Aug 5, 2022 · 876fd54 · 876fd54
1 parent a01a5c4
commit 876fd54
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 26 deletions.
diff --git a/codegen/sdk-codegen/aws-models/appconfigdata.json b/codegen/sdk-codegen/aws-models/appconfigdata.json
@@ -82,9 +82,6 @@
                 ]
             }
         },
-        "com.amazonaws.appconfigdata#Blob": {
-            "type": "blob"
-        },
         "com.amazonaws.appconfigdata#ConfigurationSession": {
             "type": "resource",
             "identifiers": {
@@ -166,11 +163,10 @@
                     }
                 },
                 "Configuration": {
-                    "target": "com.amazonaws.appconfigdata#Blob",
+                    "target": "com.amazonaws.appconfigdata#SensitiveBlob",
                     "traits": {
                         "smithy.api#documentation": "<p>The data of the configuration. This may be empty if the client already has the latest\n         version of configuration.</p>",
-                        "smithy.api#httpPayload": {},
-                        "smithy.api#sensitive": {}
+                        "smithy.api#httpPayload": {}
                     }
                 }
             }
@@ -318,6 +314,12 @@
                 ]
             }
         },
+        "com.amazonaws.appconfigdata#SensitiveBlob": {
+            "type": "blob",
+            "traits": {
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.appconfigdata#StartConfigurationSession": {
             "type": "operation",
             "input": {
@@ -424,4 +426,4 @@
             }
         }
     }
-}
+}
diff --git a/codegen/sdk-codegen/aws-models/kafkaconnect.json b/codegen/sdk-codegen/aws-models/kafkaconnect.json
@@ -471,11 +471,10 @@
                     }
                 },
                 "connectorConfiguration": {
-                    "target": "com.amazonaws.kafkaconnect#__mapOf__string",
+                    "target": "com.amazonaws.kafkaconnect#__sensitive__mapOf__string",
                     "traits": {
                         "smithy.api#documentation": "<p>A map of keys to values that represent the configuration for the connector.</p>",
-                        "smithy.api#required": {},
-                        "smithy.api#sensitive": {}
+                        "smithy.api#required": {}
                     }
                 },
                 "connectorDescription": {
@@ -734,11 +733,10 @@
                     }
                 },
                 "propertiesFileContent": {
-                    "target": "com.amazonaws.kafkaconnect#__string",
+                    "target": "com.amazonaws.kafkaconnect#__sensitiveString",
                     "traits": {
                         "smithy.api#documentation": "<p>Base64 encoded contents of connect-distributed.properties file.</p>",
-                        "smithy.api#required": {},
-                        "smithy.api#sensitive": {}
+                        "smithy.api#required": {}
                     }
                 }
             }
@@ -1216,10 +1214,9 @@
                     }
                 },
                 "connectorConfiguration": {
-                    "target": "com.amazonaws.kafkaconnect#__mapOf__string",
+                    "target": "com.amazonaws.kafkaconnect#__sensitive__mapOf__string",
                     "traits": {
-                        "smithy.api#documentation": "<p>A map of keys to values that represent the configuration for the connector.</p>",
-                        "smithy.api#sensitive": {}
+                        "smithy.api#documentation": "<p>A map of keys to values that represent the configuration for the connector.</p>"
                     }
                 },
                 "connectorDescription": {
@@ -2586,10 +2583,9 @@
                     }
                 },
                 "propertiesFileContent": {
-                    "target": "com.amazonaws.kafkaconnect#__string",
+                    "target": "com.amazonaws.kafkaconnect#__sensitiveString",
                     "traits": {
-                        "smithy.api#documentation": "<p>Base64 encoded contents of the connect-distributed.properties file.</p>",
-                        "smithy.api#sensitive": {}
+                        "smithy.api#documentation": "<p>Base64 encoded contents of the connect-distributed.properties file.</p>"
                     }
                 },
                 "revision": {
@@ -2800,13 +2796,22 @@
                 }
             }
         },
-        "com.amazonaws.kafkaconnect#__mapOf__string": {
+        "com.amazonaws.kafkaconnect#__sensitiveString": {
+            "type": "string",
+            "traits": {
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.kafkaconnect#__sensitive__mapOf__string": {
             "type": "map",
             "key": {
                 "target": "com.amazonaws.kafkaconnect#__string"
             },
             "value": {
                 "target": "com.amazonaws.kafkaconnect#__string"
+            },
+            "traits": {
+                "smithy.api#sensitive": {}
             }
         },
         "com.amazonaws.kafkaconnect#__string": {
@@ -2837,4 +2842,4 @@
             }
         }
     }
-}
+}
diff --git a/service/kafkaconnect/deserializers.go b/service/kafkaconnect/deserializers.go
diff --git a/service/kafkaconnect/serializers.go b/service/kafkaconnect/serializers.go