Merge branch 'main' into scottrobinson03/fix-httpatasource-props-type

aws · Dec 4, 2024 · 3d6583f · 3d6583f
2 parents 85545aa + c5bcfdc
commit 3d6583f
Show file tree

Hide file tree

Showing 38 changed files with 1,175 additions and 114 deletions.
diff --git a/...ool-client-explicit-props.js.snapshot/integ-user-pool-client-explicit-props.template.json b/...ool-client-explicit-props.js.snapshot/integ-user-pool-client-explicit-props.template.json
@@ -66,6 +66,7 @@
      "ALLOW_ADMIN_USER_PASSWORD_AUTH",
      "ALLOW_CUSTOM_AUTH",
      "ALLOW_USER_SRP_AUTH",
+     "ALLOW_USER_AUTH",
      "ALLOW_REFRESH_TOKEN_AUTH"
     ],
     "GenerateSecret": true,

diff --git a/...k-integ/test/aws-cognito/test/integ.user-pool-client-explicit-props.js.snapshot/tree.json b/...k-integ/test/aws-cognito/test/integ.user-pool-client-explicit-props.js.snapshot/tree.json
diff --git a/...dk-testing/framework-integ/test/aws-cognito/test/integ.user-pool-client-explicit-props.ts b/...dk-testing/framework-integ/test/aws-cognito/test/integ.user-pool-client-explicit-props.ts
@@ -20,6 +20,7 @@ const client = userpool.addClient('myuserpoolclient', {
     custom: true,
     userPassword: true,
     userSrp: true,
+    user: true,
   },
   generateSecret: true,
   oAuth: {

diff --git a/...ationSetOverridingSuppressionListSettingsIntegDefaultTestDeployAssert41D23FD8.assets.json b/...ationSetOverridingSuppressionListSettingsIntegDefaultTestDeployAssert41D23FD8.assets.json
diff --git a/...ionSetOverridingSuppressionListSettingsIntegDefaultTestDeployAssert41D23FD8.template.json b/...ionSetOverridingSuppressionListSettingsIntegDefaultTestDeployAssert41D23FD8.template.json
diff --git a/...tings.js.snapshot/cdk-ses-configuration-set-overriding-suppression-list-integ.assets.json b/...tings.js.snapshot/cdk-ses-configuration-set-overriding-suppression-list-integ.assets.json
diff --git a/...ngs.js.snapshot/cdk-ses-configuration-set-overriding-suppression-list-integ.template.json b/...ngs.js.snapshot/cdk-ses-configuration-set-overriding-suppression-list-integ.template.json
@@ -0,0 +1,77 @@
+{
+ "Resources": {
+  "DisableSuppressionList6B7ABFBF": {
+   "Type": "AWS::SES::ConfigurationSet",
+   "Properties": {
+    "SuppressionOptions": {
+     "SuppressedReasons": []
+    }
+   }
+  },
+  "OverrideSuppressionReasonsToBouncesOnly1280FADA": {
+   "Type": "AWS::SES::ConfigurationSet",
+   "Properties": {
+    "SuppressionOptions": {
+     "SuppressedReasons": [
+      "BOUNCE"
+     ]
+    }
+   }
+  },
+  "OverrideSuppressionReasonsToComplaintsOnly8F770ED6": {
+   "Type": "AWS::SES::ConfigurationSet",
+   "Properties": {
+    "SuppressionOptions": {
+     "SuppressedReasons": [
+      "COMPLAINT"
+     ]
+    }
+   }
+  },
+  "OverrideSuppressionReasonsToBouncesAndComplaints27254E32": {
+   "Type": "AWS::SES::ConfigurationSet",
+   "Properties": {
+    "SuppressionOptions": {
+     "SuppressedReasons": [
+      "BOUNCE",
+      "COMPLAINT"
+     ]
+    }
+   }
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/...s-ses/test/integ.configuration-set-override-suppression-list-settings.js.snapshot/cdk.out b/...s-ses/test/integ.configuration-set-override-suppression-list-settings.js.snapshot/cdk.out
diff --git a/...es/test/integ.configuration-set-override-suppression-list-settings.js.snapshot/integ.json b/...es/test/integ.configuration-set-override-suppression-list-settings.js.snapshot/integ.json
diff --git a/...test/integ.configuration-set-override-suppression-list-settings.js.snapshot/manifest.json b/...test/integ.configuration-set-override-suppression-list-settings.js.snapshot/manifest.json