@pagopa/dx-cli 0.18.3 → 0.18.4

package/dist/adapters/plop/generators/environment/__tests__/prompts.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/adapters/plop/generators/environment/__tests__/prompts.test.js

@@ -0,0 +1,25 @@
+// Tests for workspaceSchema transforms (lowercase and trim on domain).
+import { describe, expect, it } from "vitest";
+import { workspaceSchema } from "../prompts.js";
+describe("workspaceSchema — domain transforms", () => {
+    it("lowercases an uppercase domain", () => {
+        const result = workspaceSchema.safeParse({ domain: "API" });
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.domain).toBe("api");
+    });
+    it("lowercases a mixed-case domain", () => {
+        const result = workspaceSchema.safeParse({ domain: "MyDomain" });
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.domain).toBe("mydomain");
+    });
+    it("trims leading and trailing whitespace from domain", () => {
+        const result = workspaceSchema.safeParse({ domain: " aPi " });
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.domain).toBe("api");
+    });
+    it("defaults domain to empty string when not provided", () => {
+        const result = workspaceSchema.safeParse({});
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.domain).toBe("");
+    });
+});

package/dist/adapters/plop/generators/environment/prompts.js

@@ -7,6 +7,7 @@ import { z } from "zod/v4";
 import { githubRepoSchema, } from "../../../../domain/github-repo.js";
 import { githubAppCredentialsSchema } from "../../../../domain/github.js";
 import { getGithubRepo } from "../../../github/github-repo.js";
