@leverege/build-tools 2.48.3 → 2.48.5

package/package.json

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

package/src/Utils.mjs

@@ -317,7 +317,7 @@ https://console.cloud.google.com/artifacts/browse/leverege-registry?project=leve
   }
 
   // DEPRECATED: old museum reference to push-my-chart instead of chart-to-registry
-  if ( museum.match( 'push-my-chart' ) ) {
+  if ( museum.match( 'DISABLED-push-my-chart' ) ) {
     const deprecationError = `
 
   Update the npm museum script to use chart-to-registry instead of the deprecated
@@ -341,13 +341,17 @@ export const parseHelmChart = async ( helmroot = './helm' ) => {
   if ( !existsSync( helmroot ) ) { return undefined }
   const chartFiles = readdirSync( helmroot, { encoding : 'utf8', recursive : true } )
   const chartYaml = YAML.load( readFileSync( `${helmroot}/Chart.yaml`, 'utf8' ) )
-  const chartPackage = `${chartYaml.name}-${chartYaml.version}.tgz`
+  const chartName = chartYaml.name
+  const chartVersion = chartYaml.version
+  const chartPackage = `${chartName}-${chartVersion}.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 ( {
+    chartName,
     chartPackage,
+    chartVersion,
     imageRegistry,
     registryLocation : registryComponents[0],
     registryProject : registryComponents[1],

package/src/chart-to-registry.mjs

@@ -13,6 +13,7 @@ import {
   debug,
   errorExit,
   log,
+  warning,
   getGitRootDirectory,
   parsePackageJson,
   parseHelmChart,
@@ -20,11 +21,6 @@ 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,
@@ -40,6 +36,16 @@ const commandLineOptions = [ // Use commandLineOptions to tie into the Usage sta
     type : String,
     description : '{green the target repository to receive the pushed chart}',
   },
+  {
+    name : 'dry-run',
+    type : Boolean,
+    description : '{yellow perform everything except the actual chart push}',
+  },
+  {
+    name : 'force',
+    type : Boolean,
+    description : '{yellow push the chart even if it already exists in the registry}',
+  },
   {
     name : 'help',
     type : Boolean,
@@ -125,17 +131,30 @@ debug( {
 // 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`
+  // -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}` ) // TODO: cmd line param
+  const loginResult = await shellCmd( `${registryLoginCommand} https://${registryLocation}` )
   debug( { loginResult }, '<==registryLogin' )
 } catch ( error ) {
   errorExit( error )
 }
 
+const { chartName, chartPackage, chartVersion } = helmChart
+try {
+  await shellCmd( `helm pull ${ociPushEndpoint}/${chartName} --version ${chartVersion}` )
+  rmSync( chartPackage )
+  if ( args.force ) {
+    warning( `chart ${chartName} version ${chartVersion} exists - force pushing` )
+  } else {
+    errorExit( `Error: chart ${chartName} version ${chartVersion} already exists` )
+  }
+} catch ( error ) {
+  debug( `Chart ${chartName} version ${chartVersion} does not exist - proceeding` )
+}
+
 try {
   await shellCmd( 'helm package helm' )
-  const { chartPackage } = helmChart
   if ( !existsSync( chartPackage ) ) { // eslint-disable-line security/detect-non-literal-fs-filename
     errorExit( `Error: expected helm package to produce ${chartPackage}` )
   }

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` )
-}
-