@tahminator/pipeline 1.0.52 → 1.0.53

package/dist/internal/upload-npm/beta/index.js

@@ -1,17 +1,28 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
+import { EnvClient, EnvClientStrategy } from "../../../env";
 import { GitHubClient } from "../../../gh";
 import { NPMClient } from "../../../npm";
 import { Utils } from "../../../utils";
-const { sha } = await yargs(hideBin(process.argv))
+const { sha, prId } = await yargs(hideBin(process.argv))
     .option("sha", {
     type: "string",
     demandOption: true,
+})
+    .option("prId", {
+    type: "number",
+    demandOption: true,
 })
     .strict()
     .parse();
 async function main() {
-    const ghClient = await GitHubClient.createWithDefaultCiToken();
+    const envClient = EnvClient.create(EnvClientStrategy.GIT_CRYPT);
+    const { githubAppAppId, githubAppInstallationId, githubAppPrivateKeyB64 } = parseCiEnv(await envClient.readFromEnv(".env.ci"));
+    const ghClient = await GitHubClient.createWithGithubAppToken({
+        appId: githubAppAppId,
+        installationId: githubAppInstallationId,
+        privateKey: await Utils.decodeBase64EncodedString(githubAppPrivateKeyB64),
+    });
     const npmClient = await NPMClient.create();
     const shortSha = await getShortSha(sha);
     const lastTag = (await ghClient.getLatestTag()) ?? GitHubClient.BASE_VERSION;
@@ -22,6 +33,16 @@ async function main() {
     await Utils.updateAllPackageJsonsWithVersion(betaVersion);
     await npmClient.publish(false, true);
     console.log(`Uploaded ${betaVersion} to NPM.`);
+    await ghClient.sendPrMessage({
+        prId,
+        owner: "tahminator",
+        repository: "pipeline",
+        message: `
+## Test Version Uploaded
+
+Uploaded ${betaVersion} to NPM. View version on NPM registry [here](https://www.npmjs.com/package/@tahminator/pipeline/v/${betaVersion}).
+`,
+    });
 }
 async function getShortSha(sha) {
     const shortSha = sha.slice(0, 8).toString().trim();
@@ -30,6 +51,30 @@ async function getShortSha(sha) {
     }
     return shortSha;
 }
+function parseCiEnv(ciEnv) {
+    const githubAppAppId = (() => {
+        const v = ciEnv["GITHUB_APP_APP_ID"];
+        if (!v) {
+            throw new Error("Missing GITHUB_APP_APP_ID from .env.ci");
+        }
+        return v;
+    })();
+    const githubAppInstallationId = (() => {
+        const v = ciEnv["GITHUB_APP_INSTALLATION_ID"];
+        if (!v) {
+            throw new Error("Missing GITHUB_APP_INSTALLATION_ID from .env.ci");
+        }
+        return v;
+    })();
+    const githubAppPrivateKeyB64 = (() => {
+        const v = ciEnv["GITHUB_APP_PRIVATE_KEY_B64"];
+        if (!v) {
+            throw new Error("Missing GITHUB_APP_PRIVATE_KEY_B64 from .env.ci");
+        }
+        return v;
+    })();
+    return { githubAppAppId, githubAppInstallationId, githubAppPrivateKeyB64 };
+}
 main()
     .then(() => {
     process.exit(0);

package/dist/pulumi/client.d.ts

@@ -11,7 +11,7 @@ export declare class PulumiClient {
     up(): Promise<UpResult>;
     preview(opts: {
         diff: boolean;
-        rewriteStdoutToColorizedHtml: boolean;
+        rewriteStdoutToDiffFriendly: boolean;
     }): Promise<PreviewResult>;
     refresh(): Promise<RefreshResult>;
     static parseChangeSumaryToPrettyTable(changeSummary: OpMap): string;

package/dist/pulumi/strategy/types.d.ts

@@ -3,7 +3,7 @@ export interface IPulumiClientStrategy {
     up(): Promise<UpResult>;
     preview(opts: {
         diff: boolean;
-        rewriteStdoutToColorizedHtml: boolean;
+        rewriteStdoutToDiffFriendly: boolean;
     }): Promise<PreviewResult>;
     refresh(): Promise<RefreshResult>;
 }

package/dist/pulumi/strategy/workspace.d.ts

@@ -3,13 +3,13 @@ import type { PulumiClientCreateArgs } from "../types";
 import type { IPulumiClientStrategy } from "./types";
 export declare class LocalWorkspacePulumiClientStrategy implements IPulumiClientStrategy {
     private readonly stack;
-    private readonly htmlToAnsiConverter;
     private constructor();
     static create(args: PulumiClientCreateArgs): Promise<LocalWorkspacePulumiClientStrategy>;
     up(): Promise<UpResult>;
     preview(args: {
         diff: boolean;
-        rewriteStdoutToColorizedHtml: boolean;
+        rewriteStdoutToDiffFriendly: boolean;
     } | undefined): Promise<PreviewResult>;
+    private rewritePulumiPreviewAsDiffFriendlyText;
     refresh(): Promise<RefreshResult>;
 }

package/dist/pulumi/strategy/workspace.js

@@ -1,8 +1,6 @@
 import { LocalWorkspace, } from "@pulumi/pulumi/automation";
-import Convert from "ansi-to-html";
 export class LocalWorkspacePulumiClientStrategy {
     stack;
-    htmlToAnsiConverter = new Convert();
     constructor(stack) {
         this.stack = stack;
     }
@@ -22,20 +20,43 @@ export class LocalWorkspacePulumiClientStrategy {
         });
     }
     async preview(args) {
-        const { diff, rewriteStdoutToColorizedHtml: colorizedHtml } = args ?? {
+        const { diff, rewriteStdoutToDiffFriendly } = args ?? {
             diff: false,
-            rewriteStdoutToColorizedHtml: false,
+            rewriteStdoutToDiffFriendly: false,
         };
         const previewResult = await this.stack.preview({
-            color: colorizedHtml ? "always" : "never",
+            color: "never",
             refresh: false,
             diff,
         });
+        const stdout = rewriteStdoutToDiffFriendly ?
+            this.rewritePulumiPreviewAsDiffFriendlyText(previewResult.stdout)
+            : previewResult.stdout;
         return {
             ...previewResult,
-            stdout: this.htmlToAnsiConverter.toHtml(previewResult.stdout),
+            stdout,
         };
     }
+    rewritePulumiPreviewAsDiffFriendlyText(stdout) {
+        return stdout
+            .split("\n")
+            .map((line) => {
+            if (!line) {
+                return line;
+            }
+            const trimmed = line.trimStart();
+            const symbol = trimmed.startsWith("+-") ? "!"
+                : trimmed.startsWith("+") ? "+"
+                    : trimmed.startsWith("-") ? "-"
+                        : trimmed.startsWith("~") ? "!"
+                            : null;
+            if (!symbol) {
+                return line;
+            }
+            return symbol + line.slice(1);
+        })
+            .join("\n");
+    }
     async refresh() {
         return this.stack.refresh({
             color: "never",

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "author": "Tahmid Ahmed",
   "description": "A collection of Bun shell scripts that can be re-used in various CICD pipelines.",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "repository": {
     "url": "git+https://github.com/tahminator/pipeline.git"
   },