@leverege/build-tools 2.94.0-quinn.9 → 2.95.0

package/.vscode/launch.json

@@ -17,6 +17,20 @@
       "env": {
       },
       "outputCapture": "std"
+    },
+    {
+      "name": "service-man (launch)",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/src/service-man/service-man.mjs",
+      "args": ["--dump-configs","dbg-cfgs"],
+      "cwd": "/Users/john/Work/leverege/k8s/tst-builder",
+      "runtimeExecutable": "node",
+      "console": "integratedTerminal",
+      "skipFiles": ["<node_internals>/**"],
+      "env": {
+        "NODE_ENV": "development"
+      }
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.94.0-quinn.9",
+  "version": "2.95.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -11,13 +11,16 @@
     "clean": "rm -rf lib",
     "lint": "find ./src -name \\*.\\*js | xargs npx eslint --report-unused-disable-directives",
     "prepare": "[ $SKIP_PREPARE ] && exit 0 || ./src/hook-and-release.mjs",
-    "test": "mocha -t 60000 --exit 'test/**/*.mjs'",
+    "test": "mocha -t 60000 --exit 'test/**/!(*e2e*).mjs'",
+    "test-all": "mocha -t 60000 --exit 'test/**/**.mjs'",
     "prepack": "npm exec prepack"
   },
   "bin": {
     "build-and-push": "src/build-and-push.sh",
     "build-cnpg-image": "src/build-cnpg-image.mjs",
     "build-tools": "src/build-tools.mjs",
+    "change-up": "src/change-up.sh",
+    "chart-compass": "src/chart-compass.mjs",
     "chart-to-museum": "src/chart-to-museum.mjs",
     "chart-to-registry": "src/chart-to-registry.mjs",
     "circleate": "src/circleate.sh",
@@ -37,6 +40,7 @@
     "getjson": "src/getjson.mjs",
     "git-tar": "src/git-tar.sh",
     "helm-audit": "src/helm-audit.mjs",
+    "helmboot": "src/helmup.sh",
     "helmcycle": "src/helmup.sh",
     "helmdn": "src/helmdn.sh",
     "helminit": "src/helmup.sh",
@@ -61,10 +65,12 @@
     "refresh-npm-token": "src/refresh-npm-token.mjs",
     "refresh-py-idx": "src/refresh-py-idx.sh",
     "send-to-slack": "src/send-to-slack.mjs",
+    "service-man": "src/service-man/service-man.mjs",
     "snapshot-cnpg": "src/snapshot-cnpg.mjs",
     "tag-release": "src/tag-release.mjs",
     "unleash": "src/unleash.mjs",
-    "upload-model": "src/upload-model.sh"
+    "upload-model": "src/upload-model.sh",
+    "yarn-build": "src/yarn-build.mjs"
   },
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
@@ -76,11 +82,12 @@
     "commander": "^14.0.2",
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
-    "execa": "^9.6.0",
-    "glob": "^11.0.3",
+    "execa": "^9.6.1",
+    "find-yarn-workspace-root": "^2.0.0",
+    "glob": "^13.0.0",
     "handlebars": "^4.7.8",
     "ignore": "^7.0.5",
-    "inquirer": "^12.11.1",
+    "inquirer": "^13.1.0",
     "js-yaml": "^4.1.1",
     "jsdoc": "^4.0.5",
     "ms": "^2.1.3",
@@ -94,13 +101,14 @@
     "simple-git": "^3.30.0",
     "sloc": "^0.3.2",
     "superstruct": "^2.0.2",
+    "tmp": "^0.2.5",
     "toml": "^3.0.0",
     "zx": "^8.8.5"
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.1.1",
-    "chai": "^6.2.1",
+    "chai": "^6.2.2",
     "mocha": "^11.7.5",
-    "npm": "^11.6.2"
+    "npm": "^11.7.0"
   }
 }

