@payfit/nx-core 5.4.0 → 5.5.0-ephemeral-preview-labels.0

package/dist/src/scripts/nx-core-updater.js

@@ -7,17 +7,8 @@ const { promisify } = require('util')
 
 const execAsync = promisify(exec)
 
-// Configuration (can be overridden via CLI flags)
-const NX_CORE_VERSION = '5.2.4'
-const NX_VERSION = '22.0.2' // e.g. '21.3.11'
-const CHANGELOG_MODE = 'combined' // 'combined' | 'raw'
-
-// Read optional Jira ticket URL from env only
-const JIRA_TICKET_URL = undefined
-
-// Collect PR URLs created during this run
-const CREATED_PR_URLS = []
-
+// Configuration
+const NX_CORE_VERSION = '4.60.1'
 const REPOSITORIES = [
   'authorization',
   'company-lifecycle',
@@ -31,7 +22,6 @@ const REPOSITORIES = [
   'jetlang',
   'organization-structure',
   'payfit-domains',
-  'payroll',
   'talent-management',
   'time-absences',
 ]
@@ -78,208 +68,117 @@ async function run(command, cwd = process.cwd()) {
   }
 }
 
-// Check if @payfit/nx-core in package.json needs update
-async function needsNxCoreUpdate(repoPath) {
+// Check if package.json exists and needs update
+async function needsUpdate(repoPath) {
   try {
     const packageJsonPath = path.join(repoPath, 'package.json')
     const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'))
     const currentVersion = packageJson.devDependencies?.['@payfit/nx-core']
 
     if (!currentVersion) {
-      console.log(`ℹ @payfit/nx-core not found in devDependencies`)
+      console.log(`  ℹ @payfit/nx-core not found in devDependencies`)
       return { needsUpdate: false, currentVersion: null }
     }
 
     if (compareVersions(currentVersion, NX_CORE_VERSION) === 0) {
-      console.log(`ℹ Already on version ${NX_CORE_VERSION}`)
-      return { needsUpdate: false, currentVersion }
-    }
-
-    console.log(
-      `📦 Current version: ${currentVersion}, target: ${NX_CORE_VERSION}`,
-    )
-    return { needsUpdate: true, currentVersion }
-  } catch (error) {
-    console.error(`❌ Could not read package.json: ${error.message}`)
-    return { needsUpdate: false, currentVersion: null }
-  }
-}
-
-// Check if Nx in package.json needs update
-async function needsNxUpdate(repoPath) {
-  if (!NX_VERSION) {
-    return { needsUpdate: false, currentVersion: null }
-  }
-  try {
-    const packageJsonPath = path.join(repoPath, 'package.json')
-    const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'))
-    const currentVersion =
-      packageJson.devDependencies?.['nx'] ?? packageJson.dependencies?.['nx']
-
-    if (!currentVersion) {
-      console.log(`ℹ nx not found in package.json`)
-      return { needsUpdate: false, currentVersion: null }
-    }
-
-    if (compareVersions(currentVersion, NX_VERSION) === 0) {
-      console.log(`ℹ Nx already on version ${NX_VERSION}`)
+      console.log(`  ℹ Already on version ${NX_CORE_VERSION}`)
       return { needsUpdate: false, currentVersion }
     }
 
     console.log(
-      `📦 Nx current version: ${currentVersion}, target: ${NX_VERSION}`,
+      `  📦 Current version: ${currentVersion}, target: ${NX_CORE_VERSION}`,
     )
     return { needsUpdate: true, currentVersion }
   } catch (error) {
-    console.error(`❌ Could not read package.json for Nx: ${error.message}`)
+    console.error(`  ❌ Could not read package.json: ${error.message}`)
     return { needsUpdate: false, currentVersion: null }
   }
 }
 
 // Process a single repository
 async function processRepo(repoName) {
-  console.log(`🚀 Processing ${repoName}`)
+  console.log(`\n🚀 Processing ${repoName}`)
 
   const repoPath = path.join(WORK_DIR, repoName)
 
   try {
     // Clone repo
-    console.log(`📥 Cloning repository...`)
+    console.log(`  📥 Cloning repository...`)
     await run(
       `git clone https://github.com/PayFit/${repoName}.git ${repoPath}`,
       WORK_DIR,
     )
 
-    // Check if updates needed
-    const [nxCoreUpdateInfo, nxUpdateInfo] = await Promise.all([
-      needsNxCoreUpdate(repoPath),
-      needsNxUpdate(repoPath),
-    ])
-    if (!nxCoreUpdateInfo.needsUpdate && !nxUpdateInfo.needsUpdate) {
-      console.log(`⏭️  Skipping ${repoName} - no update needed`)
+    // Check if update needed
+    const updateInfo = await needsUpdate(repoPath)
+    if (!updateInfo.needsUpdate) {
+      console.log(`  ⏭️  Skipping ${repoName} - no update needed`)
       return
     }
 
-    // Get changelogs between current and target version (nx-core only)
-    const releaseNotes = nxCoreUpdateInfo.needsUpdate
-      ? await getChangelogBetweenVersions(
-          nxCoreUpdateInfo.currentVersion,
-          NX_CORE_VERSION,
-        )
-      : ''
+    // Get changelogs between current and target version
+    const releaseNotes = await getChangelogBetweenVersions(
+      updateInfo.currentVersion,
+      NX_CORE_VERSION,
+    )
 
     // Create branch
-    const branchNameParts = []
-    if (nxCoreUpdateInfo.needsUpdate)
-      branchNameParts.push(`nx-core-v${NX_CORE_VERSION}`)
-    if (nxUpdateInfo.needsUpdate) branchNameParts.push(`nx-v${NX_VERSION}`)
-    const branchName = branchNameParts.join('-') || `nx-maintenance`
-    console.log(`🌿 Creating branch ${branchName}`)
+    const branchName = `nx-core-v${NX_CORE_VERSION}`
+    console.log(`  🌿 Creating branch ${branchName}`)
     await run('git checkout main', repoPath)
     await run(`git checkout -b ${branchName}`, repoPath)
 
     // Install dependencies and migrate
-    console.log(`📦 Installing dependencies...`)
+    console.log(`  📦 Installing dependencies...`)
     await run('yarn', repoPath)
 
-    // Plan migrations
-    if (nxUpdateInfo.needsUpdate) {
-      console.log(`🔄 Planning Nx migration to version ${NX_VERSION}...`)
-      await run(`yarn nx migrate 'nx@${NX_VERSION}'`, repoPath)
-    }
-    if (nxCoreUpdateInfo.needsUpdate) {
-      console.log(
-        `🔄 Planning nx-core migration to version ${NX_CORE_VERSION}...`,
-      )
-      await run(
-        `yarn nx migrate '@payfit/nx-core@${NX_CORE_VERSION}'`,
-        repoPath,
-      )
-    }
+    console.log(`  🔄 Migrating nx-core to version ${NX_CORE_VERSION}...`)
+    await run(`yarn nx migrate '@payfit/nx-core@${NX_CORE_VERSION}'`, repoPath)
 
-    console.log(`📦 Installing dependencies after migration...`)
+    console.log(`  📦 Installing dependencies after migration...`)
     await run('yarn', repoPath)
 
-    console.log(`📦 Run migrations...`)
+    console.log(`  📦 Run migrations...`)
     await run(`yarn nx migrate --run-migrations --ifExists`, repoPath)
 
-    // If targeting Nx >= 22, ensure nx.json release.version.updateDependents = "auto"
-    if (nxUpdateInfo.needsUpdate && NX_VERSION) {
-      const major = parseInt(extractVersion(NX_VERSION).split('.')[0], 10) || 0
-      if (major >= 22) {
-        console.log(
-          `🔧 Ensuring nx.json has release.version.updateDependents = "auto" for Nx >= 22...`,
-        )
-        const nxJsonChanged = await ensureUpdateDependentsAuto(repoPath)
-        if (nxJsonChanged) {
-          console.log('🧹 Formatting workspace (npx nx format)...')
-          await run('npx nx format', repoPath)
-        }
-      }
-    }
-
     // Stage, commit and push
-    console.log(`📝 Staging and committing changes...`)
+    console.log(`  📝 Staging and committing changes...`)
     await run('git add .', repoPath)
-    const commitParts = []
-    if (nxUpdateInfo.needsUpdate) {
-      commitParts.push(
-        `chore(nx): update Nx from ${nxUpdateInfo.currentVersion} to ${NX_VERSION}`,
-      )
-    }
-    if (nxCoreUpdateInfo.needsUpdate) {
-      commitParts.push(
-        `chore(nx-core): update nx-core from ${nxCoreUpdateInfo.currentVersion} to ${NX_CORE_VERSION}`,
-      )
-    }
-    const commitMessage = commitParts.join('')
-    await run(`git commit -m ${JSON.stringify(commitMessage)}`, repoPath)
-    await run(`git push -q origin ${branchName}`, repoPath)
+    await run(
+      `git commit -m "chore(nx-core): update nx-core from ${updateInfo.currentVersion} to ${NX_CORE_VERSION}"`,
+      repoPath,
+    )
+    await run(`git push origin ${branchName}`, repoPath)
 
     // Create PR if it doesn't exist
-    console.log(`🔍 Checking for existing pull requests...`)
+    console.log(`  🔍 Checking for existing pull requests...`)
     const existingPRs = await run(
       `gh pr list --repo PayFit/${repoName} --head ${branchName} --json number`,
     )
     if (JSON.parse(existingPRs).length === 0) {
-      console.log(`📋 Creating pull request...`)
+      console.log(`  📋 Creating pull request...`)
 
       // Create PR body with release notes
-      const prTitleParts = []
-      if (nxUpdateInfo.needsUpdate) prTitleParts.push(`Nx to v${NX_VERSION}`)
-      if (nxCoreUpdateInfo.needsUpdate)
-        prTitleParts.push(`@payfit/nx-core to v${NX_CORE_VERSION}`)
-      const prTitle = `chore(nx): update ${prTitleParts.join(' and ')}`
-
-      let prBody = ''
-      if (nxUpdateInfo.needsUpdate) {
-        prBody += `Update Nx from ${nxUpdateInfo.currentVersion} to ${NX_VERSION}\n\n`
-      }
-      if (nxCoreUpdateInfo.needsUpdate) {
-        prBody += `Update @payfit/nx-core from ${nxCoreUpdateInfo.currentVersion} to ${NX_CORE_VERSION}\n\n`
-        prBody += `## Changelog\n\n${releaseNotes}\n`
-      }
+      const prBody = `Update @payfit/nx-core from ${updateInfo.currentVersion} to ${NX_CORE_VERSION}
 
-      if (JIRA_TICKET_URL) {
-        prBody += `\n\nJira: ${JIRA_TICKET_URL}\n`
-      }
+## Changelog
+
+${releaseNotes}
+`
 
       // Write PR body to a file to preserve formatting (newlines, markdown)
       const prBodyPath = path.join(repoPath, 'nx-core-pr-body.md')
       await fs.writeFile(prBodyPath, prBody, 'utf8')
 
-      const prUrl = await run(
-        `gh pr create --repo PayFit/${repoName} --title ${JSON.stringify(
-          prTitle,
-        )} --body-file "${prBodyPath}" --head ${branchName}`,
+      await run(
+        `gh pr create --repo PayFit/${repoName} --title "chore(nx-core): update nx-core from ${updateInfo.currentVersion} to ${NX_CORE_VERSION}" --body-file "${prBodyPath}" --head ${branchName}`,
       )
-      if (prUrl) CREATED_PR_URLS.push(prUrl)
-      console.log(`✅ Successfully created PR for ${repoName}: ${prUrl}`)
+      console.log(`  ✅ Successfully created PR for ${repoName}`)
     } else {
-      console.log(`ℹ️  PR already exists for ${repoName}`)
+      console.log(`  ℹ️  PR already exists for ${repoName}`)
     }
   } catch (error) {
-    console.error(`❌ Failed to process ${repoName}: ${error.message}`)
+    console.error(`  ❌ Failed to process ${repoName}: ${error.message}`)
     throw error
   }
 }
@@ -288,7 +187,7 @@ async function processRepo(repoName) {
 async function getChangelogBetweenVersions(currentVersion, targetVersion) {
   try {
     console.log(
-      `📋 Fetching changelogs from ${currentVersion} to ${targetVersion}...`,
+      `  📋 Fetching changelogs from ${currentVersion} to ${targetVersion}...`,
     )
 
     // Get only nx-core releases from the repository, filtered at CLI level
@@ -323,178 +222,36 @@ async function getChangelogBetweenVersions(currentVersion, targetVersion) {
 
     // Fetch detailed release notes for each relevant release
     console.log(
-      `📝 Fetching detailed release notes for ${relevantReleases.length} release(s)...`,
+      `  📝 Fetching detailed release notes for ${relevantReleases.length} release(s)...`,
     )
-    const releaseEntries = []
+    let changelog = ''
     for (const release of relevantReleases) {
       try {
         const releaseBody = await run(
           `gh release view ${release.tagName} --repo PayFit/nx-common-packages --json body --jq '.body'`,
         )
         const body = releaseBody.replace(/^"|"$/g, '') // Remove surrounding quotes from jq output
-        releaseEntries.push({
-          tag: release.tagName,
-          body: body || 'No release notes available.',
-        })
+        changelog += `### ${release.tagName}\n\n`
+        changelog += `${body || 'No release notes available.'}\n\n`
       } catch (error) {
         console.log(
-          `  ⚠️ Could not fetch release notes for ${release.tagName}: ${error.message}`,
+          `    ⚠️ Could not fetch release notes for ${release.tagName}: ${error.message}`,
         )
-        releaseEntries.push({
-          tag: release.tagName,
-          body: 'Release notes could not be retrieved.',
-        })
+        changelog += `### ${release.tagName}\n\n`
+        changelog += `Release notes could not be retrieved.\n\n`
       }
     }
 
     console.log(
-      `✅ Retrieved ${relevantReleases.length} nx-core release(s) between versions`,
+      `  ✅ Retrieved ${relevantReleases.length} nx-core release(s) between versions`,
     )
-
-    if (CHANGELOG_MODE === 'raw') {
-      // Plain concatenation with clear spacing
-      let raw = ''
-      for (const entry of releaseEntries) {
-        raw += `### ${entry.tag}\n\n${entry.body}\n\n`
-      }
-      return raw.trim()
-    }
-
-    // Combined/aggregated changelog
-    return buildCombinedChangelog(releaseEntries)
+    return changelog.trim()
   } catch (error) {
-    console.log(`⚠️ Could not fetch release notes: ${error.message}`)
+    console.log(`  ⚠️ Could not fetch release notes: ${error.message}`)
     return `Release notes could not be retrieved between ${currentVersion} and ${targetVersion}.`
   }
 }
 
-// Normalize a section heading to a canonical bucket
-function normalizeSection(title) {
-  const t = String(title).trim().toLowerCase()
-  if (/breaking|migration/.test(t)) return 'Breaking Changes'
-  if (/feature/.test(t)) return 'Features'
-  if (/fix|bug/.test(t)) return 'Bug Fixes'
-  if (/perf|performance/.test(t)) return 'Performance'
-  if (/refactor/.test(t)) return 'Refactor'
-  if (/doc/.test(t)) return 'Docs'
-  if (/chore/.test(t)) return 'Chore'
-  if (/revert/.test(t)) return 'Reverts'
-  return null
-}
-
-// Build a combined changelog from multiple release markdown bodies
-function buildCombinedChangelog(entries) {
-  const sectionOrder = [
-    'Breaking Changes',
-    'Features',
-    'Bug Fixes',
-    'Performance',
-    'Refactor',
-    'Docs',
-    'Chore',
-    'Reverts',
-    'Other Changes',
-  ]
-
-  const aggregated = new Map()
-  for (const key of sectionOrder) aggregated.set(key, [])
-
-  for (const { tag, body } of entries) {
-    const lines = String(body).split('\n')
-    let current = null
-    let inCodeBlock = false
-    let pendingBullet = null
-
-    const flushPending = () => {
-      if (pendingBullet) {
-        const bucket = current || 'Other Changes'
-        aggregated.get(bucket).push(pendingBullet.trim())
-        pendingBullet = null
-      }
-    }
-
-    for (const raw of lines) {
-      const line = raw.replace(/\r$/, '')
-
-      // Handle fenced code blocks so we don't ingest code as bullets
-      if (/^```/.test(line.trim())) {
-        inCodeBlock = !inCodeBlock
-        continue
-      }
-      if (inCodeBlock) continue
-
-      // Headings like ##, ###, ####
-      const headingMatch = line.match(/^#{2,4}\s+(.+?)\s*$/)
-      if (headingMatch) {
-        flushPending()
-        const canonical = normalizeSection(headingMatch[1])
-        current = canonical
-        continue
-      }
-
-      // Bullet points
-      const bulletMatch = line.match(/^\s*[-*]\s+(.+)$/)
-      if (bulletMatch) {
-        // Flush previous bullet before starting new
-        flushPending()
-        pendingBullet = bulletMatch[1]
-        continue
-      }
-
-      // Continuation lines for multi-line bullets
-      if (pendingBullet && line.trim().length > 0) {
-        pendingBullet += ` ${line.trim()}`
-      } else if (!pendingBullet && current && line.trim().length > 0) {
-        // Non-bullet content under a recognized section
-        aggregated.get(current).push(line.trim())
-      }
-    }
-    flushPending()
-  }
-
-  // Build markdown
-  let out = ''
-  for (const key of sectionOrder) {
-    if (key === 'Other Changes') continue // discard Other Changes entirely
-    const items = aggregated.get(key)
-    if (!items || items.length === 0) continue
-    out += `#### ${key}\n\n`
-    for (const item of items) {
-      out += `- ${item}\n`
-    }
-    out += `\n`
-  }
-  return out.trim()
-}
-
-// Ensure nx.json has release.version.updateDependents = "auto" for Nx >= 22
-async function ensureUpdateDependentsAuto(repoPath) {
-  const nxJsonPath = path.join(repoPath, 'nx.json')
-  try {
-    const content = await fs.readFile(nxJsonPath, 'utf8')
-    const data = JSON.parse(content)
-    if (!data.release) data.release = {}
-    if (!data.release.version) data.release.version = {}
-    if (data.release.version.updateDependents === undefined) {
-      data.release.version.updateDependents = 'auto'
-      await fs.writeFile(
-        nxJsonPath,
-        JSON.stringify(data, null, 2) + '\n',
-        'utf8',
-      )
-      console.log(
-        '🧩 Set release.version.updateDependents to "auto" in nx.json',
-      )
-      return true
-    }
-    console.log('ℹ nx.json already has release.version.updateDependents')
-    return false
-  } catch (error) {
-    console.log(`⚠️ Skipped nx.json update: ${error.message}`)
-    return false
-  }
-}
-
 // Check if gh CLI is installed and user is authenticated
 async function checkGhCli() {
   try {
@@ -517,9 +274,7 @@ async function checkGhCli() {
 
 // Main function
 async function main() {
-  console.log(
-    `🎯 nx-core Updater - nx-core target ${NX_CORE_VERSION}${NX_VERSION ? `, Nx target ${NX_VERSION}` : ''}`,
-  )
+  console.log(`🎯 nx-core Updater - version ${NX_CORE_VERSION}`)
   console.log(`📋 Processing ${REPOSITORIES.length} repositories`)
 
   try {
@@ -534,25 +289,19 @@ async function main() {
     await fs.mkdir(WORK_DIR, { recursive: true })
 
     // Process repositories sequentially
-    console.log(`🔄 Processing repositories...`)
+    console.log(`\n🔄 Processing repositories...`)
     for (const repo of REPOSITORIES) {
       await processRepo(repo)
     }
 
     // Cleanup
-    console.log(`🧹 Cleaning up work directory...`)
+    console.log(`\n🧹 Cleaning up work directory...`)
     await fs.rm(WORK_DIR, { recursive: true, force: true }).catch(() => {
       // ignore error if directory does not exist
     })
-    if (CREATED_PR_URLS.length > 0) {
-      console.log('🔗 Created PRs:')
-      for (const url of CREATED_PR_URLS) {
-        console.log(`- ${url}`)
-      }
-    }
-    console.log('🎉 Done!')
+    console.log('\n🎉 Done!')
   } catch (error) {
-    console.error(`💥 Script failed: ${error.message}`)
+    console.error(`\n💥 Script failed: ${error.message}`)
     process.exit(1)
   }
 }

package/dist/src/utils/common/environment.d.ts

@@ -0,0 +1 @@
+export declare function getEnvVar(name: string): string;

package/dist/src/utils/common/environment.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnvVar = getEnvVar;
+function getEnvVar(name) {
+    const value = process.env[name];
+    if (!value) {
+        throw new Error(`Missing env var ${name}`);
+    }
+    return value;
+}
+//# sourceMappingURL=environment.js.map

package/dist/src/utils/common/environment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/utils/common/environment.ts"],"names":[],"mappings":";;AAAA,8BAMC;AAND,SAAgB,SAAS,CAAC,IAAY;IACpC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAA;IAC5C,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/src/utils/common/oci.d.ts

@@ -1,22 +1,8 @@
-import { ArtifactType } from './enums';
 /**
- * Pushes Lambda, frontend function package.json as OCI artifact to ECR using ORAS.
+ * Pushes Lambda function package.json as OCI artifact to ECR using ORAS.
  *
  * @param ecrRepository - ECR repository name
  * @param tag - Version tag for the artifact
- * @param artifactPath - Path to artifact to package
- * @param type - Artifact type
- * @param ecrRegistry - ECR registry
+ * @param pathToPackageJson - Path to package.json file
  */
-export declare function pushImageToEcr(ecrRepository: string, tag: string, artifactPath: string, type: ArtifactType.LAMBDA | ArtifactType.FRONTEND, ecrRegistry: string): Promise<void>;
-/**
- * Pushes helm chart as OCI artifact to ECR using ORAS.
- *
- * @param ecrRepository - ECR repository name
- * @param tag - Version tag for the artifact
- * @param artifactPath - Path to artifact to package
- * @param type - Artifact type
- * @param ecrRegistry - ECR registry
- * @param chartConfigPath - Path to chart config file in JSON format
- */
-export declare function pushHelmOciToEcr(ecrRepository: string, tag: string, artifactPath: string, ecrRegistry: string, chartConfigPath: string): Promise<void>;
+export declare function pushImageToEcr(ecrRepository: string, tag: string, pathToPackageJson: string, type: 'lambda' | 'frontend', ecrRegistry: string): Promise<void>;

package/dist/src/utils/common/oci.js

@@ -1,57 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushImageToEcr = pushImageToEcr;
-exports.pushHelmOciToEcr = pushHelmOciToEcr;
 const consola_1 = require("consola");
 const exec_1 = require("./exec");
 const github_1 = require("./github");
 /**
- * Pushes Lambda, frontend function package.json as OCI artifact to ECR using ORAS.
+ * Pushes Lambda function package.json as OCI artifact to ECR using ORAS.
  *
  * @param ecrRepository - ECR repository name
  * @param tag - Version tag for the artifact
- * @param artifactPath - Path to artifact to package
- * @param type - Artifact type
- * @param ecrRegistry - ECR registry
+ * @param pathToPackageJson - Path to package.json file
  */
-async function pushImageToEcr(ecrRepository, tag, artifactPath, type, ecrRegistry) {
-    consola_1.consola.log(`OCI: Pushing image to ECR: ${ecrRegistry}/${ecrRepository}:${tag}`);
+async function pushImageToEcr(ecrRepository, tag, pathToPackageJson, type, ecrRegistry) {
     const commitSha = await (0, github_1.getCurrentGitCommitSha)();
     const gitRepoUrl = await (0, github_1.getSanitizedCurrentGitRepoUrl)();
-    const artifactType = `application/vnd.payfit.${type}.manifest`;
     const orasPushCommand = [
         `oras push ${ecrRegistry}/${ecrRepository}:${tag}`,
         `--annotation "org.opencontainers.image.source=${gitRepoUrl}"`,
         `--annotation "org.opencontainers.image.revision=${commitSha}"`,
         `--disable-path-validation`,
-        `--artifact-type ${artifactType} ${artifactPath}`,
-    ].join(' ');
-    const uploadToOci = await (0, exec_1.exec)(orasPushCommand, {
-        throwOnError: true,
-    });
-    consola_1.consola.log(uploadToOci.stdout);
-}
-/**
- * Pushes helm chart as OCI artifact to ECR using ORAS.
- *
- * @param ecrRepository - ECR repository name
- * @param tag - Version tag for the artifact
- * @param artifactPath - Path to artifact to package
- * @param type - Artifact type
- * @param ecrRegistry - ECR registry
- * @param chartConfigPath - Path to chart config file in JSON format
- */
-async function pushHelmOciToEcr(ecrRepository, tag, artifactPath, ecrRegistry, chartConfigPath) {
-    consola_1.consola.log(`OCI: Pushing image to ECR: ${ecrRegistry}/${ecrRepository}:${tag}`);
-    const commitSha = await (0, github_1.getCurrentGitCommitSha)();
-    const gitRepoUrl = await (0, github_1.getSanitizedCurrentGitRepoUrl)();
-    const orasPushCommand = [
-        `oras push ${ecrRegistry}/${ecrRepository}:${tag}`,
-        `--annotation "org.opencontainers.image.source=${gitRepoUrl}"`,
-        `--annotation "org.opencontainers.image.revision=${commitSha}"`,
-        `--disable-path-validation`,
-        `--config ${chartConfigPath}:application/vnd.cncf.helm.config.v1+json`,
-        `${artifactPath}:application/vnd.cncf.helm.chart.content.v1.tar+gzip`,
+        `--artifact-type application/vnd.payfit.${type}.manifest ${pathToPackageJson}`,
     ].join(' ');
     const uploadToOci = await (0, exec_1.exec)(orasPushCommand, {
         throwOnError: true,

package/dist/src/utils/common/oci.js.map

@@ -1 +1 @@
-{"version":3,"file":"oci.js","sourceRoot":"","sources":["../../../../src/utils/common/oci.ts"],"names":[],"mappings":";;AAeA,wCAwBC;AAYD,4CAwBC;AA3ED,qCAAiC;AAGjC,iCAA6B;AAC7B,qCAAgF;AAEhF;;;;;;;;GAQG;AACI,KAAK,UAAU,cAAc,CAClC,aAAqB,EACrB,GAAW,EACX,YAAoB,EACpB,IAAiD,EACjD,WAAmB;IAEnB,iBAAO,CAAC,GAAG,CACT,8BAA8B,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE,CACpE,CAAA;IACD,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IACxD,MAAM,YAAY,GAAG,0BAA0B,IAAI,WAAW,CAAA;IAC9D,MAAM,eAAe,GAAG;QACtB,aAAa,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE;QAClD,iDAAiD,UAAU,GAAG;QAC9D,mDAAmD,SAAS,GAAG;QAC/D,2BAA2B;QAC3B,mBAAmB,YAAY,IAAI,YAAY,EAAE;KAClD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACX,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,eAAe,EAAE;QAC9C,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;IACF,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AACjC,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,gBAAgB,CACpC,aAAqB,EACrB,GAAW,EACX,YAAoB,EACpB,WAAmB,EACnB,eAAuB;IAEvB,iBAAO,CAAC,GAAG,CACT,8BAA8B,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE,CACpE,CAAA;IACD,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IACxD,MAAM,eAAe,GAAG;QACtB,aAAa,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE;QAClD,iDAAiD,UAAU,GAAG;QAC9D,mDAAmD,SAAS,GAAG;QAC/D,2BAA2B;QAC3B,YAAY,eAAe,2CAA2C;QACtE,GAAG,YAAY,sDAAsD;KACtE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACX,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,eAAe,EAAE;QAC9C,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;IACF,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AACjC,CAAC"}
+{"version":3,"file":"oci.js","sourceRoot":"","sources":["../../../../src/utils/common/oci.ts"],"names":[],"mappings":";;AAYA,wCAoBC;AAhCD,qCAAiC;AAEjC,iCAA6B;AAC7B,qCAAgF;AAEhF;;;;;;GAMG;AACI,KAAK,UAAU,cAAc,CAClC,aAAqB,EACrB,GAAW,EACX,iBAAyB,EACzB,IAA2B,EAC3B,WAAmB;IAEnB,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IACxD,MAAM,eAAe,GAAG;QACtB,aAAa,WAAW,IAAI,aAAa,IAAI,GAAG,EAAE;QAClD,iDAAiD,UAAU,GAAG;QAC9D,mDAAmD,SAAS,GAAG;QAC/D,2BAA2B;QAC3B,0CAA0C,IAAI,aAAa,iBAAiB,EAAE;KAC/E,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACX,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,eAAe,EAAE;QAC9C,YAAY,EAAE,IAAI;KACnB,CAAC,CAAA;IACF,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AACjC,CAAC"}

package/dist/src/utils/common/octokit.d.ts

@@ -0,0 +1,2 @@
+import { Octokit } from '@octokit/rest';
+export declare function OctokitAuth(): Octokit;

package/dist/src/utils/common/octokit.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OctokitAuth = OctokitAuth;
+const auth_app_1 = require("@octokit/auth-app");
+const rest_1 = require("@octokit/rest");
+const environment_1 = require("./environment");
+function OctokitAuth() {
+    if (process.env.GITHUB_TOKEN) {
+        return new rest_1.Octokit({ auth: process.env.GITHUB_TOKEN });
+    }
+    else {
+        return new rest_1.Octokit({
+            authStrategy: auth_app_1.createAppAuth,
+            auth: {
+                appId: (0, environment_1.getEnvVar)('GITHUB_APP_ID'),
+                privateKey: (0, environment_1.getEnvVar)('GITHUB_PRIVATE_KEY'),
+                installationId: (0, environment_1.getEnvVar)('GITHUB_INSTALLATION_ID'),
+            },
+        });
+    }
+}
+//# sourceMappingURL=octokit.js.map

package/dist/src/utils/common/octokit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"octokit.js","sourceRoot":"","sources":["../../../../src/utils/common/octokit.ts"],"names":[],"mappings":";;AAKA,kCAaC;AAlBD,gDAAiD;AACjD,wCAAuC;AAEvC,+CAAyC;AAEzC,SAAgB,WAAW;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;QAC7B,OAAO,IAAI,cAAO,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAA;IACxD,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,cAAO,CAAC;YACjB,YAAY,EAAE,wBAAa;YAC3B,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAA,uBAAS,EAAC,eAAe,CAAC;gBACjC,UAAU,EAAE,IAAA,uBAAS,EAAC,oBAAoB,CAAC;gBAC3C,cAAc,EAAE,IAAA,uBAAS,EAAC,wBAAwB,CAAC;aACpD;SACF,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}

package/dist/src/utils/helm.d.ts

@@ -60,5 +60,5 @@ export declare function pushPackagedHelm(packagedHelmChartFilePath: string, pack
  * @param packagedHelmChartFilePath
  * @param ecrRepositoryPath
  */
-export declare function pushOciPackagedHelm(packagedHelmChartFilePath: string, ecrRepositoryPath: string, version: string, chartConfigPath: string): Promise<void>;
+export declare function pushOciPackagedHelm(packagedHelmChartFilePath: string, ecrRepositoryPath: string): Promise<import("tinyexec").Output>;
 export {};