create-svc 0.1.16 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Local microservice bootstrap CLI for Cloud Run and Workers services with Neon-backed data.",
   "module": "index.ts",
   "type": "module",

package/src/post-scaffold.test.ts

@@ -4,16 +4,16 @@ import { buildDeploymentVerificationCommands, buildPostScaffoldCommands } from "
 describe("buildPostScaffoldCommands", () => {
   test("runs create and deploy for HTTP services", () => {
     expect(buildPostScaffoldCommands({ framework: "hono" })).toEqual([
-      { command: "bun", args: ["run", "service", "--", "create"] },
-      { command: "bun", args: ["run", "service", "--", "deploy"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "create"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "deploy"] },
     ]);
   });
 
   test("builds SDK artifacts before create and deploy for ConnectRPC services", () => {
     expect(buildPostScaffoldCommands({ framework: "connectrpc" })).toEqual([
-      { command: "bun", args: ["run", "service", "--", "sdk", "build"] },
-      { command: "bun", args: ["run", "service", "--", "create"] },
-      { command: "bun", args: ["run", "service", "--", "deploy"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "sdk", "build"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "create"] },
+      { command: "bun", args: ["./scripts/cloudrun/cli.ts", "deploy"] },
     ]);
   });
 });

package/src/post-scaffold.ts

@@ -55,9 +55,9 @@ export function buildDeploymentVerificationCommands(
 
 export function buildPostScaffoldCommands(config: Pick<ScaffoldConfig, "framework">): PostScaffoldCommand[] {
   return [
-    ...(config.framework === "connectrpc" ? [{ command: "bun", args: ["run", "service", "--", "sdk", "build"] }] : []),
-    { command: "bun", args: ["run", "service", "--", "create"] },
-    { command: "bun", args: ["run", "service", "--", "deploy"] },
+    ...(config.framework === "connectrpc" ? [{ command: "bun", args: ["./scripts/cloudrun/cli.ts", "sdk", "build"] }] : []),
+    { command: "bun", args: ["./scripts/cloudrun/cli.ts", "create"] },
+    { command: "bun", args: ["./scripts/cloudrun/cli.ts", "deploy"] },
   ];
 }
 

package/templates/shared/scripts/authctl.ts

@@ -97,7 +97,7 @@ export function runAuthCommand(args: string[]) {
 
 export function ensureAuthResourceServer() {
   const command = ensureResourceServerCommandAvailable();
-  authctl([command.subject, command.mutationAction, ...defaultAuthResourceServerArgs(), "--json"]);
+  authctl([command.subject, command.mutationAction, ...defaultAuthResourceServerArgs(), "--json"], { quiet: true });
   return `Auth resource server ready: ${serviceConfig.auth.resource_server.audience}`;
 }
 
@@ -107,16 +107,19 @@ export function deleteAuthResourceServer() {
     return "authctl does not expose resource-server delete; auth resource server was not deleted";
   }
 
-  authctl([
-    command.subject,
-    "delete",
-    "--resource-server",
-    serviceConfig.auth.resource_server.id,
-    "--stage",
-    serviceConfig.stage_default,
-    "--force",
-    "--json",
-  ]);
+  authctl(
+    [
+      command.subject,
+      "delete",
+      "--resource-server",
+      serviceConfig.auth.resource_server.id,
+      "--stage",
+      serviceConfig.stage_default,
+      "--force",
+      "--json",
+    ],
+    { quiet: true }
+  );
   return `Auth resource server deleted: ${serviceConfig.auth.resource_server.id}`;
 }
 

package/templates/shared/scripts/cloudrun/bootstrap.ts

@@ -17,13 +17,13 @@ import {
   runStep,
 } from "./lib";
 
-export async function bootstrap() {
+export async function bootstrap(options: { skipProjectSetup?: boolean } = {}) {
   requireCommand("gcloud");
   requireGcloudAuth();
 
-  await runStep("Ensuring GCP project", () => ensureProject());
-  await runStep("Attaching billing", () => attachBilling());
-  await runStep("Enabling required GCP APIs", () => gcloud(["services", "enable", ...config.requiredApis, "--project", config.project.id]));
+  if (!options.skipProjectSetup) {
+    await prepareGcpProject();
+  }
 
   await runStep("Ensuring runtime service account", () => {
     ensureServiceAccount(config.runtimeServiceAccount);
@@ -53,6 +53,12 @@ export async function bootstrap() {
   await runStep("Publishing Temporal secrets", () => publishTemporalSecrets());
 }
 
+export async function prepareGcpProject() {
+  await runStep("Ensuring GCP project", () => ensureProject());
+  await runStep("Attaching billing", () => attachBilling());
+  await runStep("Enabling required GCP APIs", () => gcloud(["services", "enable", ...config.requiredApis, "--project", config.project.id]));
+}
+
 function publishTemporalSecrets() {
   const temporal = resolveTemporalRuntimeConfig();
   const apiKey = process.env.TEMPORAL_API_KEY?.trim();

package/templates/shared/scripts/cloudrun/cli.ts

@@ -2,7 +2,7 @@
 
 import { mkdir } from "node:fs/promises";
 import { ensureAuthResourceServer, runAuthCommand, runAuthDoctor } from "../authctl";
-import { bootstrap } from "./bootstrap";
+import { bootstrap, prepareGcpProject } from "./bootstrap";
 import { cleanup } from "./cleanup";
 import { deploy } from "./deploy";
 import { config } from "./config";
@@ -35,8 +35,9 @@ async function main(argv = Bun.argv.slice(2)) {
     await runMain("Create", async () => {
       assertServiceNameAvailable(config.serviceName);
       assertProductionDomainAvailable(config.serviceName);
+      await prepareGcpProject();
       await runStep("Registering auth resource server", () => ensureAuthResourceServer());
-      await bootstrap();
+      await bootstrap({ skipProjectSetup: true });
       const target = resolveDeploymentTarget("main");
       const databaseUrl = await runStep("Reading production database URL", () => accessSecretVersion(target.databaseSecretName));
       await runStep("Applying production migrations", () => runLanguageTask("migrate", { DATABASE_URL: databaseUrl }));