+import { validatePrompt } from "../../helpers/validate-prompt.js";
 const initSchema = z.object({
     cloudAccountsToInitialize: z.array(cloudAccountSchema),
     runnerAppCredentials: githubAppCredentialsSchema.optional(),
@@ -18,7 +19,7 @@ const initSchema = z.object({
 });
 const tagsSchema = z.record(z.string(), z.string().min(1));
 export const workspaceSchema = z.object({
-    domain: z.string().default(""),
+    domain: z.string().trim().toLowerCase().default(""),
 });
 export const payloadSchema = z.object({
     env: environmentSchema,
@@ -66,18 +67,16 @@ const prompts = (deps) => async (inquirer) => {
                 : "Please select a cloud account.",
         },
         {
+            filter: (value) => value.trim().toLowerCase(),
             message: "Prefix (2-4 characters)",
             name: "env.prefix",
-            transformer: (value) => value.trim().toLowerCase(),
             type: "input",
-            validate: (value) => value.length >= 2 && value.length <= 4
-                ? true
-                : "Please enter a valid prefix.",
+            validate: validatePrompt(environmentSchema.shape.prefix),
         },
         {
+            filter: (value) => value.trim().toLowerCase(),
             message: "Domain (optional)",
             name: "workspace.domain",
-            transformer: (value) => value.trim().toLowerCase(),
             type: "input",
         },
         {

package/dist/adapters/plop/generators/monorepo/prompts.js

@@ -1,16 +1,10 @@
 import { z } from "zod/v4";
+import { validatePrompt } from "../../helpers/validate-prompt.js";
 export const payloadSchema = z.object({
     repoDescription: z.string().optional(),
     repoName: z.string().trim().min(1, "Repository name cannot be empty"),
     repoOwner: z.string().trim().default("pagopa"),
 });
-const validatePrompt = (schema) => (input) => {
-    const error = schema.safeParse(input).error;
-    return error
-        ? // Return the error message defined in the Zod schema
-            z.prettifyError(error)
-        : true;
-};
 const getPrompts = () => [
     {
         message: "Name",

package/dist/adapters/plop/helpers/__tests__/validate-prompt.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/adapters/plop/helpers/__tests__/validate-prompt.test.js

@@ -0,0 +1,60 @@
+// Tests for the shared validatePrompt helper.
+import { describe, expect, it } from "vitest";
+import { z } from "zod/v4";
+import { validatePrompt } from "../validate-prompt.js";
+describe("validatePrompt", () => {
+    it("returns true when input is valid", () => {
+        const schema = z.string().min(1, "Must not be empty");
+        const validate = validatePrompt(schema);
+        const result = validate("hello");
+        expect(result).toBe(true);
+    });
+    it("returns a string error message when input is invalid", () => {
+        const schema = z.string().min(1, "Must not be empty");
+        const validate = validatePrompt(schema);
+        const result = validate("");
+        expect(typeof result).toBe("string");
+        expect(result).not.toBe(true);
+    });
+    it("returns the pretty-printed zod error message", () => {
+        const schema = z.string().min(3, "Too short");
+        const validate = validatePrompt(schema);
+        const result = validate("ab");
+        expect(result).toContain("Too short");
+    });
+    it("returns true for input that passes a min/max length schema", () => {
+        const schema = z.string().min(2).max(4);
+        const validate = validatePrompt(schema);
+        expect(validate("ab")).toBe(true);
+        expect(validate("abc")).toBe(true);
+        expect(validate("abcd")).toBe(true);
+    });
+    it("returns error string when input is too short for min/max length schema", () => {
+        const schema = z.string().min(2).max(4);
+        const validate = validatePrompt(schema);
+        const result = validate("a");
+        expect(typeof result).toBe("string");
+    });
+    it("returns error string when input is too long for min/max length schema", () => {
+        const schema = z.string().min(2).max(4);
+        const validate = validatePrompt(schema);
+        const result = validate("abcde");
+        expect(typeof result).toBe("string");
+    });
+    it("validates input after schema transforms are applied", () => {
+        // Schema with trim+toLowerCase then min length check
+        const schema = z.string().trim().toLowerCase().min(2);
+        const validate = validatePrompt(schema);
+        // "  A  " after trim is "A", after toLowerCase is "a" → length 1 → fails min(2)
+        const result = validate("  A  ");
+        expect(typeof result).toBe("string");
+    });
+    it("works with a non-string schema", () => {
+        const schema = z.array(z.string()).min(1, "Select at least one item");
+        const validate = validatePrompt(schema);
+        expect(validate(["item1"])).toBe(true);
+        const result = validate([]);
+        expect(typeof result).toBe("string");
+        expect(result).toContain("Select at least one item");
+    });
+});

package/dist/adapters/plop/helpers/validate-prompt.d.ts

@@ -0,0 +1,7 @@
+import { z } from "zod/v4";
+/**
+ * Creates an Inquirer-compatible validate function from a Zod schema.
+ * Applies any transforms defined in the schema before validating,
+ * so the same rules are enforced at both the prompt and domain levels.
+ */
+export declare const validatePrompt: (schema: z.ZodSchema) => (input: unknown) => string | true;

package/dist/adapters/plop/helpers/validate-prompt.js

@@ -0,0 +1,13 @@
+// Shared prompt validation helper for plop generators.
+// Bridges Zod schema validation with Inquirer's validate callback signature,
+// returning a human-readable error string on failure or true on success.
+import { z } from "zod/v4";
+/**
+ * Creates an Inquirer-compatible validate function from a Zod schema.
+ * Applies any transforms defined in the schema before validating,
+ * so the same rules are enforced at both the prompt and domain levels.
+ */
+export const validatePrompt = (schema) => (input) => {
+    const error = schema.safeParse(input).error;
+    return error ? z.prettifyError(error) : true;
+};

package/dist/domain/__tests__/environment.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
-import { getInitializationStatus, getTerraformBackend, hasUserPermissionToInitialize, } from "../environment.js";
+import { environmentSchema, getInitializationStatus, getTerraformBackend, hasUserPermissionToInitialize, } from "../environment.js";
 const createMockCloudAccountService = (overrides = {}) => ({
     getTerraformBackend: vi.fn().mockResolvedValue(undefined),
     hasUserPermissionToInitialize: vi.fn().mockResolvedValue(true),
@@ -280,3 +280,53 @@ describe("hasUserPermissionToInitialize", () => {
         expect(hasUserPermissionMock).toHaveBeenNthCalledWith(2, "account-b");
     });
 });
+describe("environmentSchema — prefix transforms", () => {
+    const baseEnv = {
+        cloudAccounts: [
+            {
+                csp: "azure",
+                defaultLocation: "westeurope",
+                displayName: "Test Account",
+                id: "test-account-id",
+            },
+        ],
+        name: "dev",
+        prefix: "dx",
+    };
+    it("lowercases an uppercase prefix", () => {
+        const result = environmentSchema.safeParse({ ...baseEnv, prefix: "ABC" });
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.prefix).toBe("abc");
+    });
+    it("lowercases a mixed-case prefix", () => {
+        const result = environmentSchema.safeParse({ ...baseEnv, prefix: "AbCd" });
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.prefix).toBe("abcd");
+    });
+    it("trims leading and trailing whitespace from prefix", () => {
+        const result = environmentSchema.safeParse({ ...baseEnv, prefix: " dx " });
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.prefix).toBe("dx");
+    });
+    it("trims and lowercases prefix together", () => {
+        const result = environmentSchema.safeParse({ ...baseEnv, prefix: " DX " });
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.prefix).toBe("dx");
+    });
+    it("still rejects a prefix shorter than 2 characters after trim", () => {
+        const result = environmentSchema.safeParse({ ...baseEnv, prefix: " a " });
+        expect(result.success).toBe(false);
+    });
+    it("still rejects a prefix longer than 4 characters after trim", () => {
+        const result = environmentSchema.safeParse({
+            ...baseEnv,
+            prefix: "abcde",
+        });
+        expect(result.success).toBe(false);
+    });
+    it("accepts a valid lowercase prefix unchanged", () => {
+        const result = environmentSchema.safeParse({ ...baseEnv, prefix: "dx" });
+        expect(result.success).toBe(true);
+        expect(result.success && result.data.prefix).toBe("dx");
+    });
+});

package/dist/domain/environment.js

@@ -8,7 +8,14 @@ export const environmentShort = {
 export const environmentSchema = z.object({
     cloudAccounts: z.array(cloudAccountSchema).min(1),
     name: z.enum(["dev", "prod", "uat"]),
-    prefix: z.string().min(2).max(4),
+    // Trim and lowercase at the schema level so the constraint is enforced
+    // regardless of how the data enters the system (prompt, test, or API).
+    prefix: z
+        .string()
+        .trim()
+        .toLowerCase()
+        .min(2, "Prefix must have at least 2 chars")
+        .max(4, "Prefix must have at most 4 chars"),
 });
 export async function getInitializationStatus(cloudAccountService, environment) {
     const issues = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagopa/dx-cli",
-  "version": "0.18.3",
+  "version": "0.18.4",
   "type": "module",
   "description": "A CLI useful to manage DX tools.",
   "repository": {
@@ -33,7 +33,6 @@
     "@azure/storage-blob": "^12.29.1",
     "@logtape/logtape": "^1.3.4",
     "@microsoft/microsoft-graph-client": "^3.0.7",
-    "@pagopa/dx-savemoney": "0.1.4",
     "chalk": "^5.6.2",
     "commander": "^14.0.2",
     "core-js": "^3.47.0",
@@ -47,7 +46,8 @@
     "replace-in-file": "^8.4.0",
     "semver": "^7.7.2",
     "yaml": "^2.8.2",
-    "zod": "^4.2.1"
+    "zod": "^4.2.1",
+    "@pagopa/dx-savemoney": "^0.1.5"
   },
   "devDependencies": {
     "@tsconfig/node24": "24.0.0",

package/templates/environment/shared/locals.tf.hbs

@@ -18,7 +18,7 @@ locals {
 
   tags = {
     CreatedBy   = "Terraform"
-    Environment = "{{env.name}}"
+    Environment = "{{titleCase env.name}}"
     {{#each tags}}
     {{@key}}    = "{{this}}"
     {{/each}}