functions/imagemagick: system tests + Node 8 upgrade

.kokoro/build.sh

@@ -44,6 +44,8 @@ export SENDGRID_API_KEY=$(cat $KOKORO_GFILE_DIR/secrets-sendgrid-api-key.txt)
 # Configure GCF variables
 export FUNCTIONS_TOPIC=integration-tests-instance
 export FUNCTIONS_BUCKET=$GCLOUD_PROJECT
+
+# functions/speech-to-speech
 export OUTPUT_BUCKET=$FUNCTIONS_BUCKET
 
 # functions/translate
@@ -52,6 +54,9 @@ export TRANSLATE_TOPIC=$FUNCTIONS_TOPIC
 export RESULT_TOPIC=$FUNCTIONS_TOPIC
 export RESULT_BUCKET=$FUNCTIONS_BUCKET
 
+# functions/imagemagick
+export BLURRED_BUCKET_NAME=$GCLOUD_PROJECT-functions
+
 # Configure IoT variables
 export NODEJS_IOT_EC_PUBLIC_KEY=${KOKORO_GFILE_DIR}/ec_public.pem
 export NODEJS_IOT_RSA_PRIVATE_KEY=${KOKORO_GFILE_DIR}/rsa_private.pem

functions/imagemagick/index.js

@@ -18,6 +18,7 @@
 // [START functions_imagemagick_setup]
 const gm = require('gm').subClass({imageMagick: true});
 const fs = require('fs');
+const {promisify} = require('util');
 const path = require('path');
 const {Storage} = require('@google-cloud/storage');
 const storage = new Storage();
@@ -30,115 +31,79 @@ const {BLURRED_BUCKET_NAME} = process.env;
 
 // [START functions_imagemagick_analyze]
 // Blurs uploaded images that are flagged as Adult or Violence.
