From ea357fa4987bb1393344b31a946158cec258a2a8 Mon Sep 17 00:00:00 2001 From: Josh Usiskin Date: Fri, 16 Oct 2020 16:48:27 +0000 Subject: [PATCH 1/3] fix(deadline): remove requirement of aws-sdk in stage-deadline (#181) --- packages/aws-rfdk/bin/stage-deadline.ts | 7 ++++++- .../lib/core/lambdas/nodejs/lib/version-provider/index.ts | 6 ++++++ .../version-provider/test/version-provider.test.ts | 0 .../nodejs/{ => lib}/version-provider/version-provider.ts | 0 .../lib/core/lambdas/nodejs/version-provider/handler.ts | 2 +- .../lib/core/lambdas/nodejs/version-provider/index.ts | 1 - 6 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/index.ts rename packages/aws-rfdk/lib/core/lambdas/nodejs/{ => lib}/version-provider/test/version-provider.test.ts (100%) rename packages/aws-rfdk/lib/core/lambdas/nodejs/{ => lib}/version-provider/version-provider.ts (100%) diff --git a/packages/aws-rfdk/bin/stage-deadline.ts b/packages/aws-rfdk/bin/stage-deadline.ts index fb9d2cdbe..3f4f843f1 100644 --- a/packages/aws-rfdk/bin/stage-deadline.ts +++ b/packages/aws-rfdk/bin/stage-deadline.ts @@ -12,7 +12,12 @@ import * as fs from 'fs'; import * as path from 'path'; import * as url from 'url'; import { types } from 'util'; -import {IUris, Platform, Product, VersionProvider } from '../lib/core/lambdas/nodejs/version-provider'; +import { + IUris, + Platform, + Product, + VersionProvider, +} from '../lib/core/lambdas/nodejs/lib/version-provider'; import { Version } from '../lib/deadline'; const args = process.argv.slice(2); diff --git a/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/index.ts b/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/index.ts new file mode 100644 index 000000000..180ad2437 --- /dev/null +++ b/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/index.ts @@ -0,0 +1,6 @@ +/** + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +export * from './version-provider'; diff --git a/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/test/version-provider.test.ts b/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/test/version-provider.test.ts similarity index 100% rename from packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/test/version-provider.test.ts rename to packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/test/version-provider.test.ts diff --git a/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/version-provider.ts b/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/version-provider.ts similarity index 100% rename from packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/version-provider.ts rename to packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/version-provider.ts diff --git a/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/handler.ts b/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/handler.ts index b8cca78d9..dccb8482f 100644 --- a/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/handler.ts +++ b/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/handler.ts @@ -12,7 +12,7 @@ import { IVersionProviderProperties, IVersionedUris, Platform, -} from './version-provider'; +} from '../lib/version-provider'; export class VersionProviderResource extends SimpleCustomResource { diff --git a/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/index.ts b/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/index.ts index 9b8a8b5eb..761a8c9dd 100644 --- a/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/index.ts +++ b/packages/aws-rfdk/lib/core/lambdas/nodejs/version-provider/index.ts @@ -4,4 +4,3 @@ */ export * from './handler'; -export * from './version-provider'; From 01e4997942602e2027f0334aa7aa2779a3d763b9 Mon Sep 17 00:00:00 2001 From: Josh Usiskin Date: Fri, 16 Oct 2020 16:50:01 +0000 Subject: [PATCH 2/3] fix(deadline): use HTTPS to download index (#181) --- .../lambdas/nodejs/lib/version-provider/version-provider.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/version-provider.ts b/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/version-provider.ts index 6a27d2dd0..7f9b76a8a 100644 --- a/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/version-provider.ts +++ b/packages/aws-rfdk/lib/core/lambdas/nodejs/lib/version-provider/version-provider.ts @@ -7,6 +7,7 @@ import * as fs from 'fs'; import * as http from 'http'; +import * as https from 'https'; import * as url from 'url'; export enum Platform { @@ -154,7 +155,7 @@ export class VersionProvider { }; return new Promise((resolve, reject) => { - http.get(options, (res: http.IncomingMessage) => { + https.get(options, (res: http.IncomingMessage) => { let json = ''; res.on('data', (chunk: any) => { From 0626dc9d5ff30271d97008189dc18e9345d9842a Mon Sep 17 00:00:00 2001 From: Josh Usiskin Date: Fri, 16 Oct 2020 16:54:06 +0000 Subject: [PATCH 3/3] chore(release): 0.18.1 (#181) --- CHANGELOG.md | 8 ++++++++ .../All-In-AWS-Infrastructure-Basic/python/setup.py | 4 ++-- .../All-In-AWS-Infrastructure-Basic/ts/package.json | 4 ++-- integ/package.json | 8 ++++---- lambda-layers/package.json | 2 +- lerna.json | 2 +- package.json | 2 +- packages/aws-rfdk/package.json | 6 +++--- tools/cdk-build-tools/package.json | 4 ++-- tools/pkglint/package.json | 2 +- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee16af82a..f132a4738 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.18.1](https://github.com/aws/aws-rfdk/compare/v0.18.0...v0.18.1) (2020-10-16) + + +### Bug Fixes + +* **deadline:** remove requirement of aws-sdk in stage-deadline ([3b66c1b](https://github.com/aws/aws-rfdk/commit/3b66c1bd10ff604fdb8523d71097b674b6795520)) +* **deadline:** use HTTPS to download index ([c626ba9](https://github.com/aws/aws-rfdk/commit/c626ba945005c841d5f46a45c917e040248b8e93)) + ## [0.18.0](https://github.com/aws/aws-rfdk/compare/v0.17.0...v0.18.0) (2020-10-13) diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py index 2702c0076..76bc6f6a2 100644 --- a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py +++ b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/setup.py @@ -17,8 +17,8 @@ packages=setuptools.find_packages(where="package"), install_requires=[ - "aws-cdk.core==1.57.0", - "aws-rfdk==0.17.0" + "aws-cdk.core==1.66.0", + "aws-rfdk==0.18.1" ], python_requires=">=3.7", diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json index c838cc123..b149d5c15 100644 --- a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json +++ b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/package.json @@ -1,6 +1,6 @@ { "name": "all-in-farm-basic", - "version": "0.18.0", + "version": "0.18.1", "bin": { "app": "bin/app.js" }, @@ -25,7 +25,7 @@ }, "dependencies": { "@aws-cdk/core": "1.66.0", - "aws-rfdk": "0.18.0", + "aws-rfdk": "0.18.1", "source-map-support": "^0.5.19" } } diff --git a/integ/package.json b/integ/package.json index 1a869dfea..496557e21 100644 --- a/integ/package.json +++ b/integ/package.json @@ -1,6 +1,6 @@ { "name": "integ", - "version": "0.18.0", + "version": "0.18.1", "private": false, "description": "Integration tests for RFDK constructs", "bin": { @@ -66,7 +66,7 @@ "eslint-plugin-import": "^2.22.0", "eslint-plugin-license-header": "^0.2.0", "jest": "^26.4.2", - "pkglint": "0.18.0", + "pkglint": "0.18.1", "ts-jest": "^26.2.0" }, "dependencies": { @@ -81,7 +81,7 @@ "@aws-cdk/aws-s3-assets": "1.66.0", "@aws-cdk/aws-secretsmanager": "1.66.0", "@aws-cdk/core": "1.66.0", - "aws-rfdk": "0.18.0", + "aws-rfdk": "0.18.1", "aws-sdk": "^2.741.0" }, "peerDependencies": { @@ -96,7 +96,7 @@ "@aws-cdk/aws-s3-assets": "1.66.0", "@aws-cdk/aws-secretsmanager": "1.66.0", "@aws-cdk/core": "1.66.0", - "aws-rfdk": "0.18.0", + "aws-rfdk": "0.18.1", "aws-sdk": "^2.741.0" }, "engines": { diff --git a/lambda-layers/package.json b/lambda-layers/package.json index 3e3eaef7f..007385131 100644 --- a/lambda-layers/package.json +++ b/lambda-layers/package.json @@ -1,6 +1,6 @@ { "name": "lambda-layers", - "version": "0.18.0", + "version": "0.18.1", "private": false, "description": "Package containing scripts for building and publishing Lambda Layers", "main": "lib/index.js", diff --git a/lerna.json b/lerna.json index 13f0ead66..2e32ea48a 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "integ/" ], "rejectCycles": "true", - "version": "0.18.0" + "version": "0.18.1" } diff --git a/package.json b/package.json index 6d96cd4c5..7d2e043d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aws-rfdk-project", - "version": "0.18.0", + "version": "0.18.1", "license": "Apache-2.0", "author": { "name": "Amazon Web Services", diff --git a/packages/aws-rfdk/package.json b/packages/aws-rfdk/package.json index a66560aa3..0c4896d57 100644 --- a/packages/aws-rfdk/package.json +++ b/packages/aws-rfdk/package.json @@ -1,6 +1,6 @@ { "name": "aws-rfdk", - "version": "0.18.0", + "version": "0.18.1", "private": false, "description": "Package for core render farm constructs", "main": "lib/index.js", @@ -70,9 +70,9 @@ "@types/sinon": "^9.0.8", "aws-sdk": "^2.741.0", "aws-sdk-mock": "^5.1.0", - "cdk-build-tools": "0.18.0", + "cdk-build-tools": "0.18.1", "dynalite": "^3.2.1", - "pkglint": "0.18.0", + "pkglint": "0.18.1", "sinon": "^9.2.0" }, "dependencies": { diff --git a/tools/cdk-build-tools/package.json b/tools/cdk-build-tools/package.json index 759b5d5a8..b4869a989 100644 --- a/tools/cdk-build-tools/package.json +++ b/tools/cdk-build-tools/package.json @@ -1,7 +1,7 @@ { "name": "cdk-build-tools", "private": true, - "version": "0.18.0", + "version": "0.18.1", "description": "Tools package with shared build scripts for CDK packages", "main": "lib/index.js", "repository": { @@ -38,7 +38,7 @@ "@types/jest": "^26.0.10", "@types/yargs": "^15.0.7", "eslint-plugin-license-header": "^0.2.0", - "pkglint": "0.18.0" + "pkglint": "0.18.1" }, "dependencies": { "@typescript-eslint/eslint-plugin": "^3.10.1", diff --git a/tools/pkglint/package.json b/tools/pkglint/package.json index 50372a80e..71ad4a0f2 100644 --- a/tools/pkglint/package.json +++ b/tools/pkglint/package.json @@ -1,6 +1,6 @@ { "name": "pkglint", - "version": "0.18.0", + "version": "0.18.1", "private": true, "description": "Validate and fix package.json files", "main": "lib/index.js",