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

Jump to bottom

chore(deps): bumping cdk from 1.116.0 to 1.129.0 #618

Merged
merged 1 commit into from
Oct 22, 2021
Merged

chore(deps): bumping cdk from 1.116.0 to 1.129.0 #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions examples/deadline/All-In-AWS-Infrastructure-Basic/python/package/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ def __init__(self):
# to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.12"
self.deadline_version: Optional[str] = None

# A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 AMI ID
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID
# from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the version of
# Deadline used in any connected Deadline constructs.
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0c8431fc72742c110'}
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-04ae356533dc07fb5'}

# A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.
self.ubl_certificate_secret_arn: str =\
Expand Down
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 @@ -17,7 +17,7 @@
packages=setuptools.find_packages(where="package"),

install_requires=[
"aws-cdk.core==1.116.0",
"aws-cdk.core==1.129.0",
"aws-rfdk==0.37.0"
],

Expand Down
8 changes: 4 additions & 4 deletions examples/deadline/All-In-AWS-Infrastructure-Basic/ts/bin/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class AppConfig {
public readonly deadlineVersion?: string;

/**
* A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 AMI ID from us-west-2
* A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID from us-west-2
* is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the version of
* Deadline used in any connected Deadline constructs.
*/
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0c8431fc72742c110'};
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-04ae356533dc07fb5'};

/**
* (Optional) A secret (in binary form) in SecretsManager that stores the UBL certificates in a .zip file.
Expand All @@ -70,9 +70,9 @@ class AppConfig {

/**
* Whether to enable Deadline Secrets Management.
*/
*/
public readonly enableSecretsManagement: boolean = true;

/**
* A Secret in AWS SecretsManager that stores the admin credentials for Deadline Secrets Management.
* If not defined and Secrets Management is enabled, an AWS Secret with admin credentials will be generated.
Expand Down
12 changes: 6 additions & 6 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 @@ -13,14 +13,14 @@
"watch": "tsc -w"
},
"devDependencies": {
"@types/node": "^16.4.10",
"aws-cdk": "1.116.0",
"ts-node": "^9.1.1",
"typescript": "~4.3.5"
"@types/node": "^16.11.3",
"aws-cdk": "1.129.0",
"ts-node": "^10.3.1",
"typescript": "~4.4.4"
},
"dependencies": {
"@aws-cdk/core": "1.116.0",
"@aws-cdk/core": "1.129.0",
"aws-rfdk": "0.37.0",
"source-map-support": "^0.5.19"
"source-map-support": "^0.5.20"
}
}
4 changes: 2 additions & 2 deletions examples/deadline/All-In-AWS-Infrastructure-SEP/python/package/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class AppConfig:
TODO: Fill these in with your own values.
"""
def __init__(self):
# A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 AMI ID
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID
# from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
# should match the one used for staging the render queue and usage based licensing recipes.
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0c8431fc72742c110'}
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-04ae356533dc07fb5'}


config: AppConfig = AppConfig()
2 changes: 1 addition & 1 deletion examples/deadline/All-In-AWS-Infrastructure-SEP/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
packages=setuptools.find_packages(where="package"),

install_requires=[
"aws-cdk.core==1.116.0",
"aws-cdk.core==1.129.0",
"aws-rfdk==0.37.0"
],

Expand Down
4 changes: 2 additions & 2 deletions examples/deadline/All-In-AWS-Infrastructure-SEP/ts/bin/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import 'source-map-support/register';
*/
class AppConfig {
/**
* A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 AMI ID from us-west-2
* A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID from us-west-2
* is filled in. It can be used as-is, added to, or replaced.
*/
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0c8431fc72742c110'};
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-04ae356533dc07fb5'};
}

export const config = new AppConfig();
12 changes: 6 additions & 6 deletions examples/deadline/All-In-AWS-Infrastructure-SEP/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": "^16.4.10",
"aws-cdk": "1.116.0",
"ts-node": "^9.1.1",
"typescript": "~4.3.5"
"@types/node": "^16.11.3",
"aws-cdk": "1.129.0",
"ts-node": "^10.3.1",
"typescript": "~4.4.4"
},
"dependencies": {
"@aws-cdk/core": "1.116.0",
"@aws-cdk/core": "1.129.0",
"aws-rfdk": "0.37.0",
"source-map-support": "^0.5.19"
"source-map-support": "^0.5.20"
}
}
10 changes: 5 additions & 5 deletions examples/deadline/EC2-Image-Builder/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
packages=setuptools.find_packages(where="package"),

install_requires=[
"aws-cdk.aws-iam==1.116.0",
"aws-cdk.aws-imagebuilder==1.116.0",
"aws-cdk.aws-ec2==1.116.0",
"aws-cdk.aws-s3-assets==1.116.0",
"aws-cdk.core==1.116.0",
"aws-cdk.aws-iam==1.129.0",
"aws-cdk.aws-imagebuilder==1.129.0",
"aws-cdk.aws-ec2==1.129.0",
"aws-cdk.aws-s3-assets==1.129.0",
"aws-cdk.core==1.129.0",
"aws-rfdk==0.37.0",
],

