gcp-job-runner 1.4.1 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import { generateDockerfile } from "./dockerfile.mjs";
2
- import { checkGcloudAvailable, gcloudExecCapture, gcloudJson, isDockerAvailable, shellExecCapture } from "./gcloud.mjs";
2
+ import { checkGcloudAvailable, gcloudExecCapture, gcloudJson, isDockerDaemonRunning, isDockerInstalled, shellExecCapture, startDockerDaemon, waitForDockerDaemon } from "./gcloud.mjs";
3
3
  import { hashDirectory } from "./hash.mjs";
4
4
  import { consola } from "consola";
5
5
  import path from "node:path";
@@ -42,9 +42,38 @@ async function prepareImage(options) {
42
42
  const project = envConfig.project;
43
43
  let buildLocal = cloud.buildLocal !== false;
44
44
  checkGcloudAvailable();
45
- if (buildLocal && !isDockerAvailable()) {
46
- consola.warn("Docker is not available, falling back to Cloud Build. Install Docker for faster local builds: https://docs.docker.com/get-docker/");
47
- buildLocal = false;
45
+ if (buildLocal) {
46
+ if (!isDockerInstalled()) {
47
+ consola.warn("Docker is not installed, falling back to Cloud Build. Install Docker for faster local builds: https://docs.docker.com/get-docker/");
48
+ buildLocal = false;
49
+ } else if (!isDockerDaemonRunning()) if (!process.stdin.isTTY) {
50
+ /** Non-interactive environment (CI) — fall back automatically */
51
+ consola.warn("Docker daemon is not running, falling back to Cloud Build.");
52
+ buildLocal = false;
53
+ } else {
54
+ const choice = await consola.prompt("Docker is installed but the daemon is not running.", {
55
+ type: "select",
56
+ options: [{
57
+ label: "Start Docker",
58
+ value: "start",
59
+ hint: "attempt to start the daemon"
60
+ }, {
61
+ label: "Use Cloud Build",
62
+ value: "cloud-build",
63
+ hint: "build remotely instead"
64
+ }]
65
+ });
66
+ if (typeof choice === "symbol") process.exit(0);
67
+ if (choice === "start") {
68
+ if (!startDockerDaemon()) {
69
+ consola.warn("Could not start Docker automatically, falling back to Cloud Build.");
70
+ buildLocal = false;
71
+ } else if (!await waitForDockerDaemon()) {
72
+ consola.warn("Docker daemon did not become ready in time, falling back to Cloud Build.");
73
+ buildLocal = false;
74
+ }
75
+ } else buildLocal = false;
76
+ }
48
77
  }
49
78
  /** Step 1: Run isolate to bundle workspace dependencies */
50
79
  const isolateDirectory = resolveIsolateDirectory(serviceDirectory);
@@ -208,6 +237,11 @@ async function createOrUpdateJob(options) {
208
237
  updateArgs.push(`--parallelism=${cloud.resources?.parallelism ?? 0}`);
209
238
  if (secretsString) updateArgs.push(`--set-secrets=${secretsString}`);
210
239
  if (cloud.serviceAccount) updateArgs.push(`--service-account=${cloud.serviceAccount}`);
240
+ if (cloud.network) {
241
+ updateArgs.push(`--network=${cloud.network.name}`);
242
+ if (cloud.network.subnet) updateArgs.push(`--subnet=${cloud.network.subnet}`);
243
+ updateArgs.push(`--vpc-egress=${cloud.network.egress ?? "private-ranges-only"}`);
244
+ }
211
245
  const result = gcloudExecCapture(updateArgs);
212
246
  if (!result.success) {
213
247
  consola.error("Failed to update Cloud Run Job");
@@ -238,6 +272,11 @@ async function createOrUpdateJob(options) {
238
272
  if (cloud.resources?.parallelism !== void 0) createArgs.push(`--parallelism=${cloud.resources.parallelism}`);
239
273
  if (secretsString) createArgs.push(`--set-secrets=${secretsString}`);
240
274
  if (cloud.serviceAccount) createArgs.push(`--service-account=${cloud.serviceAccount}`);
275
+ if (cloud.network) {
276
+ createArgs.push(`--network=${cloud.network.name}`);
277
+ if (cloud.network.subnet) createArgs.push(`--subnet=${cloud.network.subnet}`);
278
+ createArgs.push(`--vpc-egress=${cloud.network.egress ?? "private-ranges-only"}`);
279
+ }
241
280
  const result = gcloudExecCapture(createArgs);
242
281
  if (!result.success) {
243
282
  consola.error("Failed to create Cloud Run Job");
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.mjs","names":[],"sources":["../../src/cloud/deploy.ts"],"sourcesContent":["import { existsSync, readFileSync, writeFileSync, unlinkSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { consola } from \"consola\";\nimport type { CloudConfig, RunnerEnvOptions } from \"../config\";\nimport { generateDockerfile } from \"./dockerfile\";\nimport {\n checkGcloudAvailable,\n isDockerAvailable,\n gcloudExecCapture,\n gcloudJson,\n shellExecCapture,\n} from \"./gcloud\";\nimport { hashDirectory } from \"./hash\";\n\nexport interface DeployOptions {\n /** Cloud configuration from the runner config */\n cloud: CloudConfig;\n /** Environment configuration (project, env vars, secrets) */\n envConfig: RunnerEnvOptions;\n /** Working directory (service root where isolate.config.json lives) */\n serviceDirectory: string;\n}\n\nexport interface DeployResult {\n /** Full image URI including tag */\n imageUri: string;\n /** Whether a new image was built */\n imageBuilt: boolean;\n}\n\n/**\n * Filter out noisy gcloud hints from captured output.\n * Removes \"To execute this job\" and \"Updates are available\" blocks.\n */\nfunction filterGcloudOutput(output: string): string {\n return output\n .replace(/To execute this job.*?gcloud run jobs execute \\S+\\n?/gs, \"\")\n .replace(/Updates are available.*?\\$ gcloud components update\\n?/gs, \"\")\n .trim();\n}\n\nconst DEFAULT_REGION = \"us-central1\";\nconst DEFAULT_ARTIFACT_REGISTRY = \"cloud-run\";\nconst DEFAULT_ISOLATE_PATH = \"isolate\";\nconst GENERATED_DOCKERFILE = \"Dockerfile\";\nconst REGISTRY = \"docker.pkg.dev\";\n\ninterface IsolateConfig {\n targetPackagePath?: string;\n}\n\n/**\n * Resolve the isolate output directory path.\n * Reads isolate.config.json if present, otherwise uses default \"./isolate\".\n */\nfunction resolveIsolateDirectory(serviceDirectory: string): string {\n const configPath = path.join(serviceDirectory, \"isolate.config.json\");\n\n if (existsSync(configPath)) {\n try {\n const configContent = readFileSync(configPath, \"utf-8\");\n const config = JSON.parse(configContent) as IsolateConfig;\n if (config.targetPackagePath) {\n return path.join(serviceDirectory, config.targetPackagePath);\n }\n } catch {\n /** Ignore parse errors, use default */\n }\n }\n\n return path.join(serviceDirectory, DEFAULT_ISOLATE_PATH);\n}\n\nexport interface PrepareResult {\n imageUri: string;\n imageBuilt: boolean;\n region: string;\n project: string;\n}\n\n/**\n * Shared preparation logic: isolate, hash, check image, build if needed.\n * Used by both deploy() and deployIfChanged().\n */\nexport async function prepareImage(\n options: DeployOptions,\n): Promise<PrepareResult> {\n const { cloud, envConfig, serviceDirectory } = options;\n const region = cloud.region ?? DEFAULT_REGION;\n const artifactRegistry = cloud.artifactRegistry ?? DEFAULT_ARTIFACT_REGISTRY;\n const project = envConfig.project;\n let buildLocal = cloud.buildLocal !== false;\n\n checkGcloudAvailable();\n\n if (buildLocal && !isDockerAvailable()) {\n consola.warn(\n \"Docker is not available, falling back to Cloud Build. \" +\n \"Install Docker for faster local builds: https://docs.docker.com/get-docker/\",\n );\n buildLocal = false;\n }\n\n /** Step 1: Run isolate to bundle workspace dependencies */\n const isolateDirectory = resolveIsolateDirectory(serviceDirectory);\n\n consola.start(\"Isolating package...\");\n\n try {\n const { isolate: runIsolate } = await import(\"isolate-package\");\n\n const configPath = path.join(serviceDirectory, \"isolate.config.json\");\n const fileConfig = existsSync(configPath)\n ? JSON.parse(readFileSync(configPath, \"utf-8\"))\n : {};\n\n await runIsolate({\n ...fileConfig,\n includeDevDependencies: true,\n });\n } catch (error) {\n const message = error instanceof Error ? error.message : String(error);\n consola.error(`Failed to isolate package: ${message}`);\n process.exit(1);\n }\n\n consola.success(\"Package isolated\");\n\n /** Step 2: Hash the isolate directory */\n const tag = await hashDirectory(isolateDirectory);\n consola.info(`Content hash: ${tag}`);\n\n /** Step 3: Check if image already exists */\n const imageUri = `${region}-${REGISTRY}/${project}/${artifactRegistry}/${cloud.name}:${tag}`;\n\n const imageExists = checkImageExists(imageUri, project);\n let imageBuilt = false;\n\n if (imageExists) {\n consola.success(`Image already exists: ${cloud.name}:${tag}`);\n } else if (buildLocal) {\n /** Step 4a: Generate Dockerfile and build locally with Docker */\n consola.start(\"Building image locally with Docker...\");\n\n const dockerfilePath = path.join(serviceDirectory, GENERATED_DOCKERFILE);\n writeFileSync(dockerfilePath, generateDockerfile());\n\n try {\n const buildResult = shellExecCapture(\n `docker build --platform linux/amd64 -t ${imageUri} .`,\n { cwd: serviceDirectory },\n );\n\n if (!buildResult.success) {\n consola.error(\"Docker build failed. Output:\\n\" + buildResult.output);\n process.exit(1);\n }\n\n consola.success(`Image built: ${cloud.name}:${tag}`);\n\n /** Configure Docker authentication for Artifact Registry */\n gcloudExecCapture([\n \"auth\",\n \"configure-docker\",\n `${region}-${REGISTRY}`,\n \"--quiet\",\n ]);\n\n consola.start(\"Pushing image to Artifact Registry...\");\n\n const pushResult = shellExecCapture(`docker push ${imageUri}`);\n\n if (!pushResult.success) {\n consola.error(\"Docker push failed. Output:\\n\" + pushResult.output);\n process.exit(1);\n }\n\n consola.success(`Image pushed: ${cloud.name}:${tag}`);\n imageBuilt = true;\n } finally {\n /** Clean up generated Dockerfile */\n try {\n unlinkSync(dockerfilePath);\n } catch {\n /** Ignore cleanup errors */\n }\n }\n } else {\n /** Step 4b: Generate Dockerfile and build with Cloud Build */\n consola.start(\"Building image with Cloud Build...\");\n\n const dockerfilePath = path.join(serviceDirectory, GENERATED_DOCKERFILE);\n writeFileSync(dockerfilePath, generateDockerfile());\n\n try {\n const buildResult = gcloudExecCapture(\n [\n \"builds\",\n \"submit\",\n \"--project\",\n project,\n \"--region\",\n region,\n `--tag=${imageUri}`,\n \".\",\n ],\n { cwd: serviceDirectory },\n );\n\n /** Extract and show the Cloud Build logs URL if available */\n const logsUrlMatch = buildResult.output.match(\n /Logs are available at \\[(.+?)]/,\n );\n if (logsUrlMatch) {\n consola.info(`Cloud Build logs: ${logsUrlMatch[1]}`);\n }\n\n if (!buildResult.success) {\n consola.error(\"Cloud Build failed. Output:\\n\" + buildResult.output);\n process.exit(1);\n }\n\n consola.success(`Image built: ${cloud.name}:${tag}`);\n imageBuilt = true;\n } finally {\n /** Clean up generated Dockerfile */\n try {\n unlinkSync(dockerfilePath);\n } catch {\n /** Ignore cleanup errors */\n }\n }\n }\n\n return { imageUri, imageBuilt, region, project };\n}\n\n/**\n * Build and push a Cloud Run Job image.\n *\n * This is image-only: it does not create or update Cloud Run Job resources.\n * Use createOrUpdateJob() separately to manage job resources.\n */\nexport async function deploy(options: DeployOptions): Promise<DeployResult> {\n const { imageUri, imageBuilt } = await prepareImage(options);\n return { imageUri, imageBuilt };\n}\n\n/**\n * Build and push a Cloud Run Job image only if it has changed.\n *\n * This is image-only: it does not create or update Cloud Run Job resources.\n * Use createOrUpdateJob() separately to manage job resources.\n */\nexport async function deployIfChanged(\n options: DeployOptions,\n): Promise<DeployResult> {\n const { imageUri, imageBuilt } = await prepareImage(options);\n\n if (!imageBuilt) {\n consola.info(\"No changes detected, skipping image build\");\n }\n\n return { imageUri, imageBuilt };\n}\n\nexport interface CreateOrUpdateJobOptions {\n cloud: CloudConfig;\n envConfig: RunnerEnvOptions;\n /** The Cloud Run Job resource name (e.g., \"admin-create-user\") */\n jobName: string;\n imageUri: string;\n region: string;\n project: string;\n}\n\n/**\n * Create or update a Cloud Run Job resource.\n * Returns true if the job was newly created, false if updated.\n */\nexport async function createOrUpdateJob(\n options: CreateOrUpdateJobOptions,\n): Promise<boolean> {\n const { cloud, envConfig, jobName, imageUri, region, project } = options;\n const memory = cloud.resources?.memory ?? \"512Mi\";\n const cpu = cloud.resources?.cpu ?? \"1\";\n const timeout = cloud.resources?.timeout ?? 86400;\n\n /** Check if job already exists */\n const existingJob = gcloudJson(\n [\n \"run\",\n \"jobs\",\n \"describe\",\n jobName,\n \"--project\",\n project,\n \"--region\",\n region,\n ],\n { ignoreErrors: true },\n );\n\n /** Build environment variables */\n const envVars: Record<string, string> = {\n GOOGLE_CLOUD_PROJECT: project,\n ...envConfig.env,\n };\n\n const envVarsString = Object.entries(envVars)\n .map(([key, value]) => `${key}=${value}`)\n .join(\",\");\n\n /** Build secret references */\n const secretNames = envConfig.secrets ?? [];\n const secretsString = secretNames\n .map((name) => `${name}=${name}:latest`)\n .join(\",\");\n\n if (existingJob) {\n consola.start(\"Updating Cloud Run Job...\");\n\n const updateArgs = [\n \"run\",\n \"jobs\",\n \"update\",\n jobName,\n \"--project\",\n project,\n \"--region\",\n region,\n `--image=${imageUri}`,\n `--set-env-vars=${envVarsString}`,\n `--memory=${memory}`,\n `--cpu=${cpu}`,\n `--task-timeout=${timeout}s`,\n \"--max-retries=0\",\n ];\n\n /**\n * Always pass --parallelism on update so that removing it from config\n * resets the deployed value. Default 0 means no concurrency limit.\n */\n updateArgs.push(`--parallelism=${cloud.resources?.parallelism ?? 0}`);\n\n if (secretsString) {\n updateArgs.push(`--set-secrets=${secretsString}`);\n }\n\n if (cloud.serviceAccount) {\n updateArgs.push(`--service-account=${cloud.serviceAccount}`);\n }\n\n const result = gcloudExecCapture(updateArgs);\n\n if (!result.success) {\n consola.error(\"Failed to update Cloud Run Job\");\n process.exit(1);\n }\n\n const filtered = filterGcloudOutput(result.stderr);\n if (filtered) {\n process.stderr.write(filtered + \"\\n\");\n }\n\n consola.success(`Cloud Run Job updated: ${jobName}`);\n return false;\n }\n\n consola.start(\"Creating Cloud Run Job...\");\n\n const createArgs = [\n \"run\",\n \"jobs\",\n \"create\",\n jobName,\n \"--project\",\n project,\n \"--region\",\n region,\n `--image=${imageUri}`,\n `--set-env-vars=${envVarsString}`,\n `--memory=${memory}`,\n `--cpu=${cpu}`,\n `--task-timeout=${timeout}s`,\n \"--max-retries=0\",\n ];\n\n if (cloud.resources?.parallelism !== undefined) {\n createArgs.push(`--parallelism=${cloud.resources.parallelism}`);\n }\n\n if (secretsString) {\n createArgs.push(`--set-secrets=${secretsString}`);\n }\n\n if (cloud.serviceAccount) {\n createArgs.push(`--service-account=${cloud.serviceAccount}`);\n }\n\n const result = gcloudExecCapture(createArgs);\n\n if (!result.success) {\n consola.error(\"Failed to create Cloud Run Job\");\n process.exit(1);\n }\n\n const filtered = filterGcloudOutput(result.stderr);\n if (filtered) {\n process.stderr.write(filtered + \"\\n\");\n }\n\n consola.success(`Cloud Run Job created: ${jobName}`);\n return true;\n}\n\n/**\n * Check if a Docker image exists in Artifact Registry.\n */\nfunction checkImageExists(imageUri: string, project: string): boolean {\n const result = gcloudJson(\n [\n \"artifacts\",\n \"docker\",\n \"images\",\n \"describe\",\n imageUri,\n \"--project\",\n project,\n ],\n { ignoreErrors: true },\n );\n\n return result !== undefined;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"deploy.mjs","names":[],"sources":["../../src/cloud/deploy.ts"],"sourcesContent":["import { existsSync, readFileSync, writeFileSync, unlinkSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { consola } from \"consola\";\nimport type { CloudConfig, RunnerEnvOptions } from \"../config\";\nimport { generateDockerfile } from \"./dockerfile\";\nimport {\n checkGcloudAvailable,\n isDockerInstalled,\n isDockerDaemonRunning,\n startDockerDaemon,\n waitForDockerDaemon,\n gcloudExecCapture,\n gcloudJson,\n shellExecCapture,\n} from \"./gcloud\";\nimport { hashDirectory } from \"./hash\";\n\nexport interface DeployOptions {\n /** Cloud configuration from the runner config */\n cloud: CloudConfig;\n /** Environment configuration (project, env vars, secrets) */\n envConfig: RunnerEnvOptions;\n /** Working directory (service root where isolate.config.json lives) */\n serviceDirectory: string;\n}\n\nexport interface DeployResult {\n /** Full image URI including tag */\n imageUri: string;\n /** Whether a new image was built */\n imageBuilt: boolean;\n}\n\n/**\n * Filter out noisy gcloud hints from captured output.\n * Removes \"To execute this job\" and \"Updates are available\" blocks.\n */\nfunction filterGcloudOutput(output: string): string {\n return output\n .replace(/To execute this job.*?gcloud run jobs execute \\S+\\n?/gs, \"\")\n .replace(/Updates are available.*?\\$ gcloud components update\\n?/gs, \"\")\n .trim();\n}\n\nconst DEFAULT_REGION = \"us-central1\";\nconst DEFAULT_ARTIFACT_REGISTRY = \"cloud-run\";\nconst DEFAULT_ISOLATE_PATH = \"isolate\";\nconst GENERATED_DOCKERFILE = \"Dockerfile\";\nconst REGISTRY = \"docker.pkg.dev\";\n\ninterface IsolateConfig {\n targetPackagePath?: string;\n}\n\n/**\n * Resolve the isolate output directory path.\n * Reads isolate.config.json if present, otherwise uses default \"./isolate\".\n */\nfunction resolveIsolateDirectory(serviceDirectory: string): string {\n const configPath = path.join(serviceDirectory, \"isolate.config.json\");\n\n if (existsSync(configPath)) {\n try {\n const configContent = readFileSync(configPath, \"utf-8\");\n const config = JSON.parse(configContent) as IsolateConfig;\n if (config.targetPackagePath) {\n return path.join(serviceDirectory, config.targetPackagePath);\n }\n } catch {\n /** Ignore parse errors, use default */\n }\n }\n\n return path.join(serviceDirectory, DEFAULT_ISOLATE_PATH);\n}\n\nexport interface PrepareResult {\n imageUri: string;\n imageBuilt: boolean;\n region: string;\n project: string;\n}\n\n/**\n * Shared preparation logic: isolate, hash, check image, build if needed.\n * Used by both deploy() and deployIfChanged().\n */\nexport async function prepareImage(\n options: DeployOptions,\n): Promise<PrepareResult> {\n const { cloud, envConfig, serviceDirectory } = options;\n const region = cloud.region ?? DEFAULT_REGION;\n const artifactRegistry = cloud.artifactRegistry ?? DEFAULT_ARTIFACT_REGISTRY;\n const project = envConfig.project;\n let buildLocal = cloud.buildLocal !== false;\n\n checkGcloudAvailable();\n\n if (buildLocal) {\n if (!isDockerInstalled()) {\n consola.warn(\n \"Docker is not installed, falling back to Cloud Build. \" +\n \"Install Docker for faster local builds: https://docs.docker.com/get-docker/\",\n );\n buildLocal = false;\n } else if (!isDockerDaemonRunning()) {\n if (!process.stdin.isTTY) {\n /** Non-interactive environment (CI) — fall back automatically */\n consola.warn(\n \"Docker daemon is not running, falling back to Cloud Build.\",\n );\n buildLocal = false;\n } else {\n const choice = await consola.prompt(\n \"Docker is installed but the daemon is not running.\",\n {\n type: \"select\",\n options: [\n {\n label: \"Start Docker\",\n value: \"start\",\n hint: \"attempt to start the daemon\",\n },\n {\n label: \"Use Cloud Build\",\n value: \"cloud-build\",\n hint: \"build remotely instead\",\n },\n ],\n },\n );\n\n if (typeof choice === \"symbol\") {\n process.exit(0);\n }\n\n if (choice === \"start\") {\n const started = startDockerDaemon();\n\n if (!started) {\n consola.warn(\n \"Could not start Docker automatically, falling back to Cloud Build.\",\n );\n buildLocal = false;\n } else {\n const ready = await waitForDockerDaemon();\n\n if (!ready) {\n consola.warn(\n \"Docker daemon did not become ready in time, falling back to Cloud Build.\",\n );\n buildLocal = false;\n }\n }\n } else {\n buildLocal = false;\n }\n }\n }\n }\n\n /** Step 1: Run isolate to bundle workspace dependencies */\n const isolateDirectory = resolveIsolateDirectory(serviceDirectory);\n\n consola.start(\"Isolating package...\");\n\n try {\n const { isolate: runIsolate } = await import(\"isolate-package\");\n\n const configPath = path.join(serviceDirectory, \"isolate.config.json\");\n const fileConfig = existsSync(configPath)\n ? JSON.parse(readFileSync(configPath, \"utf-8\"))\n : {};\n\n await runIsolate({\n ...fileConfig,\n includeDevDependencies: true,\n });\n } catch (error) {\n const message = error instanceof Error ? error.message : String(error);\n consola.error(`Failed to isolate package: ${message}`);\n process.exit(1);\n }\n\n consola.success(\"Package isolated\");\n\n /** Step 2: Hash the isolate directory */\n const tag = await hashDirectory(isolateDirectory);\n consola.info(`Content hash: ${tag}`);\n\n /** Step 3: Check if image already exists */\n const imageUri = `${region}-${REGISTRY}/${project}/${artifactRegistry}/${cloud.name}:${tag}`;\n\n const imageExists = checkImageExists(imageUri, project);\n let imageBuilt = false;\n\n if (imageExists) {\n consola.success(`Image already exists: ${cloud.name}:${tag}`);\n } else if (buildLocal) {\n /** Step 4a: Generate Dockerfile and build locally with Docker */\n consola.start(\"Building image locally with Docker...\");\n\n const dockerfilePath = path.join(serviceDirectory, GENERATED_DOCKERFILE);\n writeFileSync(dockerfilePath, generateDockerfile());\n\n try {\n const buildResult = shellExecCapture(\n `docker build --platform linux/amd64 -t ${imageUri} .`,\n { cwd: serviceDirectory },\n );\n\n if (!buildResult.success) {\n consola.error(\"Docker build failed. Output:\\n\" + buildResult.output);\n process.exit(1);\n }\n\n consola.success(`Image built: ${cloud.name}:${tag}`);\n\n /** Configure Docker authentication for Artifact Registry */\n gcloudExecCapture([\n \"auth\",\n \"configure-docker\",\n `${region}-${REGISTRY}`,\n \"--quiet\",\n ]);\n\n consola.start(\"Pushing image to Artifact Registry...\");\n\n const pushResult = shellExecCapture(`docker push ${imageUri}`);\n\n if (!pushResult.success) {\n consola.error(\"Docker push failed. Output:\\n\" + pushResult.output);\n process.exit(1);\n }\n\n consola.success(`Image pushed: ${cloud.name}:${tag}`);\n imageBuilt = true;\n } finally {\n /** Clean up generated Dockerfile */\n try {\n unlinkSync(dockerfilePath);\n } catch {\n /** Ignore cleanup errors */\n }\n }\n } else {\n /** Step 4b: Generate Dockerfile and build with Cloud Build */\n consola.start(\"Building image with Cloud Build...\");\n\n const dockerfilePath = path.join(serviceDirectory, GENERATED_DOCKERFILE);\n writeFileSync(dockerfilePath, generateDockerfile());\n\n try {\n const buildResult = gcloudExecCapture(\n [\n \"builds\",\n \"submit\",\n \"--project\",\n project,\n \"--region\",\n region,\n `--tag=${imageUri}`,\n \".\",\n ],\n { cwd: serviceDirectory },\n );\n\n /** Extract and show the Cloud Build logs URL if available */\n const logsUrlMatch = buildResult.output.match(\n /Logs are available at \\[(.+?)]/,\n );\n if (logsUrlMatch) {\n consola.info(`Cloud Build logs: ${logsUrlMatch[1]}`);\n }\n\n if (!buildResult.success) {\n consola.error(\"Cloud Build failed. Output:\\n\" + buildResult.output);\n process.exit(1);\n }\n\n consola.success(`Image built: ${cloud.name}:${tag}`);\n imageBuilt = true;\n } finally {\n /** Clean up generated Dockerfile */\n try {\n unlinkSync(dockerfilePath);\n } catch {\n /** Ignore cleanup errors */\n }\n }\n }\n\n return { imageUri, imageBuilt, region, project };\n}\n\n/**\n * Build and push a Cloud Run Job image.\n *\n * This is image-only: it does not create or update Cloud Run Job resources.\n * Use createOrUpdateJob() separately to manage job resources.\n */\nexport async function deploy(options: DeployOptions): Promise<DeployResult> {\n const { imageUri, imageBuilt } = await prepareImage(options);\n return { imageUri, imageBuilt };\n}\n\n/**\n * Build and push a Cloud Run Job image only if it has changed.\n *\n * This is image-only: it does not create or update Cloud Run Job resources.\n * Use createOrUpdateJob() separately to manage job resources.\n */\nexport async function deployIfChanged(\n options: DeployOptions,\n): Promise<DeployResult> {\n const { imageUri, imageBuilt } = await prepareImage(options);\n\n if (!imageBuilt) {\n consola.info(\"No changes detected, skipping image build\");\n }\n\n return { imageUri, imageBuilt };\n}\n\nexport interface CreateOrUpdateJobOptions {\n cloud: CloudConfig;\n envConfig: RunnerEnvOptions;\n /** The Cloud Run Job resource name (e.g., \"admin-create-user\") */\n jobName: string;\n imageUri: string;\n region: string;\n project: string;\n}\n\n/**\n * Create or update a Cloud Run Job resource.\n * Returns true if the job was newly created, false if updated.\n */\nexport async function createOrUpdateJob(\n options: CreateOrUpdateJobOptions,\n): Promise<boolean> {\n const { cloud, envConfig, jobName, imageUri, region, project } = options;\n const memory = cloud.resources?.memory ?? \"512Mi\";\n const cpu = cloud.resources?.cpu ?? \"1\";\n const timeout = cloud.resources?.timeout ?? 86400;\n\n /** Check if job already exists */\n const existingJob = gcloudJson(\n [\n \"run\",\n \"jobs\",\n \"describe\",\n jobName,\n \"--project\",\n project,\n \"--region\",\n region,\n ],\n { ignoreErrors: true },\n );\n\n /** Build environment variables */\n const envVars: Record<string, string> = {\n GOOGLE_CLOUD_PROJECT: project,\n ...envConfig.env,\n };\n\n const envVarsString = Object.entries(envVars)\n .map(([key, value]) => `${key}=${value}`)\n .join(\",\");\n\n /** Build secret references */\n const secretNames = envConfig.secrets ?? [];\n const secretsString = secretNames\n .map((name) => `${name}=${name}:latest`)\n .join(\",\");\n\n if (existingJob) {\n consola.start(\"Updating Cloud Run Job...\");\n\n const updateArgs = [\n \"run\",\n \"jobs\",\n \"update\",\n jobName,\n \"--project\",\n project,\n \"--region\",\n region,\n `--image=${imageUri}`,\n `--set-env-vars=${envVarsString}`,\n `--memory=${memory}`,\n `--cpu=${cpu}`,\n `--task-timeout=${timeout}s`,\n \"--max-retries=0\",\n ];\n\n /**\n * Always pass --parallelism on update so that removing it from config\n * resets the deployed value. Default 0 means no concurrency limit.\n */\n updateArgs.push(`--parallelism=${cloud.resources?.parallelism ?? 0}`);\n\n if (secretsString) {\n updateArgs.push(`--set-secrets=${secretsString}`);\n }\n\n if (cloud.serviceAccount) {\n updateArgs.push(`--service-account=${cloud.serviceAccount}`);\n }\n\n if (cloud.network) {\n updateArgs.push(`--network=${cloud.network.name}`);\n if (cloud.network.subnet) {\n updateArgs.push(`--subnet=${cloud.network.subnet}`);\n }\n updateArgs.push(\n `--vpc-egress=${cloud.network.egress ?? \"private-ranges-only\"}`,\n );\n }\n\n const result = gcloudExecCapture(updateArgs);\n\n if (!result.success) {\n consola.error(\"Failed to update Cloud Run Job\");\n process.exit(1);\n }\n\n const filtered = filterGcloudOutput(result.stderr);\n if (filtered) {\n process.stderr.write(filtered + \"\\n\");\n }\n\n consola.success(`Cloud Run Job updated: ${jobName}`);\n return false;\n }\n\n consola.start(\"Creating Cloud Run Job...\");\n\n const createArgs = [\n \"run\",\n \"jobs\",\n \"create\",\n jobName,\n \"--project\",\n project,\n \"--region\",\n region,\n `--image=${imageUri}`,\n `--set-env-vars=${envVarsString}`,\n `--memory=${memory}`,\n `--cpu=${cpu}`,\n `--task-timeout=${timeout}s`,\n \"--max-retries=0\",\n ];\n\n if (cloud.resources?.parallelism !== undefined) {\n createArgs.push(`--parallelism=${cloud.resources.parallelism}`);\n }\n\n if (secretsString) {\n createArgs.push(`--set-secrets=${secretsString}`);\n }\n\n if (cloud.serviceAccount) {\n createArgs.push(`--service-account=${cloud.serviceAccount}`);\n }\n\n if (cloud.network) {\n createArgs.push(`--network=${cloud.network.name}`);\n if (cloud.network.subnet) {\n createArgs.push(`--subnet=${cloud.network.subnet}`);\n }\n createArgs.push(\n `--vpc-egress=${cloud.network.egress ?? \"private-ranges-only\"}`,\n );\n }\n\n const result = gcloudExecCapture(createArgs);\n\n if (!result.success) {\n consola.error(\"Failed to create Cloud Run Job\");\n process.exit(1);\n }\n\n const filtered = filterGcloudOutput(result.stderr);\n if (filtered) {\n process.stderr.write(filtered + \"\\n\");\n }\n\n consola.success(`Cloud Run Job created: ${jobName}`);\n return true;\n}\n\n/**\n * Check if a Docker image exists in Artifact Registry.\n */\nfunction checkImageExists(imageUri: string, project: string): boolean {\n const result = gcloudJson(\n [\n \"artifacts\",\n \"docker\",\n \"images\",\n \"describe\",\n imageUri,\n \"--project\",\n project,\n ],\n { ignoreErrors: true },\n );\n\n return result !== undefined;\n}\n"],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { consola } from "consola";
2
- import { execaCommandSync, execaSync } from "execa";
2
+ import { execa, execaCommandSync, execaSync } from "execa";
3
3
 
4
4
  //#region src/cloud/gcloud.ts
5
5
  /**
@@ -75,9 +75,9 @@ function checkGcloudAvailable() {
75
75
  }
76
76
  }
77
77
  /**
78
- * Check if Docker CLI is available.
78
+ * Check if the Docker CLI binary is installed.
79
79
  */
80
- function isDockerAvailable() {
80
+ function isDockerInstalled() {
81
81
  try {
82
82
  execaSync("docker", ["--version"]);
83
83
  return true;
@@ -85,7 +85,62 @@ function isDockerAvailable() {
85
85
  return false;
86
86
  }
87
87
  }
88
+ /**
89
+ * Check if the Docker daemon is running by executing `docker info`.
90
+ */
91
+ function isDockerDaemonRunning() {
92
+ try {
93
+ execaSync("docker", ["info"], { stdio: "pipe" });
94
+ return true;
95
+ } catch {
96
+ return false;
97
+ }
98
+ }
99
+ /**
100
+ * Attempt to start the Docker daemon.
101
+ * - macOS: opens the Docker Desktop application
102
+ * - Linux: starts the docker systemd service
103
+ * - Other platforms: unsupported, returns false
104
+ */
105
+ function startDockerDaemon() {
106
+ try {
107
+ if (process.platform === "darwin") {
108
+ execaSync("open", ["-a", "Docker"]);
109
+ return true;
110
+ }
111
+ if (process.platform === "linux") {
112
+ execaSync("systemctl", ["start", "docker"]);
113
+ return true;
114
+ }
115
+ return false;
116
+ } catch {
117
+ return false;
118
+ }
119
+ }
120
+ /**
121
+ * Poll `docker info` until the daemon is responsive or the timeout is reached.
122
+ * Shows a spinner while waiting.
123
+ *
124
+ * @param timeoutMs - Maximum time to wait in milliseconds (default: 30000)
125
+ * @param intervalMs - Polling interval in milliseconds (default: 2000)
126
+ * @returns true if the daemon became available, false on timeout
127
+ */
128
+ async function waitForDockerDaemon(timeoutMs = 3e4, intervalMs = 2e3) {
129
+ if (isDockerDaemonRunning()) return true;
130
+ consola.start("Waiting for Docker daemon to start...");
131
+ const deadline = Date.now() + timeoutMs;
132
+ while (Date.now() < deadline) {
133
+ await new Promise((resolve) => setTimeout(resolve, intervalMs));
134
+ try {
135
+ await execa("docker", ["info"], { stdio: "pipe" });
136
+ consola.success("Docker daemon is running");
137
+ return true;
138
+ } catch {}
139
+ }
140
+ consola.fail("Docker daemon did not start in time");
141
+ return false;
142
+ }
88
143
 
89
144
  //#endregion
90
- export { checkGcloudAvailable, gcloudExecCapture, gcloudJson, isDockerAvailable, shellExecCapture };
145
+ export { checkGcloudAvailable, gcloudExecCapture, gcloudJson, isDockerDaemonRunning, isDockerInstalled, shellExecCapture, startDockerDaemon, waitForDockerDaemon };
91
146
  //# sourceMappingURL=gcloud.mjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"gcloud.mjs","names":[],"sources":["../../src/cloud/gcloud.ts"],"sourcesContent":["import { execaCommandSync, execaSync } from \"execa\";\nimport { consola } from \"consola\";\n\nexport interface CapturedExecResult {\n success: boolean;\n output: string;\n stderr: string;\n}\n\n/**\n * Execute a gcloud command and return the parsed JSON output.\n * Throws on non-zero exit code unless `ignoreErrors` is set.\n */\nexport function gcloudJson<T = unknown>(\n args: string[],\n options?: { ignoreErrors?: boolean },\n): T | undefined {\n try {\n const result = execaSync(\"gcloud\", [...args, \"--format=json\"]);\n return JSON.parse(result.stdout) as T;\n } catch (error) {\n if (options?.ignoreErrors) {\n return undefined;\n }\n throw error;\n }\n}\n\n/**\n * Execute a gcloud command with stdio inherited (shows output in terminal).\n * Returns whether the command succeeded.\n */\nexport function gcloudExec(\n args: string[],\n options?: { cwd?: string },\n): boolean {\n try {\n execaSync(\"gcloud\", args, {\n stdio: \"inherit\",\n cwd: options?.cwd,\n reject: true,\n });\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * Execute a shell command with stdio inherited.\n * Uses shell execution for commands that need shell features (like pnpm).\n */\nexport function shellExec(\n command: string,\n options?: { cwd?: string },\n): boolean {\n try {\n execaCommandSync(command, {\n stdio: \"inherit\",\n cwd: options?.cwd,\n reject: true,\n });\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * Execute a gcloud command and capture all output instead of streaming it.\n * Returns success status and captured stdout/stderr for the caller to handle.\n */\nexport function gcloudExecCapture(\n args: string[],\n options?: { cwd?: string },\n): CapturedExecResult {\n try {\n const result = execaSync(\"gcloud\", args, {\n cwd: options?.cwd,\n reject: true,\n });\n return { success: true, output: result.stdout, stderr: result.stderr };\n } catch (error) {\n const stderr = (error as { stderr?: string }).stderr ?? \"\";\n const stdout = (error as { stdout?: string }).stdout ?? \"\";\n return {\n success: false,\n output: [stderr, stdout].filter(Boolean).join(\"\\n\"),\n stderr,\n };\n }\n}\n\n/**\n * Execute a shell command and capture all output instead of streaming it.\n * Returns success status and captured output for the caller to handle.\n */\nexport function shellExecCapture(\n command: string,\n options?: { cwd?: string },\n): CapturedExecResult {\n try {\n const result = execaCommandSync(command, {\n cwd: options?.cwd,\n reject: true,\n });\n return { success: true, output: result.stdout, stderr: result.stderr };\n } catch (error) {\n const stderr = (error as { stderr?: string }).stderr ?? \"\";\n const stdout = (error as { stdout?: string }).stdout ?? \"\";\n return {\n success: false,\n output: [stderr, stdout].filter(Boolean).join(\"\\n\"),\n stderr,\n };\n }\n}\n\n/**\n * Check if gcloud CLI is available and authenticated.\n */\nexport function checkGcloudAvailable(): void {\n try {\n execaSync(\"gcloud\", [\"--version\"]);\n } catch {\n consola.error(\n \"gcloud CLI is not installed or not in PATH.\\n\" +\n \"Install it from: https://cloud.google.com/sdk/docs/install\",\n );\n process.exit(1);\n }\n}\n\n/**\n * Check if Docker CLI is available.\n */\nexport function isDockerAvailable(): boolean {\n try {\n execaSync(\"docker\", [\"--version\"]);\n return true;\n } catch {\n return false;\n }\n}\n"],"mappings":";;;;;;;;AAaA,SAAgB,WACd,MACA,SACe;AACf,KAAI;EACF,MAAM,SAAS,UAAU,UAAU,CAAC,GAAG,MAAM,gBAAgB,CAAC;AAC9D,SAAO,KAAK,MAAM,OAAO,OAAO;UACzB,OAAO;AACd,MAAI,SAAS,aACX;AAEF,QAAM;;;;;;;AAgDV,SAAgB,kBACd,MACA,SACoB;AACpB,KAAI;EACF,MAAM,SAAS,UAAU,UAAU,MAAM;GACvC,KAAK,SAAS;GACd,QAAQ;GACT,CAAC;AACF,SAAO;GAAE,SAAS;GAAM,QAAQ,OAAO;GAAQ,QAAQ,OAAO;GAAQ;UAC/D,OAAO;EACd,MAAM,SAAU,MAA8B,UAAU;AAExD,SAAO;GACL,SAAS;GACT,QAAQ,CAAC,QAHK,MAA8B,UAAU,GAG9B,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK;GACnD;GACD;;;;;;;AAQL,SAAgB,iBACd,SACA,SACoB;AACpB,KAAI;EACF,MAAM,SAAS,iBAAiB,SAAS;GACvC,KAAK,SAAS;GACd,QAAQ;GACT,CAAC;AACF,SAAO;GAAE,SAAS;GAAM,QAAQ,OAAO;GAAQ,QAAQ,OAAO;GAAQ;UAC/D,OAAO;EACd,MAAM,SAAU,MAA8B,UAAU;AAExD,SAAO;GACL,SAAS;GACT,QAAQ,CAAC,QAHK,MAA8B,UAAU,GAG9B,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK;GACnD;GACD;;;;;;AAOL,SAAgB,uBAA6B;AAC3C,KAAI;AACF,YAAU,UAAU,CAAC,YAAY,CAAC;SAC5B;AACN,UAAQ,MACN,0GAED;AACD,UAAQ,KAAK,EAAE;;;;;;AAOnB,SAAgB,oBAA6B;AAC3C,KAAI;AACF,YAAU,UAAU,CAAC,YAAY,CAAC;AAClC,SAAO;SACD;AACN,SAAO"}
1
+ {"version":3,"file":"gcloud.mjs","names":[],"sources":["../../src/cloud/gcloud.ts"],"sourcesContent":["import { execaCommandSync, execaSync } from \"execa\";\nimport { execa } from \"execa\";\nimport { consola } from \"consola\";\n\nexport interface CapturedExecResult {\n success: boolean;\n output: string;\n stderr: string;\n}\n\n/**\n * Execute a gcloud command and return the parsed JSON output.\n * Throws on non-zero exit code unless `ignoreErrors` is set.\n */\nexport function gcloudJson<T = unknown>(\n args: string[],\n options?: { ignoreErrors?: boolean },\n): T | undefined {\n try {\n const result = execaSync(\"gcloud\", [...args, \"--format=json\"]);\n return JSON.parse(result.stdout) as T;\n } catch (error) {\n if (options?.ignoreErrors) {\n return undefined;\n }\n throw error;\n }\n}\n\n/**\n * Execute a gcloud command with stdio inherited (shows output in terminal).\n * Returns whether the command succeeded.\n */\nexport function gcloudExec(\n args: string[],\n options?: { cwd?: string },\n): boolean {\n try {\n execaSync(\"gcloud\", args, {\n stdio: \"inherit\",\n cwd: options?.cwd,\n reject: true,\n });\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * Execute a shell command with stdio inherited.\n * Uses shell execution for commands that need shell features (like pnpm).\n */\nexport function shellExec(\n command: string,\n options?: { cwd?: string },\n): boolean {\n try {\n execaCommandSync(command, {\n stdio: \"inherit\",\n cwd: options?.cwd,\n reject: true,\n });\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * Execute a gcloud command and capture all output instead of streaming it.\n * Returns success status and captured stdout/stderr for the caller to handle.\n */\nexport function gcloudExecCapture(\n args: string[],\n options?: { cwd?: string },\n): CapturedExecResult {\n try {\n const result = execaSync(\"gcloud\", args, {\n cwd: options?.cwd,\n reject: true,\n });\n return { success: true, output: result.stdout, stderr: result.stderr };\n } catch (error) {\n const stderr = (error as { stderr?: string }).stderr ?? \"\";\n const stdout = (error as { stdout?: string }).stdout ?? \"\";\n return {\n success: false,\n output: [stderr, stdout].filter(Boolean).join(\"\\n\"),\n stderr,\n };\n }\n}\n\n/**\n * Execute a shell command and capture all output instead of streaming it.\n * Returns success status and captured output for the caller to handle.\n */\nexport function shellExecCapture(\n command: string,\n options?: { cwd?: string },\n): CapturedExecResult {\n try {\n const result = execaCommandSync(command, {\n cwd: options?.cwd,\n reject: true,\n });\n return { success: true, output: result.stdout, stderr: result.stderr };\n } catch (error) {\n const stderr = (error as { stderr?: string }).stderr ?? \"\";\n const stdout = (error as { stdout?: string }).stdout ?? \"\";\n return {\n success: false,\n output: [stderr, stdout].filter(Boolean).join(\"\\n\"),\n stderr,\n };\n }\n}\n\n/**\n * Check if gcloud CLI is available and authenticated.\n */\nexport function checkGcloudAvailable(): void {\n try {\n execaSync(\"gcloud\", [\"--version\"]);\n } catch {\n consola.error(\n \"gcloud CLI is not installed or not in PATH.\\n\" +\n \"Install it from: https://cloud.google.com/sdk/docs/install\",\n );\n process.exit(1);\n }\n}\n\n/**\n * Check if the Docker CLI binary is installed.\n */\nexport function isDockerInstalled(): boolean {\n try {\n execaSync(\"docker\", [\"--version\"]);\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * Check if the Docker daemon is running by executing `docker info`.\n */\nexport function isDockerDaemonRunning(): boolean {\n try {\n execaSync(\"docker\", [\"info\"], { stdio: \"pipe\" });\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * Attempt to start the Docker daemon.\n * - macOS: opens the Docker Desktop application\n * - Linux: starts the docker systemd service\n * - Other platforms: unsupported, returns false\n */\nexport function startDockerDaemon(): boolean {\n try {\n if (process.platform === \"darwin\") {\n execaSync(\"open\", [\"-a\", \"Docker\"]);\n return true;\n }\n\n if (process.platform === \"linux\") {\n execaSync(\"systemctl\", [\"start\", \"docker\"]);\n return true;\n }\n\n return false;\n } catch {\n return false;\n }\n}\n\n/**\n * Poll `docker info` until the daemon is responsive or the timeout is reached.\n * Shows a spinner while waiting.\n *\n * @param timeoutMs - Maximum time to wait in milliseconds (default: 30000)\n * @param intervalMs - Polling interval in milliseconds (default: 2000)\n * @returns true if the daemon became available, false on timeout\n */\nexport async function waitForDockerDaemon(\n timeoutMs = 30_000,\n intervalMs = 2_000,\n): Promise<boolean> {\n if (isDockerDaemonRunning()) return true;\n\n consola.start(\"Waiting for Docker daemon to start...\");\n\n const deadline = Date.now() + timeoutMs;\n\n while (Date.now() < deadline) {\n await new Promise((resolve) => setTimeout(resolve, intervalMs));\n\n try {\n await execa(\"docker\", [\"info\"], { stdio: \"pipe\" });\n consola.success(\"Docker daemon is running\");\n return true;\n } catch {\n /** Daemon not ready yet */\n }\n }\n\n consola.fail(\"Docker daemon did not start in time\");\n return false;\n}\n"],"mappings":";;;;;;;;AAcA,SAAgB,WACd,MACA,SACe;AACf,KAAI;EACF,MAAM,SAAS,UAAU,UAAU,CAAC,GAAG,MAAM,gBAAgB,CAAC;AAC9D,SAAO,KAAK,MAAM,OAAO,OAAO;UACzB,OAAO;AACd,MAAI,SAAS,aACX;AAEF,QAAM;;;;;;;AAgDV,SAAgB,kBACd,MACA,SACoB;AACpB,KAAI;EACF,MAAM,SAAS,UAAU,UAAU,MAAM;GACvC,KAAK,SAAS;GACd,QAAQ;GACT,CAAC;AACF,SAAO;GAAE,SAAS;GAAM,QAAQ,OAAO;GAAQ,QAAQ,OAAO;GAAQ;UAC/D,OAAO;EACd,MAAM,SAAU,MAA8B,UAAU;AAExD,SAAO;GACL,SAAS;GACT,QAAQ,CAAC,QAHK,MAA8B,UAAU,GAG9B,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK;GACnD;GACD;;;;;;;AAQL,SAAgB,iBACd,SACA,SACoB;AACpB,KAAI;EACF,MAAM,SAAS,iBAAiB,SAAS;GACvC,KAAK,SAAS;GACd,QAAQ;GACT,CAAC;AACF,SAAO;GAAE,SAAS;GAAM,QAAQ,OAAO;GAAQ,QAAQ,OAAO;GAAQ;UAC/D,OAAO;EACd,MAAM,SAAU,MAA8B,UAAU;AAExD,SAAO;GACL,SAAS;GACT,QAAQ,CAAC,QAHK,MAA8B,UAAU,GAG9B,CAAC,OAAO,QAAQ,CAAC,KAAK,KAAK;GACnD;GACD;;;;;;AAOL,SAAgB,uBAA6B;AAC3C,KAAI;AACF,YAAU,UAAU,CAAC,YAAY,CAAC;SAC5B;AACN,UAAQ,MACN,0GAED;AACD,UAAQ,KAAK,EAAE;;;;;;AAOnB,SAAgB,oBAA6B;AAC3C,KAAI;AACF,YAAU,UAAU,CAAC,YAAY,CAAC;AAClC,SAAO;SACD;AACN,SAAO;;;;;;AAOX,SAAgB,wBAAiC;AAC/C,KAAI;AACF,YAAU,UAAU,CAAC,OAAO,EAAE,EAAE,OAAO,QAAQ,CAAC;AAChD,SAAO;SACD;AACN,SAAO;;;;;;;;;AAUX,SAAgB,oBAA6B;AAC3C,KAAI;AACF,MAAI,QAAQ,aAAa,UAAU;AACjC,aAAU,QAAQ,CAAC,MAAM,SAAS,CAAC;AACnC,UAAO;;AAGT,MAAI,QAAQ,aAAa,SAAS;AAChC,aAAU,aAAa,CAAC,SAAS,SAAS,CAAC;AAC3C,UAAO;;AAGT,SAAO;SACD;AACN,SAAO;;;;;;;;;;;AAYX,eAAsB,oBACpB,YAAY,KACZ,aAAa,KACK;AAClB,KAAI,uBAAuB,CAAE,QAAO;AAEpC,SAAQ,MAAM,wCAAwC;CAEtD,MAAM,WAAW,KAAK,KAAK,GAAG;AAE9B,QAAO,KAAK,KAAK,GAAG,UAAU;AAC5B,QAAM,IAAI,SAAS,YAAY,WAAW,SAAS,WAAW,CAAC;AAE/D,MAAI;AACF,SAAM,MAAM,UAAU,CAAC,OAAO,EAAE,EAAE,OAAO,QAAQ,CAAC;AAClD,WAAQ,QAAQ,2BAA2B;AAC3C,UAAO;UACD;;AAKV,SAAQ,KAAK,sCAAsC;AACnD,QAAO"}
package/dist/config.d.mts CHANGED
@@ -19,6 +19,15 @@ interface CloudResources {
19
19
  /** Maximum number of tasks that can run in parallel. Default: unset (no limit) */
20
20
  parallelism?: number;
21
21
  }
22
+ /** Direct VPC egress configuration for private network access (e.g., Redis) */
23
+ interface CloudNetworkConfig {
24
+ /** VPC network name (e.g., "default") */
25
+ name: string;
26
+ /** VPC subnet name (e.g., "default") */
27
+ subnet?: string;
28
+ /** VPC egress mode. Default: "private-ranges-only" */
29
+ egress?: "all-traffic" | "private-ranges-only";
30
+ }
22
31
  /** Configuration for Cloud Run Jobs execution */
23
32
  interface CloudConfig {
24
33
  /** Cloud Run Job name (e.g., "loads-predictions-jobs") */
@@ -36,6 +45,8 @@ interface CloudConfig {
36
45
  * Requires Docker to be installed and running. Default: true.
37
46
  */
38
47
  buildLocal?: boolean;
48
+ /** Direct VPC egress configuration for private network access */
49
+ network?: CloudNetworkConfig;
39
50
  }
40
51
  /** Full runner configuration provided by each service */
41
52
  interface RunnerConfig {
@@ -67,5 +78,5 @@ declare function defineRunnerConfig(config: RunnerConfig): RunnerConfig;
67
78
  /** Identity function for type-safe environment definition */
68
79
  declare function defineRunnerEnv(options: RunnerEnvOptions): RunnerEnvOptions;
69
80
  //#endregion
70
- export { CloudConfig, CloudResources, RunnerConfig, RunnerEnvOptions, defineRunnerConfig, defineRunnerEnv };
81
+ export { CloudConfig, CloudNetworkConfig, CloudResources, RunnerConfig, RunnerEnvOptions, defineRunnerConfig, defineRunnerEnv };
71
82
  //# sourceMappingURL=config.d.mts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.mjs","names":[],"sources":["../src/config.ts"],"sourcesContent":["/** Environment configuration for a specific deployment target */\nexport interface RunnerEnvOptions {\n /** GCP project ID — sets GOOGLE_CLOUD_PROJECT automatically */\n project: string;\n /** Additional environment variables to set before the job runs */\n env?: Record<string, string>;\n /** Secret names to load from GCP Secret Manager */\n secrets?: string[];\n}\n\n/** Container resource limits for a Cloud Run Job */\nexport interface CloudResources {\n /** Memory limit (e.g., \"512Mi\", \"1Gi\"). Default: \"512Mi\" */\n memory?: string;\n /** CPU limit (e.g., \"1\", \"2\"). Default: \"1\" */\n cpu?: string;\n /** Job timeout in seconds. Default: 86400 (24 hours) */\n timeout?: number;\n /** Maximum number of tasks that can run in parallel. Default: unset (no limit) */\n parallelism?: number;\n}\n\n/** Configuration for Cloud Run Jobs execution */\nexport interface CloudConfig {\n /** Cloud Run Job name (e.g., \"loads-predictions-jobs\") */\n name: string;\n /** GCP region. Default: \"us-central1\" */\n region?: string;\n /** Artifact Registry repository name. Default: \"cloud-run\" */\n artifactRegistry?: string;\n /** Container resource limits */\n resources?: CloudResources;\n /** Service account email for the Cloud Run Job */\n serviceAccount?: string;\n /**\n * Build Docker images locally instead of using Cloud Build.\n * Requires Docker to be installed and running. Default: true.\n */\n buildLocal?: boolean;\n}\n\n/** Full runner configuration provided by each service */\nexport interface RunnerConfig {\n /**\n * Absolute path to the directory containing job scripts.\n * Default: `dist/jobs` relative to cwd.\n */\n jobsDirectory?: string;\n /** Optional initialization function called before the job runs (skipped for --help) */\n initialize?: () => void | Promise<void>;\n /** Optional custom logger (defaults to console) */\n logger?: {\n info: (message: string) => void;\n error: (message: string) => void;\n };\n /** Named environments (e.g., stag, prod) */\n environments: Record<string, RunnerEnvOptions>;\n /** Cloud Run Jobs configuration (required for `job cloud run/deploy` commands) */\n cloud?: CloudConfig;\n /**\n * Command to build workspace dependencies before running jobs.\n * Set to `false` to skip the build step entirely.\n * Default: \"turbo build\"\n */\n buildCommand?: string | false;\n}\n\n/** Identity function for type-safe runner config definition */\nexport function defineRunnerConfig(config: RunnerConfig): RunnerConfig {\n return config;\n}\n\n/** Identity function for type-safe environment definition */\nexport function defineRunnerEnv(options: RunnerEnvOptions): RunnerEnvOptions {\n return options;\n}\n"],"mappings":";;AAoEA,SAAgB,mBAAmB,QAAoC;AACrE,QAAO;;;AAIT,SAAgB,gBAAgB,SAA6C;AAC3E,QAAO"}
1
+ {"version":3,"file":"config.mjs","names":[],"sources":["../src/config.ts"],"sourcesContent":["/** Environment configuration for a specific deployment target */\nexport interface RunnerEnvOptions {\n /** GCP project ID — sets GOOGLE_CLOUD_PROJECT automatically */\n project: string;\n /** Additional environment variables to set before the job runs */\n env?: Record<string, string>;\n /** Secret names to load from GCP Secret Manager */\n secrets?: string[];\n}\n\n/** Container resource limits for a Cloud Run Job */\nexport interface CloudResources {\n /** Memory limit (e.g., \"512Mi\", \"1Gi\"). Default: \"512Mi\" */\n memory?: string;\n /** CPU limit (e.g., \"1\", \"2\"). Default: \"1\" */\n cpu?: string;\n /** Job timeout in seconds. Default: 86400 (24 hours) */\n timeout?: number;\n /** Maximum number of tasks that can run in parallel. Default: unset (no limit) */\n parallelism?: number;\n}\n\n/** Direct VPC egress configuration for private network access (e.g., Redis) */\nexport interface CloudNetworkConfig {\n /** VPC network name (e.g., \"default\") */\n name: string;\n /** VPC subnet name (e.g., \"default\") */\n subnet?: string;\n /** VPC egress mode. Default: \"private-ranges-only\" */\n egress?: \"all-traffic\" | \"private-ranges-only\";\n}\n\n/** Configuration for Cloud Run Jobs execution */\nexport interface CloudConfig {\n /** Cloud Run Job name (e.g., \"loads-predictions-jobs\") */\n name: string;\n /** GCP region. Default: \"us-central1\" */\n region?: string;\n /** Artifact Registry repository name. Default: \"cloud-run\" */\n artifactRegistry?: string;\n /** Container resource limits */\n resources?: CloudResources;\n /** Service account email for the Cloud Run Job */\n serviceAccount?: string;\n /**\n * Build Docker images locally instead of using Cloud Build.\n * Requires Docker to be installed and running. Default: true.\n */\n buildLocal?: boolean;\n /** Direct VPC egress configuration for private network access */\n network?: CloudNetworkConfig;\n}\n\n/** Full runner configuration provided by each service */\nexport interface RunnerConfig {\n /**\n * Absolute path to the directory containing job scripts.\n * Default: `dist/jobs` relative to cwd.\n */\n jobsDirectory?: string;\n /** Optional initialization function called before the job runs (skipped for --help) */\n initialize?: () => void | Promise<void>;\n /** Optional custom logger (defaults to console) */\n logger?: {\n info: (message: string) => void;\n error: (message: string) => void;\n };\n /** Named environments (e.g., stag, prod) */\n environments: Record<string, RunnerEnvOptions>;\n /** Cloud Run Jobs configuration (required for `job cloud run/deploy` commands) */\n cloud?: CloudConfig;\n /**\n * Command to build workspace dependencies before running jobs.\n * Set to `false` to skip the build step entirely.\n * Default: \"turbo build\"\n */\n buildCommand?: string | false;\n}\n\n/** Identity function for type-safe runner config definition */\nexport function defineRunnerConfig(config: RunnerConfig): RunnerConfig {\n return config;\n}\n\n/** Identity function for type-safe environment definition */\nexport function defineRunnerEnv(options: RunnerEnvOptions): RunnerEnvOptions {\n return options;\n}\n"],"mappings":";;AAgFA,SAAgB,mBAAmB,QAAoC;AACrE,QAAO;;;AAIT,SAAgB,gBAAgB,SAA6C;AAC3E,QAAO"}
package/dist/index.d.mts CHANGED
@@ -1,8 +1,8 @@
1
- import { CloudConfig, CloudResources, RunnerConfig, RunnerEnvOptions, defineRunnerConfig, defineRunnerEnv } from "./config.mjs";
1
+ import { CloudConfig, CloudNetworkConfig, CloudResources, RunnerConfig, RunnerEnvOptions, defineRunnerConfig, defineRunnerEnv } from "./config.mjs";
2
2
  import { FlagAliases, JobFunction, JobInfo, JobMetadata, JobOptions, RunJobOptions } from "./types.mjs";
3
3
  import { defineJob } from "./define-job.mjs";
4
4
  import { discoverJobs } from "./discover-jobs.mjs";
5
5
  import { FieldInfo, extractFieldInfo, formatZodError, generateSchemaHelp, schemaToParseArgsOptions } from "./help.mjs";
6
6
  import { TaskContext, getTaskContext } from "./task-context.mjs";
7
7
  import { runJob } from "./run-job.mjs";
8
- export { type CloudConfig, type CloudResources, type FieldInfo, type FlagAliases, type JobFunction, type JobInfo, type JobMetadata, type JobOptions, type RunJobOptions, type RunnerConfig, type RunnerEnvOptions, type TaskContext, defineJob, defineRunnerConfig, defineRunnerEnv, discoverJobs, extractFieldInfo, formatZodError, generateSchemaHelp, getTaskContext, runJob, schemaToParseArgsOptions };
8
+ export { type CloudConfig, type CloudNetworkConfig, type CloudResources, type FieldInfo, type FlagAliases, type JobFunction, type JobInfo, type JobMetadata, type JobOptions, type RunJobOptions, type RunnerConfig, type RunnerEnvOptions, type TaskContext, defineJob, defineRunnerConfig, defineRunnerEnv, discoverJobs, extractFieldInfo, formatZodError, generateSchemaHelp, getTaskContext, runJob, schemaToParseArgsOptions };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gcp-job-runner",
3
- "version": "1.4.1",
3
+ "version": "1.5.0",
4
4
  "description": "Run schema-driven Cloud Run jobs seamlessly in any environment",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -44,19 +44,19 @@
44
44
  "@google-cloud/secret-manager": "^6.1.1",
45
45
  "consola": "^3.4.0",
46
46
  "execa": "^9.6.1",
47
- "isolate-package": "1.27.0",
47
+ "isolate-package": "1.28.2",
48
48
  "zod": "^4.3.6"
49
49
  },
50
50
  "devDependencies": {
51
- "@codecompose/typescript-config": "2.3.0",
52
- "@types/node": "^25.0.10",
51
+ "@codecompose/typescript-config": "3.0.0",
52
+ "@types/node": "^25.3.0",
53
53
  "del-cli": "^7.0.0",
54
54
  "husky": "^9.1.7",
55
55
  "lint-staged": "^16.2.7",
56
- "oxfmt": "^0.32.0",
57
- "oxlint": "^1.47.0",
56
+ "oxfmt": "^0.34.0",
57
+ "oxlint": "^1.49.0",
58
58
  "tsdown": "^0.20.1",
59
- "typescript": "^5.9.3",
59
+ "typescript": "6.0.0-beta",
60
60
  "vitepress": "^1.6.4",
61
61
  "vitest": "^4.0.18"
62
62
  },
@@ -70,7 +70,7 @@
70
70
  ]
71
71
  },
72
72
  "engines": {
73
- "node": ">=22.0.0"
73
+ "node": ">=22.6.0"
74
74
  },
75
75
  "packageManager": "pnpm@10.22.0"
76
76
  }
@@ -5,7 +5,10 @@ import type { CloudConfig, RunnerEnvOptions } from "../config";
5
5
  import { generateDockerfile } from "./dockerfile";
6
6
  import {
7
7
  checkGcloudAvailable,
8
- isDockerAvailable,
8
+ isDockerInstalled,
9
+ isDockerDaemonRunning,
10
+ startDockerDaemon,
11
+ waitForDockerDaemon,
9
12
  gcloudExecCapture,
10
13
  gcloudJson,
11
14
  shellExecCapture,
@@ -93,12 +96,67 @@ export async function prepareImage(
93
96
 
94
97
  checkGcloudAvailable();
95
98
 
96
- if (buildLocal && !isDockerAvailable()) {
97
- consola.warn(
98
- "Docker is not available, falling back to Cloud Build. " +
99
- "Install Docker for faster local builds: https://docs.docker.com/get-docker/",
100
- );
101
- buildLocal = false;
99
+ if (buildLocal) {
100
+ if (!isDockerInstalled()) {
101
+ consola.warn(
102
+ "Docker is not installed, falling back to Cloud Build. " +
103
+ "Install Docker for faster local builds: https://docs.docker.com/get-docker/",
104
+ );
105
+ buildLocal = false;
106
+ } else if (!isDockerDaemonRunning()) {
107
+ if (!process.stdin.isTTY) {
108
+ /** Non-interactive environment (CI) — fall back automatically */
109
+ consola.warn(
110
+ "Docker daemon is not running, falling back to Cloud Build.",
111
+ );
112
+ buildLocal = false;
113
+ } else {
114
+ const choice = await consola.prompt(
115
+ "Docker is installed but the daemon is not running.",
116
+ {
117
+ type: "select",
118
+ options: [
119
+ {
120
+ label: "Start Docker",
121
+ value: "start",
122
+ hint: "attempt to start the daemon",
123
+ },
124
+ {
125
+ label: "Use Cloud Build",
126
+ value: "cloud-build",
127
+ hint: "build remotely instead",
128
+ },
129
+ ],
130
+ },
131
+ );
132
+
133
+ if (typeof choice === "symbol") {
134
+ process.exit(0);
135
+ }
136
+
137
+ if (choice === "start") {
138
+ const started = startDockerDaemon();
139
+
140
+ if (!started) {
141
+ consola.warn(
142
+ "Could not start Docker automatically, falling back to Cloud Build.",
143
+ );
144
+ buildLocal = false;
145
+ } else {
146
+ const ready = await waitForDockerDaemon();
147
+
148
+ if (!ready) {
149
+ consola.warn(
150
+ "Docker daemon did not become ready in time, falling back to Cloud Build.",
151
+ );
152
+ buildLocal = false;
153
+ }
154
+ }
155
+ } else {
156
+ buildLocal = false;
157
+ }
158
+ }
159
+ }
102
160
  }
103
161
 
104
162
  /** Step 1: Run isolate to bundle workspace dependencies */
@@ -351,6 +409,16 @@ export async function createOrUpdateJob(
351
409
  updateArgs.push(`--service-account=${cloud.serviceAccount}`);
352
410
  }
353
411
 
412
+ if (cloud.network) {
413
+ updateArgs.push(`--network=${cloud.network.name}`);
414
+ if (cloud.network.subnet) {
415
+ updateArgs.push(`--subnet=${cloud.network.subnet}`);
416
+ }
417
+ updateArgs.push(
418
+ `--vpc-egress=${cloud.network.egress ?? "private-ranges-only"}`,
419
+ );
420
+ }
421
+
354
422
  const result = gcloudExecCapture(updateArgs);
355
423
 
356
424
  if (!result.success) {
@@ -398,6 +466,16 @@ export async function createOrUpdateJob(
398
466
  createArgs.push(`--service-account=${cloud.serviceAccount}`);
399
467
  }
400
468
 
469
+ if (cloud.network) {
470
+ createArgs.push(`--network=${cloud.network.name}`);
471
+ if (cloud.network.subnet) {
472
+ createArgs.push(`--subnet=${cloud.network.subnet}`);
473
+ }
474
+ createArgs.push(
475
+ `--vpc-egress=${cloud.network.egress ?? "private-ranges-only"}`,
476
+ );
477
+ }
478
+
401
479
  const result = gcloudExecCapture(createArgs);
402
480
 
403
481
  if (!result.success) {
@@ -0,0 +1,195 @@
1
+ import { describe, expect, it, vi, beforeEach, type Mock } from "vitest";
2
+ import { consola } from "consola";
3
+
4
+ /**
5
+ * Mock all external dependencies so we can test the Docker detection
6
+ * and fallback branching in prepareImage() without Docker or gcloud.
7
+ */
8
+ vi.mock("consola", () => ({
9
+ consola: {
10
+ warn: vi.fn(),
11
+ start: vi.fn(),
12
+ success: vi.fn(),
13
+ info: vi.fn(),
14
+ error: vi.fn(),
15
+ prompt: vi.fn(),
16
+ },
17
+ }));
18
+
19
+ vi.mock("./gcloud", () => ({
20
+ checkGcloudAvailable: vi.fn(),
21
+ isDockerInstalled: vi.fn(() => true),
22
+ isDockerDaemonRunning: vi.fn(() => true),
23
+ startDockerDaemon: vi.fn(() => true),
24
+ waitForDockerDaemon: vi.fn(async () => true),
25
+ gcloudJson: vi.fn(),
26
+ gcloudExecCapture: vi.fn(() => ({ success: true, output: "", stderr: "" })),
27
+ shellExecCapture: vi.fn(() => ({ success: true, output: "", stderr: "" })),
28
+ }));
29
+
30
+ vi.mock("isolate-package", () => ({
31
+ isolate: vi.fn(async () => {}),
32
+ }));
33
+
34
+ vi.mock("./dockerfile", () => ({
35
+ generateDockerfile: vi.fn(() => "FROM node:22"),
36
+ }));
37
+
38
+ vi.mock("./hash", () => ({
39
+ hashDirectory: vi.fn(async () => "abc123"),
40
+ }));
41
+
42
+ vi.mock("node:fs", async () => {
43
+ const actual = await vi.importActual("node:fs");
44
+ return {
45
+ ...actual,
46
+ existsSync: vi.fn(() => false),
47
+ readFileSync: vi.fn(() => "{}"),
48
+ writeFileSync: vi.fn(),
49
+ unlinkSync: vi.fn(),
50
+ };
51
+ });
52
+
53
+ import {
54
+ isDockerInstalled,
55
+ isDockerDaemonRunning,
56
+ startDockerDaemon,
57
+ waitForDockerDaemon,
58
+ gcloudJson,
59
+ } from "./gcloud";
60
+ import { prepareImage, type DeployOptions } from "./deploy";
61
+
62
+ const defaultOptions: DeployOptions = {
63
+ cloud: { name: "test-job", buildLocal: true },
64
+ envConfig: { project: "test-project" },
65
+ serviceDirectory: "/tmp/test-service",
66
+ };
67
+
68
+ /** Stub gcloudJson to report no existing image */
69
+ function stubNoExistingImage() {
70
+ (gcloudJson as Mock).mockReturnValue(undefined);
71
+ }
72
+
73
+ describe("prepareImage Docker fallback", () => {
74
+ beforeEach(() => {
75
+ vi.restoreAllMocks();
76
+ /** Defaults: Docker installed, daemon running, no existing image */
77
+ (isDockerInstalled as Mock).mockReturnValue(true);
78
+ (isDockerDaemonRunning as Mock).mockReturnValue(true);
79
+ (startDockerDaemon as Mock).mockReturnValue(true);
80
+ (waitForDockerDaemon as Mock).mockResolvedValue(true);
81
+ stubNoExistingImage();
82
+ });
83
+
84
+ it("falls back to Cloud Build with warning when Docker is not installed", async () => {
85
+ (isDockerInstalled as Mock).mockReturnValue(false);
86
+
87
+ await prepareImage(defaultOptions);
88
+
89
+ expect(consola.warn).toHaveBeenCalledWith(
90
+ expect.stringContaining("Docker is not installed"),
91
+ );
92
+ expect(isDockerDaemonRunning).not.toHaveBeenCalled();
93
+ });
94
+
95
+ it("builds locally when Docker is installed and daemon is running", async () => {
96
+ await prepareImage(defaultOptions);
97
+
98
+ expect(consola.warn).not.toHaveBeenCalled();
99
+ expect(consola.prompt).not.toHaveBeenCalled();
100
+ });
101
+
102
+ describe("daemon not running, non-interactive (no TTY)", () => {
103
+ beforeEach(() => {
104
+ (isDockerDaemonRunning as Mock).mockReturnValue(false);
105
+ Object.defineProperty(process.stdin, "isTTY", {
106
+ value: false,
107
+ configurable: true,
108
+ });
109
+ });
110
+
111
+ it("falls back to Cloud Build without prompting", async () => {
112
+ await prepareImage(defaultOptions);
113
+
114
+ expect(consola.prompt).not.toHaveBeenCalled();
115
+ expect(consola.warn).toHaveBeenCalledWith(
116
+ expect.stringContaining("falling back to Cloud Build"),
117
+ );
118
+ });
119
+ });
120
+
121
+ describe("daemon not running, interactive (TTY)", () => {
122
+ beforeEach(() => {
123
+ (isDockerDaemonRunning as Mock).mockReturnValue(false);
124
+ Object.defineProperty(process.stdin, "isTTY", {
125
+ value: true,
126
+ configurable: true,
127
+ });
128
+ });
129
+
130
+ it("prompts the user when daemon is not running", async () => {
131
+ (consola.prompt as Mock).mockResolvedValue("cloud-build");
132
+
133
+ await prepareImage(defaultOptions);
134
+
135
+ expect(consola.prompt).toHaveBeenCalledWith(
136
+ expect.stringContaining("daemon is not running"),
137
+ expect.objectContaining({ type: "select" }),
138
+ );
139
+ });
140
+
141
+ it("falls back to Cloud Build when user chooses cloud-build", async () => {
142
+ (consola.prompt as Mock).mockResolvedValue("cloud-build");
143
+
144
+ await prepareImage(defaultOptions);
145
+
146
+ expect(startDockerDaemon).not.toHaveBeenCalled();
147
+ });
148
+
149
+ it("starts Docker and waits when user chooses start", async () => {
150
+ (consola.prompt as Mock).mockResolvedValue("start");
151
+
152
+ await prepareImage(defaultOptions);
153
+
154
+ expect(startDockerDaemon).toHaveBeenCalled();
155
+ expect(waitForDockerDaemon).toHaveBeenCalled();
156
+ });
157
+
158
+ it("falls back to Cloud Build when Docker fails to start", async () => {
159
+ (consola.prompt as Mock).mockResolvedValue("start");
160
+ (startDockerDaemon as Mock).mockReturnValue(false);
161
+
162
+ await prepareImage(defaultOptions);
163
+
164
+ expect(consola.warn).toHaveBeenCalledWith(
165
+ expect.stringContaining("Could not start Docker automatically"),
166
+ );
167
+ expect(waitForDockerDaemon).not.toHaveBeenCalled();
168
+ });
169
+
170
+ it("falls back to Cloud Build when daemon does not become ready in time", async () => {
171
+ (consola.prompt as Mock).mockResolvedValue("start");
172
+ (waitForDockerDaemon as Mock).mockResolvedValue(false);
173
+
174
+ await prepareImage(defaultOptions);
175
+
176
+ expect(consola.warn).toHaveBeenCalledWith(
177
+ expect.stringContaining("did not become ready in time"),
178
+ );
179
+ });
180
+
181
+ it("exits when user cancels the prompt", async () => {
182
+ (consola.prompt as Mock).mockResolvedValue(Symbol("cancel"));
183
+
184
+ const exitSpy = vi.spyOn(process, "exit").mockImplementation(() => {
185
+ throw new Error("process.exit");
186
+ });
187
+
188
+ await expect(prepareImage(defaultOptions)).rejects.toThrow(
189
+ "process.exit",
190
+ );
191
+
192
+ expect(exitSpy).toHaveBeenCalledWith(0);
193
+ });
194
+ });
195
+ });
@@ -1,4 +1,5 @@
1
1
  import { execaCommandSync, execaSync } from "execa";
2
+ import { execa } from "execa";
2
3
  import { consola } from "consola";
3
4
 
4
5
  export interface CapturedExecResult {
@@ -132,9 +133,9 @@ export function checkGcloudAvailable(): void {
132
133
  }
133
134
 
134
135
  /**
135
- * Check if Docker CLI is available.
136
+ * Check if the Docker CLI binary is installed.
136
137
  */
137
- export function isDockerAvailable(): boolean {
138
+ export function isDockerInstalled(): boolean {
138
139
  try {
139
140
  execaSync("docker", ["--version"]);
140
141
  return true;
@@ -142,3 +143,73 @@ export function isDockerAvailable(): boolean {
142
143
  return false;
143
144
  }
144
145
  }
146
+
147
+ /**
148
+ * Check if the Docker daemon is running by executing `docker info`.
149
+ */
150
+ export function isDockerDaemonRunning(): boolean {
151
+ try {
152
+ execaSync("docker", ["info"], { stdio: "pipe" });
153
+ return true;
154
+ } catch {
155
+ return false;
156
+ }
157
+ }
158
+
159
+ /**
160
+ * Attempt to start the Docker daemon.
161
+ * - macOS: opens the Docker Desktop application
162
+ * - Linux: starts the docker systemd service
163
+ * - Other platforms: unsupported, returns false
164
+ */
165
+ export function startDockerDaemon(): boolean {
166
+ try {
167
+ if (process.platform === "darwin") {
168
+ execaSync("open", ["-a", "Docker"]);
169
+ return true;
170
+ }
171
+
172
+ if (process.platform === "linux") {
173
+ execaSync("systemctl", ["start", "docker"]);
174
+ return true;
175
+ }
176
+
177
+ return false;
178
+ } catch {
179
+ return false;
180
+ }
181
+ }
182
+
183
+ /**
184
+ * Poll `docker info` until the daemon is responsive or the timeout is reached.
185
+ * Shows a spinner while waiting.
186
+ *
187
+ * @param timeoutMs - Maximum time to wait in milliseconds (default: 30000)
188
+ * @param intervalMs - Polling interval in milliseconds (default: 2000)
189
+ * @returns true if the daemon became available, false on timeout
190
+ */
191
+ export async function waitForDockerDaemon(
192
+ timeoutMs = 30_000,
193
+ intervalMs = 2_000,
194
+ ): Promise<boolean> {
195
+ if (isDockerDaemonRunning()) return true;
196
+
197
+ consola.start("Waiting for Docker daemon to start...");
198
+
199
+ const deadline = Date.now() + timeoutMs;
200
+
201
+ while (Date.now() < deadline) {
202
+ await new Promise((resolve) => setTimeout(resolve, intervalMs));
203
+
204
+ try {
205
+ await execa("docker", ["info"], { stdio: "pipe" });
206
+ consola.success("Docker daemon is running");
207
+ return true;
208
+ } catch {
209
+ /** Daemon not ready yet */
210
+ }
211
+ }
212
+
213
+ consola.fail("Docker daemon did not start in time");
214
+ return false;
215
+ }
package/src/config.ts CHANGED
@@ -20,6 +20,16 @@ export interface CloudResources {
20
20
  parallelism?: number;
21
21
  }
22
22
 
23
+ /** Direct VPC egress configuration for private network access (e.g., Redis) */
24
+ export interface CloudNetworkConfig {
25
+ /** VPC network name (e.g., "default") */
26
+ name: string;
27
+ /** VPC subnet name (e.g., "default") */
28
+ subnet?: string;
29
+ /** VPC egress mode. Default: "private-ranges-only" */
30
+ egress?: "all-traffic" | "private-ranges-only";
31
+ }
32
+
23
33
  /** Configuration for Cloud Run Jobs execution */
24
34
  export interface CloudConfig {
25
35
  /** Cloud Run Job name (e.g., "loads-predictions-jobs") */
@@ -37,6 +47,8 @@ export interface CloudConfig {
37
47
  * Requires Docker to be installed and running. Default: true.
38
48
  */
39
49
  buildLocal?: boolean;
50
+ /** Direct VPC egress configuration for private network access */
51
+ network?: CloudNetworkConfig;
40
52
  }
41
53
 
42
54
  /** Full runner configuration provided by each service */
package/src/index.ts CHANGED
@@ -13,6 +13,7 @@ export { runJob } from "./run-job";
13
13
  export type { TaskContext } from "./task-context";
14
14
  export type {
15
15
  CloudConfig,
16
+ CloudNetworkConfig,
16
17
  CloudResources,
17
18
  RunnerConfig,
18
19
  RunnerEnvOptions,