@joshualiamzn/open-stack 0.0.1 → 0.0.2

package/src/interactive.mjs

@@ -1,17 +1,12 @@
-import { select, input, confirm } from '@inquirer/prompts';
 import {
-  printHeader, printStep, printInfo, printSubStep, printKeyHint,
-  createSpinner, theme, GoBack, withEscape,
+  printHeader, printStep, printInfo, printSubStep,
+  createSpinner, theme, GoBack, eSelect, eInput,
 } from './ui.mjs';
 import { createDefaultConfig, DEFAULTS } from './config.mjs';
-import { listDomains, listRoles, listWorkspaces } from './aws.mjs';
+import { listDomains, listWorkspaces, listApplications } from './aws.mjs';
 
 const CUSTOM_INPUT = Symbol('custom');
 
-const eSelect = withEscape(select);
-const eInput = withEscape(input);
-const eConfirm = withEscape(confirm);
-
 /**
  * Fetch resources with a spinner, returning [] on failure.
  */
@@ -37,7 +32,7 @@ async function stepMode(cfg) {
   const mode = await eSelect({
     message: 'Mode',
     choices: [
-      { name: `Simple   ${theme.muted('\u2014 just name + region; creates all resources with defaults')}`, value: 'simple' },
+      { name: `Simple   ${theme.muted('\u2014 creates all resources with defaults')}`, value: 'simple' },
       { name: `Advanced ${theme.muted('\u2014 create new or reuse existing resources; tune pipeline settings')}`, value: 'advanced' },
     ],
     default: cfg.mode || 'simple',
@@ -82,215 +77,331 @@ async function stepCore(cfg, session) {
     cfg.iamRoleName = `${cfg.pipelineName}-osi-role`;
     cfg.apsAction = 'create';
     cfg.apsWorkspaceAlias = cfg.pipelineName;
+    cfg.dashboardsAction = 'create';
+    cfg.dqsRoleName = `${cfg.pipelineName}-dqs-prometheus-role`;
+    cfg.dqsDataSourceName = `${cfg.pipelineName.replace(/-/g, '_')}_prometheus`;
+    cfg.appName = cfg.pipelineName;
     console.error();
-    printSubStep(
-      `Will create: OpenSearch Serverless collection '${theme.accent(cfg.osDomainName)}', ` +
-      `IAM role '${theme.accent(cfg.iamRoleName)}', APS workspace '${theme.accent(cfg.apsWorkspaceAlias)}'`
-    );
+    printInfo(`Will create:`);
+    printSubStep(`OpenSearch Serverless collection: ${theme.accent(cfg.osDomainName)}`);
+    printSubStep(`IAM role: ${theme.accent(cfg.iamRoleName)}`);
+    printSubStep(`APS workspace: ${theme.accent(cfg.apsWorkspaceAlias)}`);
+    printSubStep(`DQS role: ${theme.accent(cfg.dqsRoleName)}`);
+    printSubStep(`DQS data source: ${theme.accent(cfg.dqsDataSourceName)}`);
+    printSubStep(`OpenSearch Application: ${theme.accent(cfg.appName)}`);
   }
 }
 
 async function stepOpenSearch(cfg) {
   if (cfg.mode !== 'advanced') return 'skip';
 
-  printStep('OpenSearch domain');
+  printStep('OpenSearch');
   console.error();
 
-  const osChoice = await eSelect({
-    message: 'Create new or reuse existing?',
-    choices: [
-      { name: 'Create new', value: 'create' },
-      { name: 'Reuse existing', value: 'reuse' },
-    ],
-    default: cfg.osAction || 'create',
-  });
-  if (osChoice === GoBack) return GoBack;
-
-  if (osChoice === 'reuse') {
-    cfg.osAction = 'reuse';
-
-    const domains = await fetchWithSpinner(
-      'Loading OpenSearch domains & collections',
-      () => listDomains(cfg.region),
-    );
-
-    if (domains.length > 0) {
-      const choices = domains.map((d) => ({
-        name: d.endpoint
-          ? `${d.name} ${theme.muted(`\u2014 ${d.endpoint} (${d.engineVersion})`)}`
-          : `${d.name} ${theme.muted(`\u2014 provisioning... (${d.engineVersion})`)}`,
-        value: { endpoint: d.endpoint, serverless: d.serverless },
-        disabled: !d.endpoint ? '(no endpoint yet)' : false,
-      }));
-      choices.push({ name: theme.accent('Enter manually...'), value: CUSTOM_INPUT });
-
-      const selected = await eSelect({ message: 'Select domain or collection', choices });
-      if (selected === GoBack) return GoBack;
-      if (selected === CUSTOM_INPUT) {
+  while (true) {
+    const osChoice = await eSelect({
+      message: 'Create new or reuse existing?',
+      choices: [
+        { name: 'Create new', value: 'create' },
+        { name: 'Reuse existing', value: 'reuse' },
+      ],
+      default: cfg.osAction || 'create',
+    });
+    if (osChoice === GoBack) return GoBack;
+
+    if (osChoice === 'reuse') {
+      cfg.osAction = 'reuse';
+
+      const domains = await fetchWithSpinner(
+        'Loading OpenSearch domains & collections',
+        () => listDomains(cfg.region),
+      );
+
+      if (domains.length > 0) {
+        const choices = domains.map((d) => ({
+          name: d.endpoint
+            ? `${d.name} ${theme.muted(`\u2014 ${d.endpoint} (${d.engineVersion})`)}`
+            : `${d.name} ${theme.muted(`\u2014 provisioning... (${d.engineVersion})`)}`,
+          value: { endpoint: d.endpoint, serverless: d.serverless },
+          disabled: !d.endpoint ? '(no endpoint yet)' : false,
+        }));
+        choices.push({ name: theme.accent('Enter manually...'), value: CUSTOM_INPUT });
+
+        const selected = await eSelect({ message: 'Select domain or collection', choices });
+        if (selected === GoBack) continue;
+        if (selected === CUSTOM_INPUT) {
+          const ep = await promptEndpoint();
+          if (ep === GoBack) continue;
+          cfg.opensearchEndpoint = ep;
+          cfg.serverless = isServerlessEndpoint(ep);
+        } else {
+          cfg.opensearchEndpoint = selected.endpoint;
+          cfg.serverless = selected.serverless;
+        }
+      } else {
+        printInfo('No domains or collections found \u2014 enter endpoint manually');
         const ep = await promptEndpoint();
-        if (ep === GoBack) return GoBack;
+        if (ep === GoBack) continue;
         cfg.opensearchEndpoint = ep;
         cfg.serverless = isServerlessEndpoint(ep);
-      } else {
-        cfg.opensearchEndpoint = selected.endpoint;
-        cfg.serverless = selected.serverless;
       }
+
+      printSubStep(`Detected type: ${cfg.serverless ? theme.accent('OpenSearch Serverless') : theme.accent('Managed OpenSearch domain')}`);
     } else {
-      printInfo('No domains or collections found \u2014 enter endpoint manually');
-      const ep = await promptEndpoint();
-      if (ep === GoBack) return GoBack;
-      cfg.opensearchEndpoint = ep;
-      cfg.serverless = isServerlessEndpoint(ep);
+      cfg.osAction = 'create';
+
+      const osType = await eSelect({
+        message: 'OpenSearch type',
+        choices: [
+          { name: `Serverless ${theme.muted('\u2014 fully managed, auto-scales')}`, value: 'serverless' },
+          { name: `Managed domain ${theme.muted('\u2014 configure instance type, count, and storage')}`, value: 'managed' },
+        ],
+        default: cfg.serverless === true ? 'serverless' : cfg.serverless === false ? 'managed' : 'serverless',
+      });
+      if (osType === GoBack) continue;
+      cfg.serverless = osType === 'serverless';
+
+      const nameMsg = cfg.serverless ? 'Collection name' : 'Domain name';
+      const domainName = await eInput({ message: nameMsg, default: cfg.osDomainName || cfg.pipelineName });
+      if (domainName === GoBack) continue;
+      cfg.osDomainName = domainName;
+
+      if (!cfg.serverless) {
+        const instType = await eInput({ message: 'Instance type', default: cfg.osInstanceType || DEFAULTS.osInstanceType });
+        if (instType === GoBack) continue;
+        cfg.osInstanceType = instType;
+
+        const instCount = await eInput({
+          message: 'Instance count',
+          default: String(cfg.osInstanceCount || DEFAULTS.osInstanceCount),
+          validate: (v) => /^\d+$/.test(v.trim()) && Number(v) >= 1 || 'Must be a positive integer',
+        });
+        if (instCount === GoBack) continue;
+        cfg.osInstanceCount = Number(instCount);
+
+        const volSize = await eInput({
+          message: 'EBS volume size (GB)',
+          default: String(cfg.osVolumeSize || DEFAULTS.osVolumeSize),
+          validate: (v) => /^\d+$/.test(v.trim()) && Number(v) >= 10 || 'Must be at least 10 GB',
+        });
+        if (volSize === GoBack) continue;
+        cfg.osVolumeSize = Number(volSize);
+
+        const engineVer = await eInput({ message: 'Engine version', default: cfg.osEngineVersion || DEFAULTS.osEngineVersion });
+        if (engineVer === GoBack) continue;
+        cfg.osEngineVersion = engineVer;
+      }
     }
+    return;
+  }
+}
 
-    printSubStep(`Detected type: ${cfg.serverless ? theme.accent('OpenSearch Serverless') : theme.accent('Managed OpenSearch domain')}`);
-  } else {
-    cfg.osAction = 'create';
-
-    const domainName = await eInput({ message: 'Domain name', default: cfg.osDomainName || cfg.pipelineName });
-    if (domainName === GoBack) return GoBack;
-    cfg.osDomainName = domainName;
-
-    const instType = await eInput({ message: 'Instance type', default: cfg.osInstanceType || DEFAULTS.osInstanceType });
-    if (instType === GoBack) return GoBack;
-    cfg.osInstanceType = instType;
+async function stepIam(cfg) {
+  if (cfg.mode !== 'advanced') return 'skip';
 
-    const instCount = await eInput({
-      message: 'Instance count',
-      default: String(cfg.osInstanceCount || DEFAULTS.osInstanceCount),
-      validate: (v) => /^\d+$/.test(v.trim()) && Number(v) >= 1 || 'Must be a positive integer',
-    });
-    if (instCount === GoBack) return GoBack;
-    cfg.osInstanceCount = Number(instCount);
+  printStep('IAM role for OSI pipeline');
+  printInfo('This role allows the ingestion pipeline to write to OpenSearch and Prometheus');
+  console.error();
 
-    const volSize = await eInput({
-      message: 'EBS volume size (GB)',
-      default: String(cfg.osVolumeSize || DEFAULTS.osVolumeSize),
-      validate: (v) => /^\d+$/.test(v.trim()) && Number(v) >= 10 || 'Must be at least 10 GB',
+  while (true) {
+    const iamChoice = await eSelect({
+      message: 'Create new or reuse existing?',
+      choices: [
+        { name: 'Create new', value: 'create' },
+        { name: 'Reuse existing', value: 'reuse' },
+      ],
+      default: cfg.iamAction || 'create',
     });
-    if (volSize === GoBack) return GoBack;
-    cfg.osVolumeSize = Number(volSize);
+    if (iamChoice === GoBack) return GoBack;
 
-    const engineVer = await eInput({ message: 'Engine version', default: cfg.osEngineVersion || DEFAULTS.osEngineVersion });
-    if (engineVer === GoBack) return GoBack;
-    cfg.osEngineVersion = engineVer;
+    if (iamChoice === 'reuse') {
+      cfg.iamAction = 'reuse';
+      const arn = await promptArn('IAM role ARN');
+      if (arn === GoBack) continue;
+      cfg.iamRoleArn = arn;
+    } else {
+      cfg.iamAction = 'create';
+      const roleName = await eInput({ message: 'Role name', default: cfg.iamRoleName || `${cfg.pipelineName}-osi-role` });
+      if (roleName === GoBack) continue;
+      cfg.iamRoleName = roleName;
+    }
+    return;
   }
 }
 
-async function stepIam(cfg) {
+async function stepAps(cfg) {
   if (cfg.mode !== 'advanced') return 'skip';
 
-  printStep('IAM role for OSI pipeline');
+  printStep('Amazon Managed Prometheus (APS) workspace');
   console.error();
 
-  const iamChoice = await eSelect({
-    message: 'Create new or reuse existing?',
-    choices: [
-      { name: 'Create new', value: 'create' },
-      { name: 'Reuse existing', value: 'reuse' },
-    ],
-    default: cfg.iamAction || 'create',
-  });
-  if (iamChoice === GoBack) return GoBack;
+  while (true) {
+    const apsChoice = await eSelect({
+      message: 'Create new or reuse existing?',
+      choices: [
+        { name: 'Create new', value: 'create' },
+        { name: 'Reuse existing', value: 'reuse' },
+      ],
+      default: cfg.apsAction || 'create',
+    });
+    if (apsChoice === GoBack) return GoBack;
+
+    if (apsChoice === 'reuse') {
+      cfg.apsAction = 'reuse';
+
+      const workspaces = await fetchWithSpinner(
+        'Loading APS workspaces',
+        () => listWorkspaces(cfg.region),
+      );
+
+      if (workspaces.length > 0) {
+        const choices = workspaces.map((w) => ({
+          name: w.alias
+            ? `${w.alias} ${theme.muted(`\u2014 ${w.id}`)}`
+            : `${w.id} ${theme.muted('(no alias)')}`,
+          value: w.url,
+        }));
+        choices.push({ name: theme.accent('Enter URL manually...'), value: CUSTOM_INPUT });
+
+        const selected = await eSelect({ message: 'Select workspace', choices });
+        if (selected === GoBack) continue;
+        if (selected === CUSTOM_INPUT) {
+          const url = await promptUrl('Prometheus remote-write URL');
+          if (url === GoBack) continue;
+          cfg.prometheusUrl = url;
+        } else {
+          cfg.prometheusUrl = selected;
+        }
+      } else {
+        printInfo('No workspaces found \u2014 enter URL manually');
+        const url = await promptUrl('Prometheus remote-write URL');
+        if (url === GoBack) continue;
+        cfg.prometheusUrl = url;
+      }
+    } else {
+      cfg.apsAction = 'create';
+      const alias = await eInput({ message: 'Workspace alias', default: cfg.apsWorkspaceAlias || cfg.pipelineName });
+      if (alias === GoBack) continue;
+      cfg.apsWorkspaceAlias = alias;
+    }
+    return;
+  }
+}
 
-  if (iamChoice === 'reuse') {
-    cfg.iamAction = 'reuse';
+async function stepDqsRole(cfg) {
+  if (cfg.mode !== 'advanced') return 'skip';
 
-    const roles = await fetchWithSpinner(
-      'Loading IAM roles',
-      () => listRoles(cfg.region),
-    );
+  printStep('Direct Query IAM role');
+  printInfo('This role allows OpenSearch to query Prometheus metrics via Direct Query Service');
+  console.error();
 
-    if (roles.length > 0) {
-      const osiRoles = [];
-      const otherRoles = [];
-      for (const r of roles) {
-        (/osi|pipeline|ingestion/i.test(r.name) ? osiRoles : otherRoles).push(r);
-      }
-      const sorted = [...osiRoles, ...otherRoles];
-
-      const choices = sorted.map((r) => ({
-        name: `${r.name} ${theme.muted(`\u2014 ${r.arn}`)}`,
-        value: r.arn,
-      }));
-      choices.push({ name: theme.accent('Enter ARN manually...'), value: CUSTOM_INPUT });
-
-      const selected = await eSelect({ message: 'Select role', choices });
-      if (selected === GoBack) return GoBack;
-      if (selected === CUSTOM_INPUT) {
-        const arn = await promptArn();
-        if (arn === GoBack) return GoBack;
-        cfg.iamRoleArn = arn;
-      } else {
-        cfg.iamRoleArn = selected;
-      }
+  while (true) {
+    const choice = await eSelect({
+      message: 'Create new or reuse existing?',
+      choices: [
+        { name: 'Create new', value: 'create' },
+        { name: 'Reuse existing', value: 'reuse' },
+      ],
+      default: 'create',
+    });
+    if (choice === GoBack) return GoBack;
+
+    if (choice === 'reuse') {
+      const arn = await promptArn('DQS role ARN');
+      if (arn === GoBack) continue;
+      cfg.dqsRoleArn = arn;
+      cfg.dqsRoleName = '';
     } else {
-      printInfo('No roles found \u2014 enter ARN manually');
-      const arn = await promptArn();
-      if (arn === GoBack) return GoBack;
-      cfg.iamRoleArn = arn;
+      const roleName = await eInput({
+        message: 'DQS role name',
+        default: cfg.dqsRoleName || `${cfg.pipelineName}-dqs-prometheus-role`,
+      });
+      if (roleName === GoBack) continue;
+      cfg.dqsRoleName = roleName;
     }
-  } else {
-    cfg.iamAction = 'create';
-    const roleName = await eInput({ message: 'Role name', default: cfg.iamRoleName || `${cfg.pipelineName}-osi-role` });
-    if (roleName === GoBack) return GoBack;
-    cfg.iamRoleName = roleName;
+    return;
   }
 }
 
-async function stepAps(cfg) {
+async function stepDqsDataSource(cfg) {
   if (cfg.mode !== 'advanced') return 'skip';
+  // Skip if no DQS role was configured
+  if (!cfg.dqsRoleName && !cfg.dqsRoleArn) return 'skip';
 
-  printStep('Amazon Managed Prometheus (APS) workspace');
+  printStep('Direct Query data source');
+  printInfo('Connects OpenSearch to Prometheus so you can query metrics from OpenSearch UI');
   console.error();
 
-  const apsChoice = await eSelect({
-    message: 'Create new or reuse existing?',
-    choices: [
-      { name: 'Create new', value: 'create' },
-      { name: 'Reuse existing', value: 'reuse' },
-    ],
-    default: cfg.apsAction || 'create',
+  const dsName = await eInput({
+    message: 'Data source name',
+    default: cfg.dqsDataSourceName || `${cfg.pipelineName.replace(/-/g, '_')}_prometheus`,
+    validate: (v) => /^[a-z][a-z0-9_]+$/.test(v.trim()) || 'Must match [a-z][a-z0-9_]+ (lowercase, underscores only)',
   });
-  if (apsChoice === GoBack) return GoBack;
-
-  if (apsChoice === 'reuse') {
-    cfg.apsAction = 'reuse';
-
-    const workspaces = await fetchWithSpinner(
-      'Loading APS workspaces',
-      () => listWorkspaces(cfg.region),
-    );
-
-    if (workspaces.length > 0) {
-      const choices = workspaces.map((w) => ({
-        name: w.alias
-          ? `${w.alias} ${theme.muted(`\u2014 ${w.id}`)}`
-          : `${w.id} ${theme.muted('(no alias)')}`,
-        value: w.url,
-      }));
-      choices.push({ name: theme.accent('Enter URL manually...'), value: CUSTOM_INPUT });
-
-      const selected = await eSelect({ message: 'Select workspace', choices });
-      if (selected === GoBack) return GoBack;
-      if (selected === CUSTOM_INPUT) {
-        const url = await promptUrl('Prometheus remote-write URL');
-        if (url === GoBack) return GoBack;
-        cfg.prometheusUrl = url;
+  if (dsName === GoBack) return GoBack;
+  cfg.dqsDataSourceName = dsName;
+}
+
+async function stepApp(cfg) {
+  if (cfg.mode !== 'advanced') return 'skip';
+
+  printStep('OpenSearch UI');
+  printInfo('The OpenSearch Application provides a unified dashboard for your observability data');
+  console.error();
+
+  while (true) {
+    const choice = await eSelect({
+      message: 'Create new or reuse existing?',
+      choices: [
+        { name: `Create new ${theme.muted('\u2014 creates an OpenSearch Application with data sources')}`, value: 'create' },
+        { name: 'Reuse existing', value: 'reuse' },
+      ],
+      default: cfg.dashboardsAction || 'create',
+    });
+    if (choice === GoBack) return GoBack;
+
+    if (choice === 'reuse') {
+      cfg.dashboardsAction = 'reuse';
+
+      const apps = await fetchWithSpinner(
+        'Loading OpenSearch Applications',
+        () => listApplications(cfg.region),
+      );
+
+      if (apps.length > 0) {
+        const choices = apps.map((a) => ({
+          name: a.endpoint
+            ? `${a.name} ${theme.muted(`\u2014 ${a.endpoint}`)}`
+            : `${a.name} ${theme.muted(`(${a.id})`)}`,
+          value: a.endpoint || a.id,
+        }));
+        choices.push({ name: theme.accent('Enter URL manually...'), value: CUSTOM_INPUT });
+
+        const selected = await eSelect({ message: 'Select application', choices });
+        if (selected === GoBack) continue;
+        if (selected === CUSTOM_INPUT) {
+          const url = await promptUrl('OpenSearch UI URL');
+          if (url === GoBack) continue;
+          cfg.dashboardsUrl = url;
+        } else {
+          cfg.dashboardsUrl = selected;
+        }
       } else {
-        cfg.prometheusUrl = selected;
+        printInfo('No applications found \u2014 enter URL manually');
+        const url = await promptUrl('OpenSearch UI URL');
+        if (url === GoBack) continue;
+        cfg.dashboardsUrl = url;
       }
+      cfg.appName = '';
     } else {
-      printInfo('No workspaces found \u2014 enter URL manually');
-      const url = await promptUrl('Prometheus remote-write URL');
-      if (url === GoBack) return GoBack;
-      cfg.prometheusUrl = url;
+      cfg.dashboardsAction = 'create';
+      const appName = await eInput({
+        message: 'Application name',
+        default: cfg.appName || cfg.pipelineName,
+      });
+      if (appName === GoBack) continue;
+      cfg.appName = appName;
     }
-  } else {
-    cfg.apsAction = 'create';
-    const alias = await eInput({ message: 'Workspace alias', default: cfg.apsWorkspaceAlias || cfg.pipelineName });
-    if (alias === GoBack) return GoBack;
-    cfg.apsWorkspaceAlias = alias;
+    return;
   }
 }
 
@@ -321,22 +432,6 @@ async function stepTuning(cfg) {
   cfg.serviceMapWindow = window;
 }
 
-async function stepOutput(cfg) {
-  printStep('Output');
-  console.error();
-
-  const outputFile = await eInput({ message: 'Output file for pipeline YAML (leave empty for stdout)', default: cfg.outputFile || '' });
-  if (outputFile === GoBack) return GoBack;
-  cfg.outputFile = outputFile;
-
-  const dryRun = await eConfirm({
-    message: 'Dry run only (generate config, skip resource creation)?',
-    default: cfg.dryRun ?? true,
-  });
-  if (dryRun === GoBack) return GoBack;
-  cfg.dryRun = dryRun;
-}
-
 // ── Main wizard ──────────────────────────────────────────────────────────────
 
 /**
@@ -348,10 +443,8 @@ export async function runCreateWizard(session = null) {
   const cfg = createDefaultConfig();
 
   if (!session) printHeader();
-  printKeyHint([['Esc', 'back'], ['Ctrl+C', 'cancel']]);
-  console.error();
 
-  const steps = [stepMode, stepCore, stepOpenSearch, stepIam, stepAps, stepTuning, stepOutput];
+  const steps = [stepMode, stepCore, stepOpenSearch, stepIam, stepAps, stepDqsRole, stepDqsDataSource, stepApp, stepTuning];
   const visited = [];
   let i = 0;
 
@@ -360,8 +453,8 @@ export async function runCreateWizard(session = null) {
 
     if (result === GoBack) {
       if (visited.length === 0) {
-        // Escape at first step → cancel wizard (same as Ctrl+C)
-        throw Object.assign(new Error('Cancelled'), { name: 'ExitPromptError' });
+        // Escape at first step → return to menu
+        return GoBack;
       }
       i = visited.pop();
     } else if (result === 'skip') {
@@ -372,7 +465,6 @@ export async function runCreateWizard(session = null) {
     }
   }
 
-  console.error();
   return cfg;
 }
 
@@ -389,9 +481,9 @@ function promptEndpoint() {
   });
 }
 
-function promptArn() {
+function promptArn(message) {
   return eInput({
-    message: 'IAM role ARN',
+    message,
     validate: (v) => {
       if (!v.trim()) return 'ARN is required';
       if (!v.startsWith('arn:aws:iam:')) return 'Must start with arn:aws:iam:';