npm - aws-sdk - Versions diffs - 2.1396.0 → 2.1398.0 - Mend

aws-sdk 2.1396.0 → 2.1398.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (51) hide show

package/CHANGELOG.md +18 -1
package/README.md +1 -1
package/apis/auditmanager-2017-07-25.min.json +128 -88
package/apis/cloudtrail-2013-11-01.min.json +33 -33
package/apis/codeguru-security-2018-05-10.examples.json +5 -0
package/apis/codeguru-security-2018-05-10.min.json +703 -0
package/apis/codeguru-security-2018-05-10.paginators.json +22 -0
package/apis/drs-2020-02-26.min.json +392 -97
package/apis/drs-2020-02-26.paginators.json +6 -0
package/apis/ec2-2016-11-15.min.json +1178 -1013
package/apis/ec2-2016-11-15.paginators.json +6 -0
package/apis/lightsail-2016-11-28.min.json +4 -2
package/apis/location-2020-11-19.min.json +56 -8
package/apis/metadata.json +7 -0
package/apis/s3-2006-03-01.examples.json +121 -121
package/apis/securityhub-2018-10-26.examples.json +276 -0
package/apis/securityhub-2018-10-26.min.json +957 -559
package/apis/verifiedpermissions-2021-12-01.examples.json +5 -0
package/apis/verifiedpermissions-2021-12-01.min.json +1215 -0
package/apis/verifiedpermissions-2021-12-01.paginators.json +28 -0
package/apis/verifiedpermissions-2021-12-01.waiters2.json +5 -0
package/apis/wafv2-2019-07-29.min.json +241 -169
package/apis/wellarchitected-2020-03-31.min.json +655 -75
package/apis/wellarchitected-2020-03-31.paginators.json +15 -0
package/clients/all.d.ts +2 -0
package/clients/all.js +3 -1
package/clients/auditmanager.d.ts +105 -52
package/clients/cloudtrail.d.ts +28 -13
package/clients/codegurusecurity.d.ts +761 -0
package/clients/codegurusecurity.js +18 -0
package/clients/drs.d.ts +354 -3
package/clients/ec2.d.ts +225 -48
package/clients/efs.d.ts +5 -5
package/clients/guardduty.d.ts +11 -11
package/clients/imagebuilder.d.ts +1 -1
package/clients/lightsail.d.ts +12 -4
package/clients/location.d.ts +60 -7
package/clients/s3.d.ts +1 -1
package/clients/securityhub.d.ts +470 -0
package/clients/simspaceweaver.d.ts +2 -2
package/clients/verifiedpermissions.d.ts +1392 -0
package/clients/verifiedpermissions.js +19 -0
package/clients/wafv2.d.ts +105 -27
package/clients/wellarchitected.d.ts +533 -7
package/dist/aws-sdk-core-react-native.js +2 -2
package/dist/aws-sdk-react-native.js +97 -16
package/dist/aws-sdk.js +1283 -1057
package/dist/aws-sdk.min.js +80 -80
package/lib/config_service_placeholders.d.ts +4 -0
package/lib/core.js +1 -1
package/package.json +1 -1

package/apis/securityhub-2018-10-26.min.json CHANGED Viewed

@@ -54,6 +54,33 @@
       "deprecated": true,
       "deprecatedMessage": "This API has been deprecated, use AcceptAdministratorInvitation API instead."
     },
+    "BatchDeleteAutomationRules": {
+      "http": {
+        "requestUri": "/automationrules/delete"
+      },
+      "input": {
+        "type": "structure",
+        "required": [
+          "AutomationRulesArns"
+        ],
+        "members": {
+          "AutomationRulesArns": {
+            "shape": "S7"
+          }
+        }
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "ProcessedAutomationRules": {
+            "shape": "S7"
+          },
+          "UnprocessedAutomationRules": {
+            "shape": "S9"
+          }
+        }
+      }
+    },
     "BatchDisableStandards": {
       "http": {
         "requestUri": "/standards/deregister"
@@ -65,7 +92,7 @@
         ],
         "members": {
           "StandardsSubscriptionArns": {
-            "shape": "S7"
+            "shape": "Sd"
           }
         }
       },
@@ -73,7 +100,7 @@
         "type": "structure",
         "members": {
           "StandardsSubscriptions": {
-            "shape": "S9"
+            "shape": "Sf"
           }
         }
       }
@@ -98,7 +125,7 @@
               "members": {
                 "StandardsArn": {},
                 "StandardsInput": {
-                  "shape": "Sb"
+                  "shape": "Sh"
                 }
               }
             }
@@ -109,6 +136,61 @@
         "type": "structure",
         "members": {
           "StandardsSubscriptions": {
+            "shape": "Sf"
+          }
+        }
+      }
+    },
+    "BatchGetAutomationRules": {
+      "http": {
+        "requestUri": "/automationrules/get"
+      },
+      "input": {
+        "type": "structure",
+        "required": [
+          "AutomationRulesArns"
+        ],
+        "members": {
+          "AutomationRulesArns": {
+            "shape": "S7"
+          }
+        }
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "Rules": {
+            "type": "list",
+            "member": {
+              "type": "structure",
+              "members": {
+                "RuleArn": {},
+                "RuleStatus": {},
+                "RuleOrder": {
+                  "type": "integer"
+                },
+                "RuleName": {},
+                "Description": {},
+                "IsTerminal": {
+                  "type": "boolean"
+                },
+                "Criteria": {
+                  "shape": "Sw"
+                },
+                "Actions": {
+                  "shape": "S1a"
+                },
+                "CreatedAt": {
+                  "shape": "S1p"
+                },
+                "UpdatedAt": {
+                  "shape": "S1p"
+                },
+                "CreatedBy": {}
+              }
+            }
+          },
+          "UnprocessedAutomationRules": {
             "shape": "S9"
           }
         }
@@ -125,7 +207,7 @@
         ],
         "members": {
           "SecurityControlIds": {
-            "shape": "Sk"
+            "shape": "S1r"
           }
         }
       },
@@ -190,7 +272,7 @@
           "StandardsControlAssociationIds": {
             "type": "list",
             "member": {
-              "shape": "Sv"
+              "shape": "S22"
             }
           }
         }
@@ -217,10 +299,10 @@
                 "SecurityControlArn": {},
                 "AssociationStatus": {},
                 "RelatedRequirements": {
-                  "shape": "S10"
+                  "shape": "S27"
                 },
                 "UpdatedAt": {
-                  "shape": "S11"
+                  "shape": "S1p"
                 },
                 "UpdatedReason": {},
                 "StandardsControlTitle": {},
@@ -242,7 +324,7 @@
               ],
               "members": {
                 "StandardsControlAssociationId": {
-                  "shape": "Sv"
+                  "shape": "S22"
                 },
                 "ErrorCode": {},
                 "ErrorReason": {}
@@ -265,7 +347,7 @@
           "Findings": {
             "type": "list",
             "member": {
-              "shape": "S17"
+              "shape": "S2d"
             }
           }
         }
@@ -302,6 +384,58 @@
         }
       }
     },
+    "BatchUpdateAutomationRules": {
+      "http": {
+        "method": "PATCH",
+        "requestUri": "/automationrules/update"
+      },
+      "input": {
+        "type": "structure",
+        "required": [
+          "UpdateAutomationRulesRequestItems"
+        ],
+        "members": {
+          "UpdateAutomationRulesRequestItems": {
+            "type": "list",
+            "member": {
+              "type": "structure",
+              "required": [
+                "RuleArn"
+              ],
+              "members": {
+                "RuleArn": {},
+                "RuleStatus": {},
+                "RuleOrder": {
+                  "type": "integer"
+                },
+                "Description": {},
+                "RuleName": {},
+                "IsTerminal": {
+                  "type": "boolean"
+                },
+                "Criteria": {
+                  "shape": "Sw"
+                },
+                "Actions": {
+                  "shape": "S1a"
+                }
+              }
+            }
+          }
+        }
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "ProcessedAutomationRules": {
+            "shape": "S7"
+          },
+          "UnprocessedAutomationRules": {
+            "shape": "S9"
+          }
+        }
+      }
+    },
     "BatchUpdateFindings": {
       "http": {
         "method": "PATCH",
@@ -314,22 +448,13 @@
         ],
         "members": {
           "FindingIdentifiers": {
-            "shape": "Smi"
+            "shape": "Snh"
           },
           "Note": {
-            "shape": "Smk"
+            "shape": "S1e"
           },
           "Severity": {
-            "type": "structure",
-            "members": {
-              "Normalized": {
-                "type": "integer"
-              },
-              "Product": {
-                "type": "double"
-              },
-              "Label": {}
-            }
+            "shape": "S1f"
           },
           "VerificationState": {},
           "Confidence": {
@@ -339,19 +464,16 @@
             "type": "integer"
           },
           "Types": {
-            "shape": "S18"
+            "shape": "S1j"
           },
           "UserDefinedFields": {
-            "shape": "S1f"
+            "shape": "S1k"
           },
           "Workflow": {
-            "type": "structure",
-            "members": {
-              "Status": {}
-            }
+            "shape": "S1l"
           },
           "RelatedFindings": {
-            "shape": "Slh"
+            "shape": "S1n"
           }
         }
       },
@@ -363,7 +485,7 @@
         ],
         "members": {
           "ProcessedFindings": {
-            "shape": "Smi"
+            "shape": "Snh"
           },
           "UnprocessedFindings": {
             "type": "list",
@@ -376,7 +498,7 @@
               ],
               "members": {
                 "FindingIdentifier": {
-                  "shape": "Smj"
+                  "shape": "Sni"
                 },
                 "ErrorCode": {},
                 "ErrorMessage": {}
@@ -400,7 +522,7 @@
           "StandardsControlAssociationUpdates": {
             "type": "list",
             "member": {
-              "shape": "Sms"
+              "shape": "Sno"
             }
           }
         }
@@ -418,7 +540,7 @@
               ],
               "members": {
                 "StandardsControlAssociationUpdate": {
-                  "shape": "Sms"
+                  "shape": "Sno"
                 },
                 "ErrorCode": {},
                 "ErrorReason": {}
@@ -455,6 +577,47 @@
         }
       }
     },
