@pagopa/dx-cli 0.16.0 → 0.16.2

package/dist/adapters/commander/commands/init.js

@@ -5,6 +5,7 @@ import { $, ExecaError } from "execa";
 import { okAsync, ResultAsync } from "neverthrow";
 import * as path from "node:path";
 import { oraPromise } from "ora";
+import { z } from "zod";
 import { Repository, } from "../../../domain/github.js";
 import { tf$ } from "../../execa/terraform.js";
 import { getPlopInstance, runDeploymentEnvironmentGenerator, runMonorepoGenerator, } from "../../plop/index.js";
@@ -34,8 +35,20 @@ const displaySummary = (initResult) => {
         console.log(`Please, manually create a Pull Request in the GitHub repository to review the scaffolded code.\n`);
     }
 };
-const checkTerraformCliIsInstalled = () => withSpinner("Checking Terraform installation...", "Terraform is installed!", "Please install terraform CLI before running this command.", tf$ `terraform -version`);
-const checkAzLogin = () => withSpinner("Check Azure login status...", "You are logged in to Azure", "Please log in to Azure CLI using `az login` before running this command.", tf$ `az account show`);
+const checkTerraformCliIsInstalled = () => withSpinner("Checking Terraform installation...", "Terraform is installed!", "Please install terraform CLI before running this command. If you use tfenv, run: tfenv install latest && tfenv use latest", tf$ `terraform -version`);
+const azureAccountSchema = z.object({
+    user: z.object({
+        name: z.string().min(1),
+    }),
+});
+const ensureAzLogin = async () => {
+    const { stdout } = await tf$ `az account show`;
+    await tf$ `az group list`;
+    const parsed = JSON.parse(stdout);
+    const { user } = azureAccountSchema.parse(parsed);
+    return user.name;
+};
+const checkAzLogin = () => withSpinner("Check Azure login status...", (userName) => `You are logged in to Azure (${userName})`, "Please log in to Azure CLI using `az login` before running this command.", ensureAzLogin());
 const checkPreconditions = () => checkTerraformCliIsInstalled().andThen(() => checkAzLogin());
 const createRemoteRepository = ({ repoName, repoOwner, }) => {
     const logger = getLogger(["dx-cli", "init"]);
@@ -110,7 +123,10 @@ export const makeInitCommand = ({ gitHubService, }) => new Command()
         process.chdir(payload.repoName);
         console.log(chalk.blue.bold("\nCloud Environment"));
     })
-        .andThen((payload) => ResultAsync.fromPromise(runDeploymentEnvironmentGenerator(plop), handleGeneratorError).map(() => payload)))
+        .andThen((payload) => ResultAsync.fromPromise(runDeploymentEnvironmentGenerator(plop, {
+        owner: payload.repoOwner,
+        repo: payload.repoName,
+    }), handleGeneratorError).map(() => payload)))
         .andTee(() => console.log()) // Print a new line before the gh repo creation logs
         .andThen((payload) => handleNewGitHubRepository(gitHubService)(payload))
         .match(displaySummary, exitWithError(this));

package/dist/adapters/node/__tests__/data.d.ts

@@ -9,7 +9,7 @@ export declare const makeMockPackageJson: (overrides?: Partial<PackageJson>) =>
         typescript: string;
     };
     name: string;
