Merge branch 'main' into s3-skip-notification-destination-validation

aws · Aug 19, 2024 · 26b21e1 · 26b21e1
2 parents 29a46df + c1c800e
commit 26b21e1
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 0 deletions.
diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/lib/target-tracking-scaling-policy.ts
@@ -304,4 +304,19 @@ export enum PredefinedMetric {
  * @see https://docs.aws.amazon.com/autoscaling/application/APIReference/API_PredefinedMetricSpecification.html
  */
  ELASTICACHE_DATABASE_CAPACITY_USAGE_COUNTED_FOR_EVICT_PERCENTAGE = 'ElastiCacheDatabaseCapacityUsageCountedForEvictPercentage',
+ /**
+ * SAGEMAKER_INFERENCE_COMPONENT_CONCURRENT_REQUESTS_PER_COPY_HIGH_RESOLUTION
+ * @see https://docs.aws.amazon.com/autoscaling/application/APIReference/API_PredefinedMetricSpecification.html
+ */
+ SAGEMAKER_INFERENCE_COMPONENT_CONCURRENT_REQUESTS_PER_COPY_HIGH_RESOLUTION = 'SageMakerInferenceComponentConcurrentRequestsPerCopyHighResolution',
+ /**
+ * SAGEMAKER_VARIANT_CONCURRENT_REQUESTS_PER_MODEL_HIGH_RESOLUTION
+ * @see https://docs.aws.amazon.com/autoscaling/application/APIReference/API_PredefinedMetricSpecification.html
+ */
+ SAGEMAKER_VARIANT_CONCURRENT_REQUESTS_PER_MODEL_HIGH_RESOLUTION = 'SageMakerVariantConcurrentRequestsPerModelHighResolution',
+ /**
+ * WORKSPACES_AVERAGE_USER_SESSIONS_CAPACITY_UTILIZATION
+ * @see https://docs.aws.amazon.com/autoscaling/application/APIReference/API_PredefinedMetricSpecification.html
+ */
+ WORKSPACES_AVERAGE_USER_SESSIONS_CAPACITY_UTILIZATION = 'WorkSpacesAverageUserSessionsCapacityUtilization',
 }
diff --git a/packages/aws-cdk-lib/aws-applicationautoscaling/test/target-tracking.test.ts b/packages/aws-cdk-lib/aws-applicationautoscaling/test/target-tracking.test.ts
@@ -91,6 +91,66 @@ describe('target tracking', () => {
  });
  });
 
+ test('test setup target tracking on predefined metric for SAGEMAKER_VARIANT_CONCURRENT_REQUESTS_PER_MODEL_HIGH_RESOLUTION', () => {
+ // GIVEN
+ const stack = new cdk.Stack();
+ const target = createScalableTarget(stack);
+
+ // WHEN
+ target.scaleToTrackMetric('Tracking', {
+ predefinedMetric: appscaling.PredefinedMetric.SAGEMAKER_VARIANT_CONCURRENT_REQUESTS_PER_MODEL_HIGH_RESOLUTION,
+ targetValue: 0.5,
+ });
+
+ // THEN
+ Template.fromStack(stack).hasResourceProperties('AWS::ApplicationAutoScaling::ScalingPolicy', {
+ TargetTrackingScalingPolicyConfiguration: {
+ PredefinedMetricSpecification: { PredefinedMetricType: 'SageMakerVariantConcurrentRequestsPerModelHighResolution' },
+ TargetValue: 0.5,
+ },
+ });
+ });
+
+ test('test setup target tracking on predefined metric for SAGEMAKER_INFERENCE_COMPONENT_CONCURRENT_REQUESTS_PER_COPY_HIGH_RESOLUTION', () => {
+ // GIVEN
+ const stack = new cdk.Stack();
+ const target = createScalableTarget(stack);
+
+ // WHEN
+ target.scaleToTrackMetric('Tracking', {
+ predefinedMetric: appscaling.PredefinedMetric.SAGEMAKER_INFERENCE_COMPONENT_CONCURRENT_REQUESTS_PER_COPY_HIGH_RESOLUTION,
+ targetValue: 0.5,
+ });
+
+ // THEN
+ Template.fromStack(stack).hasResourceProperties('AWS::ApplicationAutoScaling::ScalingPolicy', {
+ TargetTrackingScalingPolicyConfiguration: {
+ PredefinedMetricSpecification: { PredefinedMetricType: 'SageMakerInferenceComponentConcurrentRequestsPerCopyHighResolution' },
+ TargetValue: 0.5,
+ },
+ });
+ });
+
+ test('test setup target tracking on predefined metric for WORKSPACES_AVERAGE_USER_SESSIONS_CAPACITY_UTILIZATION', () => {
+ // GIVEN
+ const stack = new cdk.Stack();
+ const target = createScalableTarget(stack);
+
+ // WHEN
+ target.scaleToTrackMetric('Tracking', {
+ predefinedMetric: appscaling.PredefinedMetric.WORKSPACES_AVERAGE_USER_SESSIONS_CAPACITY_UTILIZATION,
+ targetValue: 0.5,
+ });
+
+ // THEN
+ Template.fromStack(stack).hasResourceProperties('AWS::ApplicationAutoScaling::ScalingPolicy', {
+ TargetTrackingScalingPolicyConfiguration: {
+ PredefinedMetricSpecification: { PredefinedMetricType: 'WorkSpacesAverageUserSessionsCapacityUtilization' },
+ TargetValue: 0.5,
+ },
+ });
+ });
+
  test('test setup target tracking on custom metric', () => {
  // GIVEN
  const stack = new cdk.Stack();