Expand Down
18 changes: 9 additions & 9 deletions examples/deadline/EC2-Image-Builder/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"watch": "tsc -w"
},
"devDependencies": {
"@types/node": "^16.4.10",
"aws-cdk": "1.116.0",
"ts-node": "^9.1.1",
"typescript": "~4.3.5"
"@types/node": "^16.11.3",
"aws-cdk": "1.129.0",
"ts-node": "^10.3.1",
"typescript": "~4.4.4"
},
"dependencies": {
"@aws-cdk/aws-ec2": "1.116.0",
"@aws-cdk/aws-iam": "1.116.0",
"@aws-cdk/aws-imagebuilder": "1.116.0",
"@aws-cdk/aws-s3-assets": "1.116.0",
"@aws-cdk/core": "1.116.0",
"@aws-cdk/aws-ec2": "1.129.0",
"@aws-cdk/aws-iam": "1.129.0",
"@aws-cdk/aws-imagebuilder": "1.129.0",
"@aws-cdk/aws-s3-assets": "1.129.0",
"@aws-cdk/core": "1.129.0",
"aws-rfdk": "0.37.0"
}
}
7 changes: 4 additions & 3 deletions examples/deadline/Local-Zone/python/package/lib/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@ def __init__(self):

# The version of Deadline to use on the render farm. Leave as None for the latest release or specify a version
# to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.16"
self.deadline_version: Optional[str] = '10.1.16'
# The default value of 10.1.19 is used, to match the worker AMI ID provided below
self.deadline_version: Optional[str] = '10.1.19'

# A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.16.8 AMI ID
# A map of regions to Deadline Client Linux AMIs. As an example, the base Linux Deadline 10.1.19.4 AMI ID
# from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
# should match the one used for staging the render queue and usage based licensing recipes.
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0aa3610842bc3534d'}
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-04ae356533dc07fb5'}

# (Optional) The name of the EC2 keypair to associate with the instances.
self.key_pair_name: Optional[str] = None
Expand Down
10 changes: 5 additions & 5 deletions examples/deadline/Local-Zone/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
packages=setuptools.find_packages(where="package"),

install_requires=[
"aws-cdk.aws-ec2==1.116.0",
"aws-cdk.aws-elasticloadbalancingv2==1.116.0",
"aws-cdk.aws-route53==1.116.0",
"aws-cdk.core==1.116.0",
"aws-cdk.aws-ec2==1.129.0",
"aws-cdk.aws-elasticloadbalancingv2==1.129.0",
"aws-cdk.aws-route53==1.129.0",
"aws-cdk.core==1.129.0",
"aws-rfdk==0.37.0",
"jsii==1.31.0",
"jsii==1.40.0",
],

