@prismatic-io/prism 4.1.1 → 4.2.2

package/lib/commands/alerts/events/list.js

@@ -8,7 +8,10 @@ class ListCommand extends core_1.Command {
         const result = await (0, graphql_1.gqlRequest)({
             document: (0, graphql_1.gql) `
         query listAlertEvents($alertMonitorId: ID) {
-          alertEvents(monitor: $alertMonitorId) {
+          alertEvents(
+            monitor: $alertMonitorId
+            sortBy: [{ field: CREATED_AT, direction: DESC }]
+          ) {
             nodes {
               id
               monitor {

package/lib/commands/alerts/groups/list.js

@@ -5,19 +5,32 @@ const graphql_1 = require("../../../graphql");
 class ListCommand extends core_1.Command {
     async run() {
         const { flags } = await this.parse(ListCommand);
-        const result = await (0, graphql_1.gqlRequest)({
-            document: (0, graphql_1.gql) `
-        query listAlertGroups {
-          alertGroups {
-            nodes {
-              id
-              name
+        let alertGroups = [];
+        let hasNextPage = true;
+        let cursor = "";
+        while (hasNextPage) {
+            const { alertGroups: { nodes, pageInfo }, } = await (0, graphql_1.gqlRequest)({
+                document: (0, graphql_1.gql) `
+          query listAlertGroups($after: String) {
+            alertGroups(after: $after) {
+              nodes {
+                id
+                name
+              }
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
             }
           }
+        `,
+                variables: { after: cursor },
+            });
+            alertGroups = [...alertGroups, ...nodes];
+            cursor = pageInfo.endCursor;
+            hasNextPage = pageInfo.hasNextPage;
         }
-      `,
-        });
-        core_1.CliUx.ux.table(result.alertGroups.nodes, {
+        core_1.CliUx.ux.table(alertGroups, {
             id: {
                 minWidth: 8,
                 extended: true,

package/lib/commands/alerts/monitors/list.js

@@ -5,26 +5,56 @@ const graphql_1 = require("../../../graphql");
 class ListCommand extends core_1.Command {
     async run() {
         const { flags } = await this.parse(ListCommand);
-        const result = await (0, graphql_1.gqlRequest)({
-            document: (0, graphql_1.gql) `
-        query listAlertMonitors {
-          alertMonitors {
-            nodes {
-              id
-              name
-              triggered
+        let alertMonitors = [];
+        let hasNextPage = true;
+        let cursor = "";
+        while (hasNextPage) {
+            const { alertMonitors: { nodes, pageInfo }, } = await (0, graphql_1.gqlRequest)({
+                document: (0, graphql_1.gql) `
+          query listAlertMonitors($after: String) {
+            alertMonitors(after: $after) {
+              nodes {
+                id
+                name
+                triggered
+                instance {
+                  id
+                  name
+                  customer {
+                    id
+                    name
+                  }
+                }
+              }
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
             }
           }
+        `,
+                variables: { after: cursor },
+            });
+            alertMonitors = [...alertMonitors, ...nodes];
+            cursor = pageInfo.endCursor;
+            hasNextPage = pageInfo.hasNextPage;
         }
-      `,
-        });
-        core_1.CliUx.ux.table(result.alertMonitors.nodes, {
+        core_1.CliUx.ux.table(alertMonitors, {
             id: {
                 minWidth: 8,
                 extended: true,
             },
             name: {},
             triggered: {},
+            customer: {
+                get: ({ instance: { customer } }) => customer.name,
+            },
+            customerId: {
+                extended: true,
+                get: ({ instance: { customer } }) => customer.id,
+            },
+            instance: { get: ({ instance }) => instance.name },
+            instanceId: { extended: true, get: ({ instance }) => instance.id },
         }, { ...flags });
     }
 }

package/lib/commands/alerts/webhooks/list.js

@@ -5,22 +5,35 @@ const graphql_1 = require("../../../graphql");
 class ListCommand extends core_1.Command {
     async run() {
         const { flags } = await this.parse(ListCommand);
-        const result = await (0, graphql_1.gqlRequest)({
-            document: (0, graphql_1.gql) `
-        query listAlertWebhooks {
-          alertWebhooks {
-            nodes {
-              id
-              name
-              payloadTemplate
-              url
-              headers
+        let alertWebhooks = [];
+        let hasNextPage = true;
+        let cursor = "";
+        while (hasNextPage) {
+            const { alertWebhooks: { nodes, pageInfo }, } = await (0, graphql_1.gqlRequest)({
+                document: (0, graphql_1.gql) `
+          query listAlertWebhooks($after: String) {
+            alertWebhooks(after: $after) {
+              nodes {
+                id
+                name
+                payloadTemplate
+                url
+                headers
+              }
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
             }
           }
+        `,
+                variables: { after: cursor },
+            });
+            alertWebhooks = [...alertWebhooks, ...nodes];
+            cursor = pageInfo.endCursor;
+            hasNextPage = pageInfo.hasNextPage;
         }
-      `,
-        });
-        core_1.CliUx.ux.table(result.alertWebhooks.nodes, {
+        core_1.CliUx.ux.table(alertWebhooks, {
             id: {
                 minWidth: 8,
                 extended: true,

package/lib/commands/components/actions/list.js

@@ -4,30 +4,54 @@ const core_1 = require("@oclif/core");
 const graphql_1 = require("../../../graphql");
 class ListCommand extends core_1.Command {
     async run() {
-        const { flags } = await this.parse(ListCommand);
-        const result = await (0, graphql_1.gqlRequest)({
-            document: (0, graphql_1.gql) `
-        query listComponentActions {
-          components {
-            nodes {
-              actions(isTrigger: false) {
-                nodes {
-                  id
-                  key
-                  label
-                  description
-                  component {
+        const { flags, args: { "Component Key": componentKey }, } = await this.parse(ListCommand);
+        let actions = [];
+        let componentId;
+        let hasNextPage = true;
+        let cursor = "";
+        while (hasNextPage) {
+            const { components: { nodes: [component], }, } = await (0, graphql_1.gqlRequest)({
+                document: (0, graphql_1.gql) `
+          query listComponentActions(
+            $componentKey: String
+            $after: String
+            $public: Boolean
+          ) {
+            components(key: $componentKey, public: $public) {
+              nodes {
+                id
+                key
+                actions(isTrigger: false, after: $after) {
+                  nodes {
                     id
                     key
+                    label
+                    description
+                  }
+                  pageInfo {
+                    hasNextPage
+                    endCursor
                   }
                 }
               }
             }
           }
+        `,
+                variables: {
+                    after: cursor,
+                    componentKey,
+                    public: flags.public ? true : flags.private ? false : null,
+                },
+            });
+            if (!component) {
+                console.log("The key you provided is not valid. Please run 'prism components:list -x' and identify a valid component key.");
+                this.exit(1);
+            }
+            actions = [...actions, ...component.actions.nodes];
+            componentId = component.id;
+            cursor = component.actions.pageInfo.endCursor;
+            hasNextPage = component.actions.hasNextPage;
         }
-      `,
-        });
-        const actions = result.components.nodes.flatMap(({ actions }) => actions.nodes);
         core_1.CliUx.ux.table(actions, {
             id: {
                 minWidth: 8,
@@ -40,11 +64,11 @@ class ListCommand extends core_1.Command {
             label: {},
             description: {},
             componentid: {
-                get: ({ component: { id } }) => id,
+                get: () => componentId,
                 extended: true,
             },
             componentkey: {
-                get: ({ component: { key } }) => key,
+                get: () => componentKey,
                 extended: true,
             },
         }, { ...flags });
@@ -52,4 +76,21 @@ class ListCommand extends core_1.Command {
 }
 exports.default = ListCommand;
 ListCommand.description = "List Actions that Components implement";
-ListCommand.flags = { ...core_1.CliUx.ux.table.flags() };
+ListCommand.flags = {
+    ...core_1.CliUx.ux.table.flags(),
+    public: core_1.Flags.boolean({
+        required: false,
+        description: "Show actions for the public component with the given key. Use this flag when you have a private component with the same key as a public component.",
+    }),
+    private: core_1.Flags.boolean({
+        required: false,
+        description: "Show actions for the private component with the given key. Use this flag when you have a private component with the same key as a public component.",
+    }),
+};
+ListCommand.args = [
+    {
+        name: "Component Key",
+        required: true,
+        description: "The key of the component to show actions for (e.g. 'salesforce')",
+    },
+];

package/lib/commands/components/dev/run.js

@@ -15,7 +15,7 @@ const spawnProcess = ([command, ...args], env) => {
 };
 class RunCommand extends core_1.Command {
     async run() {
-        const { argv, flags: { integrationId, configVarKey }, } = await this.parse(RunCommand);
+        const { argv, flags: { integrationId, connectionKey }, } = await this.parse(RunCommand);
         const result = await (0, graphql_1.gqlRequest)({
             document: (0, graphql_1.gql) `
         query integration($id: ID!) {
@@ -42,7 +42,7 @@ class RunCommand extends core_1.Command {
             },
         });
         const nodes = result.integration.testConfigVariables.nodes;
-        const [connection] = nodes.filter(({ requiredConfigVariable: { key } }) => key === configVarKey);
+        const [connection] = nodes.filter(({ requiredConfigVariable: { key } }) => key === connectionKey);
         if (!connection) {
             core_1.CliUx.ux.error("Failed to find active connection.", { exit: 1 });
         }
@@ -56,7 +56,21 @@ class RunCommand extends core_1.Command {
     }
 }
 exports.default = RunCommand;
-RunCommand.description = "Run an arbitrary command within a Prismatic context";
+RunCommand.description = `Fetch an integration's active connection and execute a CLI command with that connection's fields as an environment variable.`;
+RunCommand.usage = "prism components:dev:run -i <value> -c <value> -- /command/to/run";
+RunCommand.examples = [
+    {
+        description: `To simply print an integration's basic auth config variable named "My Credentials" and pipe the resulting JSON to jq, run:`,
+        command: `$ prism components:dev:run
+    --integrationId SW50ZWdyYXRpb246Y2YyMjJlMWUtMzJiYy00NTNhLWIzOWQtYTliNzUwMDAyNjBk
+    --connectionKey "My Credentials" --
+    printenv \${PRISMATIC_CONNECTION_VALUE} | jq`,
+    },
+    {
+        description: `If one of your integrations has an authenticated OAuth 2.0 config variable "Slack Connection", you could run your component's unit tests with that environment variable:`,
+        command: `$ prism components:dev:run -i SW50ZWexample -c "Slack Connection" -- yarn run test`,
+    },
+];
 // Allow us to manually capture argv so we can isolate the wrapped command.
 RunCommand.strict = false;
 // TODO: Make this derive from the component manifest using the same
@@ -67,9 +81,9 @@ RunCommand.flags = {
         char: "i",
         description: "Integration ID",
     }),
-    configVarKey: core_1.Flags.string({
+    connectionKey: core_1.Flags.string({
         required: true,
         char: "c",
-        description: "Key of the Connection Config Var to fetch meta/state for",
+        description: "Key of the connection config variable to fetch meta/state for",
     }),
 };

package/lib/commands/components/dev/test.js

@@ -179,7 +179,7 @@ class TestCommand extends core_1.Command {
             integrationInfo: {
                 name: (0, definition_1.componentTestIntegrationName)(componentKey, name),
             },
-            componentInfo: { key: componentKey, isPublic: isPublic !== null && isPublic !== void 0 ? isPublic : false },
+            componentInfo: { key: definition.key, isPublic: isPublic !== null && isPublic !== void 0 ? isPublic : false },
             actionInfo,
             connectionInfo,
         });

package/lib/commands/components/init/index.js

@@ -32,31 +32,10 @@ const path = __importStar(require("path"));
 const wsdl_tsclient_1 = require("wsdl-tsclient");
 const logger_1 = require("wsdl-tsclient/dist/src/utils/logger");
 const index_1 = require("../../../generate/index");
-const openapi_typescript_codegen_1 = require("openapi-typescript-codegen");
 const prettier_1 = __importDefault(require("prettier"));
 const glob_promise_1 = __importDefault(require("glob-promise"));
 const yeoman_1 = require("../../../yeoman");
 const componentNameRegex = /^[a-zA-Z0-9][a-zA-Z0-9-_]*[a-zA-Z0-9]$/;
-const insertText = /* javascript */ `
-interface EnhancedConfig extends Config {
-  timeout?: number;
-  CLIENT?: AxiosInstance;
-}
-export const EnhancedOpenAPI: EnhancedConfig = OpenAPI;`;
-const injectAxiosToOpenAPI = async (basePath) => {
-    const fileLocation = path.resolve(basePath, "core", "request.ts");
-    const replaceLocation = path.join(__dirname, "..", "..", "..", "..", "templates", "component", "openapi", "request.ts");
-    await fs_1.promises.copyFile(replaceLocation, fileLocation);
-    const file = path.resolve(basePath, "core", "OpenAPI.ts");
-    const contents = await fs_1.promises.readFile(file);
-    const parts = [contents, insertText].join("\n\n").split("\n");
-    const additions = [
-        ...parts.slice(0, 3),
-        /* javascript */ `import { AxiosInstance } from "axios";`,
-        ...parts.slice(3),
-    ].join("\n");
-    await fs_1.promises.writeFile(file, additions);
-};
 const getFilesToFormat = async (basename) => {
     return await (0, glob_promise_1.default)("**/*.ts", {
         ignore: ["**/node_modules/**"],
@@ -73,7 +52,7 @@ const formatSourceFiles = async (basePath, files) => {
 };
 class InitializeComponent extends core_1.Command {
     async run() {
-        const { args: { name }, flags: { verbose, "wsdl-path": wsdlPath, "open-api-path": openApiPath, "skip-auth": skipAuth, "add-retry": addRetry, }, } = await this.parse(InitializeComponent);
+        const { args: { name }, flags: { verbose, "wsdl-path": wsdlPath, "open-api-path": openApiPath }, } = await this.parse(InitializeComponent);
         if (!componentNameRegex.test(name)) {
             this.error(`'${name}' contains invalid characters. Please select a component name that starts and ends with alphanumeric characters, and contains only alphanumeric characters, hyphens, and underscores. See https://regex101.com/?regex=${encodeURIComponent(componentNameRegex.source)}`, { exit: 1 });
         }
@@ -82,81 +61,50 @@ class InitializeComponent extends core_1.Command {
                 exit: 1,
             });
         }
-        if (skipAuth && !openApiPath) {
-            this.error("Auth templating is only supported when generating components from Open API specifications", {
-                exit: 1,
-            });
-        }
-        if (addRetry && !openApiPath) {
-            this.error("HTTP retry logic is only supported when generating components from OpenAPI specifications", {
-                exit: 1,
-            });
-        }
         this.log(`Creating component directory for "${name}"...`);
         await fs_1.promises.mkdir(name);
         const cwd = process.cwd();
         process.chdir(name);
-        await (0, yeoman_1.runGenerator)("component", process.env.NODE_ENV === "test"
-            ? {
+        if (openApiPath) {
+            await (0, yeoman_1.runGenerator)("formats", {
                 name,
-                description: "Prism-generated Component",
-                connectionType: "basic",
-                skipInstall: true,
-            }
-            : { name, skipInstall: Boolean(wsdlPath) || Boolean(openApiPath) });
-        process.chdir(cwd);
-        if (wsdlPath) {
-            if (!verbose) {
-                // wsdl-tsclient emits pretty noisy logs that aren't particularly useful
-                logger_1.Logger.disabled();
-            }
-            const wsdlName = path.basename(wsdlPath).split(".wsdl")[0];
-            await (0, wsdl_tsclient_1.parseAndGenerate)(wsdlPath, path.join(name), {
-                caseInsensitiveNames: true,
-            });
-            await (0, index_1.generate)({
-                projectRoot: name,
-                projectTemplateName: wsdlName,
-                projectTemplatePath: wsdlPath,
-                projectType: "wsdl",
-                includeClient: false,
-                addRetry: false,
-            });
-            await (0, index_1.updatePackageJson)({
-                path: path.resolve(name, "package.json"),
-                dependencies: { soap: "0.40.0" },
+                openapi: openApiPath,
             });
         }
-        else if (openApiPath) {
-            const openApiName = path.basename(openApiPath).split(".")[0];
-            const basePath = path.resolve(name, openApiName);
-            await (0, openapi_typescript_codegen_1.generate)({
-                input: openApiPath,
-                output: path.join(name, openApiName),
-                httpClient: openapi_typescript_codegen_1.HttpClient.NODE,
-                useUnionTypes: true, // handles the case of enums using reserved keywords
-            });
-            await (0, index_1.generate)({
-                projectRoot: name,
-                projectTemplateName: openApiName,
-                projectTemplatePath: openApiPath,
-                projectType: "openApi",
-                includeClient: !skipAuth,
-                addRetry,
-            });
-            await (0, index_1.updatePackageJson)({
-                path: path.resolve(name, "package.json"),
-                dependencies: {
-                    axios: "0.21.4",
-                    "axios-retry": "3.1.9",
-                    "form-data": "4.0.0",
-                },
-            });
-            await injectAxiosToOpenAPI(basePath);
-            const filesToFormat = await getFilesToFormat(basePath);
-            await formatSourceFiles(basePath, filesToFormat);
-        }
-        this.log(`
+        else {
+            // Legacy code paths (mostly; keep the component generator call)
+            await (0, yeoman_1.runGenerator)("component", process.env.NODE_ENV === "test"
+                ? {
+                    name,
+                    description: "Prism-generated Component",
+                    connectionType: "basic",
+                    skipInstall: true,
+                }
+                : { name, skipInstall: Boolean(wsdlPath) });
+            // Need to pop back as the WSDL generator assumes it's a directory up
+            process.chdir(cwd);
+            if (wsdlPath) {
+                if (!verbose) {
+                    // wsdl-tsclient emits pretty noisy logs that aren't particularly useful
+                    logger_1.Logger.disabled();
+                }
+                const wsdlName = path.basename(wsdlPath).split(".wsdl")[0];
+                await (0, wsdl_tsclient_1.parseAndGenerate)(wsdlPath, name, {
+                    caseInsensitiveNames: true,
+                });
+                await (0, index_1.generate)({
+                    projectRoot: name,
+                    projectTemplateName: wsdlName,
+                    projectTemplatePath: wsdlPath,
+                });
+                await (0, index_1.updatePackageJson)({
+                    path: path.resolve(name, "package.json"),
+                    dependencies: { soap: "0.40.0" },
+                });
+                const filesToFormat = await getFilesToFormat(name);
+                await formatSourceFiles(name, filesToFormat);
+            }
+            this.log(`
 "${name}" is ready for development.
 To install dependencies, run either "npm install" or "yarn install"
 To test the component, run "npm run test" or "yarn test"
@@ -165,6 +113,7 @@ To publish the component, run "prism components:publish"
 
 For documentation on writing custom components, visit https://prismatic.io/docs/custom-components/writing-custom-components/
     `);
+        }
     }
 }
 exports.default = InitializeComponent;
@@ -178,21 +127,11 @@ InitializeComponent.flags = {
         required: false,
         description: "The path to an OpenAPI Specification file (JSON or YAML) used to generate a Component",
     }),
-    "skip-auth": core_1.Flags.boolean({
-        required: false,
-        default: false,
-        description: "Skip templating authentication for an OpenAPI-based component. Use this option for OpenAPI specs that do not require authentication.",
-    }),
     verbose: core_1.Flags.boolean({
         required: false,
         default: false,
         description: "Output more verbose logging from Component generation",
     }),
-    "add-retry": core_1.Flags.boolean({
-        required: false,
-        default: false,
-        description: "Add inputs to each action to utilize Axios retry logic",
-    }),
 };
 InitializeComponent.args = [
     {

package/lib/commands/components/list.js

@@ -1,32 +1,50 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
+const dayjs_1 = __importDefault(require("dayjs"));
 const graphql_1 = require("../../graphql");
 class ListCommand extends core_1.Command {
     async run() {
         const { flags } = await this.parse(ListCommand);
         const { showAllVersions } = flags;
-        const result = await (0, graphql_1.gqlRequest)({
-            document: (0, graphql_1.gql) `
-        query listComponents($showAllVersions: Boolean) {
-          components(allVersions: $showAllVersions) {
-            nodes {
-              id
-              key
-              public
-              label
-              description
-              versionNumber
-              category
+        let components = [];
+        let hasNextPage = true;
+        let cursor = "";
+        while (hasNextPage) {
+            const { components: { nodes, pageInfo }, } = await (0, graphql_1.gqlRequest)({
+                document: (0, graphql_1.gql) `
+          query listComponents($showAllVersions: Boolean, $after: String) {
+            components(allVersions: $showAllVersions, after: $after) {
+              nodes {
+                id
+                key
+                public
+                label
+                description
+                versionNumber
+                category
+                versionCreatedAt
+              }
+              pageInfo {
+                hasNextPage
+                endCursor
+              }
             }
           }
+        `,
+                variables: {
+                    showAllVersions,
+                    after: cursor,
+                },
+            });
+            components = [...components, ...nodes];
+            cursor = pageInfo.endCursor;
+            hasNextPage = pageInfo.hasNextPage;
         }
-      `,
-            variables: {
-                showAllVersions,
-            },
-        });
-        core_1.CliUx.ux.table(result.components.nodes, {
+        core_1.CliUx.ux.table(components, {
             id: {
                 minWidth: 8,
                 extended: true,
@@ -39,7 +57,12 @@ class ListCommand extends core_1.Command {
             public: {},
             description: {},
             versionNumber: { header: "Version" },
-            category: {},
+            versionCreatedAt: {
+                header: "Last Published",
+                extended: true,
+                get: ({ versionCreatedAt }) => (0, dayjs_1.default)(versionCreatedAt).format(),
+            },
+            category: { get: ({ category }) => category || "" },
         }, { ...flags });
     }
 }