@pagopa/dx-cli 0.21.1 → 0.21.3

package/dist/adapters/azure/__tests__/cloud-account-service.test.js

@@ -254,6 +254,7 @@ describe("initialize", () => {
             name: "dev",
             prefix: "dx",
         }, {
+            clientId: "app-client-id",
             id: "app-id",
             installationId: "installation-id",
             key: "private-key\n",
@@ -289,7 +290,7 @@ describe("initialize", () => {
             issuer: "https://token.actions.githubusercontent.com",
             subject: "repo:pagopa/dx:environment:bootstrapper-dev-cd",
         });
-        expect(createOrUpdateEnvironmentSecret).toHaveBeenCalledTimes(6);
+        expect(createOrUpdateEnvironmentSecret).toHaveBeenCalledTimes(7);
         expect(createOrUpdateEnvironmentSecret).toHaveBeenCalledWith({
             environmentName: "bootstrapper-dev-cd",
             owner: "pagopa",
@@ -318,6 +319,13 @@ describe("initialize", () => {
             secretName: "GH_APP_ID",
             secretValue: "app-id",
         });
+        expect(createOrUpdateEnvironmentSecret).toHaveBeenCalledWith({
+            environmentName: "bootstrapper-dev-cd",
+            owner: "pagopa",
+            repo: "dx",
+            secretName: "GH_APP_CLIENT_ID",
+            secretValue: "app-client-id",
+        });
         expect(createOrUpdateEnvironmentSecret).toHaveBeenCalledWith({
             environmentName: "bootstrapper-dev-cd",
             owner: "pagopa",

package/dist/adapters/azure/cloud-account-service.js

@@ -460,6 +460,13 @@ export class AzureCloudAccountService {
                 secretName: "GH_APP_ID",
                 secretValue: runnerAppCredentials.id,
             }),
+            gitHubService.createOrUpdateEnvironmentSecret({
+                environmentName: githubEnvironmentName,
+                owner: github.owner,
+                repo: github.repo,
+                secretName: "GH_APP_CLIENT_ID",
+                secretValue: runnerAppCredentials.clientId,
+            }),
             gitHubService.createOrUpdateEnvironmentSecret({
                 environmentName: githubEnvironmentName,
                 owner: github.owner,

package/dist/adapters/commander/commands/__tests__/add.test.js

@@ -4,7 +4,7 @@
 import { errAsync, okAsync } from "neverthrow";
 import { describe, expect, it } from "vitest";
 import { mock } from "vitest-mock-extended";
-import { AuthorizationError, AuthorizationResult, IdentityAlreadyExistsError, } from "../../../../domain/authorization.js";
+import { AuthorizationError, AuthorizationResult, } from "../../../../domain/authorization.js";
 import { authorizeCloudAccounts } from "../add.js";
 const makeEnvPayload = (overrides = {}) => ({
     env: {
@@ -65,6 +65,8 @@ describe("authorizeCloudAccounts", () => {
         expect(result._unsafeUnwrap()).toEqual([expectedPr]);
         expect(authService.requestAuthorization).toHaveBeenCalledWith(expect.objectContaining({
             bootstrapIdentityId: "dx-d-itn-bootstrap-id-01",
+            envShort: "d",
+            prefix: "dx",
             subscriptionName: "DEV-FooBar",
         }));
     });
@@ -89,6 +91,8 @@ describe("authorizeCloudAccounts", () => {
         expect(result.isOk()).toBe(true);
         expect(authService.requestAuthorization).toHaveBeenCalledWith(expect.objectContaining({
             bootstrapIdentityId: "io-p-weu-bootstrap-id-01",
+            envShort: "p",
+            prefix: "io",
             subscriptionName: "PROD-Bar",
         }));
     });
@@ -140,7 +144,7 @@ describe("authorizeCloudAccounts", () => {
         expect(prs).toHaveLength(1);
         expect(prs[0]).toEqual(expectedPr);
     });
-    it("handles IdentityAlreadyExistsError gracefully", async () => {
+    it("returns a no-op authorization result when nothing changed", async () => {
         const authService = mock();
         const account = {
             csp: "azure",
@@ -148,12 +152,16 @@ describe("authorizeCloudAccounts", () => {
             displayName: "DEV-Existing",
             id: "sub-exists",
         };
-        authService.requestAuthorization.mockReturnValue(errAsync(new IdentityAlreadyExistsError("dx-d-itn-bootstrap-id-01")));
+        // No-op result: Ok with no URL (identity + groups already configured)
+        authService.requestAuthorization.mockReturnValue(okAsync(new AuthorizationResult()));
         const envPayload = makeEnvPayload({
             init: { cloudAccountsToInitialize: [account] },
         });
         const result = await authorizeCloudAccounts(authService)(envPayload);
         expect(result.isOk()).toBe(true);
-        expect(result._unsafeUnwrap()).toEqual([]);
+        // The no-op result is still collected but has no URL
+        const prs = result._unsafeUnwrap();
+        expect(prs).toHaveLength(1);
+        expect(prs[0].url).toBeUndefined();
     });
 });

package/dist/adapters/commander/commands/__tests__/init.test.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Tests for confirmGitHubRepoCreation in the init command.
+ */
+export {};

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

@@ -0,0 +1,48 @@
+/**
+ * Tests for confirmGitHubRepoCreation in the init command.
+ */
+import inquirer from "inquirer";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { confirmGitHubRepoCreation } from "../init.js";
+vi.mock("inquirer");
+const makePayload = (overrides = {}) => ({
+    repoDescription: "A test repo",
+    repoName: "test-repo",
+    repoOwner: "pagopa",
+    ...overrides,
+});
+describe("confirmGitHubRepoCreation", () => {
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it("returns true when the user confirms", async () => {
+        vi.mocked(inquirer.prompt).mockResolvedValue({ confirm: true });
+        const result = await confirmGitHubRepoCreation(makePayload());
+        expect(result.isOk()).toBe(true);
+        expect(result._unsafeUnwrap()).toBe(true);
+    });
+    it("returns false when the user declines", async () => {
+        vi.mocked(inquirer.prompt).mockResolvedValue({ confirm: false });
+        const result = await confirmGitHubRepoCreation(makePayload());
+        expect(result.isOk()).toBe(true);
+        expect(result._unsafeUnwrap()).toBe(false);
+    });
+    it("prompts with the correct repository name and owner", async () => {
+        vi.mocked(inquirer.prompt).mockResolvedValue({ confirm: true });
+        const payload = makePayload({ repoName: "my-repo", repoOwner: "my-org" });
+        await confirmGitHubRepoCreation(payload);
+        expect(inquirer.prompt).toHaveBeenCalledWith(expect.objectContaining({
+            message: expect.stringContaining("my-org/my-repo"),
+            type: "confirm",
+        }));
+    });
+    it("returns an error result when the prompt rejects", async () => {
+        const cause = new Error("non-interactive TTY");
+        vi.mocked(inquirer.prompt).mockRejectedValue(cause);
+        const result = await confirmGitHubRepoCreation(makePayload());
+        expect(result.isErr()).toBe(true);
+        const err = result._unsafeUnwrapErr();
+        expect(err).toBeInstanceOf(Error);
+        expect(err.cause).toBe(cause);
+    });
+});

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

@@ -38,6 +38,8 @@ export const authorizeCloudAccounts = (authorizationService) => (envPayload) =>
             const locShort = locationShort[account.defaultLocation];
             const input = requestAuthorizationInputSchema.safeParse({
                 bootstrapIdentityId: `${prefix}-${envShort}-${locShort}-bootstrap-id-01`,
+                envShort,
+                prefix,
                 repoName: envPayload.github.repo,
                 subscriptionName: account.displayName,
             });
@@ -62,9 +64,10 @@ const displaySummary = (result) => {
     console.log(chalk.green.bold("\nCloud environment created successfully!"));
     let step = 1;
     console.log(chalk.green.bold("\nNext Steps:"));
-    if (authorizationPrs.length > 0) {
+    const prsWithUrl = authorizationPrs.filter((pr) => pr.url != null);
+    if (prsWithUrl.length > 0) {
         console.log(`${step++}. Review the Azure authorization Pull Request(s):`);
-        for (const authPr of authorizationPrs) {
+        for (const authPr of prsWithUrl) {
             console.log(`   - ${chalk.underline(authPr.url)}`);
         }
     }

package/dist/adapters/commander/commands/init.d.ts

@@ -1,6 +1,7 @@
 import { Command } from "commander";
 import { ResultAsync } from "neverthrow";
 import { GitHubService } from "../../../domain/github.js";
+import { Payload as MonorepoPayload } from "../../plop/generators/monorepo/index.js";
 export declare const checkInitPreconditions: () => ResultAsync<import("execa").Result<{
     environment: {
         NO_COLOR: string;
@@ -17,6 +18,7 @@ export declare const checkAddEnvironmentPreconditions: () => ResultAsync<import(
     };
     shell: true;
 }>, Error>;
+export declare const confirmGitHubRepoCreation: (payload: MonorepoPayload) => ResultAsync<boolean, Error>;
 type InitCommandDependencies = {
     gitHubService: GitHubService;
 };

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

@@ -2,6 +2,7 @@ import { getLogger } from "@logtape/logtape";
 import chalk from "chalk";
 import { Command } from "commander";
 import { $, ExecaError } from "execa";
+import inquirer from "inquirer";
 import { okAsync, ResultAsync } from "neverthrow";
 import * as path from "node:path";
 import { oraPromise } from "ora";
@@ -10,13 +11,28 @@ import { Repository, } from "../../../domain/github.js";
 import { tf$ } from "../../execa/terraform.js";
 import { getPlopInstance, runMonorepoGenerator } from "../../plop/index.js";
 import { exitWithError } from "../index.js";
+const isGitHubRepoCreationSkipped = (input) => "gitHubRepoCreationSkipped" in input;
 const withSpinner = (text, successText, failText, promise) => ResultAsync.fromPromise(oraPromise(promise, {
     failText,
     successText,
     text,
 }), (cause) => new Error(failText, { cause }));
-const displaySummary = (initResult) => {
-    const { pr, repository } = initResult;
+const displaySummary = (input) => {
+    const docsUrl = "https://dx.pagopa.it/getting-started";
+    if (isGitHubRepoCreationSkipped(input)) {
+        const { payload } = input;
+        console.log(chalk.yellow.bold("\nGitHub repository creation skipped."));
+        console.log(`The workspace files have been scaffolded in ${chalk.cyan(payload.repoName + "/")}.`);
+        console.log(chalk.bold("\nTo finish the setup manually:"));
+        let step = 1;
+        console.log(`${step++}. Create the GitHub repository by applying the Terraform config scaffolded at ${chalk.cyan(`${payload.repoName}/infra/repository`)}:`);
+        console.log(`       ${chalk.cyan(`cd ${payload.repoName}/infra/repository && terraform init && terraform apply`)}`);
+        console.log(`${step++}. Push the scaffolded code to the newly created repository:`);
+        console.log(`       ${chalk.cyan(`cd ${payload.repoName} && git init && git remote add origin <url> && git push`)}`);
+        console.log(`${step}. Visit ${chalk.underline(docsUrl)} to deploy your first project\n`);
+        return;
+    }
+    const { pr, repository } = input;
     console.log(chalk.green.bold("\nWorkspace created successfully!"));
     if (repository) {
         console.log(`- Name: ${chalk.cyan(repository.name)}`);
@@ -29,7 +45,7 @@ const displaySummary = (initResult) => {
         let step = 1;
         console.log(chalk.green.bold("\nNext Steps:"));
         console.log(`${step++}. Review the Pull Request in the GitHub repository: ${chalk.underline(pr.url)}`);
-        console.log(`${step}. Visit ${chalk.underline("https://dx.pagopa.it/getting-started")} to deploy your first project\n`);
+        console.log(`${step}. Visit ${chalk.underline(docsUrl)} to deploy your first project\n`);
     }
     else {
         console.log(chalk.yellow(`\n⚠️ There was an error during Pull Request creation.`));
@@ -118,6 +134,14 @@ const handleGeneratorError = (err) => {
     }
     return new Error("Failed to run the generator", { cause: err });
 };
+export const confirmGitHubRepoCreation = (payload) => ResultAsync.fromPromise(inquirer
+    .prompt({
+    default: true,
+    message: `The project is created on ${chalk.green(payload.repoName)}. Would you like to publish it to GitHub at ${chalk.green(`${payload.repoOwner}/${payload.repoName}`)} now?`,
+    name: "confirm",
+    type: "confirm",
+})
+    .then(({ confirm }) => confirm), (cause) => new Error("Failed to read GitHub publish confirmation", { cause }));
 export const makeInitCommand = ({ gitHubService, }) => new Command()
     .name("init")
     .description("Initialize a new DX workspace")
@@ -128,6 +152,8 @@ export const makeInitCommand = ({ gitHubService, }) => new Command()
         .andTee((payload) => {
         process.chdir(payload.repoName);
     })
-        .andThen((payload) => handleNewGitHubRepository(gitHubService)(payload))
+        .andThen((payload) => confirmGitHubRepoCreation(payload).andThen((confirmed) => confirmed
+        ? handleNewGitHubRepository(gitHubService)(payload)
+        : okAsync({ gitHubRepoCreationSkipped: true, payload })))
         .match(displaySummary, exitWithError(this));
 });