Merge pull request #69 from binoculars/develop

For v3.2.0

Author: binoculars

.travis.yml

@@ -2,10 +2,9 @@ language: node_js
 node_js: lts/boron
 sudo: false
 dist: trusty
-cache:
-  directories:
-  - node_modules
-  - $HOME/.cache
+cache: yarn
+env:
+- FORCE_COLOR=1
 before_install:
 - |
   if [ -n "$TRAVIS_BRANCH" ]; then
@@ -26,6 +25,7 @@ before_install:
   export USE_GZIP=false
   export MIME_TYPES='{"png":"image/png","mp4":"video/mp4"}'
   export VIDEO_MAX_DURATION='30'
+- curl -o- -L https://yarnpkg.com/install.sh | bash
 before_script:
 - yarn global add gulp
 script:

README.md

@@ -89,8 +89,10 @@ node node_modules/babel-cli/bin/babel-node.js test/aws.js
 ### Gulp
 
 #### Task: `aws:create-cfn-bucket`
-Creates the CloudFormation for your CloudFormation template and Lambda function code. **Run this once**, the result of
-this goes in environment variable, `CFN_S3_BUCKET`
+Creates the CloudFormation for your CloudFormation template and Lambda function code. **Run this once**. Set the `CFN_S3_BUCKET` environment variable to the name of the bucket you want to create.
+```bash
+CFN_S3_BUCKET=cloudformation-bucket gulp aws:create-cfn-bucket
+```
 
 #### Environment Settings
 The following environment variables must be set prior to using the rest of the gulp commands

gulpfile.js

@@ -17,7 +17,7 @@ const buildDir = 'build';
 const filename = path.join(buildDir, 'ffmpeg-build-lambda.tar.gz');
 const releaseUrl = 'https://api.github.com/repos/binoculars/ffmpeg-build-lambda/releases/latest';
 
