create-svc 0.1.39 → 0.1.40

package/package.json

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

package/src/scaffold.test.ts

@@ -70,6 +70,8 @@ test("scaffolds all runtime/framework variants with shared cloudrun config", asy
     expect(serviceConfig).toContain('"api_key_secret_name": "dns-api-temporal-api-key"');
     expect(serviceConfig).toContain('"project_mode": "create_new"');
     expect(serviceConfig).toContain('"quota_project_id": "anmho-infra-prod"');
+    expect(serviceConfig).toContain('"artifact_repository": "cloud-run"');
+    expect(serviceConfig).not.toContain("cloudbuild.googleapis.com");
     expect(serviceConfig).toContain('"jwks_url": "https://auth.anmho.com/api/auth/jwks"');
     expect(serviceConfig).toContain('"git": {');
     expect(serviceConfig).toContain('"repository": "dns-api"');

package/src/service-runtime/cloudrun/deploy-args.ts

@@ -0,0 +1,90 @@
+export type DeployArgs = {
+  build: "local" | "cloudbuild";
+  ci: boolean;
+  destroy: boolean;
+  environment: "main" | "preview" | "personal";
+  name?: string;
+};
+
+export function parseDeployArgs(argv: string[]): DeployArgs {
+  const parsed: DeployArgs = {
+    build: parseBuildStrategy(process.env.SERVICE_BUILD_STRATEGY || process.env.SERVICE_BUILD),
+    ci: false,
+    destroy: false,
+    environment: "main",
+  };
+
+  for (let i = 0; i < argv.length; i += 1) {
+    const token = argv[i];
+    if (!token) {
+      continue;
+    }
+
+    const next = argv[i + 1];
+    const readValue = () => {
+      if (!next || next.startsWith("-")) {
+        throw new Error(`Missing value for ${token}`);
+      }
+      i += 1;
+      return next;
+    };
+
+    if (token === "--ci") {
+      parsed.ci = true;
+      continue;
+    }
+
+    if (token === "--destroy") {
+      parsed.destroy = true;
+      continue;
+    }
+
+    if (token === "--build") {
+      parsed.build = parseBuildStrategy(readValue());
+      continue;
+    }
+
+    if (token.startsWith("--build=")) {
+      parsed.build = parseBuildStrategy(token.slice("--build=".length));
+      continue;
+    }
+
+    if (token === "--cloud-build") {
+      parsed.build = "cloudbuild";
+      continue;
+    }
+
+    if (token === "--environment") {
+      parsed.environment = readValue() as DeployArgs["environment"];
+      continue;
+    }
+
+    if (token.startsWith("--environment=")) {
+      parsed.environment = token.slice("--environment=".length) as DeployArgs["environment"];
+      continue;
+    }
+
+    if (token === "--name") {
+      parsed.name = readValue();
+      continue;
+    }
+
+    if (token.startsWith("--name=")) {
+      parsed.name = token.slice("--name=".length);
+      continue;
+    }
+  }
+
+  return parsed;
+}
+
+function parseBuildStrategy(value: string | undefined): DeployArgs["build"] {
+  if (!value || value === "local") {
+    return "local";
+  }
+  if (value === "cloudbuild" || value === "cloud-build") {
+    return "cloudbuild";
+  }
+  throw new Error(`Unknown build strategy: ${value}`);
+}
+

package/src/service-runtime/cloudrun/deploy.ts

@@ -4,6 +4,7 @@ import { deleteBranch, ensureBranch, ensureDatabase, getConnectionUri, listBranc
 import {
   addSecretVersion,
   deleteService,
+  dockerStreaming,
   ensureArtifactRepository,
   ensureProductionDomainMapping,
   ensureSecretAccessor,
@@ -74,9 +75,18 @@ export async function deploy(args = Bun.argv.slice(2), deployOptions: DeployOpti
     });
   }
   const image = imageUrl();
-  await runStep("Building container image in Cloud Build", () =>
-    gcloudStreaming(["builds", "submit", "--project", config.project.id, "--region", config.region, "--tag", image])
-  );
+  if (options.build === "cloudbuild") {
+    await runStep("Building container image in Cloud Build", () =>
+      gcloudStreaming(["builds", "submit", "--project", config.project.id, "--region", config.region, "--tag", image])
+    );
+  } else {
+    requireCommand("docker");
+    await runStep("Authenticating Docker to Artifact Registry", () =>
+      gcloud(["auth", "configure-docker", `${config.region}-docker.pkg.dev`, "--quiet"])
+    );
+    await runStep("Building container image locally", () => dockerStreaming(["build", "-t", image, "."]));
+    await runStep("Pushing container image to Artifact Registry", () => dockerStreaming(["push", image]));
+  }
 
   const renderedManifestPath = await runStep("Rendering Cloud Run manifest", () => writeRenderedManifest(image, target));
 

package/src/service-runtime/cloudrun/lib.test.ts

@@ -0,0 +1,29 @@
+import { afterEach, expect, test } from "bun:test";
+import { parseDeployArgs } from "./deploy-args";
+
+const originalBuild = process.env.SERVICE_BUILD;
+const originalBuildStrategy = process.env.SERVICE_BUILD_STRATEGY;
+
+afterEach(() => {
+  process.env.SERVICE_BUILD = originalBuild;
+  process.env.SERVICE_BUILD_STRATEGY = originalBuildStrategy;
+});
+
+test("parseDeployArgs defaults to local image builds", () => {
+  delete process.env.SERVICE_BUILD;
+  delete process.env.SERVICE_BUILD_STRATEGY;
+
+  expect(parseDeployArgs([]).build).toBe("local");
+});
+
+test("parseDeployArgs accepts explicit Cloud Build fallback", () => {
+  expect(parseDeployArgs(["--build", "cloudbuild"]).build).toBe("cloudbuild");
+  expect(parseDeployArgs(["--build=cloud-build"]).build).toBe("cloudbuild");
+  expect(parseDeployArgs(["--cloud-build"]).build).toBe("cloudbuild");
+});
+
+test("parseDeployArgs accepts build strategy from env", () => {
+  process.env.SERVICE_BUILD_STRATEGY = "cloudbuild";
+
+  expect(parseDeployArgs([]).build).toBe("cloudbuild");
+});

package/src/service-runtime/cloudrun/lib.ts

@@ -2,6 +2,7 @@ import { intro, log, outro, spinner } from "@clack/prompts";
 import { join } from "node:path";
 import { config } from "./config";
 import { serviceRoot } from "../runtime";
+import { parseDeployArgs, type DeployArgs } from "./deploy-args";
 
 type CommandOptions = {
   allowFailure?: boolean;
@@ -9,13 +10,6 @@ type CommandOptions = {
   env?: Record<string, string | undefined>;
 };
 
-type DeployArgs = {
-  ci: boolean;
-  destroy: boolean;
-  environment: "main" | "preview" | "personal";
-  name?: string;
-};
-
 type CleanupArgs = {
   destroyProject: boolean;
   force: boolean;
@@ -125,6 +119,10 @@ export async function gcloudStreaming(args: string[], options: CommandOptions =
   return runStreaming("gcloud", normalized, options);
 }
 
+export async function dockerStreaming(args: string[], options: CommandOptions = {}) {
+  return runStreaming("docker", args, options);
+}
+
 export async function runStreaming(command: string, args: string[], options: CommandOptions = {}): Promise<CommandResult> {
   const child = Bun.spawn([command, ...args], {
     cwd: process.cwd(),
@@ -454,61 +452,7 @@ export function imageUrl(tag = imageTag()) {
   return `${artifactImageBase()}:${tag}`;
 }
 
-export function parseDeployArgs(argv: string[]): DeployArgs {
-  const parsed: DeployArgs = {
-    ci: false,
-    destroy: false,
-    environment: "main",
-  };
-
-  for (let i = 0; i < argv.length; i += 1) {
-    const token = argv[i];
-    if (!token) {
-      continue;
-    }
-
-    const next = argv[i + 1];
-    const readValue = () => {
-      if (!next || next.startsWith("-")) {
-        throw new Error(`Missing value for ${token}`);
-      }
-      i += 1;
-      return next;
-    };
-
-    if (token === "--ci") {
-      parsed.ci = true;
-      continue;
-    }
-
-    if (token === "--destroy") {
-      parsed.destroy = true;
-      continue;
-    }
-
-    if (token === "--environment") {
-      parsed.environment = readValue() as DeployArgs["environment"];
-      continue;
-    }
-
-    if (token.startsWith("--environment=")) {
-      parsed.environment = token.slice("--environment=".length) as DeployArgs["environment"];
-      continue;
-    }
-
-    if (token === "--name") {
-      parsed.name = readValue();
-      continue;
-    }
-
-    if (token.startsWith("--name=")) {
-      parsed.name = token.slice("--name=".length);
-      continue;
-    }
-  }
-
-  return parsed;
-}
+export { parseDeployArgs };
 
 export function parseCleanupArgs(argv: string[]): CleanupArgs {
   const parsed: CleanupArgs = {

package/templates/shared/README.md

@@ -66,10 +66,14 @@ Create, deploy, and destroy use:
 
 - known-good CLIs first, especially `gcloud`
 - `gcloud`
+- Docker for local image builds and Artifact Registry pushes
 - `NEON_API_KEY`, or a working Vault login via `VAULT_ADDR` plus `VAULT_TOKEN`, `VAULT_TOKEN_FILE`, or `~/.vault-token`
 - the repo-aware `service` CLI from this package
 
 Local provisioning intentionally prefers known-good CLIs over SDKs for Google Cloud operations.
+Cloud Run deploys build and push the container image locally by default. Use
+`service deploy --build cloudbuild` only when you explicitly want Google Cloud
+Build to build the image remotely.
 
 Authenticate `gcloud` on the machine before running provisioning commands:
 

package/templates/shared/service.jsonc

@@ -97,7 +97,6 @@
     "service_account": "{{RUNTIME_SERVICE_ACCOUNT}}",
     "required_apis": [
       "run.googleapis.com",
-      "cloudbuild.googleapis.com",
       "artifactregistry.googleapis.com",
       "iam.googleapis.com",
       "iamcredentials.googleapis.com",