+    "CreateAutomationRule": {
+      "http": {
+        "requestUri": "/automationrules/create"
+      },
+      "input": {
+        "type": "structure",
+        "required": [
+          "RuleOrder",
+          "RuleName",
+          "Description",
+          "Criteria",
+          "Actions"
+        ],
+        "members": {
+          "Tags": {
+            "shape": "Snv"
+          },
+          "RuleStatus": {},
+          "RuleOrder": {
+            "type": "integer"
+          },
+          "RuleName": {},
+          "Description": {},
+          "IsTerminal": {
+            "type": "boolean"
+          },
+          "Criteria": {
+            "shape": "Sw"
+          },
+          "Actions": {
+            "shape": "S1a"
+          }
+        }
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "RuleArn": {}
+        }
+      }
+    },
     "CreateFindingAggregator": {
       "http": {
         "requestUri": "/findingAggregator/create"
@@ -467,7 +630,7 @@
         "members": {
           "RegionLinkingMode": {},
           "Regions": {
-            "shape": "Sk"
+            "shape": "S1r"
           }
         }
       },
@@ -478,7 +641,7 @@
           "FindingAggregationRegion": {},
           "RegionLinkingMode": {},
           "Regions": {
-            "shape": "Sk"
+            "shape": "S1r"
           }
         }
       }
@@ -497,7 +660,7 @@
         "members": {
           "Name": {},
           "Filters": {
-            "shape": "Sn1"
+            "shape": "So2"
           },
           "GroupByAttribute": {}
         }
@@ -541,7 +704,7 @@
         "type": "structure",
         "members": {
           "UnprocessedAccounts": {
-            "shape": "Snq"
+            "shape": "Sof"
           }
         }
       }
@@ -557,7 +720,7 @@
         ],
         "members": {
           "AccountIds": {
-            "shape": "Snt"
+            "shape": "Soi"
           }
         }
       },
@@ -565,7 +728,7 @@
         "type": "structure",
         "members": {
           "UnprocessedAccounts": {
-            "shape": "Snq"
+            "shape": "Sof"
           }
         }
       }
@@ -657,7 +820,7 @@
         ],
         "members": {
           "AccountIds": {
-            "shape": "Snt"
+            "shape": "Soi"
           }
         }
       },
@@ -665,7 +828,7 @@
         "type": "structure",
         "members": {
           "UnprocessedAccounts": {
-            "shape": "Snq"
+            "shape": "Sof"
           }
         }
       }
@@ -681,7 +844,7 @@
         ],
         "members": {
           "AccountIds": {
-            "shape": "Snt"
+            "shape": "Soi"
           }
         }
       },
@@ -689,7 +852,7 @@
         "type": "structure",
         "members": {
           "UnprocessedAccounts": {
-            "shape": "Snq"
+            "shape": "Sof"
           }
         }
       }
@@ -702,7 +865,7 @@
         "type": "structure",
         "members": {
           "ActionTargetArns": {
-            "shape": "So6"
+            "shape": "Sov"
           },
           "NextToken": {},
           "MaxResults": {
@@ -928,7 +1091,7 @@
                 "ControlStatus": {},
                 "DisabledReason": {},
                 "ControlStatusUpdatedAt": {
-                  "shape": "S11"
+                  "shape": "S1p"
                 },
                 "ControlId": {},
                 "Title": {},
@@ -936,7 +1099,7 @@
                 "RemediationUrl": {},
                 "SeverityRating": {},
                 "RelatedRequirements": {
-                  "shape": "S10"
+                  "shape": "S27"
                 }
               }
             }
@@ -1038,7 +1201,7 @@
         ],
         "members": {
           "AccountIds": {
-            "shape": "Snt"
+            "shape": "Soi"
           }
         }
       },
@@ -1093,7 +1256,7 @@
         "type": "structure",
         "members": {
           "Tags": {
-            "shape": "Spf"
+            "shape": "Snv"
           },
           "EnableDefaultStandards": {
             "type": "boolean"
@@ -1119,7 +1282,7 @@
         "type": "structure",
         "members": {
           "Administrator": {
-            "shape": "Spl"
+            "shape": "Sq7"
           }
         }
       }
@@ -1132,7 +1295,7 @@
         "type": "structure",
         "members": {
           "StandardsSubscriptionArns": {
-            "shape": "S7"
+            "shape": "Sd"
           },
           "NextToken": {},
           "MaxResults": {
@@ -1144,7 +1307,7 @@
         "type": "structure",
         "members": {
           "StandardsSubscriptions": {
-            "shape": "S9"
+            "shape": "Sf"
           },
           "NextToken": {}
         }
@@ -1174,7 +1337,7 @@
           "FindingAggregationRegion": {},
           "RegionLinkingMode": {},
           "Regions": {
-            "shape": "Sk"
+            "shape": "S1r"
           }
         }
       }
@@ -1190,13 +1353,13 @@
         ],
         "members": {
           "FindingIdentifier": {
-            "shape": "Smj"
+            "shape": "Sni"
           },
           "StartTime": {
-            "shape": "S11"
+            "shape": "S1p"
           },
           "EndTime": {
-            "shape": "S11"
+            "shape": "S1p"
           },
           "NextToken": {},
           "MaxResults": {
@@ -1213,10 +1376,10 @@
               "type": "structure",
               "members": {
                 "FindingIdentifier": {
-                  "shape": "Smj"
+                  "shape": "Sni"
                 },
                 "UpdateTime": {
-                  "shape": "S11"
+                  "shape": "S1p"
                 },
                 "FindingCreated": {
                   "type": "boolean"
@@ -1255,7 +1418,7 @@
         "type": "structure",
         "members": {
           "Filters": {
-            "shape": "Sn1"
+            "shape": "So2"
           },
           "SortCriteria": {
             "type": "list",
@@ -1282,7 +1445,7 @@
           "Findings": {
             "type": "list",
             "member": {
-              "shape": "S17"
+              "shape": "S2d"
             }
           },
           "NextToken": {}
@@ -1351,7 +1514,7 @@
         "type": "structure",
         "members": {
           "InsightArns": {
-            "shape": "So6"
+            "shape": "Sov"
           },
           "NextToken": {},
           "MaxResults": {
@@ -1379,7 +1542,7 @@
                 "InsightArn": {},
                 "Name": {},
                 "Filters": {
-                  "shape": "Sn1"
+                  "shape": "So2"
                 },
                 "GroupByAttribute": {}
               }
@@ -1420,7 +1583,7 @@
         "type": "structure",
         "members": {
           "Master": {
-            "shape": "Spl"
+            "shape": "Sq7"
           }
         }
       },
@@ -1438,7 +1601,7 @@
         ],
         "members": {
           "AccountIds": {
-            "shape": "Snt"
+            "shape": "Soi"
           }
         }
       },
@@ -1446,10 +1609,10 @@
         "type": "structure",
         "members": {
           "Members": {
-            "shape": "Sqj"
+            "shape": "Sr5"
           },
           "UnprocessedAccounts": {
-            "shape": "Snq"
+            "shape": "Sof"
           }
         }
       }
@@ -1465,7 +1628,7 @@
         ],
         "members": {
           "AccountIds": {
-            "shape": "Snt"
+            "shape": "Soi"
           }
         }
       },
@@ -1473,11 +1636,62 @@
         "type": "structure",
         "members": {
           "UnprocessedAccounts": {
-            "shape": "Snq"
+            "shape": "Sof"
           }
         }
       }
     },
+    "ListAutomationRules": {
+      "http": {
+        "method": "GET",
+        "requestUri": "/automationrules/list"
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "NextToken": {
+            "location": "querystring",
+            "locationName": "NextToken"
+          },
+          "MaxResults": {
+            "location": "querystring",
+            "locationName": "MaxResults",
+            "type": "integer"
+          }
+        }
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "AutomationRulesMetadata": {
+            "type": "list",
+            "member": {
+              "type": "structure",
+              "members": {
+                "RuleArn": {},
+                "RuleStatus": {},
+                "RuleOrder": {
+                  "type": "integer"
+                },
+                "RuleName": {},
+                "Description": {},
+                "IsTerminal": {
+                  "type": "boolean"
+                },
+                "CreatedAt": {
+                  "shape": "S1p"
+                },
+                "UpdatedAt": {
+                  "shape": "S1p"
+                },
+                "CreatedBy": {}
+              }
+            }
+          },
+          "NextToken": {}
+        }
+      }
+    },
     "ListEnabledProductsForImport": {
       "http": {
         "method": "GET",
@@ -1568,7 +1782,7 @@
           "Invitations": {
             "type": "list",
             "member": {
-              "shape": "Spl"
+              "shape": "Sq7"
             }
           },
           "NextToken": {}
@@ -1603,7 +1817,7 @@
         "type": "structure",
         "members": {
           "Members": {
-            "shape": "Sqj"
+            "shape": "Sr5"
           },
           "NextToken": {}
         }
@@ -1748,10 +1962,10 @@
                 "SecurityControlArn": {},
                 "AssociationStatus": {},
                 "RelatedRequirements": {
-                  "shape": "S10"
+                  "shape": "S27"
                 },
                 "UpdatedAt": {
-                  "shape": "S11"
+                  "shape": "S1p"
                 },
                 "UpdatedReason": {},
                 "StandardsControlTitle": {},
@@ -1784,7 +1998,7 @@
         "type": "structure",
         "members": {
           "Tags": {
-            "shape": "Spf"
+            "shape": "Snv"
           }
         }
       }
@@ -1805,7 +2019,7 @@
             "locationName": "ResourceArn"
           },
           "Tags": {
-            "shape": "Spf"
+            "shape": "Snv"
           }
         }
       },
@@ -1882,7 +2096,7 @@
           "FindingAggregatorArn": {},
           "RegionLinkingMode": {},
           "Regions": {
-            "shape": "Sk"
+            "shape": "S1r"
           }
         }
       },
@@ -1893,7 +2107,7 @@
           "FindingAggregationRegion": {},
           "RegionLinkingMode": {},
           "Regions": {
-            "shape": "Sk"
+            "shape": "S1r"
           }
         }
       }