-function request(url, toPipe) {
+function request(url, toPipe, retries = 0) {
 	const options = parse(url);
 	options.headers = {
 		'User-Agent': 'node'
@@ -31,6 +31,22 @@ function request(url, toPipe) {
 				if (statusCode === 302)
 					return request(response.headers.location, toPipe);
 
+				if (statusCode === 403 && retries < 3)
+					return new Promise((resolve, reject) => {
+						const tryCount = retries + 1;
+
+						console.log(`Request failed, retrying ${tryCount} of 3`);
+
+						setTimeout(
+							() => {
+								return request(url, toPipe, tryCount)
+									.then(resolve)
+									.catch(reject);
+							},
+							3e3
+						);
+					});
+
 				return reject(new Error('Failed to load page, status code: ' + response.statusCode));
 			}
 
@@ -148,7 +164,16 @@ fs.readdirSync(baseDir)
 						'env',
 						{
 							targets: {
-								node: platform === 'aws' ? 6.10 : 6.9
+								node: (() => {
+									switch(platform) {
+										case 'aws':
+											return '6.10';
+										case 'gcp':
+											return '6.11';
+										default:
+											return 'current';
+									}
+								})()
 							}
 						}
 					]

package.json

@@ -3,9 +3,8 @@
   "version": "3.1.0",
   "private": true,
   "description": "AWS Lambda function to resize video and generate a thumbnail",
-  "engines-strict": true,
   "engines": {
-    "node": ">=4.3",
+    "node": ">=6.10",
     "npm": ">=3"
   },
   "main": "index.js",
@@ -26,24 +25,24 @@
   "author": "Barrett Harber",
   "license": "Unlicense",
   "devDependencies": {
-    "ava": "^0.18.2",
+    "ava": "^0.23.0",
     "aws-sdk-on-lambda": "binoculars/aws-sdk-js-on-lambda",
     "azure-storage": "^2.1.0",
-    "babel-cli": "^6.23.0",
-    "babel-preset-env": "^1.2.2",
-    "chalk": "^1.1.3",
-    "del": "^2.2.0",
-    "google-cloud": "^0.49.0",
+    "babel-cli": "^6.24.1",
+    "babel-preset-env": "^1.6.1",
+    "chalk": "^2.0.1",
+    "del": "^3.0.0",
+    "google-cloud": "^0.57.0",
     "gulp": "^3.9.1",
-    "gulp-babel": "^6.1.2",
+    "gulp-babel": "^7.0.0",
     "gulp-chmod": "^2.0.0",
     "gulp-install": "^1.1.0",
     "gulp-json-editor": "^2.2.1",
     "gulp-rename": "^1.2.2",
     "gulp-util": "^3.0.8",
     "gulp-zip": "^4.0.0",
-    "run-sequence": "^1.0.2",
-    "simple-git": "^1.67.0"
+    "run-sequence": "^2.0.0",
+    "simple-git": "^1.73.0"
   },
   "dependencies": {},
   "babel": {

platform/aws/cloudformation.json

@@ -60,7 +60,7 @@
 		"HasNoDestinationBucketName": {
 			"Fn::Equals": [
 				{
-					"Ref": "SourceBucketName"
+					"Ref": "DestinationBucketName"
 				},
 				""
 			]

platform/aws/gulp-lib.js

@@ -73,9 +73,7 @@ function stackEventToRow({Timestamp, ResourceStatus, ResourceType, LogicalResour
 		LogicalResourceId
 	].map((val, i) => val.match(new RegExp(`.{1,${columns[i]}}`, 'g')));
 
-	const style = chalk.styles[
-		getResourceStatusColor(ResourceStatus)
-	];
+	const color = getResourceStatusColor(ResourceStatus);
 
 	const maxLines = cells
 		.reduce((acc, val) => val.length > acc ? val.length : acc, '');
@@ -87,11 +85,9 @@ function stackEventToRow({Timestamp, ResourceStatus, ResourceType, LogicalResour
 
 		for (let j = 0; j < cells.length; j++) {
 			const isColored = j === 1;
-			const open = isColored ? style.open : '';
-			const close = isColored ? style.close : '';
 			const value = pad(cells[j][i] || '', columns[j]);
 
-			line.push(`${open}${value}${close}`);
+			line.push(isColored ? chalk[color](value) : value);
 		}
 
 		lines.push(cellsToRow(line));

platform/aws/gulpfile.js

@@ -40,7 +40,7 @@ function getCloudFormationOperation(StackName) {
 		})
 		.promise()
 		.then(() => 'updateStack')
-		.catch(() => 'createStack')
+		.catch(() => 'createStack');
 }
 
 function printEventsAndWaitFor(condition, StackName) {
@@ -131,6 +131,7 @@ module.exports = function(gulp, prefix) {
 			['VideoMaxDuration', VIDEO_MAX_DURATION],
 			CI ? ['ExecutionRoleManagedPolicyArn', EXECUTION_ROLE_ARN] : undefined
 		]
+			.filter(val => val)
 			.map(([ParameterKey, ParameterValue]) => ({ParameterKey, ParameterValue}));
 
 		return getCloudFormationOperation(StackName)
@@ -167,9 +168,9 @@ module.exports = function(gulp, prefix) {
 			LogicalResourceId: 'Lambda'
 		})
 		.promise()
-		.then(({StackResourceDetail: PhysicalResourceId}) => lambda
+		.then(({StackResourceDetail: {PhysicalResourceId: FunctionName}}) => lambda
 			.updateFunctionCode({
-				FunctionName: PhysicalResourceId,
+				FunctionName,
 				S3Bucket: Bucket,
 				S3Key: lambdaKey
 			})
@@ -178,30 +179,27 @@ module.exports = function(gulp, prefix) {
 	);
 
 	// Builds the function and uploads
-	gulp.task(`${prefix}:build-upload`, cb => runSequence(
+	gulp.task(`${prefix}:build-upload`, () => runSequence(
 		'clean',
 		'download-ffmpeg',
 		`${prefix}:source`,
 		'npm',
 		'untar-ffmpeg',
 		'copy-ffmpeg',
 		'zip',
-		`${prefix}:upload`,
-		cb
+		`${prefix}:upload`
 	));
 
 	// For an already created stack
-	gulp.task(`${prefix}:update`, cb => runSequence(
+	gulp.task(`${prefix}:update`, () => runSequence(
 		`${prefix}:build-upload`,
-		`${prefix}:updateCode`,
-		cb
+		`${prefix}:updateCode`
 	));
 
 	// For a new stack (or you change cloudformation.json)
-	gulp.task(`${prefix}:default`, cb => runSequence(
+	gulp.task(`${prefix}:default`, () => runSequence(
 		`${prefix}:build-upload`,
-		`${prefix}:deployStack`,
-		cb
+		`${prefix}:deployStack`
 	));
 
 	const ciStackName = `CI-for-${StackName}`;
@@ -274,7 +272,7 @@ module.exports = function(gulp, prefix) {
 				})
 				.promise()
 			)
-			.then(([{Stacks: Outputs}]) => console.log(
+			.then(({Stacks: [{Outputs}]}) => console.log(
 				Outputs
 					.map(({OutputKey, OutputValue}) => `${outputEnvMap.get(OutputKey)}=${OutputValue}`)
 					.join('\n')

platform/gcp/gulpfile.js

@@ -46,8 +46,8 @@ module.exports = function(gulp, prefix) {
 				'deploy',
 				'ffmpeg',
 				'--entry-point', 'entryPoint',
-				'--bucket', config.functionBucket,
-				'--trigger-gs-uri', config.sourceBucket
+				'--stage-bucket', config.functionBucket,
+				'--trigger-bucket', config.sourceBucket
 			],
 			{
 				cwd: './dist',
@@ -63,4 +63,4 @@ module.exports = function(gulp, prefix) {
 			cb
 		);
 	});
-};
+};

test/unit/aws/gulp-lib.js

@@ -14,10 +14,8 @@ test('A one-line event', t => {
 	};
 
 	const actual = stackEventToRow(stackEvent);
-
-	const {open, close} = chalk.styles.yellow;
 	const expected = `
-│ 1970-01-01T00:00:00.000Z │ ${open}CREATE_IN_PROGRESS${close} │ AWS::CloudFormation::Stack │ username-aws-lambda-ffmpeg-tag-v240   │
+│ 1970-01-01T00:00:00.000Z │ ${chalk.yellow('CREATE_IN_PROGRESS')} │ AWS::CloudFormation::Stack │ username-aws-lambda-ffmpeg-tag-v240   │
 `.trim();
 
 	t.is(actual, expected);
@@ -35,12 +33,10 @@ test('A multi-line event', t => {
 	};
 
 	const actual = stackEventToRow(stackEvent);
-
-	const {open, close} = chalk.styles.red;
 	const expected = `
-│ 1970-01-01T00:00:00.000Z │ ${open}UPDATE_ROLLBACK_CO${close} │ AWS::CloudFormation::Stack │ username-aws-lambda-ffmpeg-branch-mas │
-│                          │ ${open}MPLETE_CLEANUP_IN_${close} │                            │ ter                                   │
-│                          │ ${open}PROGRESS          ${close} │                            │                                       │
+│ 1970-01-01T00:00:00.000Z │ ${chalk.red('UPDATE_ROLLBACK_CO')} │ AWS::CloudFormation::Stack │ username-aws-lambda-ffmpeg-branch-mas │
+│                          │ ${chalk.red('MPLETE_CLEANUP_IN_')} │                            │ ter                                   │
+│                          │ ${chalk.red('PROGRESS          ')} │                            │                                       │
 `.trim();
 
 	t.is(actual, expected);