@pipedream/google_drive 0.10.1 → 1.0.1

package/actions/update-file/update-file.mjs

@@ -1,39 +1,15 @@
 import googleDrive from "../../google_drive.app.mjs";
-import {
-  toSingleLineString,
-  getFileStream,
-} from "../../common/utils.mjs";
-import { additionalProps } from "../../common/filePathOrUrl.mjs";
+import { toSingleLineString } from "../../common/utils.mjs";
+import { getFileStream } from "@pipedream/platform";
 
 export default {
   key: "google_drive-update-file",
   name: "Update File",
   description: "Update a file's metadata and/or content. [See the documentation](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
-  version: "1.0.2",
+  version: "2.0.0",
   type: "action",
-  additionalProps,
   props: {
     googleDrive,
-    updateType: {
-      type: "string",
-      label: "Update Type",
-      description: "Whether to update content or metadata only",
-      options: [
-        {
-          label: "Upload content from File URL",
-          value: "File URL",
-        },
-        {
-          label: "Upload content from File Path",
-          value: "File Path",
-        },
-        {
-          label: "Update file metadata only",
-          value: "File Metadata",
-        },
-      ],
-      reloadProps: true,
-    },
     drive: {
       propDefinition: [
         googleDrive,
@@ -51,27 +27,12 @@ export default {
       ],
       description: "The file to update",
     },
-    fileUrl: {
-      propDefinition: [
-        googleDrive,
-        "fileUrl",
-      ],
-      description: "The URL of the file to use to update content",
-      optional: false,
-      hidden: true,
-    },
     filePath: {
       propDefinition: [
         googleDrive,
         "filePath",
       ],
-      description: toSingleLineString(`
-        The path to the file saved to the [\`/tmp\`
-        directory](https://pipedream.com/docs/workflows/steps/code/nodejs/working-with-files/#the-tmp-directory)
-        (e.g., \`/tmp/myFile.csv\`) with which to update content
-      `),
-      optional: false,
-      hidden: true,
+      optional: true,
     },
     name: {
       propDefinition: [
@@ -139,7 +100,6 @@ export default {
   async run({ $ }) {
     const {
       fileId,
-      fileUrl,
       filePath,
       name,
       mimeType,
@@ -149,26 +109,13 @@ export default {
       ocrLanguage,
       useContentAsIndexableText,
       advanced,
-      updateType,
     } = this;
 
-    let fileStream;
-    if (updateType === "File URL") {
-      fileStream = await getFileStream({
-        $,
-        fileUrl,
-      });
-    } else if (updateType === "File Path") {
-      fileStream = await getFileStream({
-        $,
-        filePath,
-      });
-    }
-
     // Update file content, if set, separately from metadata to prevent
     // multipart upload, which `google-apis-nodejs-client` doesn't seem to
     // support for [files.update](https://bit.ly/3lP5sWn)
-    if (fileStream) {
+    if (filePath) {
+      const fileStream = await getFileStream(filePath);
       await this.googleDrive.updateFileMedia(fileId, fileStream, {
         mimeType,
       });

package/actions/upload-file/upload-file.mjs

@@ -1,19 +1,18 @@
 import googleDrive from "../../google_drive.app.mjs";
-import path from "path";
 import {
   omitEmptyStringValues,
   parseObjectEntries,
 } from "../../common/utils.mjs";
 import { GOOGLE_DRIVE_UPLOAD_TYPE_MULTIPART } from "../../common/constants.mjs";
 import {
-  getFileStream, ConfigurationError,
+  getFileStreamAndMetadata, ConfigurationError,
 } from "@pipedream/platform";
 
 export default {
   key: "google_drive-upload-file",
   name: "Upload File",
   description: "Upload a file to Google Drive. [See the documentation](https://developers.google.com/drive/api/v3/manage-uploads) for more information",
-  version: "1.1.0",
+  version: "2.0.1",
   type: "action",
   props: {
     googleDrive,
@@ -36,10 +35,10 @@ export default {
         "The folder you want to upload the file to. If not specified, the file will be placed directly in the drive's top-level folder.",
       optional: true,
     },
-    file: {
+    filePath: {
       type: "string",
-      label: "File",
-      description: "Provide either a file URL or a path to a file in the /tmp directory (for example, /tmp/myFlie.pdf).",
+      label: "File Path or URL",
+      description: "Provide either a file URL or a path to a file in the /tmp directory (for example, /tmp/myFile.pdf).",
     },
     name: {
       propDefinition: [
@@ -84,16 +83,18 @@ export default {
   async run({ $ }) {
     const {
       parentId,
+      filePath,
       name,
       mimeType,
     } = this;
     let { uploadType } = this;
     const driveId = this.googleDrive.getDriveId(this.drive);
 
-    const filename = name || path.basename(this.file);
+    const {
+      stream: file, metadata: fileMetadata,
+    } = await getFileStreamAndMetadata(filePath);
 
-    const file = await getFileStream(this.file);
-    console.log(`Upload type: ${uploadType}.`);
+    const filename = name || fileMetadata.name;
 
     const metadata = this.metadata
       ? parseObjectEntries(this.metadata)

package/common/utils.mjs

@@ -1,7 +1,4 @@
-import fs from "fs";
-import {
-  axios, ConfigurationError,
-} from "@pipedream/platform";
+import { ConfigurationError } from "@pipedream/platform";
 import {
   MY_DRIVE_VALUE,
   LEGACY_MY_DRIVE_VALUE,
@@ -60,34 +57,6 @@ function getListFilesOpts(drive, baseOpts = {}) {
   return opts;
 }
 
-/**
- * Returns a file stream from a file URL or file path to be used in Google Drive
- * API calls
- *
- * @param {Object} opts - an object containing options for getting a file stream
- * @param {String} opts.fileUrl - the url of a file to download to a Readable
- * stream
- * @param {String} opts.filePath - the path to a file from which to create a
- * Readable stream
- * @returns {stream.Readable} a Readable stream from the file URL or file path
- */
-async function getFileStream({
-  fileUrl, filePath,
-}) {
-  if (fileUrl) {
-    try {
-      return await axios(this, {
-        url: fileUrl,
-        method: "GET",
-        responseType: "stream",
-      });
-    } catch (e) {
-      throw new Error(`Status ${e.response.status} ${e.response.statusText}. ${e.message}`);
-    }
-  }
-  return fs.createReadStream(filePath);
-}
-
 function streamToBuffer(stream) {
   return new Promise((resolve, reject) => {
     const chunks = [];
@@ -294,7 +263,6 @@ export {
   isMyDrive,
   getDriveId,
   getListFilesOpts,
-  getFileStream,
   omitEmptyStringValues,
   toSingleLineString,
   buildFilePaths,

package/google_drive.app.mjs

@@ -155,24 +155,10 @@ export default {
       optional: true,
       default: false,
     },
-    fileUrl: {
-      type: "string",
-      label: "File URL",
-      description: toSingleLineString(`
-        The URL of the file you want to upload to Google Drive. Must specify either **File URL**
-        or **File Path**.
-      `),
-      optional: true,
-    },
     filePath: {
       type: "string",
-      label: "File Path",
-      description: toSingleLineString(`
-        The path to the file saved to the [\`/tmp\`
-        directory](https://pipedream.com/docs/workflows/steps/code/nodejs/working-with-files/#the-tmp-directory)
-        (e.g. \`/tmp/myFile.csv\`). Must specify either **File URL** or **File Path**.
-      `),
-      optional: true,
+      label: "File Path or URL",
+      description: "The file content to upload. Provide either a file URL or a path to a file in the `/tmp` directory (for example, `/tmp/myFile.txt`)",
     },
     fileName: {
       type: "string",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_drive",
-  "version": "0.10.1",
+  "version": "1.0.1",
   "description": "Pipedream Google_drive Components",
   "main": "google_drive.app.mjs",
   "keywords": [

package/common/filePathOrUrl.mjs

@@ -1,27 +0,0 @@
-export const updateType = {
-  type: "string",
-  label: "Use File URL or File Path",
-  description: "Whether to upload a file from a URL or from the `/tmp` folder",
-  options: [
-    "File URL",
-    "File Path",
-  ],
-  reloadProps: true,
-};
-
-export async function additionalProps(previousProps) {
-  const { updateType } = this;
-
-  if (updateType === "File URL") {
-    previousProps.fileUrl.hidden = false;
-    previousProps.filePath.hidden = true;
-  } else if (updateType === "File Path") {
-    previousProps.fileUrl.hidden = true;
-    previousProps.filePath.hidden = false;
-  } else {
-    previousProps.fileUrl.hidden = true;
-    previousProps.filePath.hidden = true;
-  }
-
-  return {};
-}