@@ -1910,10 +2124,10 @@
         ],
         "members": {
           "Filters": {
-            "shape": "Sn1"
+            "shape": "So2"
           },
           "Note": {
-            "shape": "Smk"
+            "shape": "S1e"
           },
           "RecordState": {}
         }
@@ -1940,7 +2154,7 @@
           },
           "Name": {},
           "Filters": {
-            "shape": "Sn1"
+            "shape": "So2"
           },
           "GroupByAttribute": {}
         }
@@ -2021,6 +2235,23 @@
       "member": {}
     },
     "S9": {
+      "type": "list",
+      "member": {
+        "type": "structure",
+        "members": {
+          "RuleArn": {},
+          "ErrorCode": {
+            "type": "integer"
+          },
+          "ErrorMessage": {}
+        }
+      }
+    },
+    "Sd": {
+      "type": "list",
+      "member": {}
+    },
+    "Sf": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -2034,7 +2265,7 @@
           "StandardsSubscriptionArn": {},
           "StandardsArn": {},
           "StandardsInput": {
-            "shape": "Sb"
+            "shape": "Sh"
           },
           "StandardsStatus": {},
           "StandardsStatusReason": {
@@ -2049,16 +2280,278 @@
         }
       }
     },
-    "Sb": {
+    "Sh": {
+      "type": "map",
+      "key": {},
+      "value": {}
+    },
+    "Sw": {
+      "type": "structure",
+      "members": {
+        "ProductArn": {
+          "shape": "Sx"
+        },
+        "AwsAccountId": {
+          "shape": "Sx"
+        },
+        "Id": {
+          "shape": "Sx"
+        },
+        "GeneratorId": {
+          "shape": "Sx"
+        },
+        "Type": {
+          "shape": "Sx"
+        },
+        "FirstObservedAt": {
+          "shape": "S10"
+        },
+        "LastObservedAt": {
+          "shape": "S10"
+        },
+        "CreatedAt": {
+          "shape": "S10"
+        },
+        "UpdatedAt": {
+          "shape": "S10"
+        },
+        "Confidence": {
+          "shape": "S14"
+        },
+        "Criticality": {
+          "shape": "S14"
+        },
+        "Title": {
+          "shape": "Sx"
+        },
+        "Description": {
+          "shape": "Sx"
+        },
+        "SourceUrl": {
+          "shape": "Sx"
+        },
+        "ProductName": {
+          "shape": "Sx"
+        },
+        "CompanyName": {
+          "shape": "Sx"
+        },
+        "SeverityLabel": {
+          "shape": "Sx"
+        },
+        "ResourceType": {
+          "shape": "Sx"
+        },
+        "ResourceId": {
+          "shape": "Sx"
+        },
+        "ResourcePartition": {
+          "shape": "Sx"
+        },
+        "ResourceRegion": {
+          "shape": "Sx"
+        },
+        "ResourceTags": {
+          "shape": "S17"
+        },
+        "ResourceDetailsOther": {
+          "shape": "S17"
+        },
+        "ComplianceStatus": {
+          "shape": "Sx"
+        },
+        "ComplianceSecurityControlId": {
+          "shape": "Sx"
+        },
+        "ComplianceAssociatedStandardsId": {
+          "shape": "Sx"
+        },
+        "VerificationState": {
+          "shape": "Sx"
+        },
+        "WorkflowStatus": {
+          "shape": "Sx"
+        },
+        "RecordState": {
+          "shape": "Sx"
+        },
+        "RelatedFindingsProductArn": {
+          "shape": "Sx"
+        },
+        "RelatedFindingsId": {
+          "shape": "Sx"
+        },
+        "NoteText": {
+          "shape": "Sx"
+        },
+        "NoteUpdatedAt": {
+          "shape": "S10"
+        },
+        "NoteUpdatedBy": {
+          "shape": "Sx"
+        },
+        "UserDefinedFields": {
+          "shape": "S17"
+        }
+      }
+    },
+    "Sx": {
+      "type": "list",
+      "member": {
+        "type": "structure",
+        "members": {
+          "Value": {},
+          "Comparison": {}
+        }
+      }
+    },
+    "S10": {
+      "type": "list",
+      "member": {
+        "type": "structure",
+        "members": {
+          "Start": {},
+          "End": {},
+          "DateRange": {
+            "type": "structure",
+            "members": {
+              "Value": {
+                "type": "integer"
+              },
+              "Unit": {}
+            }
+          }
+        }
+      }
+    },
+    "S14": {
+      "type": "list",
+      "member": {
+        "type": "structure",
+        "members": {
+          "Gte": {
+            "type": "double"
+          },
+          "Lte": {
+            "type": "double"
+          },
+          "Eq": {
+            "type": "double"
+          }
+        }
+      }
+    },
+    "S17": {
+      "type": "list",
+      "member": {
+        "type": "structure",
+        "members": {
+          "Key": {},
+          "Value": {},
+          "Comparison": {}
+        }
+      }
+    },
+    "S1a": {
+      "type": "list",
+      "member": {
+        "type": "structure",
+        "members": {
+          "Type": {},
+          "FindingFieldsUpdate": {
+            "type": "structure",
+            "members": {
+              "Note": {
+                "shape": "S1e"
+              },
+              "Severity": {
+                "shape": "S1f"
+              },
+              "VerificationState": {},
+              "Confidence": {
+                "type": "integer"
+              },
+              "Criticality": {
+                "type": "integer"
+              },
+              "Types": {
+                "shape": "S1j"
+              },
+              "UserDefinedFields": {
+                "shape": "S1k"
+              },
+              "Workflow": {
+                "shape": "S1l"
+              },
+              "RelatedFindings": {
+                "shape": "S1n"
+              }
+            }
+          }
+        }
+      }
+    },
+    "S1e": {
+      "type": "structure",
+      "required": [
+        "Text",
+        "UpdatedBy"
+      ],
+      "members": {
+        "Text": {},
+        "UpdatedBy": {}
+      }
+    },
+    "S1f": {
+      "type": "structure",
+      "members": {
+        "Normalized": {
+          "type": "integer"
+        },
+        "Product": {
+          "type": "double"
+        },
+        "Label": {}
+      }
+    },
+    "S1j": {
+      "type": "list",
+      "member": {}
+    },
+    "S1k": {
       "type": "map",
       "key": {},
       "value": {}
     },
-    "Sk": {
+    "S1l": {
+      "type": "structure",
+      "members": {
+        "Status": {}
+      }
+    },
+    "S1n": {
+      "type": "list",
+      "member": {
+        "type": "structure",
+        "required": [
+          "ProductArn",
+          "Id"
+        ],
+        "members": {
+          "ProductArn": {},
+          "Id": {}
+        }
+      }
+    },
+    "S1p": {
+      "type": "timestamp",
+      "timestampFormat": "iso8601"
+    },
+    "S1r": {
       "type": "list",
       "member": {}
     },
-    "Sv": {
+    "S22": {
       "type": "structure",
       "required": [
         "SecurityControlId",
@@ -2069,15 +2562,11 @@
         "StandardsArn": {}
       }
     },
-    "S10": {
+    "S27": {
       "type": "list",
       "member": {}
     },
-    "S11": {
-      "type": "timestamp",
-      "timestampFormat": "iso8601"
-    },
-    "S17": {
+    "S2d": {
       "type": "structure",
       "required": [
         "SchemaVersion",
@@ -2101,7 +2590,7 @@
         "GeneratorId": {},
         "AwsAccountId": {},
         "Types": {
-          "shape": "S18"
+          "shape": "S1j"
         },
         "FirstObservedAt": {},
         "LastObservedAt": {},
@@ -2142,10 +2631,10 @@
         },
         "SourceUrl": {},
         "ProductFields": {
-          "shape": "S1f"
+          "shape": "S1k"
         },
         "UserDefinedFields": {
-          "shape": "S1f"
+          "shape": "S1k"
         },
         "Malware": {
           "type": "list",
@@ -2168,7 +2657,7 @@
             "Direction": {},
             "Protocol": {},
             "OpenPortRange": {
-              "shape": "S1m"
+              "shape": "S2n"
             },
             "SourceIpV4": {},
             "SourceIpV6": {},
@@ -2193,10 +2682,10 @@
               "ComponentId": {},
               "ComponentType": {},
               "Egress": {
-                "shape": "S1p"
+                "shape": "S2q"
               },
               "Ingress": {
-                "shape": "S1p"
+                "shape": "S2q"
               }
             }
           }
@@ -2270,7 +2759,7 @@
               "Region": {},
               "ResourceRole": {},
               "Tags": {
-                "shape": "S1f"
+                "shape": "S1k"
               },
               "DataClassification": {
                 "type": "structure",
@@ -2309,7 +2798,7 @@
                                   },
                                   "Type": {},
                                   "Occurrences": {
-                                    "shape": "S2d"
+                                    "shape": "S3d"
                                   }
                                 }
                               }
@@ -2334,7 +2823,7 @@
                                 "Arn": {},
                                 "Name": {},
                                 "Occurrences": {
-                                  "shape": "S2d"
+                                  "shape": "S3d"
                                 }
                               }
                             }
@@ -2356,7 +2845,7 @@
                     "members": {
                       "LaunchConfigurationName": {},
                       "LoadBalancerNames": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "HealthCheckType": {},
                       "HealthCheckGracePeriod": {
@@ -2435,7 +2924,7 @@
                     "members": {
                       "EncryptionKey": {},
                       "Artifacts": {
-                        "shape": "S31"
+                        "shape": "S41"
                       },
                       "Environment": {
                         "type": "structure",
@@ -2509,15 +2998,15 @@
                         "members": {
                           "VpcId": {},
                           "Subnets": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "SecurityGroupIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           }
                         }
                       },
                       "SecondaryArtifacts": {
-                        "shape": "S31"
+                        "shape": "S41"
                       }
                     }
                   },
@@ -2598,7 +3087,7 @@
                                       "type": "structure",
                                       "members": {
                                         "Items": {
-                                          "shape": "S3c"
+                                          "shape": "S4c"
                                         },
                                         "Quantity": {
                                           "type": "integer"
@@ -2668,10 +3157,10 @@
                       "Type": {},
                       "ImageId": {},
                       "IpV4Addresses": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "IpV6Addresses": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "KeyName": {},
                       "IamInstanceProfileArn": {},
@@ -2772,10 +3261,10 @@
                       "OwnerId": {},
                       "VpcId": {},
                       "IpPermissions": {
-                        "shape": "S4a"
+                        "shape": "S5a"
                       },
                       "IpPermissionsEgress": {
-                        "shape": "S4a"
+                        "shape": "S5a"
                       }
                     }
                   },
@@ -2827,7 +3316,7 @@
                         }
                       },
                       "Ipv6CidrBlockAssociationSet": {
-                        "shape": "S4q"
+                        "shape": "S5q"
                       },
                       "DhcpOptionsId": {},
                       "State": {}
