@leverege/build-tools 2.48.2 → 2.48.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.48.2",
+  "version": "2.48.4",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/Utils.mjs

@@ -349,7 +349,7 @@ export const parseHelmChart = async ( helmroot = './helm' ) => {
   return ( {
     chartPackage,
     imageRegistry,
-    registryRegion : registryComponents[0],
+    registryLocation : registryComponents[0],
     registryProject : registryComponents[1],
     registryRepository : registryComponents[2],
     files : chartFiles,

package/src/chart-to-registry.mjs

@@ -20,16 +20,19 @@ import {
 
 const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
   /* eslint-disable max-len */
+  {
+    name : 'dry-run',
+    type : Boolean,
+    description : '{green perform everything except the actuall chart push}',
+  },
   {
     name : 'location',
     type : String,
-    defaultValue : 'us-docker.pkg.dev',
     description : '{green the location of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
   },
   {
     name : 'project',
     type : String,
-    defaultValue : process.env.HELM_CHART_REGISTRY || 'leverege-registry',
     description : '{green the name of the google project containing the npmrc and slack config secrets (default leverege-registry)}',
   },
   {
@@ -77,20 +80,6 @@ if ( semverLt( process.version, minNodejsVersion ) ) {
   errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
 }
 
-// gcloud auth print-access-token | helm registry login -u oauth2accesstoken \
-// -p ${password} https://us-docker.pkg.dev
-//
-// Get the current access token and use it to login to the registry with helm.
-try {
-  const accessToken = await shellCmd( 'gcloud auth print-access-token' )
-  const registryLoginCommand = `helm registry login -u oauth2accesstoken -p ${accessToken}`
-
-  const loginResult = await shellCmd( `${registryLoginCommand} https://${args.location}` ) // TODO: cmd line param
-  debug( { loginResult }, '<==registryLogin' )
-} catch ( error ) {
-  errorExit( error )
-}
-
 // First of all, fail if we are not in a git repository
 let gitRoot
 try {
@@ -115,8 +104,6 @@ try {
   errorExit( error )
 }
 
-debug( { packageJson, helmChart }, '<==Parsed package and chart' )
-
 // helm push helm-package.tgz oci://REGISTRY_LOCATION/REGISTRY_PROJECT/REGISTRY_REPOSITORY/charts
 //
 const registryLocation = args.location || helmChart.registryLocation
@@ -124,6 +111,29 @@ const registryProject = args.project || helmChart.registryProject
 const registryRepository = args.repository || helmChart.registryRepository
 const ociPushEndpoint = `oci://${registryLocation}/${registryProject}/${registryRepository}/charts`
 
+debug( {
+  packageJson,
+  helmChart,
+  registryLocation,
+  registryProject,
+  registryRepository,
+  ociPushEndpoint }, '<==Parsed package and chart' )
+
+// gcloud auth print-access-token | helm registry login -u oauth2accesstoken \
+// -p ${password} https://us-docker.pkg.dev
+//
+// Get the current access token and use it to login to the registry with helm.
+try {
+  const accessToken = await shellCmd( 'gcloud auth print-access-token' )
+  // -p is frowned upon but using a pipe | is problematic with shellCmd (execa)
+  const registryLoginCommand = `helm registry login -u oauth2accesstoken -p ${accessToken}`
+
+  const loginResult = await shellCmd( `${registryLoginCommand} https://${registryLocation}` )
+  debug( { loginResult }, '<==registryLogin' )
+} catch ( error ) {
+  errorExit( error )
+}
+
 try {
   await shellCmd( 'helm package helm' )
   const { chartPackage } = helmChart
@@ -132,7 +142,12 @@ try {
   }
 
   log( `\nPushing ${chalk.green.bold( chartPackage )} => ${chalk.green.bold( ociPushEndpoint )}` )
-  await shellCmd( `helm push ${chartPackage} ${ociPushEndpoint}` )
+  const pushItRealGood = `helm push ${chartPackage} ${ociPushEndpoint}`
+  if ( !args.dryRun ) {
+    await shellCmd( pushItRealGood )
+  } else {
+    log( `\nDry run => ${chalk.green.bold( pushItRealGood )}` )
+  }
   rmSync( chartPackage )
 } catch ( err ) {
   errorExit( err )

package/src/chart-compass.mjs

@@ -1,81 +0,0 @@
-#!/usr/bin/env node
-/*
- * chart-to-registry will...
- */
-import { existsSync, rmSync } from 'node:fs'
-
-import chalk from 'chalk'
-import commandLineArgs from 'command-line-args'
-import commandLineUsage from 'command-line-usage'
-import { lt as semverLt } from 'semver'
-
-import {
-  debug,
-  errorExit,
-  log,
-  getGitRootDirectory,
-  parsePackageJson,
-  parseHelmChart,
-  shellCmd } from './Utils.mjs'
-
-const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
-  /* eslint-disable max-len */
-  {
-    name : 'location',
-    type : String,
-    defaultValue : 'us-docker.pkg.dev',
-    description : '{green the location of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
-  },
-  {
-    name : 'project',
-    type : String,
-    defaultValue : process.env.HELM_CHART_REGISTRY || 'leverege-registry',
-    description : '{green the name of the google project containing the npmrc and slack config secrets (default leverege-registry)}',
-  },
-  {
-    name : 'repository',
-    type : String,
-    description : '{green the target repository to receive the pushed chart}',
-  },
-  {
-    name : 'help',
-    type : Boolean,
-    description : '{green display this help screen}',
-  },
-  /* eslint-enable max-len */
-]
-
-const sections = [
-  {
-    header : 'Leverege Helm Chart Location Tool',
-    content : `{green A tool for locating helm charts in registries. It was created to allow
-the helmup.sh bash script to easily locate charts, which may be in the
-chart museum, La everge artifact-registry project or a 3rd party
-developer\'s artifact-registry.}`
-  },
-  { header : 'Options',
-    optionList : commandLineOptions,
-  },
-]
-
-const args = commandLineArgs( commandLineOptions, { camelCase : true, partial : true } )
-const usage = commandLineUsage( sections )
-
-if ( args.help ) {
-  log( usage )
-  process.exit( 0 )
-}
-
-/* eslint-disable no-underscore-dangle */
-if ( args._unknown ) {
-  log( usage )
-  log( `\nUnrecognized argument [${chalk.bold.red( args._unknown )}]\n` )
-  process.exit( 1 )
-}
-/* eslint-enable no-underscore-dangle */
-
-const minNodejsVersion = '18.0.0'
-if ( semverLt( process.version, minNodejsVersion ) ) {
-  errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
-}
-