create-svc 0.1.14 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Local microservice bootstrap CLI for Cloud Run and Workers services with Neon-backed data.",
   "module": "index.ts",
   "type": "module",
@@ -50,8 +50,6 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.4.0",
-    "@google-cloud/billing": "^5.1.2",
-    "@google-cloud/resource-manager": "^6.2.2",
     "@neondatabase/api-client": "^2.7.1",
     "picocolors": "^1.1.1"
   }

package/src/cli.ts

@@ -1,16 +1,4 @@
-import {
-  autocomplete,
-  cancel,
-  confirm,
-  intro,
-  isCancel,
-  log,
-  note,
-  outro,
-  select,
-  spinner,
-  text,
-} from "@clack/prompts";
+import { autocomplete, cancel, intro, isCancel, log, note, outro, select, spinner, text } from "@clack/prompts";
 import pc from "picocolors";
 import { readdirSync } from "node:fs";
 import { basename, dirname, resolve } from "node:path";
@@ -68,7 +56,25 @@ type DiscoveryState = {
   warnings: string[];
 };
 
+type GcpSelection = {
+  mode: GcpProjectMode;
+  projectId: string;
+  projectName: string;
+};
+
+type InteractiveStep = "serviceName" | "target" | "runtime" | "framework" | "modulePath" | "gcp" | "confirm";
+
+type InteractiveState = {
+  serviceName?: string;
+  target?: DeployTarget;
+  runtime?: Runtime;
+  framework?: Framework;
+  modulePath?: string;
+  gcpSelection?: GcpSelection;
+};
+
 const DEFAULT_REGION = "us-west1";
