@unito/integration-cli 0.60.11 → 0.60.13

package/dist/boilerplate/Dockerfile

@@ -35,4 +35,4 @@ RUN --mount=type=secret,id=npmrc,target=.npmrc npm ci --omit=dev
 RUN npm install --omit=dev
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD ["node", "./index.js"]
+CMD ["node", "./src/index.js"]

package/dist/src/commands/dev.d.ts

@@ -11,6 +11,7 @@ export default class Dev extends BaseCommand<typeof Dev> {
         'credential-id': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'test-account': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         'read-only': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
         crawlMode: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         checks: import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
         'config-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;

package/dist/src/commands/dev.js

@@ -48,6 +48,10 @@ class Dev extends baseCommand_1.BaseCommand {
             description: 'whether or not to only perform read operations',
             allowNo: true,
         }),
+        timeout: core_1.Flags.integer({
+            description: `timeout in seconds passed as 'X-Unito-Operation-Deadline' header to the integration. Set to 0 for no timeout.`,
+            default: 0, // Dev mode has no timeout by default.
+        }),
         crawlMode: core_1.Flags.string({
             description: 'mode to use while crawling the integration graph',
             options: Object.values(configuration_1.CrawlMode),
@@ -137,6 +141,9 @@ class Dev extends baseCommand_1.BaseCommand {
         if (readOnly) {
             commandArguments.push('--read-only');
         }
+        if (flags.timeout) {
+            commandArguments.push(`--timeout=${flags.timeout}`);
+        }
         if (configuration.graphRelativeUrl) {
             commandArguments.push(`--graph-relative-url=${configuration.graphRelativeUrl}`);
         }

package/dist/src/commands/oauth2.js

@@ -76,6 +76,7 @@ class Oauth2 extends core_1.Command {
         oauth2 = decryptedEntries.successful;
         const testAccount = flags['test-account'];
         const testAccountCredentials = configuration.testAccounts?.[testAccount];
+        const testAccountsToRefresh = new Set([testAccount]);
         let credentials;
         if (!testAccountCredentials?.accessToken || flags.reauth) {
             core_1.ux.log(`Starting Oauth2 flow for test account: ${testAccount}`);
@@ -87,6 +88,14 @@ class Oauth2 extends core_1.Command {
                 core_1.ux.log(chalk_1.default.redBright('No refresh token found, nothing to do.'));
                 return;
             }
+            // Figure out if we want to refresh other test account at the same time (like if they currently have the same values)
+            for (const [account, accountCredentials] of Object.entries(configuration.testAccounts ?? {})) {
+                if (!testAccountsToRefresh.has(account) &&
+                    accountCredentials?.accessToken === testAccountCredentials.accessToken &&
+                    accountCredentials?.refreshToken === testAccountCredentials.refreshToken) {
+                    testAccountsToRefresh.add(account);
+                }
+            }
             const decryptionResult = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, testAccountCredentials);
             const refreshToken = decryptionResult.successful.refreshToken;
             core_1.ux.action.start(`Refreshing test account ${testAccount}`, undefined, { stdout: true });
@@ -103,9 +112,11 @@ class Oauth2 extends core_1.Command {
             }
             core_1.ux.action.stop();
         }
-        core_1.ux.action.start(`Saving credentials for account: ${testAccount}`, undefined, { stdout: true });
-        await (0, configuration_1.writeTestAccount)(configuration, environment, customConfigPath, credentials, testAccount);
-        core_1.ux.action.stop();
+        for (const account of testAccountsToRefresh) {
+            core_1.ux.action.start(`Saving credentials for account: ${account}`, undefined, { stdout: true });
+            await (0, configuration_1.writeTestAccount)(configuration, environment, customConfigPath, credentials, account);
+            core_1.ux.action.stop();
+        }
         return;
     }
 }

package/dist/src/commands/test.js

@@ -54,6 +54,10 @@ class Test extends baseCommand_1.BaseCommand {
             description: 'whether or not to only perform read operations',
             allowNo: true,
         }),
+        timeout: core_1.Flags.integer({
+            description: `timeout in seconds passed as 'X-Unito-Operation-Deadline' header to the integration. Set to 0 for no timeout.`,
+            default: 20, // Test mode has a default timeout of 20 seconds.
+        }),
         crawlMode: core_1.Flags.string({
             description: 'mode to use while crawling the integration graph',
             options: Object.values(configuration_1.CrawlMode),
@@ -80,7 +84,7 @@ class Test extends baseCommand_1.BaseCommand {
       Usage: <%= config.bin %> <%= command.id %> --config-path=/myCustomConfig.json`,
         }),
         'skip-install': core_1.Flags.boolean({
-            description: 'whether or not to run npm install before starting the integration',
+            description: 'whether or not to run npm install before starting the integration. Useful when npx linking modules to the integration.',
             allowNo: true,
             default: false,
         }),
@@ -158,6 +162,9 @@ class Test extends baseCommand_1.BaseCommand {
         if (readOnly) {
             commandArguments.push('--read-only');
         }
+        if (flags.timeout) {
+            commandArguments.push(`--timeout=${flags.timeout}`);
+        }
         if (configuration.graphRelativeUrl) {
             commandArguments.push(`--graph-relative-url=${configuration.graphRelativeUrl}`);
         }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.60.11",
+  "version": "0.60.13",
   "commands": {
     "activity": {
       "id": "activity",
@@ -111,6 +111,13 @@
           "description": "whether or not to only perform read operations",
           "allowNo": true
         },
+        "timeout": {
+          "name": "timeout",
+          "type": "option",
+          "description": "timeout in seconds passed as 'X-Unito-Operation-Deadline' header to the integration. Set to 0 for no timeout.",
+          "multiple": false,
+          "default": 0
+        },
         "crawlMode": {
           "name": "crawlMode",
           "type": "option",
@@ -485,6 +492,13 @@
           "description": "whether or not to only perform read operations",
           "allowNo": true
         },
+        "timeout": {
+          "name": "timeout",
+          "type": "option",
+          "description": "timeout in seconds passed as 'X-Unito-Operation-Deadline' header to the integration. Set to 0 for no timeout.",
+          "multiple": false,
+          "default": 20
+        },
         "crawlMode": {
           "name": "crawlMode",
           "type": "option",
@@ -521,7 +535,7 @@
         "skip-install": {
           "name": "skip-install",
           "type": "boolean",
-          "description": "whether or not to run npm install before starting the integration",
+          "description": "whether or not to run npm install before starting the integration. Useful when npx linking modules to the integration.",
           "allowNo": true
         }
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-cli",
-  "version": "0.60.11",
+  "version": "0.60.13",
   "description": "Integration CLI",
   "bin": {
     "integration-cli": "./bin/run"
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "@oclif/core": "3.x",
-    "@unito/integration-debugger": "0.26.8",
+    "@unito/integration-debugger": "0.26.9",
     "@oazapfts/runtime": "1.x",
     "ajv": "8.x",
     "ajv-formats": "2.x",