@@ -2872,7 +3361,7 @@
                       "SubnetId": {},
                       "VpcId": {},
                       "Ipv6CidrBlockAssociationSet": {
-                        "shape": "S4q"
+                        "shape": "S5q"
                       }
                     }
                   },
@@ -3046,7 +3535,7 @@
                       "DomainName": {},
                       "Endpoint": {},
                       "Endpoints": {
-                        "shape": "S1f"
+                        "shape": "S1k"
                       },
                       "ElasticsearchVersion": {},
                       "ElasticsearchClusterConfig": {
@@ -3089,13 +3578,13 @@
                         "type": "structure",
                         "members": {
                           "IndexSlowLogs": {
-                            "shape": "S5k"
+                            "shape": "S6k"
                           },
                           "SearchSlowLogs": {
-                            "shape": "S5k"
+                            "shape": "S6k"
                           },
                           "AuditLogs": {
-                            "shape": "S5k"
+                            "shape": "S6k"
                           }
                         }
                       },
@@ -3127,13 +3616,13 @@
                         "type": "structure",
                         "members": {
                           "AvailabilityZones": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "SecurityGroupIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "SubnetIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "VPCId": {}
                         }
@@ -3263,7 +3752,7 @@
                         }
                       },
                       "PublicAccessBlockConfiguration": {
-                        "shape": "S67"
+                        "shape": "S77"
                       },
                       "AccessControlList": {},
                       "BucketLoggingConfiguration": {
@@ -3386,7 +3875,7 @@
                     }
                   },
                   "AwsS3AccountPublicAccessBlock": {
-                    "shape": "S67"
+                    "shape": "S77"
                   },
                   "AwsS3Object": {
                     "type": "structure",
@@ -3469,15 +3958,15 @@
                     "type": "structure",
                     "members": {
                       "AttachedManagedPolicies": {
-                        "shape": "S71"
+                        "shape": "S81"
                       },
                       "CreateDate": {},
                       "GroupList": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "Path": {},
                       "PermissionsBoundary": {
-                        "shape": "S73"
+                        "shape": "S83"
                       },
                       "UserId": {},
                       "UserName": {},
@@ -3533,19 +4022,19 @@
                       "CreatedDate": {},
                       "Description": {},
                       "DefaultRouteSettings": {
-                        "shape": "S7a"
+                        "shape": "S8a"
                       },
                       "DeploymentId": {},
                       "LastUpdatedDate": {},
                       "RouteSettings": {
-                        "shape": "S7a"
+                        "shape": "S8a"
                       },
                       "StageName": {},
                       "StageVariables": {
-                        "shape": "S1f"
+                        "shape": "S1k"
                       },
                       "AccessLogSettings": {
-                        "shape": "S7b"
+                        "shape": "S8b"
                       },
                       "AutoDeploy": {
                         "type": "boolean"
@@ -3572,22 +4061,22 @@
                         "type": "structure",
                         "members": {
                           "AllowOrigins": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "AllowCredentials": {
                             "type": "boolean"
                           },
                           "ExposeHeaders": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "MaxAge": {
                             "type": "integer"
                           },
                           "AllowMethods": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "AllowHeaders": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           }
                         }
                       }
@@ -3632,13 +4121,13 @@
                               "type": "integer"
                             },
                             "KeySchema": {
-                              "shape": "S7l"
+                              "shape": "S8l"
                             },
                             "Projection": {
-                              "shape": "S7n"
+                              "shape": "S8n"
                             },
                             "ProvisionedThroughput": {
-                              "shape": "S7o"
+                              "shape": "S8o"
                             }
                           }
                         }
@@ -3648,7 +4137,7 @@
                         "type": "integer"
                       },
                       "KeySchema": {
-                        "shape": "S7l"
+                        "shape": "S8l"
                       },
                       "LatestStreamArn": {},
                       "LatestStreamLabel": {},
@@ -3660,16 +4149,16 @@
                             "IndexArn": {},
                             "IndexName": {},
                             "KeySchema": {
-                              "shape": "S7l"
+                              "shape": "S8l"
                             },
                             "Projection": {
-                              "shape": "S7n"
+                              "shape": "S8n"
                             }
                           }
                         }
                       },
                       "ProvisionedThroughput": {
-                        "shape": "S7o"
+                        "shape": "S8o"
                       },
                       "Replicas": {
                         "type": "list",
@@ -3683,14 +4172,14 @@
                                 "members": {
                                   "IndexName": {},
                                   "ProvisionedThroughputOverride": {
-                                    "shape": "S7v"
+                                    "shape": "S8v"
                                   }
                                 }
                               }
                             },
                             "KmsMasterKeyId": {},
                             "ProvisionedThroughputOverride": {
-                              "shape": "S7v"
+                              "shape": "S8v"
                             },
                             "RegionName": {},
                             "ReplicaStatus": {},
@@ -3784,11 +4273,11 @@
                         }
                       },
                       "Variables": {
-                        "shape": "S1f"
+                        "shape": "S1k"
                       },
                       "DocumentationVersion": {},
                       "AccessLogSettings": {
-                        "shape": "S7b"
+                        "shape": "S8b"
                       },
                       "CanarySettings": {
                         "type": "structure",
@@ -3798,7 +4287,7 @@
                           },
                           "DeploymentId": {},
                           "StageVariableOverrides": {
-                            "shape": "S1f"
+                            "shape": "S1k"
                           },
                           "UseStageCache": {
                             "type": "boolean"
@@ -3822,7 +4311,7 @@
                       "CreatedDate": {},
                       "Version": {},
                       "BinaryMediaTypes": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "MinimumCompressionSize": {
                         "type": "integer"
@@ -3832,7 +4321,7 @@
                         "type": "structure",
                         "members": {
                           "Types": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           }
                         }
                       }
@@ -3932,7 +4421,7 @@
                       "CreatedAt": {},
                       "DomainName": {},
                       "DomainValidationOptions": {
-                        "shape": "S8a"
+                        "shape": "S9a"
                       },
                       "ExtendedKeyUsages": {
                         "type": "list",
@@ -3947,7 +4436,7 @@
                       "FailureReason": {},
                       "ImportedAt": {},
                       "InUseBy": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "IssuedAt": {},
                       "Issuer": {},
@@ -3974,7 +4463,7 @@
                         "type": "structure",
                         "members": {
                           "DomainValidationOptions": {
-                            "shape": "S8a"
+                            "shape": "S9a"
                           },
                           "RenewalStatus": {},
                           "RenewalStatusReason": {},
@@ -3986,7 +4475,7 @@
                       "Status": {},
                       "Subject": {},
                       "SubjectAlternativeNames": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "Type": {}
                     }
@@ -4131,7 +4620,7 @@
                         "type": "integer"
                       },
                       "PendingActions": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "PendingModifiedValues": {
                         "type": "structure",
@@ -4223,7 +4712,7 @@
                     "type": "structure",
                     "members": {
                       "AvailabilityZones": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "BackendServerDescriptions": {
                         "type": "list",
@@ -4234,7 +4723,7 @@
                               "type": "integer"
                             },
                             "PolicyNames": {
-                              "shape": "Sk"
+                              "shape": "S1r"
                             }
                           }
                         }
@@ -4290,7 +4779,7 @@
                               }
                             },
                             "PolicyNames": {
-                              "shape": "Sk"
+                              "shape": "S1r"
                             }
                           }
                         }
@@ -4377,13 +4866,13 @@
                             }
                           },
                           "OtherPolicies": {
-                            "shape": "Sk"
+                            "shape": "S1r"
                           }
                         }
                       },
                       "Scheme": {},
                       "SecurityGroups": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "SourceSecurityGroup": {
                         "type": "structure",
@@ -4393,7 +4882,7 @@
                         }
                       },
                       "Subnets": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "VpcId": {}
                     }
@@ -4402,7 +4891,7 @@
                     "type": "structure",
                     "members": {
                       "AttachedManagedPolicies": {
-                        "shape": "S71"
+                        "shape": "S81"
                       },
                       "CreateDate": {},
                       "GroupId": {},
@@ -4424,7 +4913,7 @@
                     "members": {
                       "AssumeRolePolicyDocument": {},
                       "AttachedManagedPolicies": {
-                        "shape": "S71"
+                        "shape": "S81"
                       },
                       "CreateDate": {},
                       "InstanceProfileList": {
@@ -4455,7 +4944,7 @@
                         }
                       },
                       "PermissionsBoundary": {
-                        "shape": "S73"
+                        "shape": "S83"
                       },
                       "RoleId": {},
                       "RoleName": {},
@@ -4514,7 +5003,7 @@
                         "type": "structure",
                         "members": {
                           "Variables": {
-                            "shape": "S1f"
+                            "shape": "S1k"
                           },
                           "Error": {
                             "type": "structure",
@@ -4561,17 +5050,17 @@
                         "type": "structure",
                         "members": {
                           "SecurityGroupIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "SubnetIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "VpcId": {}
                         }
                       },
                       "Version": {},
                       "Architectures": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "PackageType": {}
                     }
@@ -4583,7 +5072,7 @@
                         "type": "long"
                       },
                       "CompatibleRuntimes": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "CreatedDate": {}
                     }
