@leverege/build-tools 2.48.0 → 2.48.1

package/package.json

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

package/src/Utils.mjs

@@ -278,7 +278,7 @@ https://console.cloud.google.com/artifacts/browse/leverege-registry?project=leve
   }
 
   // DEPRECATED: old reference to ./dist should be ./build
-  const { build, clean, dockerize, } = packageJson.scripts
+  const { build, clean, dockerize, museum, } = packageJson.scripts
 
   if ( build.match( 'dist' ) || clean.match( 'dist' ) ) {
     const deprecationError = `
@@ -315,6 +315,24 @@ https://console.cloud.google.com/artifacts/browse/leverege-registry?project=leve
 
     deprecated( { deprecationError, deprecationInfo } )
   }
+
+  // DEPRECATED: old museum reference to push-my-chart instead of chart-to-registry
+  if ( museum.match( 'push-my-chart' ) ) {
+    const deprecationError = `
+
+  Update the npm museum script to use chart-to-registry instead of the deprecated
+  push-my-chart script. The new museum target is simply:
+    `
+    const deprecationInfo = `
+  "scripts": {
+    ...
+    ${chalk.green.bold( '"museum": "chart-to-registry",' )}
+    ...
+  },
+  `
+
+    deprecated( { deprecationError, deprecationInfo } )
+  }
   return { artifactRegistry, ...packageJson }
 }
 
@@ -323,13 +341,15 @@ 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 valuesYaml = YAML.load( readFileSync( `${helmroot}/values.yaml`, 'utf8' ) )
   /* eslint-enable security/detect-non-literal-fs-filename */
   return ( {
+    chartPackage,
     files : chartFiles,
     yaml : {
       'Chart.yaml' : chartYaml,
-      'values.yaml' : valuesYaml
+      'values.yaml' : valuesYaml,
     }
   } )
 }

package/src/chart-to-registry.mjs

@@ -2,6 +2,7 @@
 /*
  * chart-to-registry will...
  */
+import { existsSync, rmSync } from 'node:fs'
 
 import chalk from 'chalk'
 import commandLineArgs from 'command-line-args'
@@ -9,7 +10,7 @@ import commandLineUsage from 'command-line-usage'
 import { lt as semverLt } from 'semver'
 
 import {
-  condir, debug,
+  debug,
   errorExit,
   log,
   getGitRootDirectory,
@@ -76,8 +77,6 @@ if ( semverLt( process.version, minNodejsVersion ) ) {
   errorExit( `\n***ERROR: must be running at least node ${minNodejsVersion}\n` )
 }
 
-log( { args }, chalk.yellow( '\n\n***WARNING: Under Construction' ) )
-
 // gcloud auth print-access-token | helm registry login -u oauth2accesstoken \
 // -p ${password} https://us-docker.pkg.dev
 //
@@ -116,7 +115,22 @@ try {
   errorExit( error )
 }
 
-condir( { packageJson, helmChart }, '<==Parsed package and chart' )
+debug( { packageJson, helmChart }, '<==Parsed package and chart' )
+
+// helm push helm-package.tgz oci://REGISTRY_NAME/REPOSITORY_NAME/charts/SERVICE
+//
+const ociPushEndpoint = `oci://${args.region}/${args.project}/${args.repository}/charts`
 
-// helm push chart-tarball oci://REGISTRY_NAME/REPOSITORY_NAME/charts/SERVICE
-// helm install my-release oci://REGISTRY_NAME/REPOSITORY_NAME/redis
+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}` )
+  }
+
+  log( `\nPushing ${chalk.green.bold( chartPackage )} => ${chalk.green.bold( ociPushEndpoint )}` )
+  await shellCmd( `helm push ${chartPackage} ${ociPushEndpoint}` )
+  rmSync( chartPackage )
+} catch ( err ) {
+  errorExit( err )
+}

package/src/docker-to-registry.mjs

@@ -18,7 +18,7 @@ import {
 
 import docker from './Docker.mjs'
 
-const minimumBuildToolsVersion = '2.48.0'
+const minimumBuildToolsVersion = '2.48.1'
 
 // refresh-npm-token does not throw so no need to try, but it emits in debug
 const refreshErr = await shellCmd( 'refresh-npm-token' )

package/src/dockreate.sh

@@ -10,7 +10,9 @@ fi
 . `build-tools --bashfun`
 cat<<DOCKREATE_DEPRECATED
 
-  `color y "***DOCKREATE is DEPRECATED - move to docker-to-registry***"`
+  `color r "***DOCKREATE is DEPRECATED - move to docker-to-registry***"`
+
+  For guidance on transitioning run `color g docker-to-registry guide-me`
 
 DOCKREATE_DEPRECATED
 sleep 3