chore: don't repackage mpk, just include readme

r0b1n · r0b1n · commit 673597e23902 · 2025-11-06T11:19:58.000+01:00
diff --git a/automation/utils/bin/rui-oss-clearance.ts b/automation/utils/bin/rui-oss-clearance.ts
@@ -89,8 +89,10 @@ async function selectRelease(): Promise<GitHubDraftRelease> {
     printSuccess(`Found ${releases.length} draft release${releases.length !== 1 ? "s" : ""}`);
 
     if (releases.length === 0) {
-        printWarning("No draft releases found");
-        throw new Error("No releases available");
+        printWarning(
+            "No draft releases found. Please create a draft release before trying again using `prepare-release` tool"
+        );
+        throw new Error("No draft releases found");
     }
 
     console.log(); // spacing
@@ -252,18 +254,8 @@ async function handleIncludeCommand(): Promise<void> {
 
         printInfo(`Readme to include: ${readmeToInclude}`);
 
-        // Prepare folder structure
-        const [tmpFolder, downloadPath] = await createSBomGeneratorFolderStructure(release.name);
-        printInfo(`Working directory: ${tmpFolder}`);
-
-        // Step 5: Download and verify
-        await downloadAndVerifyAsset(mpkAsset, downloadPath);
-
-        // Step 6: Include readmeToInclude into the mpk
-        await includeReadmeOssIntoMpk(readmeToInclude, downloadPath);
-
         // Step 7: Upload updated asses to the draft release
-        const newAsset = await gh.updateReleaseAsset(release.id, mpkAsset, downloadPath);
+        const newAsset = await gh.uploadReleaseAsset(release.id, readmeToInclude, basename(readmeToInclude));
         console.log(`Successfully uploaded asset ${newAsset.name} (ID: ${newAsset.id})`);
 
         console.log(release.id);
diff --git a/automation/utils/bin/rui-prepare-release.ts b/automation/utils/bin/rui-prepare-release.ts
@@ -353,15 +353,13 @@ async function createReleaseBranch(packageName: string, version: string): Promis
 }
 
 async function initializeJiraClient(): Promise<Jira> {
-    const projectKey = process.env.JIRA_PROJECT_KEY;
-    const baseUrl = process.env.JIRA_BASE_URL;
+    const projectKey = process.env.JIRA_PROJECT_KEY ?? "WC";
+    const baseUrl = process.env.JIRA_BASE_URL ?? "https://mendix.atlassian.net";
     const apiToken = process.env.JIRA_API_TOKEN;
 
     if (!projectKey || !baseUrl || !apiToken) {
         console.error(chalk.red("❌ Missing Jira environment variables"));
         console.log(chalk.dim("   Required variables:"));
-        console.log(chalk.dim("   export JIRA_PROJECT_KEY=WEB"));
-        console.log(chalk.dim("   export JIRA_BASE_URL=https://your-company.atlassian.net"));
         console.log(chalk.dim("   export JIRA_API_TOKEN=username@your-company.com:ATATT3xFfGF0..."));
         console.log(chalk.dim("   Get your API token at: https://id.atlassian.com/manage-profile/security/api-tokens"));
         throw new Error("Missing Jira environment variables");
diff --git a/automation/utils/src/github.ts b/automation/utils/src/github.ts
@@ -52,6 +52,8 @@ export class GitHub {
     authSet = false;
     tmpPrefix = "gh-";
     authToken: string = "";
+    owner = "mendix";
+    repo = "web-widgets";
 
     async ensureAuth(): Promise<void> {
         if (!this.authSet) {
@@ -140,7 +142,7 @@ export class GitHub {
             const release =
                 (await fetch<{ id: string }>(
                     "GET",
-                    `https://api.github.com/repos/mendix/web-widgets/releases/tags/${releaseTag}`,
+                    `https://api.github.com/repos/${this.owner}/${this.repo}/releases/tags/${releaseTag}`,
                     undefined,
                     { ...this.ghAPIHeaders }
                 )) ?? [];
@@ -171,7 +173,7 @@ export class GitHub {
                 name: string;
                 browser_download_url: string;
             }>
-        >("GET", `https://api.github.com/repos/mendix/web-widgets/releases/${releaseId}/assets`, undefined, {
+        >("GET", `https://api.github.com/repos/${this.owner}/${this.repo}/releases/${releaseId}/assets`, undefined, {
             ...this.ghAPIHeaders
         });
     }
@@ -188,10 +190,10 @@ export class GitHub {
         return downloadUrl;
     }
 
-    async getDraftReleases(owner = "mendix", repo = "web-widgets"): Promise<GitHubDraftRelease[]> {
+    async getDraftReleases(): Promise<GitHubDraftRelease[]> {
         const releases = await fetch<GitHubDraftRelease[]>(
             "GET",
-            `https://api.github.com/repos/${owner}/${repo}/releases`,
+            `https://api.github.com/repos/${this.owner}/${this.repo}/releases`,
             undefined,
             {
                 ...this.ghAPIHeaders
@@ -202,15 +204,10 @@ export class GitHub {
         return releases.filter(release => release.draft);
     }
 
-    async downloadReleaseAsset(
-        assetId: string,
-        destinationPath: string,
-        owner = "mendix",
-        repo = "web-widgets"
-    ): Promise<void> {
+    async downloadReleaseAsset(assetId: string, destinationPath: string): Promise<void> {
         await this.ensureAuth();
 
-        const url = `https://api.github.com/repos/${owner}/${repo}/releases/assets/${assetId}`;
+        const url = `https://api.github.com/repos/${this.owner}/${this.repo}/releases/assets/${assetId}`;
 
         try {
             const response = await nodefetch(url, {
@@ -256,14 +253,14 @@ export class GitHub {
     }): Promise<void> {
         await this.ensureAuth();
 
-        const { workflowId, ref, inputs, owner = "mendix", repo = "web-widgets" } = params;
+        const { workflowId, ref, inputs } = params;
 
         // Convert inputs object to CLI parameters
         const inputParams = Object.entries(inputs)
             .map(([key, value]) => `-f ${key}=${value}`)
             .join(" ");
 
-        const repoParam = `${owner}/${repo}`;
+        const repoParam = `${this.owner}/${this.repo}`;
 
         const command = [`gh workflow run`, `"${workflowId}"`, `--ref "${ref}"`, inputParams, `-R "${repoParam}"`]
             .filter(Boolean)
@@ -290,13 +287,16 @@ export class GitHub {
     /**
      * Delete a release asset by ID
      */
-    private async deleteReleaseAsset(assetId: string, owner = "mendix", repo = "web-widgets"): Promise<void> {
+    async deleteReleaseAsset(assetId: string): Promise<void> {
         await this.ensureAuth();
 
-        const response = await nodefetch(`https://api.github.com/repos/${owner}/${repo}/releases/assets/${assetId}`, {
-            method: "DELETE",
-            headers: this.ghAPIHeaders
-        });
+        const response = await nodefetch(
+            `https://api.github.com/repos/${this.owner}/${this.repo}/releases/assets/${assetId}`,
+            {
+                method: "DELETE",
+                headers: this.ghAPIHeaders
+            }
+        );
 
         if (!response.ok) {
             throw new Error(`Failed to delete asset ${assetId}: ${response.status} ${response.statusText}`);
@@ -306,19 +306,13 @@ export class GitHub {
     /**
      * Upload a new asset to a release
      */
-    private async uploadReleaseAsset(
-        releaseId: string,
-        filePath: string,
-        assetName: string,
-        owner = "mendix",
-        repo = "web-widgets"
-    ): Promise<GitHubReleaseAsset> {
+    async uploadReleaseAsset(releaseId: string, filePath: string, assetName: string): Promise<GitHubReleaseAsset> {
         await this.ensureAuth();
 
         // Get release info to get upload URL
         const release = await fetch<{ upload_url: string }>(
             "GET",
-            `https://api.github.com/repos/${owner}/${repo}/releases/${releaseId}`,
+            `https://api.github.com/repos/${this.owner}/${this.repo}/releases/${releaseId}`,
             undefined,
             this.ghAPIHeaders
         );
@@ -351,24 +345,6 @@ export class GitHub {
 
         return asset;
     }
-
-    /**
-     * Update a release asset by replacing it with a new file.
-     */
-    async updateReleaseAsset(
-        releaseId: string,
-        existingAsset: GitHubReleaseAsset,
-        localFilePath: string,
-        owner = "mendix",
-        repo = "web-widgets"
-    ): Promise<GitHubReleaseAsset> {
-        await this.ensureAuth();
-
-        await this.deleteReleaseAsset(existingAsset.id, owner, repo);
-
-        // Upload the new asset
-        return this.uploadReleaseAsset(releaseId, localFilePath, existingAsset.name, owner, repo);
-    }
 }
 
 export const gh = new GitHub();