@@ -4615,7 +5104,7 @@
                         "type": "boolean"
                       },
                       "Endpoint": {
-                        "shape": "Sai"
+                        "shape": "Sbi"
                       },
                       "Engine": {},
                       "EngineVersion": {},
@@ -4632,7 +5121,7 @@
                       },
                       "TdeCredentialArn": {},
                       "VpcSecurityGroups": {
-                        "shape": "Saj"
+                        "shape": "Sbj"
                       },
                       "MultiAz": {
                         "type": "boolean"
@@ -4648,7 +5137,7 @@
                         "type": "integer"
                       },
                       "DbSecurityGroups": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "DbParameterGroups": {
                         "type": "list",
@@ -4718,15 +5207,15 @@
                             "type": "structure",
                             "members": {
                               "LogTypesToEnable": {
-                                "shape": "Sk"
+                                "shape": "S1r"
                               },
                               "LogTypesToDisable": {
-                                "shape": "Sk"
+                                "shape": "S1r"
                               }
                             }
                           },
                           "ProcessorFeatures": {
-                            "shape": "Sat"
+                            "shape": "Sbt"
                           }
                         }
                       },
@@ -4736,10 +5225,10 @@
                       },
                       "ReadReplicaSourceDBInstanceIdentifier": {},
                       "ReadReplicaDBInstanceIdentifiers": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "ReadReplicaDBClusterIdentifiers": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "LicenseModel": {},
                       "Iops": {
@@ -4773,7 +5262,7 @@
                       },
                       "StorageType": {},
                       "DomainMemberships": {
-                        "shape": "Saz"
+                        "shape": "Sbz"
                       },
                       "CopyTagsToSnapshot": {
                         "type": "boolean"
@@ -4794,13 +5283,13 @@
                         "type": "integer"
                       },
                       "EnabledCloudWatchLogsExports": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "ProcessorFeatures": {
-                        "shape": "Sat"
+                        "shape": "Sbt"
                       },
                       "ListenerEndpoint": {
-                        "shape": "Sai"
+                        "shape": "Sbi"
                       },
                       "MaxAllocatedStorage": {
                         "type": "integer"
@@ -4926,7 +5415,7 @@
                         "type": "boolean"
                       },
                       "ProcessorFeatures": {
-                        "shape": "Sat"
+                        "shape": "Sbt"
                       },
                       "DbiResourceId": {}
                     }
@@ -4935,7 +5424,7 @@
                     "type": "structure",
                     "members": {
                       "AvailabilityZones": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "SnapshotCreateTime": {},
                       "Engine": {},
@@ -4973,7 +5462,7 @@
                         "type": "integer"
                       },
                       "AvailabilityZones": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "BackupRetentionPeriod": {
                         "type": "integer"
@@ -4983,7 +5472,7 @@
                       "Endpoint": {},
                       "ReaderEndpoint": {},
                       "CustomEndpoints": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "MultiAz": {
                         "type": "boolean"
@@ -4997,10 +5486,10 @@
                       "PreferredBackupWindow": {},
                       "PreferredMaintenanceWindow": {},
                       "ReadReplicaIdentifiers": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "VpcSecurityGroups": {
-                        "shape": "Saj"
+                        "shape": "Sbj"
                       },
                       "HostedZoneId": {},
                       "StorageEncrypted": {
@@ -5020,7 +5509,7 @@
                       },
                       "ClusterCreateTime": {},
                       "EnabledCloudWatchLogsExports": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "EngineMode": {},
                       "DeletionProtection": {
@@ -5037,7 +5526,7 @@
                         "type": "boolean"
                       },
                       "DomainMemberships": {
-                        "shape": "Saz"
+                        "shape": "Sbz"
                       },
                       "DbClusterParameterGroup": {},
                       "DbSubnetGroup": {},
@@ -5081,7 +5570,7 @@
                         "type": "integer"
                       },
                       "CapacityProviders": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "ClusterSettings": {
                         "type": "list",
@@ -5145,7 +5634,7 @@
                     }
                   },
                   "AwsEcsContainer": {
-                    "shape": "Sbt"
+                    "shape": "Sct"
                   },
                   "AwsEcsTaskDefinition": {
                     "type": "structure",
@@ -5156,7 +5645,7 @@
                           "type": "structure",
                           "members": {
                             "Command": {
-                              "shape": "S3c"
+                              "shape": "S4c"
                             },
                             "Cpu": {
                               "type": "integer"
@@ -5175,19 +5664,19 @@
                               "type": "boolean"
                             },
                             "DnsSearchDomains": {
-                              "shape": "S3c"
+                              "shape": "S4c"
                             },
                             "DnsServers": {
-                              "shape": "S3c"
+                              "shape": "S4c"
                             },
                             "DockerLabels": {
-                              "shape": "S1f"
+                              "shape": "S1k"
                             },
                             "DockerSecurityOptions": {
-                              "shape": "S3c"
+                              "shape": "S4c"
                             },
                             "EntryPoint": {
-                              "shape": "S3c"
+                              "shape": "S4c"
                             },
                             "Environment": {
                               "type": "list",
@@ -5226,7 +5715,7 @@
                               "type": "structure",
                               "members": {
                                 "Options": {
-                                  "shape": "S1f"
+                                  "shape": "S1k"
                                 },
                                 "Type": {}
                               }
@@ -5235,7 +5724,7 @@
                               "type": "structure",
                               "members": {
                                 "Command": {
-                                  "shape": "S3c"
+                                  "shape": "S4c"
                                 },
                                 "Interval": {
                                   "type": "integer"
@@ -5257,7 +5746,7 @@
                               "type": "boolean"
                             },
                             "Links": {
-                              "shape": "S3c"
+                              "shape": "S4c"
                             },
                             "LinuxParameters": {
                               "type": "structure",
@@ -5266,10 +5755,10 @@
                                   "type": "structure",
                                   "members": {
                                     "Add": {
-                                      "shape": "S3c"
+                                      "shape": "S4c"
                                     },
                                     "Drop": {
-                                      "shape": "S3c"
+                                      "shape": "S4c"
                                     }
                                   }
                                 },
@@ -5281,7 +5770,7 @@
                                       "ContainerPath": {},
                                       "HostPath": {},
                                       "Permissions": {
-                                        "shape": "S3c"
+                                        "shape": "S4c"
                                       }
                                     }
                                   }
@@ -5305,7 +5794,7 @@
                                     "members": {
                                       "ContainerPath": {},
                                       "MountOptions": {
-                                        "shape": "S3c"
+                                        "shape": "S4c"
                                       },
                                       "Size": {
                                         "type": "integer"
@@ -5320,7 +5809,7 @@
                               "members": {
                                 "LogDriver": {},
                                 "Options": {
-                                  "shape": "S1f"
+                                  "shape": "S1k"
                                 },
                                 "SecretOptions": {
                                   "type": "list",
@@ -5497,7 +5986,7 @@
                         }
                       },
                       "RequiresCompatibilities": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "TaskRoleArn": {},
                       "Volumes": {
@@ -5513,10 +6002,10 @@
                                 },
                                 "Driver": {},
                                 "DriverOpts": {
-                                  "shape": "S1f"
+                                  "shape": "S1k"
                                 },
                                 "Labels": {
-                                  "shape": "S1f"
+                                  "shape": "S1k"
                                 },
                                 "Scope": {}
                               }
@@ -5575,7 +6064,7 @@
                     }
                   },
                   "Other": {
-                    "shape": "S1f"
+                    "shape": "S1k"
                   },
                   "AwsRdsEventSubscription": {
                     "type": "structure",
@@ -5586,12 +6075,12 @@
                         "type": "boolean"
                       },
                       "EventCategoriesList": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "EventSubscriptionArn": {},
                       "SnsTopicArn": {},
                       "SourceIdsList": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "SourceType": {},
                       "Status": {},
@@ -5681,10 +6170,10 @@
                             "members": {
                               "AssignPublicIp": {},
                               "SecurityGroups": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               },
                               "Subnets": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               }
                             }
                           }
@@ -5775,7 +6264,7 @@
                       },
                       "ClassicLinkVpcId": {},
                       "ClassicLinkVpcSecurityGroups": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "CreatedTime": {},
                       "EbsOptimized": {
@@ -5798,7 +6287,7 @@
                       "PlacementTenancy": {},
                       "RamdiskId": {},
                       "SecurityGroups": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "SpotPrice": {},
                       "UserData": {},
@@ -5855,29 +6344,29 @@
                                   "type": "integer"
                                 },
                                 "IkeVersions": {
-                                  "shape": "S3c"
+                                  "shape": "S4c"
                                 },
                                 "OutsideIpAddress": {},
                                 "Phase1DhGroupNumbers": {
-                                  "shape": "Se6"
+                                  "shape": "Sf6"
                                 },
                                 "Phase1EncryptionAlgorithms": {
-                                  "shape": "S3c"
+                                  "shape": "S4c"
                                 },
                                 "Phase1IntegrityAlgorithms": {
-                                  "shape": "S3c"
+                                  "shape": "S4c"
                                 },
                                 "Phase1LifetimeSeconds": {
                                   "type": "integer"
                                 },
                                 "Phase2DhGroupNumbers": {
-                                  "shape": "Se6"
+                                  "shape": "Sf6"
                                 },
                                 "Phase2EncryptionAlgorithms": {
-                                  "shape": "S3c"
+                                  "shape": "S4c"
                                 },
                                 "Phase2IntegrityAlgorithms": {
-                                  "shape": "S3c"
+                                  "shape": "S4c"
                                 },
                                 "Phase2LifetimeSeconds": {
                                   "type": "integer"
@@ -5919,7 +6408,7 @@
                       "Architecture": {},
                       "ImageDigest": {},
                       "ImageTags": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "ImagePublishedAt": {}
                     }
@@ -6021,10 +6510,10 @@
                         "type": "structure",
                         "members": {
                           "SecurityGroupIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "SubnetIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           }
                         }
                       },
