@bctrl/cli 0.1.4 → 0.1.6

package/dist/commands/toolset/index.js

@@ -1,36 +1,34 @@
 import { Command } from 'commander';
-import { createDeleteCommand, createJsonBodyCommand, createListCommand, createViewCommand, } from '../shared/rest.js';
+import { createOperationDeleteCommand, createOperationJsonBodyCommand, createOperationListCommand, createOperationViewCommand, } from '../shared/operation.js';
 export function createToolsetCommand(factory) {
     const command = new Command('toolset').description('Manage BCTRL toolsets');
-    command.addCommand(createListCommand(factory, {
+    command.addCommand(createOperationListCommand(factory, {
+        operationId: 'toolsets.list',
         description: 'List toolsets',
-        path: '/toolsets',
         configure: (cmd) => cmd.option('--space <id>', 'Filter by space id'),
         query: (options) => ({
             spaceId: typeof options.space === 'string' ? options.space : undefined,
         }),
     }));
-    command.addCommand(createViewCommand(factory, {
+    command.addCommand(createOperationViewCommand(factory, {
+        operationId: 'toolsets.get',
         name: 'get',
         description: 'View a toolset',
-        path: '/toolsets/{id}',
     }));
-    command.addCommand(createJsonBodyCommand(factory, {
+    command.addCommand(createOperationJsonBodyCommand(factory, {
+        operationId: 'toolsets.create',
         name: 'create',
         description: 'Create a toolset',
-        method: 'post',
-        path: '/toolsets',
     }));
-    command.addCommand(createJsonBodyCommand(factory, {
+    command.addCommand(createOperationJsonBodyCommand(factory, {
+        operationId: 'toolsets.update',
         name: 'patch',
         description: 'Edit a toolset',
-        method: 'patch',
-        path: '/toolsets/{id}',
         argNames: ['id'],
     }));
-    command.addCommand(createDeleteCommand(factory, {
+    command.addCommand(createOperationDeleteCommand(factory, {
+        operationId: 'toolsets.delete',
         description: 'Delete a toolset',
-        path: '/toolsets/{id}',
     }));
     return command;
 }

package/dist/commands/usage/index.js

@@ -1,13 +1,13 @@
 import { Command } from 'commander';
 import { addOutputFlags } from '../shared/output.js';
-import { requestAndPrint } from '../shared/rest.js';
+import { outputFlags, requestOperationAndPrint } from '../shared/operation.js';
 export function createUsageCommand(factory) {
     const command = addOutputFlags(new Command('usage').description('Get organization usage'));
     command.action(async (options) => {
-        await requestAndPrint(factory, 'get', '/usage', { output: options });
+        await requestOperationAndPrint(factory, 'usage.get', { output: outputFlags(options) });
     });
     command.addCommand(addOutputFlags(new Command('get').description('Get organization usage')).action(async (options) => {
-        await requestAndPrint(factory, 'get', '/usage', { output: options });
+        await requestOperationAndPrint(factory, 'usage.get', { output: outputFlags(options) });
     }));
     return command;
 }

package/dist/commands/vault/index.js

@@ -3,12 +3,12 @@ import { CliError } from '../../runtime/errors.js';
 import { readJsonFile, readText } from '../shared/io.js';
 import { parsePositiveInteger } from '../shared/options.js';
 import { addOutputFlags } from '../shared/output.js';
-import { createDeleteCommand, createJsonBodyCommand, createListCommand, createViewCommand, pathTemplate, requestAndPrint, } from '../shared/rest.js';
+import { createOperationDeleteCommand, createOperationJsonBodyCommand, createOperationListCommand, createOperationViewCommand, outputFlags, requestOperationAndPrint, } from '../shared/operation.js';
 export function createVaultCommand(factory) {
     const command = new Command('vault').description('Manage vault secrets and TOTP codes');
-    command.addCommand(createListCommand(factory, {
+    command.addCommand(createOperationListCommand(factory, {
+        operationId: 'vault.secrets.list',
         description: 'List vault secret metadata',
-        path: '/vault/secrets',
         configure: (cmd) => cmd
             .option('--prefix <prefix>', 'Filter by secret key prefix')
             .option('--origin <origin>', 'Filter by origin')
@@ -21,18 +21,18 @@ export function createVaultCommand(factory) {
             limit: typeof options.limit === 'number' ? options.limit : undefined,
         }),
     }));
-    command.addCommand(createViewCommand(factory, {
+    command.addCommand(createOperationViewCommand(factory, {
+        operationId: 'vault.secrets.get',
         name: 'get',
         description: 'View vault secret metadata',
-        path: '/vault/secrets/{key}',
         argName: 'key',
     }));
     command.addCommand(createVaultReadCommand(factory));
     command.addCommand(createVaultSetCommand(factory));
     command.addCommand(createVaultPatchCommand(factory));
-    command.addCommand(createDeleteCommand(factory, {
+    command.addCommand(createOperationDeleteCommand(factory, {
+        operationId: 'vault.secrets.delete',
         description: 'Delete a vault secret',
-        path: '/vault/secrets/{key}',
         argNames: ['key'],
     }));
     command.addCommand(createVaultTotpCommand(factory));
@@ -46,17 +46,17 @@ function createVaultReadCommand(factory) {
         if (factory.io.isStdoutTTY() && options.reveal !== true) {
             throw new CliError('Refusing to print a secret to a terminal without --reveal');
         }
-        await requestAndPrint(factory, 'get', `/vault/secrets/${encodeURIComponent(key)}/value`, {
-            output: options,
+        await requestOperationAndPrint(factory, 'vault.secrets.value', {
+            pathParams: { key },
+            output: outputFlags(options),
         });
     });
 }
 function createVaultSetCommand(factory) {
-    return createJsonBodyCommand(factory, {
+    return createOperationJsonBodyCommand(factory, {
+        operationId: 'vault.secrets.upsert',
         name: 'set',
         description: 'Create or replace a vault secret',
-        method: 'put',
-        path: '/vault/secrets/{key}',
         argNames: ['key'],
         configure: (cmd) => cmd
             .option('--type <type>', 'Secret type: login or value')
@@ -71,8 +71,9 @@ function createVaultSetCommand(factory) {
             .option('--origin-pattern <pattern...>', 'Allowed origin pattern')
             .option('--input <path>', 'Read full JSON request body from file, or - for stdin'),
         body: async (args, options) => {
-            if (typeof options.input === 'string')
-                return readJsonFile(options.input);
+            if (typeof options.input === 'string') {
+                return (await readJsonFile(options.input));
+            }
             const password = typeof options.passwordFromFile === 'string'
                 ? (await readText(options.passwordFromFile)).trimEnd()
                 : options.password;
@@ -118,11 +119,10 @@ function createVaultSetCommand(factory) {
     });
 }
 function createVaultPatchCommand(factory) {
-    return createJsonBodyCommand(factory, {
+    return createOperationJsonBodyCommand(factory, {
+        operationId: 'vault.secrets.update',
         name: 'patch',
         description: 'Update a vault secret',
-        method: 'patch',
-        path: '/vault/secrets/{key}',
         argNames: ['key'],
         configure: (cmd) => cmd
             .option('--value <value>', 'Generic secret value')
@@ -140,8 +140,9 @@ function createVaultPatchCommand(factory) {
             .option('--clear-origin-patterns', 'Remove origin patterns')
             .option('--input <path>', 'Read full JSON request body from file, or - for stdin'),
         body: async (_args, options) => {
-            if (typeof options.input === 'string')
-                return readJsonFile(options.input);
+            if (typeof options.input === 'string') {
+                return (await readJsonFile(options.input));
+            }
             const password = typeof options.passwordFromFile === 'string'
                 ? (await readText(options.passwordFromFile)).trimEnd()
                 : options.password;
@@ -168,8 +169,9 @@ function createVaultTotpCommand(factory) {
     return addOutputFlags(new Command('totp')
         .description('Generate the current TOTP code for a vault secret')
         .argument('<key>')).action(async (key, options) => {
-        await requestAndPrint(factory, 'get', pathTemplate('/vault/secrets/{key}/totp', { key }), {
-            output: options,
+        await requestOperationAndPrint(factory, 'vault.secrets.totp', {
+            pathParams: { key },
+            output: outputFlags(options),
         });
     });
 }