create-svc 0.1.34 → 0.1.35

package/package.json

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

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

@@ -5,6 +5,7 @@ import { config } from "./config";
 import { deleteBranch, deleteDatabase, listBranches, resolveNeonConfig } from "./neon";
 import {
   assertOwnedResource,
+  deleteArtifactImage,
   deleteProject,
   deleteProductionDomainMapping,
   deleteSecret,
@@ -15,6 +16,7 @@ import {
   describeSecret,
   formatError,
   listCloudRunServices,
+  listArtifactImages,
   listSecrets,
   parseCleanupArgs,
   requireCommand,
@@ -50,6 +52,7 @@ type DestroyPlan = {
   hasProductionDomainMapping: boolean;
   serviceNames: string[];
   secretNames: string[];
+  artifactImages: string[];
   neon?: {
     projectId: string;
     baseBranchId: string;
@@ -91,6 +94,13 @@ export async function cleanup(args = Bun.argv.slice(2)) {
     }
   });
 
+  const artifactImages = plan.artifactImages;
+  await runStep("Deleting Artifact Registry images", () => {
+    for (const image of artifactImages) {
+      deleteArtifactImage(image);
+    }
+  });
+
   const secretNames = plan.secretNames;
   await runStep("Deleting service secrets", () => {
     for (const secretName of secretNames) {
@@ -137,12 +147,14 @@ async function buildDestroyPlan(destroyProject: boolean): Promise<DestroyPlan> {
     hasProductionDomainMapping: false,
     serviceNames: [],
     secretNames: [],
+    artifactImages: [],
   };
 
   planGitHubRepository(plan);
   await planLocalDev(plan);
   planProductionDomainMapping(plan);
   planCloudRunServices(plan);
+  planArtifactImages(plan);
   planSecrets(plan);
   await planNeon(plan);
   await planGrafana(plan);
@@ -236,6 +248,21 @@ function planCloudRunServices(plan: DestroyPlan) {
   }
 }
 
+function planArtifactImages(plan: DestroyPlan) {
+  try {
+    plan.artifactImages = listArtifactImages();
+    if (plan.artifactImages.length === 0) {
+      plan.skipped.push({ label: `Artifact Registry images for ${config.serviceName}`, detail: "none matched" });
+      return;
+    }
+    for (const image of plan.artifactImages) {
+      plan.resources.push({ label: `Artifact Registry image ${image}`, detail: `${config.project.id}/${config.region}` });
+    }
+  } catch (error) {
+    plan.blockers.push(`Artifact Registry images for ${config.serviceName}: ${formatError(error)}`);
+  }
+}
+
 function planSecrets(plan: DestroyPlan) {
   try {
     plan.secretNames = listSecrets().filter(matchesSecretResource);

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

@@ -415,6 +415,32 @@ export function ensureArtifactRepository() {
   ]);
 }
 
+export function artifactImageBase() {
+  return `${config.region}-docker.pkg.dev/${config.project.id}/${config.artifactRepository}/${config.serviceName}`;
+}
+
+export function listArtifactImages() {
+  const result = gcloud(
+    ["artifacts", "docker", "images", "list", artifactImageBase(), "--include-tags", "--project", config.project.id, "--format=json"],
+    { allowFailure: true }
+  );
+  if (!result.success || !result.stdout) {
+    return [];
+  }
+
+  try {
+    return (JSON.parse(result.stdout) as Array<{ package?: string; version?: string }>)
+      .map((image) => (image.package && image.version ? `${image.package}@${image.version}` : ""))
+      .filter(Boolean);
+  } catch {
+    throw new Error(`Unable to parse Artifact Registry images for ${artifactImageBase()}`);
+  }
+}
+
+export function deleteArtifactImage(image: string) {
+  gcloud(["artifacts", "docker", "images", "delete", image, "--delete-tags", "--project", config.project.id, "--quiet"], { allowFailure: true });
+}
+
 export function projectNumber() {
   return gcloud(["projects", "describe", config.project.id, "--format=value(projectNumber)"]).stdout;
 }
@@ -425,7 +451,7 @@ export function imageTag() {
 }
 
 export function imageUrl(tag = imageTag()) {
-  return `${config.region}-docker.pkg.dev/${config.project.id}/${config.artifactRepository}/${config.serviceName}:${tag}`;
+  return `${artifactImageBase()}:${tag}`;
 }
 
 export function parseDeployArgs(argv: string[]): DeployArgs {