@tahminator/pipeline 1.0.51 → 1.0.52-beta.3f43a4ea

package/README.md

@@ -156,6 +156,11 @@ await npm.publish();
 
 // dry run
 await npm.publish(true);
+
+// publish to the beta dist-tag instead of latest
+// just like before, you should use `Utils.updateAllPackageJsonsWithVersion`
+// with `Utils.SemVar.validate(betaTag)` to set a valid version
+await npm.publish(false, true);
 ```
 
 ### `SonarScannerClient`

package/dist/gh/client.d.ts

@@ -4,6 +4,7 @@ import { GitHubTagManager } from "./tag";
 export declare class GitHubClient {
     private readonly client;
     private readonly isExplicitToken;
+    static readonly BASE_VERSION = "1.0.0";
     private readonly tagManager;
     private readonly outputManager;
     private readonly prManager;
@@ -35,6 +36,7 @@ export declare class GitHubClient {
      */
     static createWithPatCiToken(pat: string): Promise<GitHubClient>;
     createTag(...args: Parameters<GitHubTagManager["createTag"]>): Promise<void>;
+    getLatestTag(...args: Parameters<GitHubTagManager["getLatestTag"]>): Promise<string | null>;
     outputToGithubOutput(...args: Parameters<GitHubOutputManager["outputToGithubOutput"]>): Promise<void>;
     updateK8sTagWithPR(...args: Parameters<GitHubPRManager["updateK8sTagWithPR"]>): Promise<void>;
     sendPrMessage(...args: Parameters<GitHubPRManager["sendPrMessage"]>): Promise<void>;

package/dist/gh/client.js

@@ -6,6 +6,7 @@ import { GitHubTagManager } from "./tag";
 export class GitHubClient {
     client;
     isExplicitToken;
+    static BASE_VERSION = GitHubTagManager.BASE_VERSION;
     tagManager;
     outputManager;
     prManager;
@@ -56,6 +57,9 @@ export class GitHubClient {
     createTag(...args) {
         return this.tagManager.createTag(...args);
     }
+    getLatestTag(...args) {
+        return this.tagManager.getLatestTag(...args);
+    }
     outputToGithubOutput(...args) {
         return this.outputManager.outputToGithubOutput(...args);
     }

package/dist/gh/tag/index.d.ts

@@ -4,9 +4,15 @@ import type { OwnerString, RepoString } from "../../types";
 export declare class GitHubTagManager {
     private readonly client;
     private readonly isExplicitToken;
-    private static readonly BASE_VERSION;
+    static readonly BASE_VERSION = "1.0.0";
     constructor(client: Octokit, isExplicitToken: boolean);
     private checkToken;
+    /**
+     * Returns the latest stable semver tag in the repository.
+     */
+    getLatestTag({ repositoryOverride, }?: {
+        repositoryOverride?: [OwnerString, RepoString];
+    }): Promise<string | null>;
     /**
      * Utilizes the GitHub API to create a new tag version in the given repository.
      *

package/dist/gh/tag/index.js

@@ -14,6 +14,23 @@ export class GitHubTagManager {
             throw new Error("You must pass in an explicit GitHub token for this operation. You may either use a PAT or a GitHub App Token");
         }
     }
+    /**
+     * Returns the latest stable semver tag in the repository.
+     */
+    async getLatestTag({ repositoryOverride, } = {}) {
+        const [owner, repo] = this.parseRepository(repositoryOverride);
+        const { data: tags } = await this.client.rest.repos.listTags({
+            owner,
+            repo,
+        });
+        return (tags
+            .map((t) => t.name)
+            .filter((tag) => {
+            const parsed = semver.parse(tag);
+            return parsed && parsed.prerelease.length === 0;
+        })
+            .sort(semver.rcompare)[0] ?? null);
+    }
     /**
      * Utilizes the GitHub API to create a new tag version in the given repository.
      *
@@ -23,19 +40,10 @@ export class GitHubTagManager {
      */
     async createTag({ repositoryOverride, releaseType, onPreTagCreate, }) {
         this.checkToken();
-        const repositoryEnv = (() => {
-            const v = process.env.GITHUB_REPOSITORY;
-            return v;
-        })();
-        const [owner, repo] = this.parseRepository(repositoryOverride, repositoryEnv)();
-        const { data: tags } = await this.client.rest.repos.listTags({
-            owner,
-            repo,
+        const [owner, repo] = this.parseRepository(repositoryOverride);
+        const lastTag = await this.getLatestTag({
+            repositoryOverride: [owner, repo],
         });
-        const lastTag = tags
-            .map((t) => t.name)
-            .filter((v) => semver.valid(v))
-            .sort(semver.rcompare)[0];
         const nextTag = lastTag ?
             semver.inc(lastTag, releaseType ?? "patch")
             : GitHubTagManager.BASE_VERSION;
@@ -80,16 +88,18 @@ export class GitHubTagManager {
             sha: commit.sha,
         });
     }
-    parseRepository(repositoryOverride, repositoryEnv) {
-        return () => {
-            if (repositoryOverride) {
-                return [repositoryOverride[0], repositoryOverride[1]];
-            }
-            if (repositoryEnv) {
-                return repositoryEnv.split("/");
-            }
+    parseRepository(repositoryOverride) {
+        if (repositoryOverride) {
+            return [repositoryOverride[0], repositoryOverride[1]];
+        }
+        const repositoryEnv = (() => {
+            const v = process.env.GITHUB_REPOSITORY;
+            return v;
+        })();
+        if (!repositoryEnv) {
             throw new Error("GITHUB_REPOSITORY not found in environment and no explicit github repository override defined");
-        };
+        }
+        return repositoryEnv.split("/");
     }
     async createBlob({ owner, repo, baseSha, changedFiles, }) {
         if (!changedFiles.length) {

package/dist/internal/upload-npm/beta/index.d.ts

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

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

@@ -0,0 +1,85 @@
+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, prId } = await yargs(hideBin(process.argv))
+    .option("sha", {
+    type: "string",
+    demandOption: true,
+})
+    .option("prId", {
+    type: "number",
+    demandOption: true,
+})
+    .strict()
+    .parse();
+async function main() {
+    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;
+    const betaVersion = `${lastTag}-beta.${shortSha}`;
+    if (!Utils.SemVer.validate(betaVersion)) {
+        throw new Error(`Generated invalid beta version: ${betaVersion}`);
+    }
+    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();
+    if (shortSha.length !== 8) {
+        throw new Error("Could not parse git 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);
+})
+    .catch((e) => {
+    console.error(e);
+    process.exit(1);
+});

package/dist/npm/client.d.ts

@@ -18,7 +18,7 @@ export declare class NPMClient {
      * is filled out with the name of the package and the version you would like to
      * deploy.
      */
-    publish(dryRun?: boolean): Promise<void>;
+    publish(dryRun?: boolean, publishBetaTag?: boolean): Promise<void>;
     [Symbol.asyncDispose](): Promise<void>;
     cleanup(): Promise<void>;
 }

package/dist/npm/client.js

@@ -23,15 +23,16 @@ export class NPMClient {
      * is filled out with the name of the package and the version you would like to
      * deploy.
      */
-    async publish(dryRun) {
+    async publish(dryRun, publishBetaTag) {
         const dryRunFlag = dryRun ? ["--dry-run"] : [];
+        const tagFlag = publishBetaTag ? ["--tag", "beta"] : [];
         if (Utils.Log.isDebug) {
             console.log(await $ `ls .`.text());
             console.log(await $ `ls ./dist/`.text());
             console.log(await $ `pwd`.text());
             console.log(await $ `cat ./package.json`.text());
         }
-        await $ `npm publish --access public --provenance ${dryRunFlag} ./`;
+        await $ `npm publish --access public --provenance ${tagFlag} ${dryRunFlag} ./`;
         console.log("Package has been successfully published");
     }
     async [Symbol.asyncDispose]() {

package/dist/pulumi/strategy/workspace.js

@@ -31,9 +31,12 @@ export class LocalWorkspacePulumiClientStrategy {
             refresh: false,
             diff,
         });
+        console.log("old stdout", previewResult.stdout);
+        const stdout = this.htmlToAnsiConverter.toHtml(previewResult.stdout);
+        console.log("new stdout", stdout);
         return {
             ...previewResult,
-            stdout: this.htmlToAnsiConverter.toHtml(previewResult.stdout),
+            stdout,
         };
     }
     async refresh() {

package/dist/utils/client.d.ts

@@ -2,10 +2,12 @@ import { decodeBase64EncodedString } from "./b64";
 import { isCmdAvailable } from "./cmd";
 import { Colors } from "./colors";
 import { Log } from "./log";
+import { SemVer } from "./semver";
 import { generateShortId } from "./short";
 export declare class Utils {
     static Colors: typeof Colors;
     static Log: typeof Log;
+    static SemVer: typeof SemVer;
     static generateShortId(...args: Parameters<typeof generateShortId>): string;
     static updateAllPackageJsonsWithVersion(version: string): Promise<void>;
     static isCmdAvailable(...args: Parameters<typeof isCmdAvailable>): Promise<boolean>;

package/dist/utils/client.js

@@ -3,11 +3,13 @@ import { decodeBase64EncodedString } from "./b64";
 import { isCmdAvailable } from "./cmd";
 import { Colors } from "./colors";
 import { Log } from "./log";
+import { SemVer } from "./semver";
 import { generateShortId } from "./short";
 export class Utils {
     // hoist
     static Colors = Colors;
     static Log = Log;
+    static SemVer = SemVer;
     static generateShortId(...args) {
         return generateShortId(...args);
     }

package/dist/utils/semver.d.ts

@@ -0,0 +1,4 @@
+import semver from "semver";
+export declare class SemVer {
+    static validate(version: string | semver.SemVer): boolean;
+}

package/dist/utils/semver.js

@@ -0,0 +1,6 @@
+import semver from "semver";
+export class SemVer {
+    static validate(version) {
+        return semver.valid(version) != null;
+    }
+}

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.51",
+  "version": "1.0.52-beta.3f43a4ea",
   "repository": {
     "url": "git+https://github.com/tahminator/pipeline.git"
   },