Merge branch 'main' into update-aurora-engines

aws · Dec 29, 2023 · 24a062c · 24a062c
2 parents 76e364a + 9b466ae
commit 24a062c
Show file tree

Hide file tree

Showing 41 changed files with 2,130 additions and 182 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.17.0
+    hooks:
+      - id: gitleaks
diff --git a/...rk-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/aws-cdk-asg-integ.assets.json b/...rk-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/aws-cdk-asg-integ.assets.json
diff --git a/...-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/aws-cdk-asg-integ.template.json b/...-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/aws-cdk-asg-integ.template.json
@@ -716,6 +716,58 @@
     }
    }
   },
+  "AsgFromMipWithInstanceRequirementsASG8BFE597D": {
+   "Type": "AWS::AutoScaling::AutoScalingGroup",
+   "Properties": {
+    "DesiredCapacity": "5",
+    "MaxSize": "10",
+    "MinSize": "0",
+    "MixedInstancesPolicy": {
+     "LaunchTemplate": {
+      "LaunchTemplateSpecification": {
+       "LaunchTemplateId": {
+        "Ref": "MainLT4FC09097"
+       },
+       "Version": {
+        "Fn::GetAtt": [
+         "MainLT4FC09097",
+         "LatestVersionNumber"
+        ]
+       }
+      },
+      "Overrides": [
+       {
+        "InstanceRequirements": {
+         "CpuManufacturers": [
+          "intel"
+         ],
+         "MemoryMiB": {
+          "Min": 16384
+         },
+         "VCpuCount": {
+          "Max": 8,
+          "Min": 4
+         }
+        }
+       }
+      ]
+     }
+    },
+    "VPCZoneIdentifier": [
+     {
+      "Ref": "VPCPrivateSubnet1Subnet8BCA10E0"
+     },
+     {
+      "Ref": "VPCPrivateSubnet2SubnetCFCDAA7A"
+     }
+    ]
+   },
+   "UpdatePolicy": {
+    "AutoScalingScheduledAction": {
+     "IgnoreUnmodifiedGroupSizeProperties": true
+    }
+   }
+  },
   "AsgWithGp3BlockdeviceInstanceSecurityGroup54D76206": {
    "Type": "AWS::EC2::SecurityGroup",
    "Properties": {

diff --git a/...ws-cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/cdk.out b/...ws-cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/cdk.out
diff --git a/...cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/integ.json b/...cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/integ.json
diff --git a/...-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/manifest.json b/...-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/manifest.json