cdk-rds-sql 2.1.1 → 2.2.0

package/node_modules/aws-sdk/apis/macie2-2020-01-01.min.json

@@ -255,8 +255,8 @@
           }
         },
         "required": [
-          "name",
-          "regex"
+          "regex",
+          "name"
         ]
       },
       "output": {
@@ -675,6 +675,10 @@
                   "shape": "S2t",
                   "locationName": "jobDetails"
                 },
+                "lastAutomatedDiscoveryTime": {
+                  "shape": "S9",
+                  "locationName": "lastAutomatedDiscoveryTime"
+                },
                 "lastUpdated": {
                   "shape": "S9",
                   "locationName": "lastUpdated"
@@ -712,6 +716,10 @@
                     }
                   }
                 },
+                "sensitivityScore": {
+                  "locationName": "sensitivityScore",
+                  "type": "integer"
+                },
                 "serverSideEncryption": {
                   "locationName": "serverSideEncryption",
                   "type": "structure",
@@ -1123,6 +1131,43 @@
         }
       }
     },
+    "GetAutomatedDiscoveryConfiguration": {
+      "http": {
+        "method": "GET",
+        "requestUri": "/automated-discovery/configuration",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {}
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "classificationScopeId": {
+            "locationName": "classificationScopeId"
+          },
+          "disabledAt": {
+            "shape": "S4d",
+            "locationName": "disabledAt"
+          },
+          "firstEnabledAt": {
+            "shape": "S4d",
+            "locationName": "firstEnabledAt"
+          },
+          "lastUpdatedAt": {
+            "shape": "S4d",
+            "locationName": "lastUpdatedAt"
+          },
+          "sensitivityInspectionTemplateId": {
+            "locationName": "sensitivityInspectionTemplateId"
+          },
+          "status": {
+            "locationName": "status"
+          }
+        }
+      }
+    },
     "GetBucketStatistics": {
       "http": {
         "requestUri": "/datasources/s3/statistics",
@@ -1227,6 +1272,28 @@
               }
             }
           },
+          "bucketStatisticsBySensitivity": {
+            "locationName": "bucketStatisticsBySensitivity",
+            "type": "structure",
+            "members": {
+              "classificationError": {
+                "shape": "S4n",
+                "locationName": "classificationError"
+              },
+              "notClassified": {
+                "shape": "S4n",
+                "locationName": "notClassified"
+              },
+              "notSensitive": {
+                "shape": "S4n",
+                "locationName": "notSensitive"
+              },
+              "sensitive": {
+                "shape": "S4n",
+                "locationName": "sensitive"
+              }
+            }
+          },
           "classifiableObjectCount": {
             "locationName": "classifiableObjectCount",
             "type": "long"
@@ -1276,12 +1343,64 @@
         "type": "structure",
         "members": {
           "configuration": {
-            "shape": "S4i",
+            "shape": "S4q",
             "locationName": "configuration"
           }
         }
       }
     },
+    "GetClassificationScope": {
+      "http": {
+        "method": "GET",
+        "requestUri": "/classification-scopes/{id}",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "id": {
+            "location": "uri",
+            "locationName": "id"
+          }
+        },
+        "required": [
+          "id"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "id": {
+            "locationName": "id"
+          },
+          "name": {
+            "locationName": "name"
+          },
+          "s3": {
+            "locationName": "s3",
+            "type": "structure",
+            "members": {
+              "excludes": {
+                "locationName": "excludes",
+                "type": "structure",
+                "members": {
+                  "bucketNames": {
+                    "shape": "S4x",
+                    "locationName": "bucketNames"
+                  }
+                },
+                "required": [
+                  "bucketNames"
+                ]
+              }
+            },
+            "required": [
+              "excludes"
+            ]
+          }
+        }
+      }
+    },
     "GetCustomDataIdentifier": {
       "http": {
         "method": "GET",
@@ -1420,7 +1539,7 @@
             "locationName": "findingIds"
           },
           "sortCriteria": {
-            "shape": "S4u",
+            "shape": "S59",
             "locationName": "sortCriteria"
           }
         },
@@ -1492,7 +1611,7 @@
                                     "locationName": "name"
                                   },
                                   "occurrences": {
-                                    "shape": "S55",
+                                    "shape": "S5k",
                                     "locationName": "occurrences"
                                   }
                                 }
