@joshualiamzn/open-stack 0.0.1 → 0.0.2

package/src/main.mjs

@@ -8,6 +8,10 @@ import {
   createApsWorkspace,
   createOsiPipeline,
   mapOsiRoleInDomain,
+  setupDashboards,
+  createDqsPrometheusRole,
+  createDirectQueryDataSource,
+  createOpenSearchApplication,
 } from './aws.mjs';
 import {
   printError,
@@ -18,6 +22,52 @@ import {
   theme,
 } from './ui.mjs';
 
+async function runDemoCommand(cfg) {
+  const { STSClient, GetCallerIdentityCommand } = await import('@aws-sdk/client-sts');
+  const { checkDemoPrerequisites, createEksCluster, installHelmChart, installOtelDemo } = await import('./eks.mjs');
+  const { getPipelineEndpoint } = await import('./aws.mjs');
+
+  if (!cfg.region) throw new Error('--region is required (or set AWS_REGION)');
+  if (!cfg.pipeline) throw new Error('--pipeline is required');
+
+  const sts = new STSClient({ region: cfg.region });
+  const identity = await sts.send(new GetCallerIdentityCommand({}));
+
+  checkDemoPrerequisites();
+
+  const otlpEndpoint = await getPipelineEndpoint(cfg.region, cfg.pipeline);
+  if (!otlpEndpoint) throw new Error(`No OTLP endpoint found for pipeline: ${cfg.pipeline}`);
+  printSuccess(`Pipeline endpoint: ${otlpEndpoint}`);
+
+  await createEksCluster({
+    clusterName: cfg.clusterName,
+    region: cfg.region,
+    nodeCount: cfg.nodeCount,
+    instanceType: cfg.instanceType,
+    stackName: cfg.pipeline,
+    accountId: identity.Account,
+  });
+
+  console.error();
+  await installHelmChart({ otlpEndpoint });
+
+  if (!cfg.skipOtelDemo) {
+    console.error();
+    await installOtelDemo({ otlpEndpoint });
+  }
+
+  console.error();
+  printBox([
+    '',
+    `${theme.success.bold(`${STAR} Demo Services Deployed! ${STAR}`)}`,
+    '',
+    `${theme.label('Cluster:')}    ${cfg.clusterName}`,
+    `${theme.label('Region:')}     ${cfg.region}`,
+    `${theme.label('Pipeline:')}   ${cfg.pipeline}`,
+    '',
+  ], { color: 'primary', padding: 2 });
+}
+
 export async function run() {
   try {
     // Parse CLI or run interactive REPL
@@ -27,6 +77,12 @@ export async function run() {
       return startRepl();
     }
 
+    // Demo subcommand
+    if (cfg._command === 'demo') {
+      await runDemoCommand(cfg);
+      return;
+    }
+
     // Apply simple-mode defaults for anything not explicitly set
     if (!cfg.mode) cfg.mode = 'simple';
     if (cfg.mode === 'simple') applySimpleDefaults(cfg);
@@ -103,6 +159,27 @@ export async function executePipeline(cfg) {
     console.error();
   }
 
+  // Extract apsWorkspaceId from prometheusUrl if not already set
+  if (!cfg.apsWorkspaceId && cfg.prometheusUrl) {
+    const m = cfg.prometheusUrl.match(/\/workspaces\/(ws-[^/]+)\//);
+    if (m) cfg.apsWorkspaceId = m[1];
+  }
+
+  // Create DQS Prometheus role and Direct Query data source (connects AMP to OpenSearch)
+  if (cfg.apsWorkspaceId && cfg.dqsRoleName) {
+    await createDqsPrometheusRole(cfg);
+    console.error();
+
+    await createDirectQueryDataSource(cfg);
+    console.error();
+  }
+
+  // Create OpenSearch Application and associate data sources
+  if (cfg.appName) {
+    await createOpenSearchApplication(cfg);
+    console.error();
+  }
+
   // Generate pipeline YAML
   const pipelineYaml = renderPipeline(cfg);
 
@@ -114,31 +191,28 @@ export async function executePipeline(cfg) {
 
   // Create the OSI pipeline
   await createOsiPipeline(cfg, pipelineYaml);
+  console.error();
+
+  // Set up OpenSearch UI and create Observability workspace
+  await setupDashboards(cfg);
 
   // ── Final summary ───────────────────────────────────────────────────
   console.error();
+  const pad = (l) => l.padEnd(35);
   printBox([
     '',
-    `${theme.success.bold(`${STAR} OSI Pipeline Setup Complete! ${STAR}`)}`,
+    `${theme.success.bold(`${STAR} Open Stack Setup Complete! ${STAR}`)}`,
     '',
-    `${theme.label('Pipeline:')}     ${cfg.pipelineName}`,
-    `${theme.label('OpenSearch:')}   ${cfg.opensearchEndpoint}`,
-    `${theme.label('IAM Role:')}     ${cfg.iamRoleArn}`,
-    `${theme.label('Prometheus:')}   ${cfg.prometheusUrl}`,
+    `${theme.label(pad('OSI Pipeline:'))} ${cfg.ingestEndpoints?.length ? `https://${cfg.ingestEndpoints[0]}` : cfg.pipelineName}`,
+    `${theme.label(pad('OSI Pipeline Role:'))} ${cfg.iamRoleArn}`,
+    `${theme.label(pad('OpenSearch:'))} ${cfg.opensearchEndpoint}`,
+    `${theme.label(pad('OpenSearch UI:'))} ${cfg.dashboardsUrl}`,
+    `${theme.label(pad('Prometheus:'))} ${cfg.prometheusUrl}`,
+    `${theme.label(pad('Direct Query Service Datasource:'))} ${cfg.dqsDataSourceArn || 'n/a'}`,
+    `${theme.label(pad('Direct Query Service Role:'))} ${cfg.dqsRoleArn || 'n/a'}`,
     '',
   ], { color: 'primary', padding: 2 });
 
-  console.error();
-  printBox([
-    '',
-    `${theme.muted('# Check pipeline status')}`,
-    `${theme.accentBold(`aws osis get-pipeline --pipeline-name ${cfg.pipelineName} --region ${cfg.region}`)}`,
-    '',
-    `${theme.muted('# Delete pipeline')}`,
-    `${theme.accentBold(`aws osis delete-pipeline --pipeline-name ${cfg.pipelineName} --region ${cfg.region}`)}`,
-    '',
-  ], { title: 'Useful commands', color: 'dim', padding: 2 });
-  console.error();
 }
 
 // ── Summary ─────────────────────────────────────────────────────────────────
@@ -191,6 +265,21 @@ function printSummary(cfg) {
     apsEntries.push(['Workspace alias', cfg.apsWorkspaceAlias]);
   }
 
+  // Dashboards
+  const dashEntries = [];
+  if (cfg.dashboardsAction === 'reuse') {
+    dashEntries.push(['Action', 'reuse existing']);
+    dashEntries.push(['URL', cfg.dashboardsUrl]);
+  } else {
+    dashEntries.push(['Action', 'create new Observability workspace']);
+  }
+
+  // Direct Query & Application
+  const dqEntries = [];
+  if (cfg.dqsRoleName) dqEntries.push(['DQS role', cfg.dqsRoleName]);
+  if (cfg.dqsDataSourceName) dqEntries.push(['Data source name', cfg.dqsDataSourceName]);
+  if (cfg.appName) dqEntries.push(['Application name', cfg.appName]);
+
   // Pipeline settings
   const tuneEntries = [
     ['Min OCU', String(cfg.minOcu)],
@@ -204,12 +293,18 @@ function printSummary(cfg) {
     ['', theme.accentBold('OpenSearch')],
     ...osEntries,
     ['', ''],
+    ['', theme.accentBold('OpenSearch UI')],
+    ...dashEntries,
+    ['', ''],
     ['', theme.accentBold('IAM Role')],
     ...iamEntries,
     ['', ''],
     ['', theme.accentBold('Amazon Managed Prometheus')],
     ...apsEntries,
     ['', ''],
+    ['', theme.accentBold('Direct Query & Application')],
+    ...dqEntries,
+    ['', ''],
     ['', theme.accentBold('Pipeline Settings')],
     ...tuneEntries,
   ]);

package/src/render.mjs

@@ -174,8 +174,7 @@ otel-metrics-pipeline:
   source:
     pipeline:
       name: otlp-pipeline
-  processor:
-    - otel_metrics:
+  processor: []
   sink:
     - prometheus:
         url: '${cfg.prometheusUrl}'

package/src/repl.mjs

@@ -1,8 +1,8 @@
-import { select, input } from '@inquirer/prompts';
+import { input } from '@inquirer/prompts';
 import { STSClient, GetCallerIdentityCommand } from '@aws-sdk/client-sts';
 import {
-  printBanner, printError, printInfo,
-  printKeyHint, printPanel, theme,
+  printBanner, printDivider, printError, printInfo,
+  theme, GoBack, eSelect,
 } from './ui.mjs';
 import { COMMANDS, COMMAND_CHOICES } from './commands/index.mjs';
 
@@ -10,39 +10,31 @@ import { COMMANDS, COMMAND_CHOICES } from './commands/index.mjs';
  * Initialize session — prompt for region and verify AWS credentials.
  */
 async function initSession() {
-  const region = await input({
+  const envRegion = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
+  const region = envRegion || await input({
     message: 'AWS region',
     default: 'us-east-1',
     validate: (v) => /^[a-z]{2}-[a-z]+-\d+$/.test(v) || 'Expected format: us-east-1',
   });
 
-  console.error();
   const sts = new STSClient({ region });
   let identity;
   try {
     identity = await sts.send(new GetCallerIdentityCommand({}));
   } catch (err) {
     printError('AWS credentials are not configured or have expired');
-    printInfo(err.message);
     printInfo('Run "aws configure" or "aws sso login" to set up credentials, then restart.');
+    printInfo('See documentation: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-quickstart.html#getting-started-quickstart-new-command.');
     throw err;
   }
 
-  printPanel('Session', [
-    ['Account', identity.Account],
-    ['Region', region],
-    ['Identity', theme.muted(identity.Arn)],
-  ]);
-
-  return { region, accountId: identity.Account };
+  return { region, accountId: identity.Account, arn: identity.Arn };
 }
 
 /**
  * Start the interactive REPL loop.
  */
 export async function startRepl() {
-  printBanner();
-
   let session;
   try {
     session = await initSession();
@@ -50,39 +42,23 @@ export async function startRepl() {
     process.exit(1);
   }
 
-  console.error();
-  printKeyHint([['Enter', 'select'], ['Esc', 'back'], ['Ctrl+C', 'exit']]);
+  printBanner({ account: session.accountId, region: session.region, arn: session.arn });
+
   console.error();
 
   while (true) {
-    let cmd;
-    try {
-      cmd = await select({
-        message: theme.primary(`osi-pipeline [${session.region}]`),
-        choices: COMMAND_CHOICES,
-      });
-    } catch (err) {
-      // Ctrl+C at the menu level → exit
-      if (err.name === 'ExitPromptError') break;
-      throw err;
-    }
+    const cmd = await eSelect({
+      message: theme.primary(`open-stack [${session.region}]`),
+      choices: COMMAND_CHOICES,
+      clearPromptOnDone: true,
+    });
 
-    if (cmd === 'quit') break;
+    if (cmd === GoBack || cmd === 'quit') break;
 
-    try {
-      await COMMANDS[cmd](session);
-    } catch (err) {
-      if (err.name === 'ExitPromptError') {
-        // Ctrl+C during a command → return to menu
-        console.error();
-        printInfo('Cancelled.');
-        console.error();
-        continue;
-      }
-      console.error();
-      printError(err.message);
-      console.error();
-    }
+    const result = await COMMANDS[cmd](session);
+    printDivider();
+    console.error();
+    if (result === GoBack) continue;
   }
 
   console.error();

package/src/ui.mjs

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import ora from 'ora';
 import readline from 'node:readline';
+import { search, input, confirm } from '@inquirer/prompts';
 
 // ── Theme colors ─────────────────────────────────────────────────────────────
 
@@ -28,9 +29,11 @@ export const DOT = '\u2022';
 export const DIAMOND = '\u25C6';
 
 // Box-drawing characters
+const DIVIDER = Symbol('divider');
+
 const BOX = {
   tl: '\u256D', tr: '\u256E', bl: '\u2570', br: '\u256F', // rounded corners
-  h: '\u2500', v: '\u2502',
+  h: '\u2500', v: '\u2502', lT: '\u251C', rT: '\u2524',
   ltee: '\u251C', rtee: '\u2524',
 };
 
@@ -51,7 +54,7 @@ export function renderBox(lines, opts = {}) {
 
   // Strip ANSI for width calculation
   const stripAnsi = (s) => s.replace(/\x1B\[[0-9;]*m/g, '');
-  const innerWidth = opts.width || Math.max(...lines.map((l) => stripAnsi(l).length)) + pad * 2;
+  const innerWidth = opts.width || Math.max(...lines.filter((l) => typeof l === 'string').map((l) => stripAnsi(l).length)) + pad * 2;
 
   const colorFn = opts.color === 'dim' ? chalk.dim
     : opts.color === 'primary' ? theme.primary
@@ -62,7 +65,7 @@ export function renderBox(lines, opts = {}) {
   if (opts.title) {
     const titleStr = ` ${opts.title} `;
     const titleLen = stripAnsi(titleStr).length;
-    const remaining = innerWidth - titleLen;
+    const remaining = innerWidth - titleLen - 1;
     topBorder = colorFn(BOX.tl + BOX.h) + theme.primaryBold(titleStr) + colorFn(BOX.h.repeat(Math.max(0, remaining)) + BOX.tr);
   } else {
     topBorder = colorFn(BOX.tl + BOX.h.repeat(innerWidth) + BOX.tr);
@@ -72,6 +75,10 @@ export function renderBox(lines, opts = {}) {
 
   const boxLines = [topBorder];
   for (const line of lines) {
+    if (line === DIVIDER) {
+      boxLines.push(colorFn(BOX.lT + BOX.h.repeat(innerWidth) + BOX.rT));
+      continue;
+    }
     const visLen = stripAnsi(line).length;
     const rightPad = Math.max(0, innerWidth - pad * 2 - visLen);
     boxLines.push(colorFn(BOX.v) + sp + line + ' '.repeat(rightPad) + sp + colorFn(BOX.v));
@@ -118,7 +125,7 @@ export function printHeader() {
   const banner = [
     '',
     `${theme.primaryBold('Open Stack CLI')}`,
-    `${theme.muted('Create AWS resources and OpenSearch Ingestion pipelines')}`,
+    `${theme.muted('Create and manage your observability stack on AWS')}`,
     '',
   ];
   printBox(banner, { color: 'primary', padding: 2 });
@@ -152,7 +159,7 @@ export function printInfo(msg) {
 
 // Spinner — wraps ora for consistent styling
 export function createSpinner(text) {
-  return ora({ text, stream: process.stderr, spinner: 'dots', color: 'magenta' });
+  return ora({ text, stream: process.stderr, spinner: 'dots', color: 'magenta', indent: 2 });
 }
 
 // ── Key hints ────────────────────────────────────────────────────────────────
@@ -165,6 +172,99 @@ export function printKeyHint(hints) {
   console.error(`  ${parts.join('  ')}`);
 }
 
+/**
+ * Returns a keysHelpTip theme function for @inquirer/select that appends
+ * extra key hints (e.g. Esc, Ctrl+C) to the default navigation line.
+ */
+export function formatKeysHelpTip(extraHints) {
+  const extra = extraHints.map(([key, desc]) =>
+    `${theme.accent(key)} ${theme.muted(desc)}`
+  ).join(theme.muted(' \u2022 '));
+  return (keys) => {
+    const base = keys.map(([key, action]) =>
+      `${theme.accent(key)} ${theme.muted(action)}`
+    ).join(theme.muted(' \u2022 '));
+    return `${base} ${theme.muted('\u2022')} ${extra}`;
+  };
+}
+
+// ── Shared escape-wrapped prompts ────────────────────────────────────────────
+
+const _promptPrefix = { idle: '  ?', done: '  ✔', canceled: '  ✖' };
+
+const _selectKeyTheme = {
+  prefix: _promptPrefix,
+  style: { keysHelpTip: formatKeysHelpTip([['Esc', 'back']]) },
+};
+
+export const eInput = withEscape(input);
+export const eConfirm = withEscape(confirm);
+
+// ── Searchable select ───────────────────────────────────────────────────────
+
+/**
+ * Select prompt with built-in incremental search and Escape-to-go-back.
+ * Type to filter, arrow keys to navigate, Enter to select, Esc to go back.
+ */
+export function eSelect(opts) {
+  if (!_keypressInit && process.stdin.isTTY) {
+    readline.emitKeypressEvents(process.stdin);
+    _keypressInit = true;
+  }
+
+  const searchableChoices = (opts.choices || []).filter((c) => c.type !== 'separator' && !c.disabled);
+
+  const promise = search({
+    message: opts.message || 'Select',
+    theme: _selectKeyTheme,
+    source: (term) => {
+      if (!term) return searchableChoices;
+      const lower = term.toLowerCase();
+      return searchableChoices.filter((c) => {
+        const name = (c.name || String(c.value || '')).toLowerCase();
+        return name.includes(lower);
+      });
+    },
+  });
+
+  // Intercept tab at emit level to prevent search prompt's autocomplete
+  const origEmit = process.stdin.emit;
+  process.stdin.emit = function (event, ...args) {
+    if (event === 'keypress' && args[1]?.name === 'tab') return true;
+    return origEmit.apply(this, [event, ...args]);
+  };
+
+  let escaped = false;
+  const onKeypress = (_ch, key) => {
+    if (key?.name === 'escape') {
+      escaped = true;
+      promise.cancel();
+    }
+  };
+
+  process.stdin.on('keypress', onKeypress);
+
+  const cleanup = () => {
+    process.stdin.removeListener('keypress', onKeypress);
+    process.stdin.emit = origEmit;
+  };
+
+  return promise.then(
+    (val) => { cleanup(); return val; },
+    (err) => {
+      cleanup();
+      if (escaped) return GoBack;
+      if (err.name === 'ExitPromptError') {
+        console.error();
+        console.error(`  ${theme.muted('Goodbye.')}`);
+        console.error();
+        process.exit(0);
+      }
+      throw err;
+    },
+  );
+}
+
 // ── Pipeline status colorizer ────────────────────────────────────────────────
 
 const STATUS_COLORS = {
@@ -196,15 +296,18 @@ export function formatDate(d) {
 
 // ── REPL banner ──────────────────────────────────────────────────────────────
 
-export function printBanner() {
+export function printBanner(session) {
   console.error();
-  const banner = [
-    '',
-    `${theme.primaryBold('Open Stack')}`,
-    `${theme.muted('Create, list, describe, and update OpenSearch Ingestion pipelines')}`,
-    '',
+  const lines = [
+    `${theme.muted('Create and manage your observability stack on AWS')}`,
   ];
-  printBox(banner, { color: 'primary', padding: 2 });
+  if (session) {
+    lines.push(DIVIDER);
+    lines.push(`${theme.muted('Account')}  ${session.account}`);
+    lines.push(`${theme.muted('Region')}   ${session.region}`);
+    lines.push(`${theme.muted('Identity')} ${theme.muted(session.arn)}`);
+  }
+  printBox(lines, { title: 'Open Stack', color: 'primary', padding: 2 });
 }
 
 // ── Horizontal divider ──────────────────────────────────────────────────────
@@ -222,6 +325,7 @@ let _keypressInit = false;
 /**
  * Wrap an @inquirer/prompts function so that pressing Escape cancels
  * the prompt and returns the GoBack sentinel instead of throwing.
+ * @param {Function} promptFn
  */
 export function withEscape(promptFn) {
   return (...args) => {
@@ -247,6 +351,13 @@ export function withEscape(promptFn) {
       (err) => {
         process.stdin.removeListener('keypress', onKeypress);
         if (escaped) return GoBack;
+        // Ctrl+C → exit immediately
+        if (err.name === 'ExitPromptError') {
+          console.error();
+          console.error(`  ${theme.muted('Goodbye.')}`);
+          console.error();
+          process.exit(0);
+        }
         throw err;
       },
     );