@leverege/build-tools 2.48.4 → 2.48.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.48.4",
+  "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,
@@ -134,9 +140,21 @@ try {
   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}` )
   }