@@ -1527,7 +1646,7 @@
                                       "type": "long"
                                     },
                                     "occurrences": {
-                                      "shape": "S55",
+                                      "shape": "S5k",
                                       "locationName": "occurrences"
                                     },
                                     "type": {
@@ -1709,7 +1828,7 @@
                                   "locationName": "principalId"
                                 },
                                 "sessionContext": {
-                                  "shape": "S5x",
+                                  "shape": "S6c",
                                   "locationName": "sessionContext"
                                 }
                               }
@@ -1752,7 +1871,7 @@
                                   "locationName": "principalId"
                                 },
                                 "sessionContext": {
-                                  "shape": "S5x",
+                                  "shape": "S6c",
                                   "locationName": "sessionContext"
                                 }
                               }
@@ -1821,7 +1940,7 @@
                           "locationName": "createdAt"
                         },
                         "defaultServerSideEncryption": {
-                          "shape": "S68",
+                          "shape": "S6n",
                           "locationName": "defaultServerSideEncryption"
                         },
                         "name": {
@@ -1844,7 +1963,7 @@
                           "locationName": "publicAccess"
                         },
                         "tags": {
-                          "shape": "S6b",
+                          "shape": "S6q",
                           "locationName": "tags"
                         }
                       }
@@ -1877,7 +1996,7 @@
                           "type": "boolean"
                         },
                         "serverSideEncryption": {
-                          "shape": "S68",
+                          "shape": "S6n",
                           "locationName": "serverSideEncryption"
                         },
                         "size": {
@@ -1888,7 +2007,7 @@
                           "locationName": "storageClass"
                         },
                         "tags": {
-                          "shape": "S6b",
+                          "shape": "S6q",
                           "locationName": "tags"
                         },
                         "versionId": {
@@ -1999,7 +2118,7 @@
         "type": "structure",
         "members": {
           "securityHubConfiguration": {
-            "shape": "S6k",
+            "shape": "S6z",
             "locationName": "securityHubConfiguration"
           }
         }
@@ -2132,6 +2251,84 @@
         }
       }
     },
+    "GetResourceProfile": {
+      "http": {
+        "method": "GET",
+        "requestUri": "/resource-profiles",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "resourceArn": {
+            "location": "querystring",
+            "locationName": "resourceArn"
+          }
+        },
+        "required": [
+          "resourceArn"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "profileUpdatedAt": {
+            "shape": "S9",
+            "locationName": "profileUpdatedAt"
+          },
+          "sensitivityScore": {
+            "locationName": "sensitivityScore",
+            "type": "integer"
+          },
+          "sensitivityScoreOverridden": {
+            "locationName": "sensitivityScoreOverridden",
+            "type": "boolean"
+          },
+          "statistics": {
+            "locationName": "statistics",
+            "type": "structure",
+            "members": {
+              "totalBytesClassified": {
+                "locationName": "totalBytesClassified",
+                "type": "long"
+              },
+              "totalDetections": {
+                "locationName": "totalDetections",
+                "type": "long"
+              },
+              "totalDetectionsSuppressed": {
+                "locationName": "totalDetectionsSuppressed",
+                "type": "long"
+              },
+              "totalItemsClassified": {
+                "locationName": "totalItemsClassified",
+                "type": "long"
+              },
+              "totalItemsSensitive": {
+                "locationName": "totalItemsSensitive",
+                "type": "long"
+              },
+              "totalItemsSkipped": {
+                "locationName": "totalItemsSkipped",
+                "type": "long"
+              },
+              "totalItemsSkippedInvalidEncryption": {
+                "locationName": "totalItemsSkippedInvalidEncryption",
+                "type": "long"
+              },
+              "totalItemsSkippedInvalidKms": {
+                "locationName": "totalItemsSkippedInvalidKms",
+                "type": "long"
+              },
+              "totalItemsSkippedPermissionDenied": {
+                "locationName": "totalItemsSkippedPermissionDenied",
+                "type": "long"
+              }
+            }
+          }
+        }
+      }
+    },
     "GetRevealConfiguration": {
       "http": {
         "method": "GET",
@@ -2146,7 +2343,7 @@
         "type": "structure",
         "members": {
           "configuration": {
-            "shape": "S6v",
+            "shape": "S7d",
             "locationName": "configuration"
           }
         }
@@ -2233,6 +2430,47 @@
         }
       }
     },