-    scripts: Map<string & import("zod/v4").$brand<"ScriptName">, string> | {
+    scripts: Map<string & import("zod").$brand<"ScriptName">, string> | {
         build: string;
         "code-review": string;
     };

package/dist/adapters/plop/generators/environment/index.d.ts

@@ -1,6 +1,7 @@
 import { type NodePlopAPI } from "node-plop";
 import { CloudAccountRepository, CloudAccountService } from "../../../../domain/cloud-account.js";
+import { GitHubRepo } from "../../../../domain/github-repo.js";
 import { Payload, payloadSchema } from "./prompts.js";
 export declare const PLOP_ENVIRONMENT_GENERATOR_NAME = "DX_DeploymentEnvironment";
 export { Payload, payloadSchema };
-export default function (plop: NodePlopAPI, templatesPath: string, cloudAccountRepository: CloudAccountRepository, cloudAccountService: CloudAccountService): void;
+export default function (plop: NodePlopAPI, templatesPath: string, cloudAccountRepository: CloudAccountRepository, cloudAccountService: CloudAccountService, github?: GitHubRepo): void;

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

@@ -8,7 +8,7 @@ import getActions from "./actions.js";
 import getPrompts, { payloadSchema } from "./prompts.js";
 export const PLOP_ENVIRONMENT_GENERATOR_NAME = "DX_DeploymentEnvironment";
 export { payloadSchema };
-export default function (plop, templatesPath, cloudAccountRepository, cloudAccountService) {
+export default function (plop, templatesPath, cloudAccountRepository, cloudAccountService, github) {
     setEnvShortHelper(plop);
     setResourcePrefixHelper(plop);
     setEqHelper(plop);
@@ -18,6 +18,10 @@ export default function (plop, templatesPath, cloudAccountRepository, cloudAccou
     plop.setGenerator(PLOP_ENVIRONMENT_GENERATOR_NAME, {
         actions: getActions(templatesPath),
         description: "Generate a new deployment environment",
-        prompts: getPrompts({ cloudAccountRepository, cloudAccountService }),
+        prompts: getPrompts({
+            cloudAccountRepository,
+            cloudAccountService,
+            github,
+        }),
     });
 }

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

@@ -6,6 +6,7 @@ type InquirerChoice<T> = inquirer.Separator | {
     value: T;
 };
 import { z } from "zod/v4";
+import { GitHubRepo } from "../../../../domain/github-repo.js";
 export declare const workspaceSchema: z.ZodObject<{
     domain: z.ZodDefault<z.ZodString>;
 }, z.core.$strip>;
@@ -59,6 +60,7 @@ export type Payload = z.infer<typeof payloadSchema>;
 export type PromptsDependencies = {
     cloudAccountRepository: CloudAccountRepository;
     cloudAccountService: CloudAccountService;
+    github?: GitHubRepo;
 };
 declare const prompts: (deps: PromptsDependencies) => DynamicPromptsFunction;
 export declare const getCloudAccountChoices: (cloudAccounts: CloudAccount[]) => InquirerChoice<CloudAccount>[];

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

@@ -4,7 +4,7 @@ import { environmentSchema, getInitializationStatus, hasUserPermissionToInitiali
 import * as azure from "../../../azure/locations.js";
 import { getLogger } from "@logtape/logtape";
 import { z } from "zod/v4";
-import { githubRepoSchema } from "../../../../domain/github-repo.js";
+import { githubRepoSchema, } from "../../../../domain/github-repo.js";
 import { getGithubRepo } from "../../../github/github-repo.js";
 const initSchema = z.object({
     cloudAccountsToInitialize: z.array(cloudAccountSchema),
@@ -27,7 +27,7 @@ export const payloadSchema = z.object({
 });
 const prompts = (deps) => async (inquirer) => {
     const logger = getLogger(["gen", "env"]);
-    const github = await getGithubRepo();
+    const github = deps.github ?? (await getGithubRepo());
     assert.ok(github, "This generator only works inside a GitHub repository.");
     logger.debug("github repo {github}", { github });
     const answers = await inquirer.prompt([

package/dist/adapters/plop/index.d.ts

@@ -1,8 +1,9 @@
 import type { NodePlopAPI } from "plop";
+import { GitHubRepo } from "../../domain/github-repo.js";
 import { GitHubService } from "../../domain/github.js";
 import { Payload as MonorepoPayload } from "../plop/generators/monorepo/index.js";
 export declare const setMonorepoGenerator: (plop: NodePlopAPI) => void;
 export declare const getPlopInstance: () => Promise<NodePlopAPI>;
 export declare const runMonorepoGenerator: (plop: NodePlopAPI, githubService: GitHubService) => Promise<MonorepoPayload>;
-export declare const runDeploymentEnvironmentGenerator: (plop: NodePlopAPI) => Promise<void>;
-export declare const setDeploymentEnvironmentGenerator: (plop: NodePlopAPI) => void;
+export declare const runDeploymentEnvironmentGenerator: (plop: NodePlopAPI, github: GitHubRepo) => Promise<void>;
+export declare const setDeploymentEnvironmentGenerator: (plop: NodePlopAPI, github: GitHubRepo) => void;

package/dist/adapters/plop/index.js

@@ -25,23 +25,24 @@ const validatePayload = async (payload, github) => {
         }
     }
 };
-export const getPlopInstance = async () => {
-    const plop = await nodePlop();
-    setMonorepoGenerator(plop);
-    setDeploymentEnvironmentGenerator(plop);
-    return plop;
-};
+export const getPlopInstance = async () => nodePlop();
 const runActions = async (generator, payload) => {
     const logger = getLogger(["dx-cli", "init"]);
     const result = await generator.runActions(payload);
     if (result.failures.length > 0) {
         for (const failure of result.failures) {
-            logger.error(failure.message);
+            if (failure.error === "Aborted due to previous action failure") {
+                continue;
+            }
+            logger.error(`Error on {type} step. ${failure.message}`, {
+                type: failure.type,
+            });
+            throw new Error("One or more actions failed during generation.");
         }
-        throw new Error("One or more actions failed during generation.");
     }
 };
 export const runMonorepoGenerator = async (plop, githubService) => {
+    setMonorepoGenerator(plop);
     const generator = plop.getGenerator(PLOP_MONOREPO_GENERATOR_NAME);
     const answers = await generator.runPrompts();
     const payload = monorepoPayloadSchema.parse(answers);
@@ -53,7 +54,8 @@ export const runMonorepoGenerator = async (plop, githubService) => {
     });
     return payload;
 };
-export const runDeploymentEnvironmentGenerator = async (plop) => {
+export const runDeploymentEnvironmentGenerator = async (plop, github) => {
+    setDeploymentEnvironmentGenerator(plop, github);
     const generator = plop.getGenerator(PLOP_ENVIRONMENT_GENERATOR_NAME);
     const payload = await generator.runPrompts();
     await oraPromise(runActions(generator, payload), {
@@ -62,10 +64,10 @@ export const runDeploymentEnvironmentGenerator = async (plop) => {
         text: "Creating environment...",
     });
 };
-export const setDeploymentEnvironmentGenerator = (plop) => {
+export const setDeploymentEnvironmentGenerator = (plop, github) => {
     const credential = new AzureCliCredential();
     const cloudAccountRepository = new AzureSubscriptionRepository(credential);
     const cloudAccountService = new AzureCloudAccountService(credential);
     const templatesPath = path.join(import.meta.dirname, "../../../templates/environment");
-    createDeploymentEnvironmentGenerator(plop, templatesPath, cloudAccountRepository, cloudAccountService);
+    createDeploymentEnvironmentGenerator(plop, templatesPath, cloudAccountRepository, cloudAccountService, github);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagopa/dx-cli",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "type": "module",
   "description": "A CLI useful to manage DX tools.",
   "repository": {

package/templates/monorepo/.gitignore.hbs

@@ -0,0 +1,305 @@
+# Created by https://www.toptal.com/developers/gitignore/api/macos,turbo,terraform,intellij+all,node
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos,turbo,terraform,intellij+all,node
+
+### Intellij+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Intellij+all Patch ###
+# Ignore everything but code style settings and run configurations
+# that are supposed to be shared within teams.
+
+.idea/*
+
+!.idea/codeStyles
+!.idea/runConfigurations
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+### Node Patch ###
+# Serverless Webpack directories
+.webpack/
+
+# Optional stylelint cache
+
+# SvelteKit build / generate output
+.svelte-kit
+
+### Terraform ###
+# Local .terraform directories
+**/.terraform/*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+crash.*.log
+
+# Exclude all .tfvars files, which are likely to contain sensitive data, such as
+# password, private keys, and other secrets. These should not be part of version
+# control as they are data points which are potentially sensitive and subject
+# to change depending on the environment.
+*.tfvars
+*.tfvars.json
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+
+# Include override files you do wish to add to version control using negated pattern
+# !example_override.tf
+
+# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
+# example: *tfplan*
+
+# Ignore CLI configuration files
+.terraformrc
+terraform.rc
+
+### Turbo ###
+# Turborepo task cache
+.turbo
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,turbo,terraform,intellij+all,node