-exports.blurOffensiveImages = event => {
- const object = event.data || event; // Node 6: event.data === Node 8+: event
-
- // Exit if this is a deletion or a deploy event.
- if (object.resourceState === 'not_exists') {
- console.log('This is a deletion event.');
- return;
- } else if (!object.name) {
- console.log('This is a deploy event.');
- return;
- }
+exports.blurOffensiveImages = async event => {
+ const object = event;
 
  const file = storage.bucket(object.bucket).file(object.name);
  const filePath = `gs://${object.bucket}/${object.name}`;
 
- // Ignore already-blurred files (to prevent re-invoking this function)
- if (file.name.startsWith('blurred-')) {
- console.log(`The image ${file.name} is already blurred.`);
- return;
- }
-
  console.log(`Analyzing ${file.name}.`);
 
- return client
- .safeSearchDetection(filePath)
- .catch(err => {
- console.error(`Failed to analyze ${file.name}.`, err);
- return Promise.reject(err);
- })
- .then(([result]) => {
- const detections = result.safeSearchAnnotation;
-
- if (
- detections.adult === 'VERY_LIKELY' ||
- detections.violence === 'VERY_LIKELY'
- ) {
- console.log(
- `The image ${file.name} has been detected as inappropriate.`
- );
- return blurImage(file, BLURRED_BUCKET_NAME);
- } else {
- console.log(`The image ${file.name} has been detected as OK.`);
- }
- });
+ try {
+ const [result] = await client.safeSearchDetection(filePath);
+ const detections = result.safeSearchAnnotation || {};
+
+ if (
+ detections.adult === 'VERY_LIKELY' ||
+ detections.violence === 'VERY_LIKELY'
+ ) {
+ console.log(`Detected ${file.name} as inappropriate.`);
+ return blurImage(file, BLURRED_BUCKET_NAME);
+ } else {
+ console.log(`Detected ${file.name} as OK.`);
+ }
+ } catch (err) {
+ console.error(`Failed to analyze ${file.name}.`, err);
+ return Promise.reject(err);
+ }
 };
 // [END functions_imagemagick_analyze]
 
 // [START functions_imagemagick_blur]
 // Blurs the given file using ImageMagick, and uploads it to another bucket.
-function blurImage(file, blurredBucketName) {
+const blurImage = async (file, blurredBucketName) => {
  const tempLocalPath = `/tmp/${path.parse(file.name).base}`;
 
  // Download file from bucket.
- return file
- .download({destination: tempLocalPath})
- .catch(err => {
- console.error('Failed to download file.', err);
- return Promise.reject(err);
- })
- .then(() => {
- console.log(
- `Image ${file.name} has been downloaded to ${tempLocalPath}.`
- );
-
- // Blur the image using ImageMagick.
- return new Promise((resolve, reject) => {
- gm(tempLocalPath)
- .blur(0, 16)
- .write(tempLocalPath, (err, stdout) => {
- if (err) {
- console.error('Failed to blur image.', err);
- reject(err);
- } else {
- resolve(stdout);
- }
- });
- });
- })
- .then(() => {
- console.log(`Image ${file.name} has been blurred.`);
-
- // Upload result to a different bucket, to avoid re-triggering this function.
- // You can also re-upload it to the same bucket + tell your Cloud Function to
- // ignore files marked as blurred (e.g. those with a "blurred" prefix)
- const blurredBucket = storage.bucket(blurredBucketName);
-
- // Upload the Blurred image back into the bucket.
- return blurredBucket
- .upload(tempLocalPath, {destination: file.name})
- .catch(err => {
- console.error('Failed to upload blurred image.', err);
- return Promise.reject(err);
- });
- })
- .then(() => {
- console.log(
- `Blurred image has been uploaded to: gs://${blurredBucketName}/${file.name}`
- );
-
- // Delete the temporary file.
- return new Promise((resolve, reject) => {
- fs.unlink(tempLocalPath, err => {
- if (err) {
- reject(err);
- } else {
- resolve();
- }
- });
+ try {
+ await file.download({destination: tempLocalPath});
+
+ console.log(`Downloaded ${file.name} to ${tempLocalPath}.`);
+ } catch (err) {
+ console.error('File download failed.', err);
+ return Promise.reject(err);
+ }
+
+ await new Promise((resolve, reject) => {
+ gm(tempLocalPath)
+ .blur(0, 16)
+ .write(tempLocalPath, (err, stdout) => {
+ if (err) {
+ console.error('Failed to blur image.', err);
+ reject(err);
+ } else {
+ console.log(`Blurred image: ${file.name}`);
+ resolve(stdout);
+ }
  });
- });
-}
+ });
+
+ // Upload result to a different bucket, to avoid re-triggering this function.
+ // You can also re-upload it to the same bucket + tell your Cloud Function to
+ // ignore files marked as blurred (e.g. those with a "blurred" prefix)
+ const blurredBucket = storage.bucket(blurredBucketName);
+
+ // Upload the Blurred image back into the bucket.
+ const gcsPath = `gs://${blurredBucketName}/${file.name}`;
+ try {
+ await blurredBucket.upload(tempLocalPath, {destination: file.name});
+ console.log(`Uploaded blurred image to: ${gcsPath}`);
+ } catch (err) {
+ console.error(`Unable to upload blurred image to ${gcsPath}:`, err);
+ return Promise.reject(err);
+ }
+
+ // Delete the temporary file.
+ return promisify(fs.unlink(tempLocalPath));
+};
 // [END functions_imagemagick_blur]

functions/imagemagick/package.json

@@ -12,21 +12,29 @@
  "node": ">=8.0.0"
  },
  "scripts": {
- "test": "mocha test/*.test.js --timeout=20000"
+ "test": "mocha test/*.test.js --timeout=20000 --exit"
  },
  "dependencies": {
  "@google-cloud/storage": "^3.0.0",
  "@google-cloud/vision": "^0.25.0",
  "gm": "^1.23.1"
  },
  "devDependencies": {
+ "@google-cloud/functions-framework": "^1.1.1",
  "@google-cloud/nodejs-repo-tools": "^3.3.0",
+ "child-process-promise": "^2.2.1",
  "mocha": "^6.0.0",
  "proxyquire": "^2.1.0",
+ "request": "^2.88.0",
+ "requestretry": "^4.0.0",
  "sinon": "^7.0.0"
  },
  "cloud-repo-tools": {
  "requiresKeyFile": true,
- "requiresProjectId": true
+ "requiresProjectId": true,
+ "requiredEnvVars": [
+ "FUNCTIONS_BUCKET",
+ "BLURRED_BUCKET_NAME"
+ ]
  }
 }