+    "GetSensitivityInspectionTemplate": {
+      "http": {
+        "method": "GET",
+        "requestUri": "/templates/sensitivity-inspections/{id}",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "id": {
+            "location": "uri",
+            "locationName": "id"
+          }
+        },
+        "required": [
+          "id"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "description": {
+            "locationName": "description"
+          },
+          "excludes": {
+            "shape": "S7u",
+            "locationName": "excludes"
+          },
+          "includes": {
+            "shape": "S7v",
+            "locationName": "includes"
+          },
+          "name": {
+            "locationName": "name"
+          },
+          "sensitivityInspectionTemplateId": {
+            "locationName": "sensitivityInspectionTemplateId"
+          }
+        }
+      }
+    },
     "GetUsageStatistics": {
       "http": {
         "requestUri": "/usage/statistics",
@@ -2299,6 +2537,10 @@
                 "accountId": {
                   "locationName": "accountId"
                 },
+                "automatedDiscoveryFreeTrialStartDate": {
+                  "shape": "S9",
+                  "locationName": "automatedDiscoveryFreeTrialStartDate"
+                },
                 "freeTrialStartDate": {
                   "shape": "S9",
                   "locationName": "freeTrialStartDate"
@@ -2460,11 +2702,11 @@
             "type": "structure",
             "members": {
               "excludes": {
-                "shape": "S82",
+                "shape": "S8o",
                 "locationName": "excludes"
               },
               "includes": {
-                "shape": "S82",
+                "shape": "S8o",
                 "locationName": "includes"
               }
             }
@@ -2499,8 +2741,12 @@
             "member": {
               "type": "structure",
               "members": {
-                "bucketDefinitions": {
+                "bucketCriteria": {
                   "shape": "Sq",
+                  "locationName": "bucketCriteria"
+                },
+                "bucketDefinitions": {
+                  "shape": "S10",
                   "locationName": "bucketDefinitions"
                 },
                 "createdAt": {
@@ -2526,10 +2772,49 @@
                 "userPausedDetails": {
                   "shape": "S3j",
                   "locationName": "userPausedDetails"
+                }
+              }
+            }
+          },
+          "nextToken": {
+            "locationName": "nextToken"
+          }
+        }
+      }
+    },
+    "ListClassificationScopes": {
+      "http": {
+        "method": "GET",
+        "requestUri": "/classification-scopes",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "name": {
+            "location": "querystring",
+            "locationName": "name"
+          },
+          "nextToken": {
+            "location": "querystring",
+            "locationName": "nextToken"
+          }
+        }
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "classificationScopes": {
+            "locationName": "classificationScopes",
+            "type": "list",
+            "member": {
+              "type": "structure",
+              "members": {
+                "id": {
+                  "locationName": "id"
                 },
-                "bucketCriteria": {
-                  "shape": "S13",
-                  "locationName": "bucketCriteria"
+                "name": {
+                  "locationName": "name"
                 }
               }
             }
@@ -2611,7 +2896,7 @@
             "locationName": "nextToken"
           },
           "sortCriteria": {
-            "shape": "S4u",
+            "shape": "S59",
             "locationName": "sortCriteria"
           }
         }
@@ -2872,17 +3157,21 @@
         }
       }
     },
