@intentius/chant-lexicon-gcp 0.124.32 → 0.124.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-gcp",
-  "version": "0.124.32",
+  "version": "0.124.33",
   "description": "Google Cloud lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -76,6 +76,6 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.124.32"
+    "@intentius/chant": "^0.124.33"
   }
 }

package/src/attributes.test.ts

@@ -0,0 +1,16 @@
+/**
+ * A RunService's URL is referenceable (#4179), so DNS in another lexicon can
+ * point at it: `status.uri` is read through `status_uri`.
+ */
+
+import { describe, expect, test } from "vitest";
+import { AttrRef } from "@intentius/chant";
+import { CloudRunService } from "./index";
+
+describe("status attributes", () => {
+  test("a RunService exposes status.uri as an AttrRef", () => {
+    const svc = new CloudRunService({ location: "us-central1", projectRef: { external: "p" }, template: {} }) as unknown as Record<string, unknown>;
+    expect(svc.status_uri).toBeInstanceOf(AttrRef);
+    expect((svc.status_uri as AttrRef).attribute).toBe("status.uri");
+  });
+});

package/src/codegen/generate.ts

@@ -125,7 +125,7 @@ function generateLexiconJSON(results: GcpParseResult[], naming: NamingStrategy):
         required: r.resource.properties.filter((p) => p.required).map((p) => p.name),
       },
       attrs: Object.fromEntries(
-        r.resource.attributes.map((a) => [a.name, a.tsType]),
+        r.resource.attributes.map((a) => [attrKey(a.name), a.tsType]),
       ),
     };
 
@@ -170,7 +170,7 @@ function generateTypeScriptDeclarations(results: GcpParseResult[], naming: Namin
 
     // Attributes
     for (const attr of r.resource.attributes) {
-      lines.push(`  readonly ${attr.name}: ${attr.tsType};`);
+      lines.push(`  readonly ${attrKey(attr.name)}: ${attr.tsType};`);
     }
 
     lines.push(`}`);
@@ -222,6 +222,11 @@ function generateTypeScriptDeclarations(results: GcpParseResult[], naming: Namin
 
 // ── Runtime index generation ────────────────────────────────────────
 
+/** The property an attribute is read through: `status.uri` is `status_uri`, as AWS's `Endpoint.Address` is `Endpoint_Address`. */
+function attrKey(name: string): string {
+  return name.replace(/\./g, "_");
+}
+
 function generateRuntimeIndex(results: GcpParseResult[], naming: NamingStrategy): string {
   const resourceEntries: RuntimeIndexEntry[] = [];
   const propertyEntries: RuntimeIndexPropertyEntry[] = [];
@@ -234,7 +239,7 @@ function generateRuntimeIndex(results: GcpParseResult[], naming: NamingStrategy)
 
     const attrs: Record<string, string> = {};
     for (const a of r.resource.attributes) {
-      attrs[a.name] = a.name;
+      attrs[attrKey(a.name)] = a.name;
     }
 
     resourceEntries.push({ tsName, resourceType: cfnType, attrs });

package/src/composites/catalog.ts

@@ -119,7 +119,13 @@ export const compositeCatalog: CompositeEntry[] = [
         "name": "location",
         "type": "string",
         "required": false,
-        "description": "GCP region."
+        "description": "GCP region (default: GCP.Region, resolved from GCP_REGION at build)."
+      },
+      {
+        "name": "projectId",
+        "type": "string",
+        "required": false,
+        "description": "GCP project the service runs in, as `projectRef.external` (default: GCP.ProjectId, resolved from GCP_PROJECT_ID at build)."
       },
       {
         "name": "port",

package/src/composites/cloud-run-service.ts

@@ -7,14 +7,17 @@ import {
   CloudRunService as CloudRunServiceResource,
   IAMPolicyMember,
 } from "../generated";
+import { GCP } from "../pseudo";
 
 export interface CloudRunServiceProps {
   /** Service name. */
   name: string;
   /** Container image. */
   image: string;
-  /** GCP region. */
+  /** GCP region (default: GCP.Region, resolved from GCP_REGION at build). */
   location?: string;
+  /** GCP project the service runs in, as `projectRef.external` (default: GCP.ProjectId, resolved from GCP_PROJECT_ID at build). */
+  projectId?: string;
   /** Port the container listens on (default: 8080). */
   port?: number;
   /** CPU limit (default: "1000m"). */
@@ -47,10 +50,12 @@ export interface CloudRunServiceProps {
  *
  * @example
  * ```ts
- * import { CloudRunService } from "@intentius/chant-lexicon-gcp";
+ * import { CloudRunServiceComposite } from "@intentius/chant-lexicon-gcp";
  *
- * const { service, publicIam } = CloudRunService({
+ * const { service, publicIam } = CloudRunServiceComposite({
  *   name: "my-api",
+ *   projectId: "my-project",
+ *   location: "us-central1",
  *   image: "gcr.io/my-project/my-api:latest",
  *   publicAccess: true,
  * });
@@ -61,6 +66,7 @@ export const CloudRunServiceComposite = Composite((props: CloudRunServiceProps)
     name,
     image,
     location,
+    projectId,
     port = 8080,
     cpuLimit = "1000m",
     memoryLimit = "512Mi",
@@ -97,7 +103,8 @@ export const CloudRunServiceComposite = Composite((props: CloudRunServiceProps)
       ...(namespace && { namespace }),
       labels: { ...commonLabels, "app.kubernetes.io/component": "service" },
     },
-    ...(location && { location }),
+    location: location ?? GCP.Region,
+    projectRef: { external: projectId ?? GCP.ProjectId },
     template: {
       maxInstanceRequestConcurrency,
       scaling: {
@@ -106,7 +113,7 @@ export const CloudRunServiceComposite = Composite((props: CloudRunServiceProps)
       },
       containers,
     },
-  } as Record<string, unknown>, defs?.service));
+  }, defs?.service));
 
   const result: Record<string, any> = { service };
 

package/src/composites/composites.test.ts

@@ -83,6 +83,23 @@ describe("CloudRunServiceComposite", () => {
     expect(result.service).toBeDefined();
   });
 
+  test("sets projectRef and location, which the RunService CRD requires", () => {
+    const result = CloudRunServiceComposite({
+      name: "api",
+      image: "gcr.io/p/api:1",
+      projectId: "proj",
+      location: "us-central1",
+    });
+    expect(p(result.service).projectRef).toEqual({ external: "proj" });
+    expect(p(result.service).location).toBe("us-central1");
+  });
+
+  test("defaults projectRef and location to the GCP pseudo-parameters", () => {
+    const result = CloudRunServiceComposite({ name: "api", image: "gcr.io/p/api:1" });
+    expect(JSON.parse(JSON.stringify(p(result.service).projectRef))).toEqual({ external: { Ref: "GCP::ProjectId" } });
+    expect(JSON.parse(JSON.stringify(p(result.service).location))).toEqual({ Ref: "GCP::Region" });
+  });
+
   test("no public IAM by default", () => {
     const result = CloudRunServiceComposite({ name: "api", image: "gcr.io/p/api:1" });
     expect(result.publicIam).toBeUndefined();