python_requires=">=3.7",
Expand Down
8 changes: 4 additions & 4 deletions examples/deadline/Local-Zone/ts/bin/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ class AppConfig {
/**
* The version of Deadline to use on the render farm. Some examples of pinned version values are "10", "10.1", or
* "10.1.16"
* @default 10.1.16 is used, to match the worker AMI ID provided below
* @default 10.1.19 is used, to match the worker AMI ID provided below
*/
public readonly deadlineVersion: string = '10.1.16';
public readonly deadlineVersion: string = '10.1.19';

/**
* A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.16.8 AMI ID from us-west-2
* A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.19.4 AMI ID from us-west-2
* is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the one in
* package.json used for staging the render queue and usage based licensing recipes.
*/
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0aa3610842bc3534d'};
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-04ae356533dc07fb5'};

/**
* (Optional) The name of the EC2 keypair to associate with instances.
Expand Down
18 changes: 9 additions & 9 deletions examples/deadline/Local-Zone/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
"watch": "tsc -w"
},
"devDependencies": {
"@types/node": "^16.4.10",
"aws-cdk": "1.116.0",
"ts-node": "^9.1.1",
"typescript": "~4.3.5"
"@types/node": "^16.11.3",
"aws-cdk": "1.129.0",
"ts-node": "^10.3.1",
"typescript": "~4.4.4"
},
"dependencies": {
"@aws-cdk/aws-ec2": "1.116.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.116.0",
"@aws-cdk/aws-route53": "1.116.0",
"@aws-cdk/core": "1.116.0",
"@aws-cdk/aws-ec2": "1.129.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.129.0",
"@aws-cdk/aws-route53": "1.129.0",
"@aws-cdk/core": "1.129.0",
"aws-rfdk": "0.37.0",
"source-map-support": "^0.5.19"
"source-map-support": "^0.5.20"
}
}
87 changes: 44 additions & 43 deletions integ/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,56 +55,57 @@
"pkglint": "pkglint -f"
},
"devDependencies": {
"@aws-cdk/assert": "1.116.0",
"@types/jest": "^26.0.24",
"@types/node": "^16.4.10",
"@typescript-eslint/eslint-plugin": "^4.28.4",
"@typescript-eslint/parser": "^4.28.4",
"aws-cdk": "1.116.0",
"eslint": "^7.31.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-import-resolver-typescript": "^2.4.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-license-header": "^0.2.0",
"jest": "^26.6.3",
"@aws-cdk/assert": "1.129.0",
"@types/jest": "^27.0.2",
"@types/node": "^16.11.3",
"@typescript-eslint/eslint-plugin": "^5.1.0",
"@typescript-eslint/parser": "^5.1.0",
"aws-cdk": "1.129.0",
"eslint": "^8.0.1",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^2.5.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-license-header": "^0.2.1",
"jest": "^27.3.1",
"pkglint": "0.37.0",
"ts-jest": "^26.5.6",
"typescript": "~4.3.5"
"ts-jest": "^27.0.7",
"typescript": "~4.4.4"
},
"dependencies": {
"@aws-cdk/aws-autoscaling": "1.116.0",
"@aws-cdk/aws-docdb": "1.116.0",
"@aws-cdk/aws-ec2": "1.116.0",
"@aws-cdk/aws-ecr": "1.116.0",
"@aws-cdk/aws-ecs": "1.116.0",
"@aws-cdk/aws-efs": "1.116.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.116.0",
"@aws-cdk/aws-iam": "1.116.0",
"@aws-cdk/aws-logs": "1.116.0",
"@aws-cdk/aws-route53": "1.116.0",
"@aws-cdk/aws-s3": "1.116.0",
"@aws-cdk/aws-s3-assets": "1.116.0",
"@aws-cdk/aws-secretsmanager": "1.116.0",
"@aws-cdk/core": "1.116.0",
"@aws-cdk/aws-autoscaling": "1.129.0",
"@aws-cdk/aws-docdb": "1.129.0",
"@aws-cdk/aws-ec2": "1.129.0",
"@aws-cdk/aws-ecr": "1.129.0",
"@aws-cdk/aws-ecs": "1.129.0",
"@aws-cdk/aws-efs": "1.129.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.129.0",
"@aws-cdk/aws-iam": "1.129.0",
"@aws-cdk/aws-logs": "1.129.0",
"@aws-cdk/aws-route53": "1.129.0",
"@aws-cdk/aws-s3": "1.129.0",
"@aws-cdk/aws-s3-assets": "1.129.0",
"@aws-cdk/aws-secretsmanager": "1.129.0",
"@aws-cdk/core": "1.129.0",
"aws-rfdk": "0.37.0",
"aws-sdk": "^2.959.0"
"aws-sdk": "^2.1012.0"
},
"peerDependencies": {
"@aws-cdk/aws-docdb": "1.116.0",
"@aws-cdk/aws-ec2": "1.116.0",
"@aws-cdk/aws-ecr": "1.116.0",
"@aws-cdk/aws-ecs": "1.116.0",
"@aws-cdk/aws-efs": "1.116.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.116.0",
"@aws-cdk/aws-iam": "1.116.0",
"@aws-cdk/aws-logs": "1.116.0",
"@aws-cdk/aws-route53": "1.116.0",
"@aws-cdk/aws-s3": "1.116.0",
"@aws-cdk/aws-s3-assets": "1.116.0",
"@aws-cdk/aws-secretsmanager": "1.116.0",
"@aws-cdk/core": "1.116.0",
"@aws-cdk/aws-autoscaling": "1.129.0",
"@aws-cdk/aws-docdb": "1.129.0",
"@aws-cdk/aws-ec2": "1.129.0",
"@aws-cdk/aws-ecr": "1.129.0",
"@aws-cdk/aws-ecs": "1.129.0",
"@aws-cdk/aws-efs": "1.129.0",
"@aws-cdk/aws-elasticloadbalancingv2": "1.129.0",
"@aws-cdk/aws-iam": "1.129.0",
"@aws-cdk/aws-logs": "1.129.0",
"@aws-cdk/aws-route53": "1.129.0",
"@aws-cdk/aws-s3": "1.129.0",
"@aws-cdk/aws-s3-assets": "1.129.0",
"@aws-cdk/aws-secretsmanager": "1.129.0",
"@aws-cdk/core": "1.129.0",
"aws-rfdk": "0.37.0",
"aws-sdk": "^2.959.0"
"aws-sdk": "^2.1012.0"
},
"engines": {
"node": ">= 12.18.3 <13 || >=13.7.0"
Expand Down
4 changes: 2 additions & 2 deletions integ/scripts/node/stack-order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ async function main() {
let args: ProgramArguments;
try {
args = parseProgramArguments();
} catch(e) {
} catch(e: any) {
console.error(e.toString());
console.error(usage());
process.exit(1);
Expand All @@ -254,7 +254,7 @@ async function main() {
// Parse the JSON and cast to a Manifest
try {
manifest = JSON.parse(manifestRaw) as Manifest;
} catch (e) {
} catch (e: any) {
throw new Error(`${args.manifestPath} is not a valid JSON file`);
}

Expand Down
Loading