-    "ListTagsForResource": {
+    "ListResourceProfileArtifacts": {
       "http": {
         "method": "GET",
-        "requestUri": "/tags/{resourceArn}",
+        "requestUri": "/resource-profiles/artifacts",
         "responseCode": 200
       },
       "input": {
         "type": "structure",
         "members": {
+          "nextToken": {
+            "location": "querystring",
+            "locationName": "nextToken"
+          },
           "resourceArn": {
-            "location": "uri",
+            "location": "querystring",
             "locationName": "resourceArn"
           }
         },
@@ -2893,38 +3182,197 @@
       "output": {
         "type": "structure",
         "members": {
-          "tags": {
-            "shape": "Si",
-            "locationName": "tags"
+          "artifacts": {
+            "locationName": "artifacts",
+            "type": "list",
+            "member": {
+              "type": "structure",
+              "members": {
+                "arn": {
+                  "locationName": "arn"
+                },
+                "classificationResultStatus": {
+                  "locationName": "classificationResultStatus"
+                },
+                "sensitive": {
+                  "locationName": "sensitive",
+                  "type": "boolean"
+                }
+              },
+              "required": [
+                "classificationResultStatus",
+                "arn"
+              ]
+            }
+          },
+          "nextToken": {
+            "locationName": "nextToken"
           }
         }
       }
     },
-    "PutClassificationExportConfiguration": {
+    "ListResourceProfileDetections": {
       "http": {
-        "method": "PUT",
-        "requestUri": "/classification-export-configuration",
+        "method": "GET",
+        "requestUri": "/resource-profiles/detections",
         "responseCode": 200
       },
       "input": {
         "type": "structure",
         "members": {
-          "configuration": {
-            "shape": "S4i",
-            "locationName": "configuration"
+          "maxResults": {
+            "location": "querystring",
+            "locationName": "maxResults",
+            "type": "integer"
+          },
+          "nextToken": {
+            "location": "querystring",
+            "locationName": "nextToken"
+          },
+          "resourceArn": {
+            "location": "querystring",
+            "locationName": "resourceArn"
           }
         },
         "required": [
-          "configuration"
+          "resourceArn"
         ]
       },
       "output": {
         "type": "structure",
         "members": {
-          "configuration": {
-            "shape": "S4i",
-            "locationName": "configuration"
-          }
+          "detections": {
+            "locationName": "detections",
+            "type": "list",
+            "member": {
+              "type": "structure",
+              "members": {
+                "arn": {
+                  "locationName": "arn"
+                },
+                "count": {
+                  "locationName": "count",
+                  "type": "long"
+                },
+                "id": {
+                  "locationName": "id"
+                },
+                "name": {
+                  "locationName": "name"
+                },
+                "suppressed": {
+                  "locationName": "suppressed",
+                  "type": "boolean"
+                },
+                "type": {
+                  "locationName": "type"
+                }
+              }
+            }
+          },
+          "nextToken": {
+            "locationName": "nextToken"
+          }
+        }
+      }
+    },
+    "ListSensitivityInspectionTemplates": {
+      "http": {
+        "method": "GET",
+        "requestUri": "/templates/sensitivity-inspections",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "maxResults": {
+            "location": "querystring",
+            "locationName": "maxResults",
+            "type": "integer"
+          },
+          "nextToken": {
+            "location": "querystring",
+            "locationName": "nextToken"
+          }
+        }
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "nextToken": {
+            "locationName": "nextToken"
+          },
+          "sensitivityInspectionTemplates": {
+            "locationName": "sensitivityInspectionTemplates",
+            "type": "list",
+            "member": {
+              "type": "structure",
+              "members": {
+                "id": {
+                  "locationName": "id"
+                },
+                "name": {
+                  "locationName": "name"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "ListTagsForResource": {
+      "http": {
+        "method": "GET",
+        "requestUri": "/tags/{resourceArn}",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "resourceArn": {
+            "location": "uri",
+            "locationName": "resourceArn"
+          }
+        },
+        "required": [
+          "resourceArn"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "tags": {
+            "shape": "Si",
+            "locationName": "tags"
+          }
+        }
+      }
+    },
+    "PutClassificationExportConfiguration": {
+      "http": {
+        "method": "PUT",
+        "requestUri": "/classification-export-configuration",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "configuration": {
+            "shape": "S4q",
+            "locationName": "configuration"
+          }
+        },
+        "required": [
+          "configuration"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {
+          "configuration": {
+            "shape": "S4q",
+            "locationName": "configuration"
+          }
         }
       }
     },
@@ -2942,7 +3390,7 @@
             "idempotencyToken": true
           },
           "securityHubConfiguration": {
-            "shape": "S6k",
+            "shape": "S6z",
             "locationName": "securityHubConfiguration"
           }
         }
@@ -2965,11 +3413,11 @@
             "type": "structure",
             "members": {
               "excludes": {
-                "shape": "S98",
+                "shape": "Sac",
                 "locationName": "excludes"
               },
               "includes": {
-                "shape": "S98",
+                "shape": "Sac",
                 "locationName": "includes"
               }
             }
@@ -3032,6 +3480,10 @@
                       "shape": "S2t",
                       "locationName": "jobDetails"
                     },
+                    "lastAutomatedDiscoveryTime": {
+                      "shape": "S9",
+                      "locationName": "lastAutomatedDiscoveryTime"
+                    },
                     "objectCount": {
                       "locationName": "objectCount",
                       "type": "long"
@@ -3040,6 +3492,10 @@
                       "shape": "S2w",
                       "locationName": "objectCountByEncryptionType"
                     },
+                    "sensitivityScore": {
+                      "locationName": "sensitivityScore",
+                      "type": "integer"
+                    },
                     "sizeInBytes": {
                       "locationName": "sizeInBytes",
                       "type": "long"
@@ -3207,6 +3663,28 @@
         }
       }
     },
+    "UpdateAutomatedDiscoveryConfiguration": {
+      "http": {
+        "method": "PUT",
+        "requestUri": "/automated-discovery/configuration",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "status": {
+            "locationName": "status"
+          }
+        },
+        "required": [
+          "status"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {}
+      }
+    },
     "UpdateClassificationJob": {
       "http": {
         "method": "PATCH",
@@ -3234,6 +3712,55 @@
         "members": {}
       }
     },
+    "UpdateClassificationScope": {
+      "http": {
+        "method": "PATCH",
+        "requestUri": "/classification-scopes/{id}",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "id": {
+            "location": "uri",
+            "locationName": "id"
+          },
+          "s3": {
+            "locationName": "s3",
+            "type": "structure",
+            "members": {
+              "excludes": {
+                "locationName": "excludes",
+                "type": "structure",
+                "members": {
+                  "bucketNames": {
+                    "shape": "S4x",
+                    "locationName": "bucketNames"
+                  },
+                  "operation": {
+                    "locationName": "operation"
+                  }
+                },
+                "required": [
+                  "bucketNames",
+                  "operation"
+                ]
+              }
+            },
+            "required": [
+              "excludes"
+            ]
+          }
+        },
+        "required": [
+          "id"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {}
+      }
+    },
     "UpdateFindingsFilter": {
       "http": {
         "method": "PATCH",
@@ -3246,6 +3773,10 @@
           "action": {
             "locationName": "action"
           },
+          "clientToken": {
+            "locationName": "clientToken",
+            "idempotencyToken": true
+          },
           "description": {
             "locationName": "description"
           },
@@ -3263,10 +3794,6 @@
           "position": {
             "locationName": "position",
             "type": "integer"
-          },
-          "clientToken": {
-            "locationName": "clientToken",
-            "idempotencyToken": true
           }
         },
         "required": [
@@ -3357,6 +3884,71 @@
         "members": {}
       }
     },
+    "UpdateResourceProfile": {
+      "http": {
+        "method": "PATCH",
+        "requestUri": "/resource-profiles",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "resourceArn": {
+            "location": "querystring",
+            "locationName": "resourceArn"
+          },
+          "sensitivityScoreOverride": {
+            "locationName": "sensitivityScoreOverride",
+            "type": "integer"
+          }
+        },
+        "required": [
+          "resourceArn"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {}
+      }
+    },
+    "UpdateResourceProfileDetections": {
+      "http": {
+        "method": "PATCH",
+        "requestUri": "/resource-profiles/detections",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "resourceArn": {
+            "location": "querystring",
+            "locationName": "resourceArn"
+          },
+          "suppressDataIdentifiers": {
+            "locationName": "suppressDataIdentifiers",
+            "type": "list",
+            "member": {
+              "type": "structure",
+              "members": {
+                "id": {
+                  "locationName": "id"
+                },
+                "type": {
+                  "locationName": "type"
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "resourceArn"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {}
+      }
+    },
     "UpdateRevealConfiguration": {
       "http": {
         "method": "PUT",
@@ -3367,7 +3959,7 @@
         "type": "structure",
         "members": {
           "configuration": {
-            "shape": "S6v",
+            "shape": "S7d",
             "locationName": "configuration"
           }
         },
@@ -3379,11 +3971,45 @@
         "type": "structure",
         "members": {
           "configuration": {
-            "shape": "S6v",
+            "shape": "S7d",
             "locationName": "configuration"
           }
         }
       }
+    },
+    "UpdateSensitivityInspectionTemplate": {
+      "http": {
+        "method": "PUT",
+        "requestUri": "/templates/sensitivity-inspections/{id}",
+        "responseCode": 200
+      },
+      "input": {
+        "type": "structure",
+        "members": {
+          "description": {
+            "locationName": "description"
+          },
+          "excludes": {
+            "shape": "S7u",
+            "locationName": "excludes"
+          },
+          "id": {
+            "location": "uri",
+            "locationName": "id"
+          },
+          "includes": {
+            "shape": "S7v",
+            "locationName": "includes"
+          }
+        },
+        "required": [
+          "id"
+        ]
+      },
+      "output": {
+        "type": "structure",
+        "members": {}
+      }
     }
   },
   "shapes": {
@@ -3427,8 +4053,12 @@
     "Sp": {
       "type": "structure",
       "members": {
-        "bucketDefinitions": {
+        "bucketCriteria": {
           "shape": "Sq",
+          "locationName": "bucketCriteria"
+        },
+        "bucketDefinitions": {
+          "shape": "S10",
           "locationName": "bucketDefinitions"
         },
         "scoping": {
@@ -3436,41 +4066,31 @@
           "type": "structure",
           "members": {
             "excludes": {
-              "shape": "St",
+              "shape": "S13",
               "locationName": "excludes"
             },
             "includes": {
-              "shape": "St",
+              "shape": "S13",
               "locationName": "includes"
             }
           }
-        },
-        "bucketCriteria": {
-          "shape": "S13",
-          "locationName": "bucketCriteria"
         }
       }
     },
     "Sq": {
-      "type": "list",
-      "member": {
-        "type": "structure",
-        "members": {
-          "accountId": {
-            "locationName": "accountId"
-          },
-          "buckets": {
-            "shape": "S5",
-            "locationName": "buckets"
-          }
+      "type": "structure",
+      "members": {
+        "excludes": {
+          "shape": "Sr",
+          "locationName": "excludes"
         },
-        "required": [
-          "accountId",
-          "buckets"
-        ]
+        "includes": {
+          "shape": "Sr",
+          "locationName": "includes"
+        }
       }
     },
-    "St": {
+    "Sr": {
       "type": "structure",
       "members": {
         "and": {
@@ -3479,8 +4099,8 @@
           "member": {
             "type": "structure",
             "members": {
-              "simpleScopeTerm": {
-                "locationName": "simpleScopeTerm",
+              "simpleCriterion": {
+                "locationName": "simpleCriterion",
                 "type": "structure",
                 "members": {
                   "comparator": {
@@ -3495,16 +4115,13 @@
                   }
                 }
               },
-              "tagScopeTerm": {
-                "locationName": "tagScopeTerm",
+              "tagCriterion": {
+                "locationName": "tagCriterion",
                 "type": "structure",
                 "members": {
                   "comparator": {
                     "locationName": "comparator"
                   },
-                  "key": {
-                    "locationName": "key"
-                  },
                   "tagValues": {
                     "locationName": "tagValues",
                     "type": "list",
@@ -3519,9 +4136,6 @@
                         }
                       }
                     }
-                  },
-                  "target": {
-                    "locationName": "target"
                   }
                 }
               }
@@ -3530,20 +4144,26 @@
         }
       }
     },
-    "S13": {
-      "type": "structure",
-      "members": {
-        "excludes": {
-          "shape": "S14",
-          "locationName": "excludes"
+    "S10": {
+      "type": "list",
+      "member": {
+        "type": "structure",
+        "members": {
+          "accountId": {
+            "locationName": "accountId"
+          },
+          "buckets": {
+            "shape": "S5",
+            "locationName": "buckets"
+          }
         },
-        "includes": {
-          "shape": "S14",
-          "locationName": "includes"
-        }
+        "required": [
+          "accountId",
+          "buckets"
+        ]
       }
     },
-    "S14": {
+    "S13": {
       "type": "structure",
       "members": {
         "and": {
@@ -3552,8 +4172,8 @@
           "member": {
             "type": "structure",
             "members": {
-              "simpleCriterion": {
-                "locationName": "simpleCriterion",
+              "simpleScopeTerm": {
+                "locationName": "simpleScopeTerm",
                 "type": "structure",
                 "members": {
                   "comparator": {
@@ -3568,13 +4188,16 @@
                   }
                 }
               },
-              "tagCriterion": {
-                "locationName": "tagCriterion",
+              "tagScopeTerm": {
+                "locationName": "tagScopeTerm",
                 "type": "structure",
                 "members": {
                   "comparator": {
                     "locationName": "comparator"
                   },
+                  "key": {
+                    "locationName": "key"
+                  },
                   "tagValues": {
                     "locationName": "tagValues",
                     "type": "list",
@@ -3589,6 +4212,9 @@
                         }
                       }
                     }
+                  },
+                  "target": {
+                    "locationName": "target"
                   }
                 }
               }
@@ -3901,7 +4527,32 @@
         }
       }
     },
-    "S4i": {
+    "S4d": {
+      "type": "timestamp",
+      "timestampFormat": "iso8601"
+    },
+    "S4n": {
+      "type": "structure",
+      "members": {
+        "classifiableSizeInBytes": {
+          "locationName": "classifiableSizeInBytes",
+          "type": "long"
+        },
+        "publiclyAccessibleCount": {
+          "locationName": "publiclyAccessibleCount",
+          "type": "long"
+        },
+        "totalCount": {
+          "locationName": "totalCount",
+          "type": "long"
+        },
+        "totalSizeInBytes": {
+          "locationName": "totalSizeInBytes",
+          "type": "long"
+        }
+      }
+    },
+    "S4q": {
       "type": "structure",
       "members": {
         "s3Destination": {
@@ -3925,7 +4576,11 @@
         }
       }
     },
-    "S4u": {
+    "S4x": {
+      "type": "list",
+      "member": {}
+    },
+    "S59": {
       "type": "structure",
       "members": {
         "attributeName": {
@@ -3936,7 +4591,7 @@
         }
       }
     },
-    "S55": {
+    "S5k": {
       "type": "structure",
       "members": {
         "cells": {
@@ -3963,11 +4618,11 @@
           }
         },
         "lineRanges": {
-          "shape": "S58",
+          "shape": "S5n",
           "locationName": "lineRanges"
         },
         "offsetRanges": {
-          "shape": "S58",
+          "shape": "S5n",
           "locationName": "offsetRanges"
         },
         "pages": {
@@ -3977,11 +4632,11 @@
             "type": "structure",
             "members": {
               "lineRange": {
-                "shape": "S59",
+                "shape": "S5o",
                 "locationName": "lineRange"
               },
               "offsetRange": {
-                "shape": "S59",
+                "shape": "S5o",
                 "locationName": "offsetRange"
               },
               "pageNumber": {
@@ -4009,13 +4664,13 @@
         }
       }
     },
-    "S58": {
+    "S5n": {
       "type": "list",
       "member": {
-        "shape": "S59"
+        "shape": "S5o"
       }
     },
-    "S59": {
+    "S5o": {
       "type": "structure",
       "members": {
         "end": {
@@ -4032,7 +4687,7 @@
         }
       }
     },
-    "S5x": {
+    "S6c": {
       "type": "structure",
       "members": {
         "attributes": {
@@ -4072,7 +4727,7 @@
         }
       }
     },
-    "S68": {
+    "S6n": {
       "type": "structure",
       "members": {
         "encryptionType": {
@@ -4083,13 +4738,13 @@
         }
       }
     },
-    "S6b": {
+    "S6q": {
       "type": "list",
       "member": {
         "shape": "S3a"
       }
     },
-    "S6k": {
+    "S6z": {
       "type": "structure",
       "members": {
         "publishClassificationFindings": {
@@ -4106,7 +4761,7 @@
         "publishClassificationFindings"
       ]
     },
-    "S6v": {
+    "S7d": {
       "type": "structure",
       "members": {
         "kmsKeyId": {
@@ -4120,7 +4775,33 @@
         "status"
       ]
     },
-    "S82": {
+    "S7u": {
+      "type": "structure",
+      "members": {
+        "managedDataIdentifierIds": {
+          "shape": "S5",
+          "locationName": "managedDataIdentifierIds"
+        }
+      }
+    },
+    "S7v": {
+      "type": "structure",
+      "members": {
+        "allowListIds": {
+          "shape": "S5",
+          "locationName": "allowListIds"
+        },
+        "customDataIdentifierIds": {
+          "shape": "S5",
+          "locationName": "customDataIdentifierIds"
+        },
+        "managedDataIdentifierIds": {
+          "shape": "S5",
+          "locationName": "managedDataIdentifierIds"
+        }
+      }
+    },
+    "S8o": {
       "type": "list",
       "member": {
         "type": "structure",
@@ -4138,7 +4819,7 @@
         }
       }
     },
-    "S98": {
+    "Sac": {
       "type": "structure",
       "members": {
         "and": {