@intentius/chant-lexicon-gitlab 0.53.1 → 0.54.0

package/dist/components/generate-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-pipeline.d.ts","sourceRoot":"","sources":["../../src/components/generate-pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAGH,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACjG,OAAO,KAAK,EACV,oBAAoB,IAAI,YAAY,EACpC,wBAAwB,IAAI,qBAAqB,EACjD,uBAAuB,IAAI,oBAAoB,EAChD,MAAM,0BAA0B,CAAC;AAElC,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;AAS1E;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,eAAe,EAAE,EAC7B,OAAO,GAAE,qBAA0B,GAClC,oBAAoB,CA+EtB"}
+{"version":3,"file":"generate-pipeline.d.ts","sourceRoot":"","sources":["../../src/components/generate-pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAGH,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACjG,OAAO,KAAK,EACV,oBAAoB,IAAI,YAAY,EACpC,wBAAwB,IAAI,qBAAqB,EACjD,uBAAuB,IAAI,oBAAoB,EAChD,MAAM,0BAA0B,CAAC;AAElC,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;AAS1E;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,eAAe,EAAE,EAC7B,OAAO,GAAE,qBAA0B,GAClC,oBAAoB,CAqFtB"}

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "ca204e316f0225bf3ebc1336e5e0cb32daf98e8e958f16cc6565def3dc1c17d8",
+    "manifest.json": "806f8315836161b6b23f6f175528bb58ec17f6448e241bdd04f56726b1d1d3d5",
     "meta.json": "931fc3246a55645b1493080bbeb160e5d205e42349e8bdca96ca243adb5f0da3",
     "types/index.d.ts": "5cd2e99f135a929b72bdd822d00d780d39b1cd407ba0cfb3d511c7ac9d667b58",
     "rules/artifact-no-expiry.ts": "3f3cabf9792cbf8207e53a25f506715466b19ec25e9c3b4d0d77fed6b2eb4542",
@@ -55,5 +55,5 @@
     "skills/chant-gitlab-migrate.md": "4853d04980560b379e5b0f7267dcb0a1e5d5879cb9e9931681ce76b2a5fe69d8",
     "skills/chant-gitlab-patterns.md": "6d9a44e9e8de4c3820be9d65381b0d2ede4cb3626aaaf0011e21838a9fbf556e"
   },
-  "composite": "c89df7e7ca6b30838a49a3def44be2be408ab6cd7c737f2239f6796ddad8b0ef"
+  "composite": "05b06811191671c96703ccd8387152231daa54b5048fe07747a08a3ed09a7837"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab",
-  "version": "0.53.1",
+  "version": "0.54.0",
   "chantVersion": ">=0.1.0",
   "namespace": "GitLab",
   "intrinsics": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-gitlab",
-  "version": "0.53.1",
+  "version": "0.54.0",
   "description": "GitLab CI lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -67,8 +67,8 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.53.1",
-    "@intentius/chant-lexicon-github": "^0.53.1",
+    "@intentius/chant": "^0.54.0",
+    "@intentius/chant-lexicon-github": "^0.54.0",
     "typescript": "^5.9.3"
   },
   "peerDependenciesMeta": {

package/src/components/generate-pipeline.test.ts

@@ -213,12 +213,33 @@ describe("generateGitlabPipeline: a cross-cutting change is one generator edit,
 });
 
 describe("generateGitlabPipeline: options", () => {
-  test("emits a variables: block when provided", () => {
+  test("merges caller variables into the variables: block alongside CHANT_ENV", () => {
     const result = generateGitlabPipeline(pilotComponents(), {
-      variables: { CHANT_ENV: "staging" },
+      env: "staging",
+      variables: { AWS_REGION: "eu-west-1" },
     });
     const parsed = parseYAML(result.yaml);
-    expect(parsed.variables).toEqual({ CHANT_ENV: "staging" });
+    expect(parsed.variables).toEqual({ AWS_REGION: "eu-west-1", CHANT_ENV: "staging" });
+  });
+
+  test("the document carries its environment identity: workflow name + CHANT_ENV (#2046)", () => {
+    const staging = generateGitlabPipeline(pilotComponents(), { env: "staging" });
+    const prod = generateGitlabPipeline(pilotComponents());
+
+    expect(parseYAML(staging.yaml).workflow).toEqual({ name: "chant-components-staging" });
+    expect(parseYAML(prod.yaml).workflow).toEqual({ name: "chant-components-production" });
+    expect(parseYAML(staging.yaml).variables).toEqual({ CHANT_ENV: "staging" });
+
+    expect(staging.env).toBe("staging");
+    expect(prod.env).toBe("production");
+  });
+
+  test("CHANT_ENV always reflects the environment baked into the script lines — a caller variable cannot override it", () => {
+    const result = generateGitlabPipeline(pilotComponents(), {
+      env: "staging",
+      variables: { CHANT_ENV: "prod" },
+    });
+    expect((parseYAML(result.yaml).variables as Record<string, unknown>).CHANT_ENV).toBe("staging");
   });
 
   test("uses a custom image for every job when provided", () => {

package/src/components/generate-pipeline.ts

@@ -90,10 +90,15 @@ export function generateGitlabPipeline(
   }
 
   const doc: Record<string, unknown> = {};
+  // `workflow:name` + a CHANT_ENV variable give the document a recoverable
+  // environment identity (#2046): two pipelines generated for two
+  // environments were previously identical except for one shell argument in
+  // each job's `script:`. CHANT_ENV always reflects the environment baked
+  // into the run lines, so a caller-supplied variable of the same name cannot
+  // make the document lie about what its jobs deploy.
+  doc.workflow = { name: `chant-components-${env}` };
   doc.stages = stages;
-  if (options.variables && Object.keys(options.variables).length > 0) {
-    doc.variables = options.variables;
-  }
+  doc.variables = { ...options.variables, CHANT_ENV: env };
 
   waves.forEach((wave, waveIndex) => {
     const stage = stages[waveIndex];
@@ -131,6 +136,7 @@ export function generateGitlabPipeline(
   // `stages:[]` is the plain scalar "stages:[]" — a colon opens a mapping only
   // when whitespace or the line's end follows it — which is how GitLab's own
   // reader takes it, and now how `parseYAML` does too (chant #2013).
+  sections.push("workflow:" + emitYAML(doc.workflow, 1));
   sections.push(stages.length > 0 ? "stages:" + emitYAML(stages, 1) : "stages: []");
   if (doc.variables) sections.push("variables:" + emitYAML(doc.variables, 1));
   for (const job of jobs) {
@@ -138,5 +144,5 @@ export function generateGitlabPipeline(
     sections.push(`${job.jobName}:` + emitYAML(props, 1));
   }
 
-  return { yaml: sections.join("\n\n") + "\n", stages, jobs };
+  return { yaml: sections.join("\n\n") + "\n", stages, jobs, env };
 }