@@ -6032,18 +6521,18 @@
                         "type": "structure",
                         "members": {
                           "IndexSlowLogs": {
-                            "shape": "Sej"
+                            "shape": "Sfj"
                           },
                           "SearchSlowLogs": {
-                            "shape": "Sej"
+                            "shape": "Sfj"
                           },
                           "AuditLogs": {
-                            "shape": "Sej"
+                            "shape": "Sfj"
                           }
                         }
                       },
                       "DomainEndpoints": {
-                        "shape": "S1f"
+                        "shape": "S1k"
                       },
                       "AdvancedSecurityOptions": {
                         "type": "structure",
@@ -6073,19 +6562,19 @@
                         "type": "boolean"
                       },
                       "AvailabilityZones": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "BaseEndpointDnsNames": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "ManagesVpcEndpoints": {
                         "type": "boolean"
                       },
                       "GatewayLoadBalancerArns": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "NetworkLoadBalancerArns": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "PrivateDnsName": {},
                       "ServiceId": {},
@@ -6196,10 +6685,10 @@
                         "type": "structure",
                         "members": {
                           "SecurityGroupIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "SubnetIds": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "EndpointPublicAccess": {
                             "type": "boolean"
@@ -6220,7 +6709,7 @@
                                   "type": "boolean"
                                 },
                                 "Types": {
-                                  "shape": "S3c"
+                                  "shape": "S4c"
                                 }
                               }
                             }
@@ -6250,17 +6739,17 @@
                               "type": "structure",
                               "members": {
                                 "ActionDefinition": {
-                                  "shape": "Sfa"
+                                  "shape": "Sga"
                                 },
                                 "ActionName": {}
                               }
                             }
                           },
                           "StatelessDefaultActions": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "StatelessFragmentDefaultActions": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "StatelessRuleGroupReferences": {
                             "type": "list",
@@ -6328,7 +6817,7 @@
                                 "type": "structure",
                                 "members": {
                                   "Definition": {
-                                    "shape": "S3c"
+                                    "shape": "S4c"
                                   }
                                 }
                               },
@@ -6336,7 +6825,7 @@
                                 "type": "structure",
                                 "members": {
                                   "Definition": {
-                                    "shape": "S3c"
+                                    "shape": "S4c"
                                   }
                                 }
                               }
@@ -6350,10 +6839,10 @@
                                 "members": {
                                   "GeneratedRulesType": {},
                                   "TargetTypes": {
-                                    "shape": "S3c"
+                                    "shape": "S4c"
                                   },
                                   "Targets": {
-                                    "shape": "S3c"
+                                    "shape": "S4c"
                                   }
                                 }
                               },
@@ -6400,7 +6889,7 @@
                                       "type": "structure",
                                       "members": {
                                         "ActionDefinition": {
-                                          "shape": "Sfa"
+                                          "shape": "Sga"
                                         },
                                         "ActionName": {}
                                       }
@@ -6418,7 +6907,7 @@
                                           "type": "structure",
                                           "members": {
                                             "Actions": {
-                                              "shape": "S3c"
+                                              "shape": "S4c"
                                             },
                                             "MatchAttributes": {
                                               "type": "structure",
@@ -6481,10 +6970,10 @@
                                                     "type": "structure",
                                                     "members": {
                                                       "Flags": {
-                                                        "shape": "S3c"
+                                                        "shape": "S4c"
                                                       },
                                                       "Masks": {
-                                                        "shape": "S3c"
+                                                        "shape": "S4c"
                                                       }
                                                     }
                                                   }
@@ -6569,7 +7058,7 @@
                       "AutoAcceptSharedAttachments": {},
                       "DefaultRouteTableAssociation": {},
                       "TransitGatewayCidrBlocks": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "AssociationDefaultRouteTableId": {},
                       "PropagationDefaultRouteTableId": {},
@@ -6593,7 +7082,7 @@
                         "members": {
                           "Gid": {},
                           "SecondaryGids": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "Uid": {}
                         }
@@ -6618,7 +7107,7 @@
                     "type": "structure",
                     "members": {
                       "Capabilities": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "CreationTime": {},
                       "Description": {},
@@ -6636,7 +7125,7 @@
                       },
                       "LastUpdatedTime": {},
                       "NotificationArns": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "Outputs": {
                         "type": "list",
@@ -6666,7 +7155,7 @@
                         "type": "boolean"
                       },
                       "AlarmActions": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "AlarmArn": {},
                       "AlarmConfigurationUpdatedTimestamp": {},
@@ -6692,12 +7181,12 @@
                       },
                       "ExtendedStatistic": {},
                       "InsufficientDataActions": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "MetricName": {},
                       "Namespace": {},
                       "OkActions": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "Period": {
                         "type": "integer"
@@ -6715,11 +7204,11 @@
                     "type": "structure",
                     "members": {
                       "AccepterVpcInfo": {
-                        "shape": "Sgy"
+                        "shape": "Shy"
                       },
                       "ExpirationTime": {},
                       "RequesterVpcInfo": {
-                        "shape": "Sgy"
+                        "shape": "Shy"
                       },
                       "Status": {
                         "type": "structure",
@@ -6889,7 +7378,7 @@
                       "Containers": {
                         "type": "list",
                         "member": {
-                          "shape": "Sbt"
+                          "shape": "Sct"
                         }
                       }
                     }
@@ -6904,7 +7393,7 @@
                         "type": "structure",
                         "members": {
                           "BackupVaultEvents": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "SnsTopicArn": {}
                         }
@@ -6925,7 +7414,7 @@
                               "type": "structure",
                               "members": {
                                 "BackupOptions": {
-                                  "shape": "S1f"
+                                  "shape": "S1k"
                                 },
                                 "ResourceType": {}
                               }
@@ -6956,13 +7445,13 @@
                                     "members": {
                                       "DestinationBackupVaultArn": {},
                                       "Lifecycle": {
-                                        "shape": "Si3"
+                                        "shape": "Sj3"
                                       }
                                     }
                                   }
                                 },
                                 "Lifecycle": {
-                                  "shape": "Si3"
+                                  "shape": "Sj3"
                                 }
                               }
                             }
@@ -7186,10 +7675,10 @@
                                 }
                               },
                               "AcceleratorManufacturers": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               },
                               "AcceleratorNames": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               },
                               "AcceleratorTotalMemoryMiB": {
                                 "type": "structure",
@@ -7203,7 +7692,7 @@
                                 }
                               },
                               "AcceleratorTypes": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               },
                               "BareMetal": {},
                               "BaselineEbsBandwidthMbps": {
@@ -7219,17 +7708,17 @@
                               },
                               "BurstablePerformance": {},
                               "CpuManufacturers": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               },
                               "ExcludedInstanceTypes": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               },
                               "InstanceGenerations": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               },
                               "LocalStorage": {},
                               "LocalStorageTypes": {
-                                "shape": "S3c"
+                                "shape": "S4c"
                               },
                               "MemoryGiBPerVCpu": {
                                 "type": "structure",
@@ -7354,7 +7843,7 @@
                                   "type": "integer"
                                 },
                                 "Groups": {
-                                  "shape": "S3c"
+                                  "shape": "S4c"
                                 },
                                 "InterfaceType": {},
                                 "Ipv4PrefixCount": {
@@ -7446,10 +7935,10 @@
                           },
                           "RamDiskId": {},
                           "SecurityGroupIdSet": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "SecurityGroupSet": {
-                            "shape": "S3c"
+                            "shape": "S4c"
                           },
                           "UserData": {}
                         }
@@ -7466,10 +7955,10 @@
                     "type": "structure",
                     "members": {
                       "AcceleratorTypes": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "AdditionalCodeRepositories": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "DefaultCodeRepository": {},
                       "DirectInternetAccess": {},
@@ -7491,7 +7980,7 @@
                       "RoleArn": {},
                       "RootAccess": {},
                       "SecurityGroups": {
-                        "shape": "S3c"
+                        "shape": "S4c"
                       },
                       "SubnetId": {},
                       "Url": {},
@@ -7529,19 +8018,19 @@
                         "type": "structure",
                         "members": {
                           "Allow": {
-                            "shape": "Sjm"
+                            "shape": "Skm"
                           },
                           "Block": {
-                            "shape": "Sjq"
+                            "shape": "Skq"
                           }
                         }
                       },
                       "Description": {},
                       "Rules": {
-                        "shape": "Sjs"
+                        "shape": "Sks"
                       },
                       "VisibilityConfig": {
-                        "shape": "Sjx"
+                        "shape": "Skx"
                       }
                     }
                   },
@@ -7556,11 +8045,11 @@
                       "Name": {},
                       "Arn": {},
                       "Rules": {
-                        "shape": "Sjs"
+                        "shape": "Sks"
                       },
                       "Scope": {},
                       "VisibilityConfig": {
-                        "shape": "Sjx"
+                        "shape": "Skx"
                       }
                     }
                   },
@@ -7654,7 +8143,7 @@
                         "type": "structure",
                         "members": {
                           "Hosts": {
-                            "shape": "Sk"
+                            "shape": "S1r"
                           },
                           "RoleBase": {},
                           "RoleName": {},
@@ -7707,11 +8196,11 @@
                         "type": "boolean"
                       },
                       "SecurityGroups": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "StorageType": {},
                       "SubnetIds": {
-                        "shape": "Sk"
+                        "shape": "S1r"
                       },
                       "Users": {
                         "type": "list",
@@ -7731,18 +8220,18 @@
                       "ApiId": {},
                       "Id": {},
                       "OpenIdConnectConfig": {
-                        "shape": "Skg"
+                        "shape": "Slg"
                       },
                       "Name": {},
                       "LambdaAuthorizerConfig": {
-                        "shape": "Skh"
+                        "shape": "Slh"
                       },
                       "XrayEnabled": {
                         "type": "boolean"
                       },
                       "Arn": {},
                       "UserPoolConfig": {
-                        "shape": "Ski"
+                        "shape": "Sli"
                       },
                       "AuthenticationType": {},
                       "LogConfig": {
@@ -7762,13 +8251,13 @@
                           "members": {
                             "AuthenticationType": {},
                             "LambdaAuthorizerConfig": {
-                              "shape": "Skh"
+                              "shape": "Slh"
                             },
                             "OpenIdConnectConfig": {
-                              "shape": "Skg"
+                              "shape": "Slg"
                             },
                             "UserPoolConfig": {
-                              "shape": "Ski"
+                              "shape": "Sli"
                             }
                           }
                         }
@@ -7912,7 +8401,7 @@
           "members": {
             "Status": {},
             "RelatedRequirements": {
-              "shape": "S10"
+              "shape": "S27"
             },
             "StatusReasons": {
               "type": "list",
@@ -7953,7 +8442,7 @@
         },
         "RecordState": {},
         "RelatedFindings": {
-          "shape": "Slh"
+          "shape": "S1n"
         },
         "Note": {
           "type": "structure",
@@ -8021,7 +8510,7 @@
                 }
               },
               "RelatedVulnerabilities": {
-                "shape": "Sk"
+                "shape": "S1r"
               },
               "Vendor": {
                 "type": "structure",
@@ -8037,7 +8526,7 @@
                 }
               },
               "ReferenceUrls": {
-                "shape": "Sk"
+                "shape": "S1r"
               },
               "FixAvailable": {}
             }