package/src/Docker.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable security/detect-non-literal-fs-filename */
 import fs from 'node:fs'
 import path from 'node:path'
 import url from 'node:url'
@@ -17,8 +18,14 @@ import {
 
 const DIRNAME = path.dirname( url.fileURLToPath( import.meta.url ) )
 
-// TODO: change default to node 22 (jod) after 01/01/25
-const dockerfileNodeVersion = 'jod-alpine'
+// TODO: This is a temporary band-aid while we assess the impact of the yarn
+// and/or CI pipeline transition. This will at least allow us to lock down the
+// specific versions of node/npm and facilitate testing via the env vars.
+//
+// See the latest docker images here => https://hub.docker.com/_/node
+//
+const dockerfileNodeVersion = process.env.DOCKER_BUILD_NODE_VERSION || '24.12.0-alpine3.23'
+const dockerfileNpmVersion = process.env.DOCKER_BUILD_NPM_VERSION || '11.6.0'
 
 // The contents of these variables were initially located in files that live in
 // the build-tools repository, but it just became simpler to pull the contents
@@ -55,7 +62,7 @@ const defaultSettings = {
   nodeimage : 'jod-alpine',
   imageBase : 'node:jod-alpine',
   npmlogging : process.env.VERBOSE_NPM_LOGGING ? '--ddd' : '--silent',
-  npmVersion : 'npm@11',
+  npmVersion : `npm@${dockerfileNpmVersion}`,
   pluginfile : '# NO PLUGIN',
   preInstallPluginfile : '# NO PRE-INSTALL PLUGIN',
   regvers : 'package.version',
@@ -77,7 +84,7 @@ const generateDockerfile = async ( options ) => {
   const gitReference = await shellCmd( 'git rev-parse --short HEAD' )
   const settings = { gitReference, ...defaultSettings, ...options }
   const dockerTemplate = options.isNodeJsProject ? 'dockerfileTemplateNodeJs' : 'dockerfileTemplatePython'
-  const dockerfileTemplate = fs.readFileSync( path.join( DIRNAME, `./templates/${dockerTemplate}.hbs` ), 'utf8' ) // eslint-disable-line security/detect-non-literal-fs-filename
+  const dockerfileTemplate = fs.readFileSync( path.join( DIRNAME, `./templates/${dockerTemplate}.hbs` ), 'utf8' )
   
   // defaults to the current "official" version of node unless it gets
   // overridden in the leverege.nodeimg package.json stanza

package/src/Utils.mjs

@@ -39,11 +39,42 @@ export const warning = ( warningText ) => {
   console.error( `\n${chalk.yellow.bold( fullWarning )}` )
 }
 
-export const errorExit = ( error, opts = {} ) => {
-  const { errorCode = 1 } = opts
-  console.error( `\n${chalk.red.bold( error )}\n` )
-  process.exit( errorCode )
+export const errorExit = ( arg, opts = {} ) => {
+  const exitCode =
+    typeof opts.exitCode === 'number' ? opts.exitCode :
+      ( arg && typeof arg.exitCode === 'number' ) ? arg.exitCode : 1
+
+  // lets figure out what to print
+  let message
+  let details
+
+  if ( arg instanceof Error ) {
+    message = arg.message || 'Error'
+    details = arg.stack
+  } else if ( typeof arg === 'string' ) {
+    message = arg
+  } else if ( arg && typeof arg === 'object' ) {
+    message = 'Error'
+    details = JSON.stringify( arg, null, 2 )
+  } else if ( arg != null ) {
+    message = String( arg )
+  }
+
+  console.error( `\n${chalk.red.bold( message )}\n` )
+  if ( details && details !== message ) {
+    console.error( `${details}\n` )
+  }
+
+  process.exit( exitCode )
+}
+
+/**
+ * Clears the screen and optionally homes the cursor.
+ */
+export const clear = ( home = true ) => {
+  log( `${home ? '\x1B[0f' : ''}\x1B[2J` )
 }
+
 /* eslint-enable no-console */
 
 export const isHex = ( hex ) => {
@@ -54,6 +85,22 @@ export const isString = ( s ) => {
   return typeof s === 'string' || s instanceof String
 }
 
+/**
+  *  * Sets first char to Upper
+  *   */
+export const capitalize = ( norm ) => {
+  return norm.charAt( 0 ).toUpperCase() + norm.slice( 1 )
+}
+
+/**
+ * A simple mS sleep delay.
+ */
+export const sleep = ( ms = 0 ) => {
+  return new Promise( ( resolve ) => {
+    setTimeout( resolve, ms )
+  } )
+}
+
 /**
  * General "yes" to proceed function.
  */
@@ -226,7 +273,7 @@ export const gitRepoIsDirty = async () => {
 
 export const parseYamlFile = async ( filePath ) => {
   try {
-    const fileContent = await fs.promises.readFile( filePath, 'utf8' )
+    const fileContent = await fs.promises.readFile( filePath, 'utf8' ) /* eslint-disable-line security/detect-non-literal-fs-filename */
     return YAML.load( fileContent )
   } catch ( error ) {
     throw new Error( `Failed to parse YAML file ${filePath}: ${error.message}` )
@@ -493,7 +540,7 @@ export const parseHelmChart = async ( helmroot = './helm' ) => {
   
   // See if this is a leaf chart and whether or not dependencies need updating
   const hasDependencies = chartYaml.dependencies !== undefined
-  let depsOutOfSync
+  let depsOutOfSync = hasDependencies // assume unsynced if dependencies
   if ( chartFiles.includes( 'Chart.lock' ) ) {
     const chartLock = YAML.load( fs.readFileSync( `${helmroot}/Chart.lock`, 'utf8' ) )
     // Using Object.fromEntries will be able to handle multiple dependencies if ever needed
@@ -538,7 +585,7 @@ export const getRepositoryDescr = async () => {
   const helmChart = await parseHelmChart()
   const rootPackageJson = await parseJsonFile( `${gitRoot}/package.json` )
   const rootPyProjectToml = await parsePyProjectToml( `${gitRoot}/pyproject.toml` )
-  const isYarnProject = fs.existsSync( path.join( gitRoot, 'yarn.lock' ) ) || fs.existsSync( path.join( gitRoot, '.yarn' ) )
+  const isYarnProject = fs.existsSync( path.join( gitRoot, 'yarn.lock' ) ) || fs.existsSync( path.join( gitRoot, '.yarn' ) ) /* eslint-disable-line security/detect-non-literal-fs-filename */
 
   return {
     currentDir : process.cwd(),

package/src/artifacts/ArtifactPuller.mjs

@@ -1,12 +1,14 @@
 /* eslint-disable security/detect-non-literal-fs-filename */
 import fs from 'node:fs'
+import path from 'node:path'
 
 import { shellCmd, log, debug, err } from '../Utils.mjs'
 
-import { toExplicitPath, deduplicatePath, convertGenericArtifactNameToPath } from './Utils.mjs'
+import { parseGenericArtifactSchemaToRemoteRelativePath, parseGenericArtifactSchemaToLocalRelativePath, listGenericArtifactFiles, parseGenericArtifactFileToRemoteRelativePath, parseGenericArtifactSchemaToArtifactName } from './Utils.mjs'
 
 class ArtifactPuller {
-  constructor( artifact ) {
+  constructor( path, artifact ) {
+    this.path = path
     this.artifact = artifact
   }
 
@@ -17,142 +19,101 @@ class ArtifactPuller {
 
 class GenericArtifactPuller extends ArtifactPuller {
 
-  async prepareFileDownload( tmpFilePath, finalFilePath ) {
-    // Ensure directories exist
-    fs.mkdirSync( tmpFilePath.split( '/' ).slice( 0, -1 ).join( '/' ), { recursive : true } )
-    fs.mkdirSync( finalFilePath.split( '/' ).slice( 0, -1 ).join( '/' ), { recursive : true } )
+  async downloadFile( remoteRelativePath, localRelativePath ) {
+    debug( { remoteRelativePath, localRelativePath }, '<==Download File' )
 
-    // Ensure no conflicting files exist
-    if ( fs.existsSync( tmpFilePath ) ) {
-      fs.unlinkSync( tmpFilePath )
-    }
-    if ( fs.existsSync( finalFilePath ) ) {
-      fs.unlinkSync( finalFilePath )
-    }
-  }
+    const isBasenameDifferent = path.basename( localRelativePath ) !== path.basename( remoteRelativePath )
 
-  async cleanupFileDownload( tmpFilePath, finalFilePath ) {
-    // Delete the tmp file
-    if ( fs.existsSync( tmpFilePath ) ) {
-      fs.unlinkSync( tmpFilePath )
+    let tmpLocalRelativePath
+    if ( isBasenameDifferent ) {
+      const artifactName = parseGenericArtifactSchemaToArtifactName( this.artifact )
+      const encodedArtifactName = artifactName.replaceAll( ':', '_' ).replaceAll( '/', '_' ).replaceAll( '%2F', '_' )
+      tmpLocalRelativePath = path.join( '/', 'tmp', encodedArtifactName )
+    } else {
+      await fs.promises.mkdir( path.dirname( localRelativePath ), { recursive : true } )
     }
-    // Delete the tmp directory
-    if ( fs.existsSync( tmpFilePath.split( '/' ).slice( 0, -1 ).join( '/' ) ) ) {
-      fs.rmSync( tmpFilePath.split( '/' ).slice( 0, -1 ).join( '/' ), { recursive : true } )
-    }
-  }
-
-  async downloadFile( remoteFilePath, localFilePath ) {
-    debug( { remoteFilePath, localFilePath }, '<==Download File' )
-
-    // 1 dir per file to avoid dir creation and deletion race conditions for files in the same directory
-    const tmpDirectoryPath = `/tmp/${remoteFilePath.replaceAll( '/', '_' ).replaceAll( '.', '_' )}`
-    const tmpFilePath = `${tmpDirectoryPath}/${remoteFilePath.split( '/' ).pop()}`
-
-    await this.prepareFileDownload( tmpFilePath, localFilePath )
 
     try {
       const command = `gcloud artifacts generic download \
-      --project=${this.artifact.gcp_project_id} \
-      --location=${this.artifact.gcp_location} \
-      --repository=${this.artifact.gcp_artifact_registry_repository_name} \
-      --package=${this.artifact.gcp_artifact_registry_package_name} \
-      --version=${this.artifact.gcp_artifact_registry_package_version} \
-      --name="${remoteFilePath}" \
-      --destination=${tmpDirectoryPath}`
+      --project=${this.artifact.project} \
+      --location=${this.artifact.location} \
+      --repository=${this.artifact.repository} \
+      --package=${this.artifact.package} \
+      --version=${this.artifact.version} \
+      --name="${remoteRelativePath}" \
+      --destination=${tmpLocalRelativePath || path.dirname( localRelativePath )}`
 
       debug( { command }, '<==Download File Command' )
 
       await shellCmd( command )
 
-      // Check if file exists in the tmp path
-      if ( !fs.existsSync( tmpFilePath ) ) {
-        debug( { tmpFilePath }, '<==File does not exist in the tmp path' )
-        return false
-      }
-
-      debug( { tmpFilePath, localFilePath }, '<==Copying file' )
-
-      await fs.copyFileSync( tmpFilePath, localFilePath )
-
-      // Check if file exists in the local path
-      if ( !fs.existsSync( localFilePath ) ) {
-        debug( { localFilePath }, '<==File does not exist in the local path' )
-        return false
+      if ( isBasenameDifferent ) {
+        await fs.promises.rename( tmpLocalRelativePath, localRelativePath )
       }
 
       return true
     } catch ( error ) {
-      err( `Error downloading file: ${remoteFilePath} ${error.message}` )
+      err( `Error downloading file: ${localRelativePath} ${error.message}` )
       return false
-    } finally {
-      await this.cleanupFileDownload( tmpFilePath, localFilePath )
     }
   }
 
-  async downloadDirectory( localPath ) {
+  async downloadDirectory( remoteRelativePath, localRelativePath ) {
+
+    await fs.promises.mkdir( localRelativePath, { recursive : true } )
+
     const command = `gcloud artifacts generic download \
-      --project=${this.artifact.gcp_project_id} \
-      --location=${this.artifact.gcp_location} \
-      --repository=${this.artifact.gcp_artifact_registry_repository_name} \
-      --package=${this.artifact.gcp_artifact_registry_package_name} \
-      --version=${this.artifact.gcp_artifact_registry_package_version} \
-      --destination=${localPath}`
+      --project=${this.artifact.project} \
+      --location=${this.artifact.location} \
+      --repository=${this.artifact.repository} \
+      --package=${this.artifact.package} \
+      --version=${this.artifact.version} \
+      --destination=${localRelativePath}`
 
     debug( { command }, '<==Download Directory Command' )
 
     await shellCmd( command )
   }
 
-  async downloadNestedDirectory( remotePath, localPath ) {
-    debug( { remotePath, localPath }, '<==Download Nested Directory' )
+  async downloadNestedDirectory( remoteRelativePath, localRelativePath ) {
+    debug( { remoteRelativePath, localRelativePath }, '<==Download Nested Directory' )
 
-    const files = await this.listFiles( remotePath )
+    const files = await listGenericArtifactFiles( this.artifact )
     await Promise.all(
       files
-        .filter( file => convertGenericArtifactNameToPath( file.name ).startsWith( remotePath ) )
-        .map( async ( file ) => {
-          const remoteFilePath = convertGenericArtifactNameToPath( file.name )
-          const localFilePath = deduplicatePath( `${localPath}/${remoteFilePath.replaceAll( remotePath, '' )}` )
-          await this.downloadFile( remoteFilePath, localFilePath )
-        } )
+        .reduce( ( acc, file ) => {
+          const remoteFilePath = parseGenericArtifactFileToRemoteRelativePath( file )
+          if ( remoteFilePath.startsWith( remoteRelativePath ) ) {
+            const remoteFilePathWithoutRemotePath = remoteFilePath.replace( remoteRelativePath, '' )
+            const localFilePath = path.join( localRelativePath, remoteFilePathWithoutRemotePath )
+            acc.push( this.downloadFile( remoteFilePath, localFilePath ) )
+          }
+          return acc
+        }, [] )
     )
   }
 
-  async listFiles( ) {
-    const command = `gcloud artifacts files list \
-        --project=${this.artifact.gcp_project_id} \
-        --location=${this.artifact.gcp_location} \
-        --repository=${this.artifact.gcp_artifact_registry_repository_name} \
-        --package=${this.artifact.gcp_artifact_registry_package_name} \
-        --version ${this.artifact.gcp_artifact_registry_package_version} \
-        --format="json"`
-
-    debug( { command }, '<==List Files Command' )
-      
-    const result = await shellCmd( command )
-  
-    // Parse the JSON response
-    const files = JSON.parse( result )
-    return files
-  }
-
   async pull() {
     log( `Pulling artifact: ${this.artifact.name}` )
     
     debug( { artifact : this.artifact }, '<==Pulling artifact' )
 
     try {
+      const remoteRelativePath = parseGenericArtifactSchemaToRemoteRelativePath( this.artifact )
+      const localRelativePath = parseGenericArtifactSchemaToLocalRelativePath( this.artifact )
+
       if ( this.artifact.remote_file_path && this.artifact.local_file_path ) {
-        await this.downloadFile( this.artifact.remote_file_path, toExplicitPath( this.artifact.local_file_path ) )
+        await this.downloadFile( remoteRelativePath, path.join( this.path, localRelativePath ) )
       } else if ( this.artifact.remote_file_path && this.artifact.local_path ) {
-        await this.downloadFile( this.artifact.remote_file_path, toExplicitPath( `${this.artifact.local_path}/${this.artifact.remote_file_path.split( '/' ).pop()}` ) )
+        await this.downloadFile( remoteRelativePath, path.join( this.path, localRelativePath ) )
+      } else if ( this.artifact.remote_file_path && !this.artifact.local_path && !this.artifact.local_file_path ) {
+        await this.downloadFile( remoteRelativePath, path.join( this.path, localRelativePath ) )
       } else if ( this.artifact.remote_path && this.artifact.local_path ) {
-        await this.downloadNestedDirectory( this.artifact.remote_path, toExplicitPath( this.artifact.local_path ) )
+        await this.downloadNestedDirectory( remoteRelativePath, path.join( this.path, localRelativePath ) )
       } else if ( this.artifact.remote_path && !this.artifact.local_path && !this.artifact.local_file_path ) {
-        await this.downloadDirectory( this.artifact.remote_path, '.' )
+        await this.downloadDirectory( remoteRelativePath, path.join( this.path, localRelativePath ) )
       } else if ( !this.artifact.remote_path && !this.artifact.remote_file_path && this.artifact.local_path ) {
-        await this.downloadDirectory( toExplicitPath( this.artifact.local_path ) )
+        await this.downloadDirectory( remoteRelativePath, path.join( this.path, localRelativePath ) )
       } else {
         throw new Error( 'No valid paths provided' )
       }
@@ -160,13 +121,6 @@ class GenericArtifactPuller extends ArtifactPuller {
       log( `Successfully pulled artifact: ${this.artifact.name}` )
 
       return true
-      
-      // if ( !this.artifact.remote_path && !this.artifact.remote_file_path && this.local_file_path ) {
-      //   throw new Error( '' )
-      // }
-      // if ( this.artifact.remote_path && this.artifact.local_file_path ) {
-      //   throw new Error( '' )
-      // }
     } catch ( error ) {
       err( `Error pulling artifact: ${this.artifact.name} ${error.message}` )
     }

package/src/artifacts/ArtifactPusher.mjs

@@ -1,9 +1,20 @@
+import path from 'node:path'
+import fs from 'node:fs'
+
 import { shellCmd, log, err, debug } from '../Utils.mjs'
 
-import { convertGenericArtifactNameToPath } from './Utils.mjs'
+import {
+  parseGenericArtifactFileToRemoteRelativePath,
+  parseGenericArtifactSchemaToRemoteRelativePath,
+  listGenericArtifactFiles,
+  shouldUseIgnoreConfiguration,
+  findIgnoreFilePath,
+  copyFilesWithIgnoreConfiguration
+} from './Utils.mjs'
 
 class ArtifactPusher {
-  constructor( artifact ) {
+  constructor( path, artifact ) {
+    this.path = path
     this.artifact = artifact
   }
 
@@ -13,25 +24,6 @@ class ArtifactPusher {
 }
 
 class GenericArtifactPusher extends ArtifactPusher {
-
-  async listFiles( ) {
-    const command = `gcloud artifacts files list \
-        --project=${this.artifact.gcp_project_id} \
-        --location=${this.artifact.gcp_location} \
-        --repository=${this.artifact.gcp_artifact_registry_repository_name} \
-        --package=${this.artifact.gcp_artifact_registry_package_name} \
-        --version ${this.artifact.gcp_artifact_registry_package_version} \
-        --format="json"`
-
-    debug( { command }, '<==List Files Command' )
-      
-    const result = await shellCmd( command )
-  
-    // Parse the JSON response
-    const files = JSON.parse( result )
-
-    return files
-  }
     
   async push() {
     log( `Pushing artifact: ${this.artifact.name}` )
@@ -41,41 +33,74 @@ class GenericArtifactPusher extends ArtifactPusher {
       return false
     }
 
-    try {
-   
+    if ( !this.artifact.local_path && !this.artifact.local_file_path ) {
+      err( 'Local path or local file path is required for pushing artifacts' )
+      return false
+    }
+
+    try {   
       let command = ''
 
       command = `gcloud artifacts generic upload \
-      --project=${this.artifact.gcp_project_id} \
-      --location=${this.artifact.gcp_location} \
-      --repository=${this.artifact.gcp_artifact_registry_repository_name} \
-      --package=${this.artifact.gcp_artifact_registry_package_name} \
-      --version=${this.artifact.gcp_artifact_registry_package_version}`
+      --project=${this.artifact.project} \
+      --location=${this.artifact.location} \
+      --repository=${this.artifact.repository} \
+      --package=${this.artifact.package} \
+      --version=${this.artifact.version}`
+
+      let pathToDelete
 
       if ( this.artifact.local_path ) {
-        command += ` --source-directory=${this.artifact.local_path}`
+        const originalLocalPath = path.join( this.path, this.artifact.local_path )
+
+        let localPath = originalLocalPath
+
+        const useIgnoreConfiguration = await shouldUseIgnoreConfiguration()
+
+        if ( useIgnoreConfiguration ) {
+          const ignoreFilePath = await findIgnoreFilePath( this.path )
+          if ( ignoreFilePath ) {
+            const tmpLocalPath = path.join( '/', 'tmp', `${this.artifact.project}_${this.artifact.location}_${this.artifact.repository}_${this.artifact.package}_${this.artifact.version}` )
+            localPath = tmpLocalPath
+            pathToDelete = tmpLocalPath
+            await copyFilesWithIgnoreConfiguration( originalLocalPath, tmpLocalPath, ignoreFilePath )
+          }
+        }
+
+        command += ` --source-directory=${localPath}`
         command += ' --skip-existing'
       } else if ( this.artifact.local_file_path ) {
-        const files = await this.listFiles( this.artifact.remote_path )
-        if ( files.some( file => convertGenericArtifactNameToPath( file.name ) === `${this.artifact.remote_path}/${this.artifact.remote_file_path.split( '/' ).pop()}` ) ) {
-          err( `File already exists in the artifact registry: ${this.artifact.local_file_path}` )
-          return false
+
+        const files = await listGenericArtifactFiles( this.artifact )
+
+        const newRemoteFilePath = parseGenericArtifactSchemaToRemoteRelativePath( this.artifact )
+
+        for ( const file of files ) {
+          const existingRemoteFilePath = parseGenericArtifactFileToRemoteRelativePath( file )
+          if ( existingRemoteFilePath === newRemoteFilePath ) {
+            err( `File already exists in the artifact registry:  ${existingRemoteFilePath}` )
+            return false
+          }
         }
-        command += ` --source=${this.artifact.local_file_path}`
+        const localPath = path.join( this.path, this.artifact.local_file_path )
+        command += ` --source=${localPath}`
       }
 
-      if ( this.artifact.remote_path ) {
-        command += ` --destination-path=${this.artifact.remote_path}`
-      }
+      command += ` --destination-path=${this.artifact.remote_path || '""'}`
 
       debug( { command }, '<==Upload Command' )
         
       await shellCmd( command )
-      
+
+      if ( pathToDelete ) {
+        await fs.promises.rm( pathToDelete, { recursive : true } )
+      }
+
       log( `Successfully pushed artifact: ${this.artifact.name}` )
 
       return true
     } catch ( error ) {
+      debug( { error }, '<==Error Pushing Artifact' )
       err( `Error pushing artifact: ${this.artifact.name} ${error.message}` )
       return false
     }