+const BACK = "__back__" as const;
 
 export async function run(argv: string[]) {
   try {
@@ -376,9 +382,11 @@ export function parseArgs(argv: string[]): ParsedArgs {
 
 export async function resolveConfig(args: ParsedArgs): Promise<ScaffoldConfig> {
   const inferredName = slugify(args.serviceName ?? basename(args.directory ?? "my-service"));
-  const serviceName = args.yes
-    ? inferredName
-    : await promptText("Service name", inferredName, (value) => validateServiceNameInput(value, args.directory));
+  if (!args.yes) {
+    return resolveInteractiveConfig(args, inferredName);
+  }
+
+  const serviceName = inferredName;
   const directory = args.directory ?? serviceName;
   const targetDir = resolve(process.cwd(), directory);
   await assertTargetDirectoryIsEmpty(targetDir);
@@ -392,22 +400,14 @@ export async function resolveConfig(args: ParsedArgs): Promise<ScaffoldConfig> {
   const modulePath = await resolveModulePath(args, runtime, defaults.modulePath);
   const discovery = await waitForDiscovery(discoveryPromise);
   const gcpSelection = await resolveGcpSelection(args, defaults, discovery);
+  if (gcpSelection === BACK) {
+    throw new Error("Unexpected back navigation in non-interactive config");
+  }
   const region = args.region ?? DEFAULT_REGION;
   const billingAccount = chooseBillingAccount(args.billingAccount, discovery.billingAccounts);
   const autoDeploy = resolveAutoDeploy(args.autoDeploy);
   const git = buildGitBootstrapConfig(serviceName, args.noGit);
 
-  if (!args.yes) {
-    const okay = await confirm({
-      message: "Create the scaffold with these defaults?",
-      initialValue: true,
-    });
-    if (isCancel(okay) || !okay) {
-      cancel("Aborted");
-      process.exit(1);
-    }
-  }
-
   for (const warning of discovery.warnings) {
     log.warn(warning);
   }
@@ -434,6 +434,226 @@ export async function resolveConfig(args: ParsedArgs): Promise<ScaffoldConfig> {
   };
 }
 
+async function resolveInteractiveConfig(args: ParsedArgs, initialServiceName: string): Promise<ScaffoldConfig> {
+  const state: InteractiveState = {
+    serviceName: args.serviceName ? slugify(args.serviceName) : undefined,
+    target: args.target,
+    runtime: args.runtime,
+    framework: args.framework,
+    modulePath: args.modulePath,
+  };
+  let serviceNameDraft = state.serviceName ?? initialServiceName;
+  let discovery: DiscoveryState | undefined;
+  const discoveryPromise = discoverCloudInputs();
+  let step: InteractiveStep = state.serviceName ? "target" : "serviceName";
+
+  while (true) {
+    if (step === "serviceName") {
+      const value = await promptText("Service name", serviceNameDraft, (input) => validateServiceNameInput(input, args.directory));
+      serviceNameDraft = value;
+      state.serviceName = value;
+      step = "target";
+      continue;
+    }
+
+    if (!state.serviceName) {
+      step = "serviceName";
+      continue;
+    }
+
+    const defaults = deriveDefaults(state.serviceName);
+
+    if (step === "target") {
+      if (args.target) {
+        state.target = args.target;
+      } else {
+        const value = await promptSelectWithBack<DeployTarget>(
+          "Deploy target",
+          [
+            { value: "cloudrun", label: "Cloud Run", hint: "Default" },
+            { value: "workers", label: "Cloudflare Workers" },
+          ],
+          "cloudrun",
+          step,
+          args,
+          state
+        );
+        if (value === BACK) {
+          step = previousPromptStep(step, args, state) ?? step;
+          continue;
+        }
+        state.target = value;
+        state.runtime = undefined;
+        state.framework = undefined;
+      }
+      step = "runtime";
+      continue;
+    }
+
+    if (step === "runtime") {
+      if (!state.target) {
+        step = "target";
+        continue;
+      }
+      if (state.target === "workers") {
+        state.runtime = "bun";
+      } else if (args.runtime) {
+        state.runtime = args.runtime;
+      } else {
+        const value = await promptSelectWithBack<Runtime>(
+          "Runtime",
+          [
+            { value: "go", label: "Go", hint: "Default" },
+            { value: "bun", label: "Bun" },
+          ],
+          "go",
+          step,
+          args,
+          state
+        );
+        if (value === BACK) {
+          step = previousPromptStep(step, args, state) ?? step;
+          continue;
+        }
+        state.runtime = value;
+        state.framework = undefined;
+      }
+      step = "framework";
+      continue;
+    }
+
+    if (step === "framework") {
+      if (!state.target || !state.runtime) {
+        step = state.target ? "runtime" : "target";
+        continue;
+      }
+      const allowed = frameworksForTargetRuntime(state.target, state.runtime);
+      if (args.framework) {
+        if (!allowed.some((framework) => framework === args.framework)) {
+          throw new Error(`Framework ${args.framework} is not valid for target ${state.target} and runtime ${state.runtime}`);
+        }
+        state.framework = args.framework;
+      } else {
+        const value = await promptSelectWithBack<Framework>(
+          "Framework",
+          allowed.map((framework, index) => ({
+            value: framework,
+            label: framework,
+            hint: index === 0 ? "Default" : undefined,
+          })),
+          allowed[0],
+          step,
+          args,
+          state
+        );
+        if (value === BACK) {
+          step = previousPromptStep(step, args, state) ?? step;
+          continue;
+        }
+        state.framework = value;
+      }
+      step = "modulePath";
+      continue;
+    }
+
+    if (step === "modulePath") {
+      if (!state.runtime) {
+        step = "runtime";
+        continue;
+      }
+      if (state.runtime !== "go") {
+        state.modulePath = args.modulePath ?? defaults.modulePath;
+      } else if (args.modulePath) {
+        state.modulePath = args.modulePath.trim();
+      } else {
+        const value = await promptTextWithBack(
+          "Go module path",
+          state.modulePath ?? defaults.modulePath,
+          (input) => {
+            if (!input.trim()) {
+              return "Go module path is required";
+            }
+            return true;
+          },
+          step,
+          args,
+          state
+        );
+        if (value === BACK) {
+          step = previousPromptStep(step, args, state) ?? step;
+          continue;
+        }
+        state.modulePath = value;
+      }
+      step = "gcp";
+      continue;
+    }
+
+    if (step === "gcp") {
+      discovery ??= await waitForDiscovery(discoveryPromise);
+      const value = await resolveGcpSelection(args, defaults, discovery, {
+        allowBack: Boolean(previousPromptStep(step, args, state)),
+      });
+      if (value === BACK) {
+        step = previousPromptStep(step, args, state) ?? step;
+        continue;
+      }
+      state.gcpSelection = value;
+      step = "confirm";
+      continue;
+    }
+
+    if (step === "confirm") {
+      if (!state.target || !state.runtime || !state.framework || !state.modulePath || !state.gcpSelection) {
+        step = "serviceName";
+        continue;
+      }
+      const value = await promptSelectWithBack<"create">(
+        "Create the scaffold with these defaults?",
+        [{ value: "create", label: "Create scaffold", hint: "Default" }],
+        "create",
+        step,
+        args,
+        state
+      );
+      if (value === BACK) {
+        step = previousPromptStep(step, args, state) ?? step;
+        continue;
+      }
+
+      const directory = args.directory ?? state.serviceName;
+      const targetDir = resolve(process.cwd(), directory);
+      await assertTargetDirectoryIsEmpty(targetDir);
+      const billingAccount = chooseBillingAccount(args.billingAccount, discovery?.billingAccounts ?? []);
+
+      for (const warning of discovery?.warnings ?? []) {
+        log.warn(warning);
+      }
+
+      return {
+        directory,
+        serviceName: state.serviceName,
+        modulePath: state.modulePath,
+        target: state.target,
+        runtime: state.runtime,
+        framework: state.framework,
+        profile: args.profile,
+        region: args.region ?? DEFAULT_REGION,
+        gcpProjectMode: state.gcpSelection.mode,
+        gcpProject: state.gcpSelection.projectId,
+        gcpProjectName: state.gcpSelection.projectName,
+        billingAccount,
+        quotaProjectId: args.quotaProjectId ?? QUOTA_PROJECT_DEFAULT,
+        autoDeploy: resolveAutoDeploy(args.autoDeploy),
+        git: buildGitBootstrapConfig(state.serviceName, args.noGit),
+        neonDatabaseName: defaults.neonDatabaseName,
+        apiHostname: defaults.apiHostname,
+        generatorRoot: resolve(dirname(fileURLToPath(import.meta.url)), ".."),
+      };
+    }
+  }
+}
+
 async function waitForDiscovery(discoveryPromise: Promise<DiscoveryState>) {
   const indicator = spinner();
   indicator.start("Discovering GCP defaults");
@@ -561,8 +781,9 @@ async function resolveModulePath(args: ParsedArgs, runtime: Runtime, initialValu
 async function resolveGcpSelection(
   args: ParsedArgs,
   defaults: ReturnType<typeof deriveDefaults>,
-  discovery: DiscoveryState
-) {
+  discovery: DiscoveryState,
+  options: { allowBack?: boolean } = {}
+): Promise<GcpSelection | typeof BACK> {
   if (args.gcpProjectMode && args.gcpProject) {
     const existing = discovery.projects.find((project) => matchesProject(project, args.gcpProject ?? ""));
     return {
@@ -601,6 +822,15 @@ async function resolveGcpSelection(
     message: "GCP project",
     initialValue: "create_new",
     options: [
+      ...(options.allowBack
+        ? [
+            {
+              value: BACK,
+              label: "Back",
+              hint: "Return to previous step",
+            },
+          ]
+        : []),
       {
         value: "create_new",
         label: `Create new project: ${defaults.projectName} (${defaults.projectId})`,
@@ -620,6 +850,10 @@ async function resolveGcpSelection(
     process.exit(1);
   }
 
+  if (mode === BACK) {
+    return BACK;
+  }
+
   if (mode === "create_new") {
     return {
       mode: "create_new" as const,
@@ -632,7 +866,10 @@ async function resolveGcpSelection(
     throw new Error("No existing GCP projects were discovered");
   }
 
-  const selected = await promptForExistingProject(discovery.projects);
+  const selected = await promptForExistingProject(discovery.projects, options);
+  if (selected === BACK) {
+    return BACK;
+  }
   if (!selected) {
     return resolveGcpSelection(
       {
@@ -641,7 +878,8 @@ async function resolveGcpSelection(
         gcpProject: undefined,
       },
       defaults,
-      discovery
+      discovery,
+      options
     );
   }
 
@@ -717,6 +955,108 @@ async function promptText(
   return value.trim();
 }
 
+async function promptTextWithBack(
+  message: string,
+  initialValue: string,
+  validate: (value: string) => true | string,
+  step: InteractiveStep,
+  args: ParsedArgs,
+  state: InteractiveState
+): Promise<string | typeof BACK> {
+  const allowBack = Boolean(previousPromptStep(step, args, state));
+  const value = await text({
+    message: allowBack ? `${message} (type "back" to return)` : message,
+    initialValue,
+    validate: (input) => {
+      const normalized = (input ?? "").trim().toLowerCase();
+      if (allowBack && (normalized === "back" || normalized === "<")) {
+        return undefined;
+      }
+      return normalizeValidationResult(validate((input ?? "").trim()));
+    },
+  });
+
+  if (isCancel(value)) {
+    cancel("Aborted");
+    process.exit(1);
+  }
+
+  const trimmed = value.trim();
+  if (allowBack && (trimmed.toLowerCase() === "back" || trimmed === "<")) {
+    return BACK;
+  }
+
+  return trimmed;
+}
+
+async function promptSelectWithBack<Value extends string>(
+  message: string,
+  options: Array<{ value: Value; label?: string; hint?: string; disabled?: boolean }>,
+  initialValue: Value | undefined,
+  step: InteractiveStep,
+  args: ParsedArgs,
+  state: InteractiveState
+): Promise<Value | typeof BACK> {
+  const allowBack = Boolean(previousPromptStep(step, args, state));
+  const value = await select<Value | typeof BACK>({
+    message,
+    initialValue,
+    options: [
+      ...(allowBack
+        ? [
+            {
+              value: BACK,
+              label: "Back",
+              hint: "Return to previous step",
+            },
+          ]
+        : []),
+      ...options,
+    ] as any,
+  });
+
+  if (isCancel(value)) {
+    cancel("Aborted");
+    process.exit(1);
+  }
+
+  return value;
+}
+
+function previousPromptStep(step: InteractiveStep, args: ParsedArgs, state: InteractiveState): InteractiveStep | undefined {
+  const steps: InteractiveStep[] = ["serviceName", "target", "runtime", "framework", "modulePath", "gcp", "confirm"];
+  const currentIndex = steps.indexOf(step);
+  for (let index = currentIndex - 1; index >= 0; index -= 1) {
+    const candidate = steps[index];
+    if (candidate && isPromptableStep(candidate, args, state)) {
+      return candidate;
+    }
+  }
+  return undefined;
+}
+
+function isPromptableStep(step: InteractiveStep, args: ParsedArgs, state: InteractiveState) {
+  if (step === "serviceName") {
+    return !args.serviceName;
+  }
+  if (step === "target") {
+    return !args.target;
+  }
+  if (step === "runtime") {
+    return state.target !== "workers" && !args.runtime;
+  }
+  if (step === "framework") {
+    return !args.framework;
+  }
+  if (step === "modulePath") {
+    return state.runtime === "go" && !args.modulePath;
+  }
+  if (step === "gcp") {
+    return !args.gcpProjectMode;
+  }
+  return step === "confirm";
+}
+
 function formatError(error: unknown) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -731,17 +1071,21 @@ function handleCliError(error: unknown) {
   process.exit(1);
 }
 
-async function promptForExistingProject(projects: GcpProject[]) {
+async function promptForExistingProject(projects: GcpProject[], options: { allowBack?: boolean } = {}) {
   const value = await autocomplete({
     message: "Existing GCP project",
     placeholder: "Search by project name or id",
     maxItems: 10,
     options: [
-      {
-        value: "__back__",
-        label: "Back",
-        hint: "Return to project mode",
-      },
+      ...(options.allowBack
+        ? [
+            {
+              value: BACK,
+              label: "Back",
+              hint: "Return to project mode",
+            },
+          ]
+        : []),
       ...projects.map((project) => ({
         value: project.projectId,
         label: project.name,
@@ -755,8 +1099,8 @@ async function promptForExistingProject(projects: GcpProject[]) {
     process.exit(1);
   }
 
-  if (value === "__back__") {
-    return undefined;
+  if (value === BACK) {
+    return BACK;
   }
 
   const project = projects.find((candidate) => candidate.projectId === value);

package/src/gcp.ts

@@ -1,6 +1,3 @@
-import { CloudBillingClient } from "@google-cloud/billing";
-import { ProjectsClient } from "@google-cloud/resource-manager";
-
 export type GcpProject = {
   projectId: string;
   name: string;
@@ -20,58 +17,29 @@ export type GcpApi = {
   attachBillingAccount(projectId: string, billingAccountName: string): Promise<void>;
 };
 
-export function createGcpApi(
-  projectsClient = new ProjectsClient(),
-  billingClient = new CloudBillingClient()
-): GcpApi {
+export function createGcpApi(): GcpApi {
   return {
     async listProjects() {
-      const projects: GcpProject[] = [];
-      for await (const project of projectsClient.searchProjectsAsync({}, { autoPaginate: false })) {
-        projects.push({
-          projectId: project.projectId ?? "",
-          name: project.displayName ?? project.projectId ?? "",
-          lifecycleState: `${project.state ?? ""}`,
-        });
-      }
-
-      return projects
-        .filter((project) => project.projectId && project.lifecycleState !== "DELETE_REQUESTED")
-        .sort((left, right) => left.name.localeCompare(right.name));
+      return parseJson<GcpProject[]>(
+        runGcloud(["projects", "list", "--format=json(projectId,name,lifecycleState)"]).stdout,
+        "GCP project discovery"
+      );
     },
 
     async listBillingAccounts() {
-      const accounts: BillingAccount[] = [];
-      for await (const account of billingClient.listBillingAccountsAsync({}, { autoPaginate: false })) {
-        accounts.push({
-          name: account.name ?? "",
-          displayName: account.displayName ?? account.name ?? "",
-          open: Boolean(account.open),
-        });
-      }
-
-      return accounts
-        .filter((account) => account.name && account.open)
-        .sort((left, right) => left.displayName.localeCompare(right.displayName));
+      return parseJson<BillingAccount[]>(
+        runGcloud(["billing", "accounts", "list", "--format=json(name,displayName,open)"]).stdout,
+        "billing account discovery"
+      );
     },
 
     async createProject(projectId: string, name: string) {
-      const [operation] = await projectsClient.createProject({
-        project: {
-          projectId,
-          displayName: name,
-        },
-      });
-      await operation.promise();
+      runGcloud(["projects", "create", projectId, "--name", name]);
     },
 
     async attachBillingAccount(projectId: string, billingAccountName: string) {
-      await billingClient.updateProjectBillingInfo({
-        name: `projects/${projectId}`,
-        projectBillingInfo: {
-          billingAccountName,
-        },
-      });
+      const account = billingAccountName.replace(/^billingAccounts\//, "");
+      runGcloud(["billing", "projects", "link", projectId, "--billing-account", account]);
     },
   };
 }
@@ -95,3 +63,26 @@ export async function createProject(projectId: string, name: string, api = creat
 export async function attachBillingAccount(projectId: string, billingAccountName: string, api = createGcpApi()) {
   await api.attachBillingAccount(projectId, billingAccountName);
 }
+
+function runGcloud(args: string[]) {
+  const result = Bun.spawnSync(["gcloud", ...args], {
+    stdout: "pipe",
+    stderr: "pipe",
+  });
+
+  if (result.exitCode !== 0) {
+    throw new Error(result.stderr.toString().trim() || `gcloud ${args.join(" ")} failed`);
+  }
+
+  return {
+    stdout: result.stdout.toString(),
+  };
+}
+
+function parseJson<T>(value: string, label: string): T {
+  try {
+    return JSON.parse(value) as T;
+  } catch (error) {
+    throw new Error(`Unable to parse ${label} output: ${(error as Error).message}`);
+  }
+}

package/templates/shared/scripts/authctl.ts

@@ -216,7 +216,7 @@ function authctl(args: string[], options: { allowFailure?: boolean; quiet?: bool
   };
 
   if (!output.success && !options.allowFailure) {
-    throw new Error(`authctl ${args.join(" ")} failed with exit code ${output.exitCode}\n${output.stderr || output.stdout}`);
+    throw new Error(formatAuthctlFailure(args, output));
   }
 
   if (output.stdout && !options.quiet) {
@@ -226,6 +226,22 @@ function authctl(args: string[], options: { allowFailure?: boolean; quiet?: bool
   return output;
 }
 
+function formatAuthctlFailure(args: string[], output: CommandResult) {
+  const detail = output.stderr || output.stdout;
+  if (detail.includes("status_code\":401") || detail.includes("Forbidden. You don't have permission")) {
+    return [
+      `authctl ${args.join(" ")} failed with exit code ${output.exitCode}`,
+      "authctl reached the auth internal API, but Cloudflare Access rejected the request.",
+      "Export the authctl Cloudflare Access service token before running service create:",
+      '  export AUTH_INTERNAL_BASE_URL="$(vault kv get -mount=secret -field=AUTH_INTERNAL_BASE_URL prod/apps/auth/authctl/cloudflare-access)"',
+      '  export CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID="$(vault kv get -mount=secret -field=CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID prod/apps/auth/authctl/cloudflare-access)"',
+      '  export CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET="$(vault kv get -mount=secret -field=CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET prod/apps/auth/authctl/cloudflare-access)"',
+    ].join("\n");
+  }
+
+  return `authctl ${args.join(" ")} failed with exit code ${output.exitCode}\n${detail}`;
+}
+
 function authctlPath() {
   return existsSync("./node_modules/.bin/authctl") ? "./node_modules/.bin/authctl" : Bun.which("authctl");
 }