@leverege/build-tools 2.93.3-beta.3 → 2.93.3-beta.5

package/package.json

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

package/src/artifacts/ArtifactPusher.mjs

@@ -38,8 +38,7 @@ class GenericArtifactPusher extends ArtifactPusher {
       return false
     }
 
-    try {
-   
+    try {   
       let command = ''
 
       command = `gcloud artifacts generic upload \

package/src/artifacts/Utils.mjs

@@ -8,7 +8,7 @@ import { parseYamlFile, err, warning, debug, shellCmd } from '../Utils.mjs'
 
 import { ArtifactTypeEnum, ArtifactsSchema, GenericArtifactSchema } from './Structs.mjs'
 
-const getArtifactsSchema = async ( artifactsFilePath = './artifacts.yml' ) => {
+const getArtifactsSchema = async ( artifactsFilePath = './artifacts.yaml' ) => {
   const artifactsConfig = await parseYamlFile( artifactsFilePath )
   const [ error, result ] = validate( artifactsConfig, ArtifactsSchema )
   if ( error ) {
@@ -163,7 +163,6 @@ const calculateHash = async ( path ) => {
     hash.update( await fs.promises.readFile( path ) )
     return `${hash.digest( 'base64url' )}=`
   } catch ( error ) {
-    console.error( error )
     throw new Error( `Failed to calculate hash for artifact ${path}: ${error.message}` )
   }
 }

package/src/artifacts/pull-artifact.mjs

@@ -13,26 +13,35 @@ import { GenericArtifactPuller } from './ArtifactPuller.mjs'
 program
   .name( 'pull-artifact' )
   .description( 'Pull artifacts from GCP Artifact Registry' )
-  .requiredOption( '-f, --file-path <path>', 'Path to artifacts.yaml file' )
-  .requiredOption( '-p, --project <project>', 'GCP project id' )
-  .requiredOption( '-l, --location <location>', 'GCP location' )
-  .requiredOption( '-r, --repository <repository>', 'GCP artifact registry repository' )
-  .requiredOption( '-n  --package <name>', 'GCP artifact registry package name' )
-  .requiredOption( '-v, --version <version>', 'GCP artifact registry package version' )
+  .option( '-f, --file <path>', 'Path to artifacts.yaml file', './artifacts.yaml' )
+  .option( '-a, --artifact <artifact-path>', 'GCP artifact path' )
   .parse()
 
 const options = program.opts()
 
 async function main() {
-  const artifactsSchema = await getArtifactsSchema( options.filePath )
+  const artifactsSchema = await getArtifactsSchema( options.file )
   const flattenedArtifactsSchema = flattenArtifactsSchema( artifactsSchema )
-  
-  const filteredArtifactsSchema = flattenedArtifactsSchema.filter(
-    artifact => artifact.project === options.project &&
-    artifact.location === options.location &&
-    artifact.repository === options.repository &&
-    artifact.package === options.package &&
-    artifact.version === options.version )
+
+  let filteredArtifactsSchema = flattenedArtifactsSchema
+
+  if ( options.artifact ) {
+    const artifactPathElements = options.artifact.split( '/' )
+
+    if ( artifactPathElements.length !== 5 ) {
+      warning( 'Invalid artifact path, it must be in the format <project>/<location>/<repository>/<package>/<version>' )
+      return false
+    }
+
+    const [ project, location, repository, packageName, version ] = artifactPathElements
+
+    filteredArtifactsSchema = flattenedArtifactsSchema.filter(
+      artifact => artifact.project === project &&
+      artifact.location === location &&
+      artifact.repository === repository &&
+      artifact.package === packageName &&
+      artifact.version === version )
+  }
 
   let counter = 0
 
@@ -65,6 +74,8 @@ async function main() {
   counter = pullResults.filter( Boolean ).length
 
   log( `Successfully pulled ${counter}/${filteredArtifactsSchema.length} artifacts` )
+
+  return counter === filteredArtifactsSchema.length
 }
 
 main()

package/src/artifacts/push-artifact.mjs

@@ -13,26 +13,34 @@ import { GenericArtifactPusher } from './ArtifactPusher.mjs'
 program
   .name( 'push-artifact' )
   .description( 'Push artifacts to GCP Artifact Registry' )
-  .requiredOption( '-f, --file-path <path>', 'Path to artifacts.yaml file' )
-  .requiredOption( '-p, --project <project>', 'GCP project id' )
-  .requiredOption( '-l, --location <location>', 'GCP location' )
-  .requiredOption( '-r, --repository <repository>', 'GCP artifact registry repository' )
-  .requiredOption( '-n  --package <name>', 'GCP artifact registry package name' )
-  .requiredOption( '-v, --version <version>', 'GCP artifact registry package version' )
+  .option( '-f, --file <path>', 'Path to artifacts.yaml file', './artifacts.yaml' )
+  .option( '-a, --artifact <artifact-path>', 'GCP artifact path' )
   .parse()
 
 const options = program.opts()
 
 async function main() {
-  const artifactsSchema = await getArtifactsSchema( options.filePath )
+  const artifactsSchema = await getArtifactsSchema( options.file )
   const flattenedArtifactsSchema = flattenArtifactsSchema( artifactsSchema )
-  
-  const filteredArtifactsSchema = flattenedArtifactsSchema.filter(
-    artifact => artifact.project === options.project &&
-    artifact.location === options.location &&
-    artifact.repository === options.repository &&
-    artifact.package === options.package &&
-    artifact.version === options.version )
+
+  let filteredArtifactsSchema = flattenedArtifactsSchema
+
+  if ( options.artifact ) {
+    const artifactPathElements = options.artifact.split( '/' )
+    if ( artifactPathElements.length !== 5 ) {
+      warning( 'Invalid artifact path, it must be in the format <project>/<location>/<repository>/<package>/<version>' )
+      return false
+    }
+
+    const [ project, location, repository, packageName, version ] = artifactPathElements
+
+    filteredArtifactsSchema = flattenedArtifactsSchema.filter(
+      artifact => artifact.project === project &&
+      artifact.location === location &&
+      artifact.repository === repository &&
+      artifact.package === packageName &&
+      artifact.version === version )
+  }
 
   let counter = 0
 
@@ -65,6 +73,8 @@ async function main() {
   counter = pushResults.filter( Boolean ).length
 
   log( `Successfully pushed ${counter}/${filteredArtifactsSchema.length} artifacts` )
+  
+  return counter === filteredArtifactsSchema.length
 }
 
 main()