Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Bulk update of all dependencies #104

Merged
merged 4 commits into from
Aug 28, 2020
Merged

chore(deps): Bulk update of all dependencies #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e3b7f1
chore(deps): Update CDK version
Aug 28, 2020
b62c0ea
chore(deps): Remove awslint in favour of official package
Aug 28, 2020
ce95602
chore(deps): Update the remaining deps
Aug 28, 2020
502b743
Remove example from the build & change deps to match release
Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ updates:
- dependency-name: "@types/node"
versions: ">=11.0.0-0"
- dependency-name: "constructs"
versions: ">=3.0.2"
versions: ">=3.0.4"
- dependency-name: "@aws-cdk/*"
commit-message:
prefix: "chore(deps):"
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ rm -rf $BUILD_INDICATOR

echo "============================================================================================="
echo "building..."
time lerna run $bail --stream $runtarget || fail
time lerna run $bail --stream $runtarget --ignore 'all-in-farm**' || fail

touch $BUILD_INDICATOR
2 changes: 1 addition & 1 deletion examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

install_requires=[
"aws-cdk.core==1.57.0",
"aws-rfdk==0.16.0"
"aws-rfdk==0.17.0"
],

python_requires=">=3.7",
Expand Down
10 changes: 5 additions & 5 deletions examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
"watch": "tsc -w"
},
"devDependencies": {
"@types/node": "10.17.5",
"aws-cdk": "1.57.0",
"ts-node": "^8.1.0",
"typescript": "^3.8.3"
"@types/node": "^14.6.1",
"aws-cdk": "1.61.1",
"ts-node": "^9.0.0",
"typescript": "~3.9.7"
},
"dependencies": {
"@aws-cdk/core": "1.57.0",
"aws-rfdk": "0.17.0",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.19"
}
}
68 changes: 34 additions & 34 deletions integ/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,50 +54,50 @@
"pkglint": "pkglint -f"
},
"devDependencies": {
"@aws-cdk/assert": "1.57.0",
"@types/jest": "^26.0.4",
"@types/node": "^14.0.14",
"@typescript-eslint/eslint-plugin": "^3.5.0",
"@typescript-eslint/parser": "^3.5.0",
"aws-cdk": "1.57.0",
"eslint": "^7.4.0",
"@aws-cdk/assert": "1.61.1",
"@types/jest": "^26.0.10",
"@types/node": "^14.6.1",
"@typescript-eslint/eslint-plugin": "^3.10.1",
"@typescript-eslint/parser": "^3.10.1",
"aws-cdk": "1.61.1",
"eslint": "^7.7.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-import-resolver-typescript": "^2.0.0",
"eslint-import-resolver-typescript": "^2.2.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-license-header": "^0.2.0",
"jest": "^26.1.0",
"jest": "^26.4.2",
"pkglint": "0.17.0",
"ts-jest": "^26.1.3"
"ts-jest": "^26.2.0"
},
"dependencies": {
"@aws-cdk/aws-docdb": "1.57.0",
"@aws-cdk/aws-ec2": "1.57.0",
"@aws-cdk/aws-efs": "1.57.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.57.0",
"@aws-cdk/aws-iam": "1.57.0",
"@aws-cdk/aws-logs": "1.57.0",
"@aws-cdk/aws-route53": "1.57.0",
"@aws-cdk/aws-s3": "1.57.0",
"@aws-cdk/aws-s3-assets": "1.57.0",
"@aws-cdk/aws-secretsmanager": "1.57.0",
"@aws-cdk/core": "1.57.0",
"@aws-cdk/aws-docdb": "1.61.1",
"@aws-cdk/aws-ec2": "1.61.1",
"@aws-cdk/aws-efs": "1.61.1",
"@aws-cdk/aws-elasticloadbalancingv2": "1.61.1",
"@aws-cdk/aws-iam": "1.61.1",
"@aws-cdk/aws-logs": "1.61.1",
"@aws-cdk/aws-route53": "1.61.1",
"@aws-cdk/aws-s3": "1.61.1",
"@aws-cdk/aws-s3-assets": "1.61.1",
"@aws-cdk/aws-secretsmanager": "1.61.1",
"@aws-cdk/core": "1.61.1",
"aws-rfdk": "0.17.0",
"aws-sdk": "^2.709.0"
"aws-sdk": "^2.741.0"
},
"peerDependencies": {
"@aws-cdk/aws-docdb": "1.57.0",
"@aws-cdk/aws-ec2": "1.57.0",
"@aws-cdk/aws-efs": "1.57.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.57.0",
"@aws-cdk/aws-iam": "1.57.0",
"@aws-cdk/aws-logs": "1.57.0",
"@aws-cdk/aws-route53": "1.57.0",
"@aws-cdk/aws-s3": "1.57.0",
"@aws-cdk/aws-s3-assets": "1.57.0",
"@aws-cdk/aws-secretsmanager": "1.57.0",
"@aws-cdk/core": "1.57.0",
"@aws-cdk/aws-docdb": "1.61.1",
"@aws-cdk/aws-ec2": "1.61.1",
"@aws-cdk/aws-efs": "1.61.1",
"@aws-cdk/aws-elasticloadbalancingv2": "1.61.1",
"@aws-cdk/aws-iam": "1.61.1",
"@aws-cdk/aws-logs": "1.61.1",
"@aws-cdk/aws-route53": "1.61.1",
"@aws-cdk/aws-s3": "1.61.1",
"@aws-cdk/aws-s3-assets": "1.61.1",
"@aws-cdk/aws-secretsmanager": "1.61.1",
"@aws-cdk/core": "1.61.1",
"aws-rfdk": "0.17.0",
"aws-sdk": "^2.709.0"
"aws-sdk": "^2.741.0"
},
"engines": {
"node": ">= 10.13.0 <13 || >=13.7.0"
Expand Down
6 changes: 3 additions & 3 deletions lambda-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"stability": "stable",
"maturity": "stable",
"devDependencies": {
"@types/node": "^14.0.12",
"typescript": "~3.9.6"
"@types/node": "^14.6.1",
"typescript": "~3.9.7"
},
"dependencies": {
"aws-sdk": "^2.693.0"
"aws-sdk": "^2.741.0"
}
}
124 changes: 62 additions & 62 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,75 +26,75 @@
}
},
"devDependencies": {
"@aws-cdk/assets": "1.57.0",
"@aws-cdk/aws-apigateway": "1.57.0",
"@aws-cdk/aws-applicationautoscaling": "1.57.0",
"@aws-cdk/aws-autoscaling": "1.57.0",
"@aws-cdk/aws-autoscaling-common": "1.57.0",
"@aws-cdk/aws-autoscaling-hooktargets": "1.57.0",
"@aws-cdk/aws-batch": "1.57.0",
"@aws-cdk/aws-certificatemanager": "1.57.0",
"@aws-cdk/aws-cloudformation": "1.57.0",
"@aws-cdk/aws-cloudfront": "1.57.0",
"@aws-cdk/aws-cloudwatch": "1.57.0",
"@aws-cdk/aws-cloudwatch-actions": "1.57.0",
"@aws-cdk/aws-codebuild": "1.57.0",
"@aws-cdk/aws-codecommit": "1.57.0",
"@aws-cdk/aws-codeguruprofiler": "1.57.0",
"@aws-cdk/aws-codepipeline": "1.57.0",
"@aws-cdk/aws-cognito": "1.57.0",
"@aws-cdk/aws-docdb": "1.57.0",
"@aws-cdk/aws-dynamodb": "1.57.0",
"@aws-cdk/aws-ec2": "1.57.0",
"@aws-cdk/aws-ecr": "1.57.0",
"@aws-cdk/aws-ecr-assets": "1.57.0",
"@aws-cdk/aws-ecs": "1.57.0",
"@aws-cdk/aws-ecs-patterns": "1.57.0",
"@aws-cdk/aws-efs": "1.57.0",
"@aws-cdk/aws-elasticloadbalancing": "1.57.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.57.0",
"@aws-cdk/aws-events": "1.57.0",
"@aws-cdk/aws-events-targets": "1.57.0",
"@aws-cdk/aws-iam": "1.57.0",
"@aws-cdk/aws-kinesis": "1.57.0",
"@aws-cdk/aws-kms": "1.57.0",
"@aws-cdk/aws-lambda": "1.57.0",
"@aws-cdk/aws-logs": "1.57.0",
"@aws-cdk/aws-route53": "1.57.0",
"@aws-cdk/aws-route53-targets": "1.57.0",
"@aws-cdk/aws-s3": "1.57.0",
"@aws-cdk/aws-s3-assets": "1.57.0",
"@aws-cdk/aws-sam": "1.57.0",
"@aws-cdk/aws-secretsmanager": "1.57.0",
"@aws-cdk/aws-servicediscovery": "1.57.0",
"@aws-cdk/aws-sns": "1.57.0",
"@aws-cdk/aws-sns-subscriptions": "1.57.0",
"@aws-cdk/aws-sqs": "1.57.0",
"@aws-cdk/aws-ssm": "1.57.0",
"@aws-cdk/aws-stepfunctions": "1.57.0",
"@aws-cdk/cloud-assembly-schema": "1.57.0",
"@aws-cdk/core": "1.57.0",
"@aws-cdk/custom-resources": "1.57.0",
"@aws-cdk/cx-api": "1.57.0",
"@aws-cdk/region-info": "1.57.0",
"@types/jest": "^26.0.4",
"@types/node": "^14.0.14",
"@aws-cdk/assets": "1.61.1",
"@aws-cdk/aws-apigateway": "1.61.1",
"@aws-cdk/aws-applicationautoscaling": "1.61.1",
"@aws-cdk/aws-autoscaling": "1.61.1",
"@aws-cdk/aws-autoscaling-common": "1.61.1",
"@aws-cdk/aws-autoscaling-hooktargets": "1.61.1",
"@aws-cdk/aws-batch": "1.61.1",
"@aws-cdk/aws-certificatemanager": "1.61.1",
"@aws-cdk/aws-cloudformation": "1.61.1",
"@aws-cdk/aws-cloudfront": "1.61.1",
"@aws-cdk/aws-cloudwatch": "1.61.1",
"@aws-cdk/aws-cloudwatch-actions": "1.61.1",
"@aws-cdk/aws-codebuild": "1.61.1",
"@aws-cdk/aws-codecommit": "1.61.1",
"@aws-cdk/aws-codeguruprofiler": "1.61.1",
"@aws-cdk/aws-codepipeline": "1.61.1",
"@aws-cdk/aws-cognito": "1.61.1",
"@aws-cdk/aws-docdb": "1.61.1",
"@aws-cdk/aws-dynamodb": "1.61.1",
"@aws-cdk/aws-ec2": "1.61.1",
"@aws-cdk/aws-ecr": "1.61.1",
"@aws-cdk/aws-ecr-assets": "1.61.1",
"@aws-cdk/aws-ecs": "1.61.1",
"@aws-cdk/aws-ecs-patterns": "1.61.1",
"@aws-cdk/aws-efs": "1.61.1",
"@aws-cdk/aws-elasticloadbalancing": "1.61.1",
"@aws-cdk/aws-elasticloadbalancingv2": "1.61.1",
"@aws-cdk/aws-events": "1.61.1",
"@aws-cdk/aws-events-targets": "1.61.1",
"@aws-cdk/aws-iam": "1.61.1",
"@aws-cdk/aws-kinesis": "1.61.1",
"@aws-cdk/aws-kms": "1.61.1",
"@aws-cdk/aws-lambda": "1.61.1",
"@aws-cdk/aws-logs": "1.61.1",
"@aws-cdk/aws-route53": "1.61.1",
"@aws-cdk/aws-route53-targets": "1.61.1",
"@aws-cdk/aws-s3": "1.61.1",
"@aws-cdk/aws-s3-assets": "1.61.1",
"@aws-cdk/aws-sam": "1.61.1",
"@aws-cdk/aws-secretsmanager": "1.61.1",
"@aws-cdk/aws-servicediscovery": "1.61.1",
"@aws-cdk/aws-sns": "1.61.1",
"@aws-cdk/aws-sns-subscriptions": "1.61.1",
"@aws-cdk/aws-sqs": "1.61.1",
"@aws-cdk/aws-ssm": "1.61.1",
"@aws-cdk/aws-stepfunctions": "1.61.1",
"@aws-cdk/cloud-assembly-schema": "1.61.1",
"@aws-cdk/core": "1.61.1",
"@aws-cdk/custom-resources": "1.61.1",
"@aws-cdk/cx-api": "1.61.1",
"@aws-cdk/region-info": "1.61.1",
"@types/jest": "^26.0.10",
"@types/node": "^14.6.1",
"@types/nodeunit": "^0.0.31",
"aws-cdk": "1.57.0",
"aws-sdk": "^2.709.0",
"constructs": "^3.0.2",
"conventional-changelog-cli": "^2.0.34",
"aws-cdk": "1.61.1",
"aws-sdk": "^2.741.0",
"constructs": "^3.0.4",
"conventional-changelog-cli": "^2.1.0",
"fs-extra": "^9.0.1",
"jest": "^25.5.4",
"jest": "^26.4.2",
"jsii-diff": "^1.12.0",
"jsii-pacmak": "^1.12.0",
"jest-junit": "^11.0.1",
"jest-junit": "^11.1.0",
"lerna": "^3.22.1",
"nodeunit": "^0.11.3",
"nyc": "^15.1.0",
"standard-version": "^8.0.2",
"ts-jest": "^25.5.1",
"typescript": "~3.9.6"
"standard-version": "^9.0.0",
"ts-jest": "^26.2.0",
"typescript": "~3.9.7"
},
"workspaces": {
"packages": [
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-rfdk/lib/core/lib/cloudwatch-agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ export interface CloudWatchAgentProps {
* bucket to prevent an attacker from modifying the actions performed by these scripts. We strongly recommend that
* you either enable Amazon S3 server access logging on your CDK bootstrap bucket, or enable AWS CloudTrail on your
* account to assist in post-incident analysis of compromised production environments.
*
* @ResourcesDeployed
*/
export class CloudWatchAgent extends Construct {

Expand Down
2 changes: 0 additions & 2 deletions packages/aws-rfdk/lib/core/lib/exporting-log-group.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ export interface ExportingLogGroupProps {
* We strongly recommend that you either enable Amazon S3 server access logging on your CDK bootstrap bucket,
* or enable AWS CloudTrail on your account to assist in post-incident analysis of compromised production
* environments.
*
* @ResourcesDeployed
*/
export class ExportingLogGroup extends Construct {
/**
Expand Down
17 changes: 15 additions & 2 deletions packages/aws-rfdk/lib/core/lib/health-monitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
Duration,
IResource,
RemovalPolicy,
ResourceEnvironment,
Stack,
} from '@aws-cdk/core';
import {LoadBalancerFactory} from './load-balancer-manager';
Expand Down Expand Up @@ -212,6 +213,11 @@ abstract class HealthMonitorBase extends Construct implements IHealthMonitor {
*/
public abstract readonly stack: Stack;

/**
* The environment this resource belongs to.
*/
public abstract readonly env: ResourceEnvironment;

/**
* Attaches the load-balancing target to the ELB for instance-level
* monitoring.
Expand Down Expand Up @@ -281,8 +287,6 @@ abstract class HealthMonitorBase extends Construct implements IHealthMonitor {
* Notification Service (SNS) Topic that is created by this construct. Any principal that is able to publish notification
* to this SNS Topic can cause the Lambda to execute and reduce one of your worker fleets to zero instances. You should
* not grant any additional principals permissions to publish to this SNS Topic.
*
* @ResourcesDeployed
*/
export class HealthMonitor extends HealthMonitorBase {

Expand Down Expand Up @@ -345,6 +349,11 @@ export class HealthMonitor extends HealthMonitorBase {
*/
public readonly stack: Stack;

/**
* The environment this resource belongs to.
*/
public readonly env: ResourceEnvironment;

/**
* SNS topic for all unhealthy fleet notifications. This is triggered by
* the grace period and hard terminations alarms for the registered fleets.
Expand All @@ -364,6 +373,10 @@ export class HealthMonitor extends HealthMonitorBase {
constructor(scope: Construct, id: string, props: HealthMonitorProps) {
super(scope, id);
this.stack = Stack.of(scope);
this.env = {
account: this.stack.account,
region: this.stack.region,
};
this.props = props;

this.lbFactory = new LoadBalancerFactory(this, props.vpc);
Expand Down
8 changes: 6 additions & 2 deletions packages/aws-rfdk/lib/core/lib/imported-acm-certificate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
CustomResource,
Duration,
RemovalPolicy,
ResourceEnvironment,
Stack,
Tag,
Token,
Expand Down Expand Up @@ -89,8 +90,6 @@ export interface ImportedAcmCertificateProps {
* - The AWS Lambda for this construct also has broad IAM permissions to delete any Certificate that is stored
* in AWS Certificate Manager. You should not grant any additional actors/principals the ability to modify or
* execute this Lambda.
*
* @ResourcesDeployed
*/
export class ImportedAcmCertificate extends Construct implements ICertificate {
private static IMPORTER_UUID = '2d20d8f2-7b84-444e-b738-c75b499a9eaa';
Expand All @@ -100,6 +99,7 @@ export class ImportedAcmCertificate extends Construct implements ICertificate {
*/
public readonly certificateArn: string;
public readonly stack: Stack;
public readonly env: ResourceEnvironment;
// The DynamoDB Table that is used as a backing store for the CustomResource utilized in this construct.
protected readonly database: Table;
protected readonly uniqueTag: Tag;
Expand All @@ -108,6 +108,10 @@ export class ImportedAcmCertificate extends Construct implements ICertificate {
super(scope, id);

this.stack = Stack.of(this);
this.env = {
account: this.stack.account,
region: this.stack.region,
};

this.database = new Table(this, 'Table', {
partitionKey: { name: 'PhysicalId', type: AttributeType.STRING },
Expand Down
2 changes: 0 additions & 2 deletions packages/aws-rfdk/lib/core/lib/mongodb-installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ export interface MongoDbInstallerProps {
* bucket to prevent an attacker from modifying the actions performed by these scripts. We strongly recommend that
* you either enable Amazon S3 server access logging on your CDK bootstrap bucket, or enable AWS CloudTrail on your
* account to assist in post-incident analysis of compromised production environments.
*
* @ResourcesDeployed
*/
export class MongoDbInstaller {

Expand Down
Loading