Merge branch 'master' into issue-15752

Author: luancazarine

components/elastic_email/app/elastic_email.app.ts renamed to components/alibaba_cloud/alibaba_cloud.app.mjs

@@ -1,13 +1,11 @@
-import { defineApp } from "@pipedream/types";
-
-export default defineApp({
+export default {
   type: "app",
-  app: "elastic_email",
+  app: "alibaba_cloud",
   propDefinitions: {},
   methods: {
     // this.$auth contains connected account data
     authKeys() {
       console.log(Object.keys(this.$auth));
     },
   },
-});
+};

components/alibaba_cloud/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@pipedream/alibaba_cloud",
+  "version": "0.0.1",
+  "description": "Pipedream Alibaba Cloud Components",
+  "main": "alibaba_cloud.app.mjs",
+  "keywords": [
+    "pipedream",
+    "alibaba_cloud"
+  ],
+  "homepage": "https://pipedream.com/apps/alibaba_cloud",
+  "author": "Pipedream <[email protected]> (https://pipedream.com/)",
+  "publishConfig": {
+    "access": "public"
+  }
+}

components/aws/actions/s3-upload-file-tmp/s3-upload-file-tmp.mjs

@@ -7,12 +7,12 @@ import { ConfigurationError } from "@pipedream/platform";
 export default {
   ...common,
   key: "aws-s3-upload-file-tmp",
-  name: "S3 - Upload File - /tmp",
+  name: "S3 - Upload Files - /tmp",
   description: toSingleLineString(`
     Accepts a file path or folder path starting from /tmp, then uploads the contents to S3.
     [See the docs](https://docs.aws.amazon.com/AmazonS3/latest/userguide/upload-objects.html)
   `),
-  version: "1.0.2",
+  version: "1.0.3",
   type: "action",
   props: {
     aws: common.props.aws,
@@ -25,15 +25,8 @@ export default {
     },
     path: {
       type: "string",
-      label: "File Path",
-      description: "A path starting from `/tmp`, i.e. `/tmp/some_text_file.txt`",
-      optional: true,
-    },
-    folderPath: {
-      type: "string",
-      label: "Folder Path",
-      description: "A path starting from `/tmp`, i.e. `/tmp/some_folder`. If provided, all the files inside this path will be uploaded. This will override the `Filename Key` and `File Path` props.",
-      optional: true,
+      label: "File Or Folder Path",
+      description: "Path starting from `/tmp`. If it's a directory, all files will be uploaded.",
     },
     customFilename: {
       type: common.props.key.type,
@@ -44,58 +37,83 @@ export default {
   },
   methods: {
     ...common.methods,
-    async uploadFolderFiles($) {
+    getFilesRecursive(dir) {
+      let results = [];
+      const items = fs.readdirSync(dir);
+      for (const item of items) {
+        const itemPath = join(dir, item);
+        const stat = fs.statSync(itemPath);
+        if (stat.isDirectory()) {
+          results = results.concat(this.getFilesRecursive(itemPath));
+        } else {
+          results.push(itemPath);
+        }
+      }
+      return results;
+    },
+    async uploadFolderFiles($, folderPath) {
       const {
         uploadFile,
         bucket,
-        folderPath,
         prefix,
       } = this;
-
-      const files = fs.readdirSync(folderPath);
-      const promises = [];
-      for (const filename of files) {
-        const fileContent = fs.readFileSync(join(folderPath, filename), {
+      const files = this.getFilesRecursive(folderPath);
+      const response = await Promise.all(files.map(async (filePath) => {
+        const fileContent = fs.readFileSync(filePath, {
           encoding: "base64",
         });
-        promises.push(uploadFile({
+        const relativePath = filePath.substring(folderPath.length + 1);
+        const s3Key = join(prefix, relativePath);
+
+        await uploadFile({
           Bucket: bucket,
-          Key: join(prefix, filename),
+          Key: s3Key,
           Body: Buffer.from(fileContent, "base64"),
-        }));
-      }
-      const response = await Promise.all(promises);
+        });
+        return {
+          filePath,
+          s3Key,
+          status: "uploaded",
+        };
+      }));
       $.export("$summary", `Uploaded all files from ${folderPath} to S3`);
       return response;
     },
-    async uploadSingleFile($) {
+    async uploadSingleFile($, filePath) {
       const {
         uploadFile,
         bucket,
-        path,
         prefix,
         customFilename,
       } = this;
 
-      if (!path) {
-        throw new ConfigurationError("File Path is required");
-      }
-      const file = fs.readFileSync(path, {
+      const file = fs.readFileSync(filePath, {
         encoding: "base64",
       });
-      const filename = customFilename || path.split("/").pop();
+      const filename = customFilename || filePath.split("/").pop();
+
       const response = await uploadFile({
         Bucket: bucket,
         Key: join(prefix, filename),
         Body: Buffer.from(file, "base64"),
       });
+
       $.export("$summary", `Uploaded file ${filename} to S3`);
       return response;
     },
   },
   async run({ $ }) {
-    return this.folderPath
-      ? await this.uploadFolderFiles($)
-      : await this.uploadSingleFile($);
+    const {
+      uploadSingleFile,
+      uploadFolderFiles,
+      path,
+    } = this;
+    if (!fs.existsSync(path)) {
+      throw new ConfigurationError(`The file or directory path \`${path}\` does not exist. Please verify the path and include the leading /tmp if needed.`);
+    }
+    const stat = fs.statSync(path);
+    return stat.isDirectory()
+      ? await uploadFolderFiles($, path)
+      : await uploadSingleFile($, path);
   },
 };

components/aws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/aws",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Pipedream Aws Components",
   "main": "aws.app.mjs",
   "keywords": [

components/egestor/egestor.app.mjs

@@ -0,0 +1,11 @@
+export default {
+  type: "app",
+  app: "egestor",
+  propDefinitions: {},
+  methods: {
+    // this.$auth contains connected account data
+    authKeys() {
+      console.log(Object.keys(this.$auth));
+    },
+  },
+};

components/egestor/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@pipedream/egestor",
+  "version": "0.0.1",
+  "description": "Pipedream eGestor Components",
+  "main": "egestor.app.mjs",
+  "keywords": [
+    "pipedream",
+    "egestor"
+  ],
+  "homepage": "https://pipedream.com/apps/egestor",
+  "author": "Pipedream <[email protected]> (https://pipedream.com/)",
+  "publishConfig": {
+    "access": "public"
+  }
+}

components/elastic_email/.gitignore

@@ -0,0 +1,104 @@
+import { ConfigurationError } from "@pipedream/platform";
+import {
+  CONSENT_TRACKING_OPTIONS,
+  STATUS_OPTIONS,
+} from "../../common/constants.mjs";
+import { parseObject } from "../../common/utils.mjs";
+import app from "../../elastic_email.app.mjs";
+
+export default {
+  key: "elastic_email-add-contact",
+  name: "Add Contact to Mailing List",
+  description: "Adds a new contact to a mailing list. [See the documentation](https://elasticemail.com/developers/api-documentation/rest-api#operation/contactsPost)",
+  version: "0.0.1",
+  type: "action",
+  props: {
+    app,
+    email: {
+      propDefinition: [
+        app,
+        "email",
+      ],
+    },
+    listNames: {
+      propDefinition: [
+        app,
+        "listNames",
+      ],
+      optional: true,
+    },
+    status: {
+      type: "string",
+      label: "Status",
+      description: "The initial status of the contact.",
+      options: STATUS_OPTIONS,
+      optional: true,
+    },
+    firstName: {
+      type: "string",
+      label: "First Name",
+      description: "The contact's first name.",
+      optional: true,
+    },
+    lastName: {
+      type: "string",
+      label: "Last Name",
+      description: "The contact's last name.",
+      optional: true,
+    },
+    customFields: {
+      type: "object",
+      label: "Custom Fields",
+      description: "A key-value collection of custom contact fields which can be used in the system. Only already existing custom fields will be saved.",
+      optional: true,
+    },
+    consentIP: {
+      type: "string",
+      label: "Consent IP",
+      description: "IP address of consent to send this contact(s) your email. If not provided your current public IP address is used for consent.",
+      optional: true,
+    },
+    consentDate: {
+      type: "string",
+      label: "Consent Date",
+      description: "Date of consent to send this contact(s) your email. If not provided current date is used for consent.",
+      optional: true,
+    },
+    consentTracking: {
+      type: "string",
+      label: "Consent Tracking",
+      description: "Tracking of consent to send this contact(s) your email. Defaults to \"Unknown\".",
+      options: CONSENT_TRACKING_OPTIONS,
+      optional: true,
+    },
+  },
+  async run({ $ }) {
+    const response = await this.app.addContact({
+      $,
+      params: {
+        listnames: parseObject(this.listNames),
+      },
+      data: [
+        {
+          Email: this.email,
+          Status: this.status,
+          FirstName: this.firstName,
+          LastName: this.lastName,
+          CustomFields: parseObject(this.customFields),
+          Consent: {
+            ConsentIP: this.consentIP,
+            ConsentDate: this.consentDate,
+            ConsentTracking: this.consentTracking,
+          },
+        },
+      ],
+    });
+
+    if (("success" in response) && response.success === "false") {
+      throw new ConfigurationError(response.error);
+    }
+
+    $.export("$summary", `Successfully added contact ${this.email} to the mailing list`);
+    return response;
+  },
+};