@@ -8083,7 +8572,7 @@
               "members": {
                 "ConnectionDirection": {},
                 "RemoteIpDetails": {
-                  "shape": "Slx"
+                  "shape": "Smt"
                 },
                 "RemotePortDetails": {
                   "type": "structure",
@@ -8095,7 +8584,7 @@
                   }
                 },
                 "LocalPortDetails": {
-                  "shape": "Sm3"
+                  "shape": "Smz"
                 },
                 "Protocol": {},
                 "Blocked": {
@@ -8110,7 +8599,7 @@
                 "ServiceName": {},
                 "CallerType": {},
                 "RemoteIpDetails": {
-                  "shape": "Slx"
+                  "shape": "Smt"
                 },
                 "DomainDetails": {
                   "type": "structure",
@@ -8119,7 +8608,7 @@
                   }
                 },
                 "AffectedResources": {
-                  "shape": "S1f"
+                  "shape": "S1k"
                 },
                 "FirstSeen": {},
                 "LastSeen": {}
@@ -8144,7 +8633,7 @@
                     "type": "structure",
                     "members": {
                       "LocalPortDetails": {
-                        "shape": "Sm3"
+                        "shape": "Smz"
                       },
                       "LocalIpDetails": {
                         "type": "structure",
@@ -8153,7 +8642,7 @@
                         }
                       },
                       "RemoteIpDetails": {
-                        "shape": "Slx"
+                        "shape": "Smt"
                       }
                     }
                   }
@@ -8175,7 +8664,7 @@
               "type": "integer"
             },
             "RelatedFindings": {
-              "shape": "Slh"
+              "shape": "S1n"
             },
             "Severity": {
               "type": "structure",
@@ -8185,7 +8674,7 @@
               }
             },
             "Types": {
-              "shape": "S18"
+              "shape": "S1j"
             }
           }
         },
@@ -8194,16 +8683,7 @@
         }
       }
     },
-    "S18": {
-      "type": "list",
-      "member": {}
-    },
-    "S1f": {
-      "type": "map",
-      "key": {},
-      "value": {}
-    },
-    "S1m": {
+    "S2n": {
       "type": "structure",
       "members": {
         "Begin": {
@@ -8214,40 +8694,40 @@
         }
       }
     },
-    "S1p": {
+    "S2q": {
       "type": "structure",
       "members": {
         "Protocol": {},
         "Destination": {
-          "shape": "S1q"
+          "shape": "S2r"
         },
         "Source": {
-          "shape": "S1q"
+          "shape": "S2r"
         }
       }
     },
-    "S1q": {
+    "S2r": {
       "type": "structure",
       "members": {
         "Address": {
-          "shape": "Sk"
+          "shape": "S1r"
         },
         "PortRanges": {
           "type": "list",
           "member": {
-            "shape": "S1m"
+            "shape": "S2n"
           }
         }
       }
     },
-    "S2d": {
+    "S3d": {
       "type": "structure",
       "members": {
         "LineRanges": {
-          "shape": "S2e"
+          "shape": "S3e"
         },
         "OffsetRanges": {
-          "shape": "S2e"
+          "shape": "S3e"
         },
         "Pages": {
           "type": "list",
@@ -8258,10 +8738,10 @@
                 "type": "long"
               },
               "LineRange": {
-                "shape": "S2f"
+                "shape": "S3f"
               },
               "OffsetRange": {
-                "shape": "S2f"
+                "shape": "S3f"
               }
             }
           }
@@ -8296,13 +8776,13 @@
         }
       }
     },
-    "S2e": {
+    "S3e": {
       "type": "list",
       "member": {
-        "shape": "S2f"
+        "shape": "S3f"
       }
     },
-    "S2f": {
+    "S3f": {
       "type": "structure",
       "members": {
         "Start": {
@@ -8316,7 +8796,7 @@
         }
       }
     },
-    "S31": {
+    "S41": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8337,11 +8817,11 @@
         }
       }
     },
-    "S3c": {
+    "S4c": {
       "type": "list",
       "member": {}
     },
-    "S4a": {
+    "S5a": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8397,7 +8877,7 @@
         }
       }
     },
-    "S4q": {
+    "S5q": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8408,7 +8888,7 @@
         }
       }
     },
-    "S5k": {
+    "S6k": {
       "type": "structure",
       "members": {
         "CloudWatchLogsLogGroupArn": {},
@@ -8417,7 +8897,7 @@
         }
       }
     },
-    "S67": {
+    "S77": {
       "type": "structure",
       "members": {
         "BlockPublicAcls": {
@@ -8434,7 +8914,7 @@
         }
       }
     },
-    "S71": {
+    "S81": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8444,14 +8924,14 @@
         }
       }
     },
-    "S73": {
+    "S83": {
       "type": "structure",
       "members": {
         "PermissionsBoundaryArn": {},
         "PermissionsBoundaryType": {}
       }
     },
-    "S7a": {
+    "S8a": {
       "type": "structure",
       "members": {
         "DetailedMetricsEnabled": {
@@ -8469,14 +8949,14 @@
         }
       }
     },
-    "S7b": {
+    "S8b": {
       "type": "structure",
       "members": {
         "Format": {},
         "DestinationArn": {}
       }
     },
-    "S7l": {
+    "S8l": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8486,16 +8966,16 @@
         }
       }
     },
-    "S7n": {
+    "S8n": {
       "type": "structure",
       "members": {
         "NonKeyAttributes": {
-          "shape": "Sk"
+          "shape": "S1r"
         },
         "ProjectionType": {}
       }
     },
-    "S7o": {
+    "S8o": {
       "type": "structure",
       "members": {
         "LastDecreaseDateTime": {},
@@ -8511,7 +8991,7 @@
         }
       }
     },
-    "S7v": {
+    "S8v": {
       "type": "structure",
       "members": {
         "ReadCapacityUnits": {
@@ -8519,7 +8999,7 @@
         }
       }
     },
-    "S8a": {
+    "S9a": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8535,14 +9015,14 @@
           },
           "ValidationDomain": {},
           "ValidationEmails": {
-            "shape": "Sk"
+            "shape": "S1r"
           },
           "ValidationMethod": {},
           "ValidationStatus": {}
         }
       }
     },
-    "Sai": {
+    "Sbi": {
       "type": "structure",
       "members": {
         "Address": {},
@@ -8552,7 +9032,7 @@
         "HostedZoneId": {}
       }
     },
-    "Saj": {
+    "Sbj": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8562,7 +9042,7 @@
         }
       }
     },
-    "Sat": {
+    "Sbt": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8572,7 +9052,7 @@
         }
       }
     },
-    "Saz": {
+    "Sbz": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8584,7 +9064,7 @@
         }
       }
     },
-    "Sbt": {
+    "Sct": {
       "type": "structure",
       "members": {
         "Name": {},
@@ -8604,13 +9084,13 @@
         }
       }
     },
-    "Se6": {
+    "Sf6": {
       "type": "list",
       "member": {
         "type": "integer"
       }
     },
-    "Sej": {
+    "Sfj": {
       "type": "structure",
       "members": {
         "CloudWatchLogsLogGroupArn": {},
@@ -8619,7 +9099,7 @@
         }
       }
     },
-    "Sfa": {
+    "Sga": {
       "type": "structure",
       "members": {
         "PublishMetricAction": {
@@ -8638,7 +9118,7 @@
         }
       }
     },
-    "Sgy": {
+    "Shy": {
       "type": "structure",
       "members": {
         "CidrBlock": {},
@@ -8679,7 +9159,7 @@
         "VpcId": {}
       }
     },
-    "Si3": {
+    "Sj3": {
       "type": "structure",
       "members": {
         "DeleteAfterDays": {
@@ -8690,23 +9170,23 @@
         }
       }
     },
-    "Sjm": {
+    "Skm": {
       "type": "structure",
       "members": {
         "CustomRequestHandling": {
-          "shape": "Sjn"
+          "shape": "Skn"
         }
       }
     },
-    "Sjn": {
+    "Skn": {
       "type": "structure",
       "members": {
         "InsertHeaders": {
-          "shape": "Sjo"
+          "shape": "Sko"
         }
       }
     },
-    "Sjo": {
+    "Sko": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8716,7 +9196,7 @@
         }
       }
     },
-    "Sjq": {
+    "Skq": {
       "type": "structure",
       "members": {
         "CustomResponse": {
@@ -8727,13 +9207,13 @@
               "type": "integer"
             },
             "ResponseHeaders": {
-              "shape": "Sjo"
+              "shape": "Sko"
             }
           }
         }
       }
     },
-    "Sjs": {
+    "Sks": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -8742,16 +9222,16 @@
             "type": "structure",
             "members": {
               "Allow": {
-                "shape": "Sjm"
+                "shape": "Skm"
               },
               "Block": {
-                "shape": "Sjq"
+                "shape": "Skq"
               },
               "Captcha": {
                 "type": "structure",
                 "members": {
                   "CustomRequestHandling": {
-                    "shape": "Sjn"
+                    "shape": "Skn"
                   }
                 }
               },
@@ -8759,7 +9239,7 @@
                 "type": "structure",
                 "members": {
                   "CustomRequestHandling": {
-                    "shape": "Sjn"
+                    "shape": "Skn"
                   }
                 }
               }
@@ -8771,12 +9251,12 @@
             "type": "integer"
           },
           "VisibilityConfig": {
-            "shape": "Sjx"
+            "shape": "Skx"
           }
         }
       }
     },
