@leverege/build-tools 2.48.1 → 2.48.3

package/package.json

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

package/src/Utils.mjs

@@ -125,7 +125,7 @@ export const getGitUpstream = async () => {
 
 export const gitRepoIsDirty = async () => {
   const cleanliness = await shellCmd( 'git status --porcelain' )
-  return cleanliness?.length
+  return cleanliness?.length > 0
 }
 
 export const parseJsonFile = async ( jsonFile ) => {
@@ -343,9 +343,15 @@ export const parseHelmChart = async ( helmroot = './helm' ) => {
   const chartYaml = YAML.load( readFileSync( `${helmroot}/Chart.yaml`, 'utf8' ) )
   const chartPackage = `${chartYaml.name}-${chartYaml.version}.tgz`
   const valuesYaml = YAML.load( readFileSync( `${helmroot}/values.yaml`, 'utf8' ) )
+  const imageRegistry = valuesYaml.image?.registry
+  const registryComponents = imageRegistry.split( '/' )
   /* eslint-enable security/detect-non-literal-fs-filename */
   return ( {
     chartPackage,
+    imageRegistry,
+    registryLocation : registryComponents[0],
+    registryProject : registryComponents[1],
+    registryRepository : registryComponents[2],
     files : chartFiles,
     yaml : {
       'Chart.yaml' : chartYaml,

package/src/chart-compass.mjs

@@ -0,0 +1,81 @@
+#!/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` )
+}
+

package/src/chart-to-registry.mjs

@@ -21,16 +21,19 @@ import {
 const commandLineOptions = [ // Use commandLineOptions to tie into the Usage statements
   /* eslint-disable max-len */
   {
-    name : 'project',
+    name : 'dry-run',
+    type : Boolean,
+    description : '{green perform everything except the actuall chart push}',
+  },
+  {
+    name : 'location',
     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)}',
+    description : '{green the location of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
   },
   {
-    name : 'region',
+    name : 'project',
     type : String,
-    defaultValue : 'us-docker.pkg.dev',
-    description : '{green the region of the artifact registry the chart will be pushed to (default us-docker.pkg.dev)}',
+    description : '{green the name of the google project containing the npmrc and slack config secrets (default leverege-registry)}',
   },
   {
     name : 'repository',
@@ -49,7 +52,7 @@ const sections = [
   {
     header : 'Leverege Helm Chart to Artifact Registry',
     content : `{green This tool helps ...
-... multi-line helm.}`
+... multi-line help.}`
   },
   { header : 'Options',
     optionList : commandLineOptions,
@@ -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.region}` ) // 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,11 +104,34 @@ 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
+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' )
 
-// helm push helm-package.tgz oci://REGISTRY_NAME/REPOSITORY_NAME/charts/SERVICE
+// gcloud auth print-access-token | helm registry login -u oauth2accesstoken \
+// -p ${password} https://us-docker.pkg.dev
 //
-const ociPushEndpoint = `oci://${args.region}/${args.project}/${args.repository}/charts`
+// 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 = `echo ${accessToken} | helm registry login --username oauth2accesstoken --password-stdin`
+
+  const loginResult = await shellCmd( `${registryLoginCommand} https://${registryLocation}` ) // TODO: cmd line param
+  debug( { loginResult }, '<==registryLogin' )
+} catch ( error ) {
+  errorExit( error )
+}
 
 try {
   await shellCmd( 'helm package helm' )
@@ -129,7 +141,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 )