Skip to content

Commit

Permalink
Merge branch 'main' into sagemaker-l2-model
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Nov 9, 2022
2 parents 38326c7 + 834fab4 commit d82d8c6
Show file tree
Hide file tree
Showing 79 changed files with 6,182 additions and 665 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
"devDependencies": {
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"cdk-generate-synthetic-examples": "^0.1.43",
"cdk-generate-synthetic-examples": "^0.1.57",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.10",
"jest-junit": "^13.2.0",
"jsii-diff": "1.69.0",
"jsii-pacmak": "1.69.0",
"jsii-reflect": "1.69.0",
"jsii-rosetta": "1.69.0",
"jsii-diff": "1.71.0",
"jsii-pacmak": "1.71.0",
"jsii-reflect": "1.71.0",
"jsii-rosetta": "1.71.0",
"lerna": "^4.0.0",
"patch-package": "^6.5.0",
"semver": "^6.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.186",
"@types/lodash": "^4.14.188",
"jest": "^27.5.1",
"lodash": "^4.17.21"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Vpc } from '@aws-cdk/aws-ec2';
import { Cluster, ContainerImage } from '@aws-cdk/aws-ecs';
import { App, Stack } from '@aws-cdk/core';
import * as cxapi from '@aws-cdk/cx-api';
import * as integ from '@aws-cdk/integ-tests';
import { ApplicationLoadBalancedFargateService } from '../../lib';

const app = new App();
const app = new App({ postCliContext: { [cxapi.ECS_DISABLE_EXPLICIT_DEPLOYMENT_CONTROLLER_FOR_CIRCUIT_BREAKER]: false } });
const stack = new Stack(app, 'aws-ecs-integ-circuit-breaker');
const vpc = new Vpc(stack, 'Vpc', { maxAzs: 2 });
const cluster = new Cluster(stack, 'Cluster', { vpc });
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "21.0.0",
"files": {
"4eec79ee498cc4b9ae0a8ad419511759b90d72d3a3cb5bd018e5e137f050cfae": {
"source": {
"path": "aws-ecs-integ-circuit-breaker-no-dc.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "4eec79ee498cc4b9ae0a8ad419511759b90d72d3a3cb5bd018e5e137f050cfae.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
Loading

0 comments on commit d82d8c6

Please sign in to comment.