-    "Sjx": {
+    "Skx": {
       "type": "structure",
       "members": {
         "CloudWatchMetricsEnabled": {
@@ -8788,7 +9268,7 @@
         }
       }
     },
-    "Skg": {
+    "Slg": {
       "type": "structure",
       "members": {
         "AuthTtL": {
@@ -8801,7 +9281,7 @@
         "Issuer": {}
       }
     },
-    "Skh": {
+    "Slh": {
       "type": "structure",
       "members": {
         "AuthorizerResultTtlInSeconds": {
@@ -8811,7 +9291,7 @@
         "IdentityValidationExpression": {}
       }
     },
-    "Ski": {
+    "Sli": {
       "type": "structure",
       "members": {
         "AppIdClientRegex": {},
@@ -8820,21 +9300,7 @@
         "UserPoolId": {}
       }
     },
-    "Slh": {
-      "type": "list",
-      "member": {
-        "type": "structure",
-        "required": [
-          "ProductArn",
-          "Id"
-        ],
-        "members": {
-          "ProductArn": {},
-          "Id": {}
-        }
-      }
-    },
-    "Slx": {
+    "Smt": {
       "type": "structure",
       "members": {
         "IpAddressV4": {},
@@ -8875,7 +9341,7 @@
         }
       }
     },
-    "Sm3": {
+    "Smz": {
       "type": "structure",
       "members": {
         "Port": {
@@ -8884,13 +9350,13 @@
         "PortName": {}
       }
     },
-    "Smi": {
+    "Snh": {
       "type": "list",
       "member": {
-        "shape": "Smj"
+        "shape": "Sni"
       }
     },
-    "Smj": {
+    "Sni": {
       "type": "structure",
       "required": [
         "Id",
@@ -8901,18 +9367,7 @@
         "ProductArn": {}
       }
     },
-    "Smk": {
-      "type": "structure",
-      "required": [
-        "Text",
-        "UpdatedBy"
-      ],
-      "members": {
-        "Text": {},
-        "UpdatedBy": {}
-      }
-    },
-    "Sms": {
+    "Sno": {
       "type": "structure",
       "required": [
         "StandardsArn",
@@ -8926,272 +9381,277 @@
         "UpdatedReason": {}
       }
     },
-    "Sn1": {
+    "Snv": {
+      "type": "map",
+      "key": {},
+      "value": {}
+    },
+    "So2": {
       "type": "structure",
       "members": {
         "ProductArn": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "AwsAccountId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "Id": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "GeneratorId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "Region": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "Type": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "FirstObservedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "LastObservedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "CreatedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "UpdatedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "SeverityProduct": {
-          "shape": "Sn9",
+          "shape": "S14",
           "deprecated": true,
           "deprecatedMessage": "This filter is deprecated. Instead, use FindingProviderSeverityOriginal."
         },
         "SeverityNormalized": {
-          "shape": "Sn9",
+          "shape": "S14",
           "deprecated": true,
           "deprecatedMessage": "This filter is deprecated. Instead, use SeverityLabel or FindingProviderFieldsSeverityLabel."
         },
         "SeverityLabel": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "Confidence": {
-          "shape": "Sn9"
+          "shape": "S14"
         },
         "Criticality": {
-          "shape": "Sn9"
+          "shape": "S14"
         },
         "Title": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "Description": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "RecommendationText": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "SourceUrl": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ProductFields": {
-          "shape": "Snb"
+          "shape": "S17"
         },
         "ProductName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "CompanyName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "UserDefinedFields": {
-          "shape": "Snb"
+          "shape": "S17"
         },
         "MalwareName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "MalwareType": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "MalwarePath": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "MalwareState": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "NetworkDirection": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "NetworkProtocol": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "NetworkSourceIpV4": {
-          "shape": "Sne"
+          "shape": "So3"
         },
         "NetworkSourceIpV6": {
-          "shape": "Sne"
+          "shape": "So3"
         },
         "NetworkSourcePort": {
-          "shape": "Sn9"
+          "shape": "S14"
         },
         "NetworkSourceDomain": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "NetworkSourceMac": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "NetworkDestinationIpV4": {
-          "shape": "Sne"
+          "shape": "So3"
         },
         "NetworkDestinationIpV6": {
-          "shape": "Sne"
+          "shape": "So3"
         },
         "NetworkDestinationPort": {
-          "shape": "Sn9"
+          "shape": "S14"
         },
         "NetworkDestinationDomain": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ProcessName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ProcessPath": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ProcessPid": {
-          "shape": "Sn9"
+          "shape": "S14"
         },
         "ProcessParentPid": {
-          "shape": "Sn9"
+          "shape": "S14"
         },
         "ProcessLaunchedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "ProcessTerminatedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "ThreatIntelIndicatorType": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ThreatIntelIndicatorValue": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ThreatIntelIndicatorCategory": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ThreatIntelIndicatorLastObservedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "ThreatIntelIndicatorSource": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ThreatIntelIndicatorSourceUrl": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceType": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourcePartition": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceRegion": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceTags": {
-          "shape": "Snb"
+          "shape": "S17"
         },
         "ResourceAwsEc2InstanceType": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsEc2InstanceImageId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsEc2InstanceIpV4Addresses": {
-          "shape": "Sne"
+          "shape": "So3"
         },
         "ResourceAwsEc2InstanceIpV6Addresses": {
-          "shape": "Sne"
+          "shape": "So3"
         },
         "ResourceAwsEc2InstanceKeyName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsEc2InstanceIamInstanceProfileArn": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsEc2InstanceVpcId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsEc2InstanceSubnetId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsEc2InstanceLaunchedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "ResourceAwsS3BucketOwnerId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsS3BucketOwnerName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsIamAccessKeyUserName": {
-          "shape": "Sn2",
+          "shape": "Sx",
           "deprecated": true,
           "deprecatedMessage": "This filter is deprecated. Instead, use ResourceAwsIamAccessKeyPrincipalName."
         },
         "ResourceAwsIamAccessKeyPrincipalName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsIamAccessKeyStatus": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceAwsIamAccessKeyCreatedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "ResourceAwsIamUserUserName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceContainerName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceContainerImageId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceContainerImageName": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ResourceContainerLaunchedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "ResourceDetailsOther": {
-          "shape": "Snb"
+          "shape": "S17"
         },
         "ComplianceStatus": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "VerificationState": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "WorkflowState": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "WorkflowStatus": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "RecordState": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "RelatedFindingsProductArn": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "RelatedFindingsId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "NoteText": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "NoteUpdatedAt": {
-          "shape": "Sn5"
+          "shape": "S10"
         },
         "NoteUpdatedBy": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "Keyword": {
           "deprecated": true,
@@ -9205,25 +9665,25 @@
           }
         },
         "FindingProviderFieldsConfidence": {
-          "shape": "Sn9"
+          "shape": "S14"
         },
         "FindingProviderFieldsCriticality": {
-          "shape": "Sn9"
+          "shape": "S14"
         },
         "FindingProviderFieldsRelatedFindingsId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "FindingProviderFieldsRelatedFindingsProductArn": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "FindingProviderFieldsSeverityLabel": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "FindingProviderFieldsSeverityOriginal": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "FindingProviderFieldsTypes": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "Sample": {
           "type": "list",
@@ -9237,71 +9697,14 @@
           }
         },
         "ComplianceSecurityControlId": {
-          "shape": "Sn2"
+          "shape": "Sx"
         },
         "ComplianceAssociatedStandardsId": {
-          "shape": "Sn2"
-        }
-      }
-    },
-    "Sn2": {
-      "type": "list",
-      "member": {
-        "type": "structure",
-        "members": {
-          "Value": {},
-          "Comparison": {}
-        }
-      }
-    },
-    "Sn5": {
-      "type": "list",
-      "member": {
-        "type": "structure",
-        "members": {
-          "Start": {},
-          "End": {},
-          "DateRange": {
-            "type": "structure",
-            "members": {
-              "Value": {
-                "type": "integer"
-              },
-              "Unit": {}
-            }
-          }
+          "shape": "Sx"
         }
       }
     },
-    "Sn9": {
-      "type": "list",
-      "member": {
-        "type": "structure",
-        "members": {
-          "Gte": {
-            "type": "double"
-          },
-          "Lte": {
-            "type": "double"
-          },
-          "Eq": {
-            "type": "double"
-          }
-        }
-      }
-    },
-    "Snb": {
-      "type": "list",
-      "member": {
-        "type": "structure",
-        "members": {
-          "Key": {},
-          "Value": {},
-          "Comparison": {}
-        }
-      }
-    },
-    "Sne": {
+    "So3": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -9310,7 +9713,7 @@
         }
       }
     },
-    "Snq": {
+    "Sof": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -9320,31 +9723,26 @@
         }
       }
     },
-    "Snt": {
+    "Soi": {
       "type": "list",
       "member": {}
     },
-    "So6": {
+    "Sov": {
       "type": "list",
       "member": {}
     },
-    "Spf": {
-      "type": "map",
-      "key": {},
-      "value": {}
-    },
-    "Spl": {
+    "Sq7": {
       "type": "structure",
       "members": {
         "AccountId": {},
         "InvitationId": {},
         "InvitedAt": {
-          "shape": "S11"
+          "shape": "S1p"
         },
         "MemberStatus": {}
       }
     },
-    "Sqj": {
+    "Sr5": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -9358,10 +9756,10 @@
           "AdministratorId": {},
           "MemberStatus": {},
           "InvitedAt": {
-            "shape": "S11"
+            "shape": "S1p"
           },
           "UpdatedAt": {
-            "shape": "S11"
+            "shape": "S1p"
           }
         }
       }