@leverege/build-tools 2.58.0-pedro.3 → 2.58.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.58.0-pedro.3",
+  "version": "2.58.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -48,7 +48,6 @@
     "pkglint": "src/pkglint.sh",
     "prune-git": "src/prune-git.sh",
     "pull-git": "src/pull-git.sh",
-    "push-model-registry": "src/push-model-registry.mjs",
     "push-my-chart": "src/push-my-chart.mjs",
     "refresh-npm-token": "src/refresh-npm-token.mjs",
     "refresh-py-idx": "src/refresh-py-idx.sh",
@@ -60,7 +59,6 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
     "@google-cloud/artifact-registry": "^3.5.0",
-    "@google-cloud/storage": "^7.14.0",
     "ansi-colors": "^4.1.3",
     "chalk": "^5.3.0",
     "command-line-args": "^6.0.1",
@@ -68,7 +66,6 @@
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
     "execa": "^9.5.1",
-    "fast-crc32c": "^2.0.0",
     "glob": "^11.0.0",
     "handlebars": "^4.7.8",
     "inquirer": "^12.1.0",
@@ -85,6 +82,6 @@
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^10.9.1"
+    "npm": "^10.9.2"
   }
-}
+}

package/src/Docker.mjs

@@ -183,9 +183,11 @@ const setPreviousBuild = ( version ) => {
   fs.writeFileSync( previousFile, version )
 }
 
-const generateDockerfile = ( settings = defaultSettings ) => {
+const generateDockerfile = ( options ) => {
 
-  log( chalk.green.bold( 'Validating the docker structure\n' ) )
+  const settings = { ...defaultSettings, ...options }
+
+  log( { settings }, chalk.green.bold( 'Validating the docker structure\n' ) )
 
   // Ensure the presence of the docker dir with plugin and bashrc - this code
   // could probably be tightened up a little.

package/src/Utils.mjs

@@ -237,7 +237,10 @@ https://console.cloud.google.com/artifacts/browse/leverege-registry?project=leve
   }
 
   // DEPRECATED: leverege.nodeimg
-  if ( packageJson?.leverege?.nodeimg ) {
+  //
+  // NOTE: added nodeimg support back in but leaving this here and disabled
+  //       by checking for xnodeimg vice nodeimg - still not sure we're keeping
+  if ( packageJson?.leverege?.xnodeimg ) {
     const removeLine = `"nodeimg": "${packageJson.leverege.nodeimg}",`
 
     const deprecationError = 'leverege.nodeimg is no longer supported'

package/src/docker-to-registry.mjs

@@ -94,7 +94,10 @@ if ( semver.lt( semver.coerce( repoDescr.buildToolsVersion ), minimumBuildToolsV
   errorExit( `Error: package.json @leverege/build-tools minimum version is ^${minimumBuildToolsVersion}` )
 }
 
-const dockerInfo = await docker.generateDockerfile()
+const dockerInfo = await docker.generateDockerfile( {
+  regvers : repoDescr.packageVersion,
+  nodeimage : repoDescr.closestPackageJson.leverege?.nodeimg, // left as nodeimg in package.json for backwards compat
+} )
 debug( { dockerInfo }, '<==The Docker Info' )
 
 const {

package/src/helm-charts/geotile-server/values-local.yaml

@@ -4,4 +4,4 @@ image:
 config:
   UPLOADER_TYPE: "OVH:<BUCKET_TYPE>"
   UPLOADER_PROJECT_ID: "OVH:<PROJECT_ID>"
-  UPLOADER_BUCKET: "OVH:<PROJECT_ID>-geotiles"
+  UPLOADER_BUCKET: "OVH:<PROJECT_ID>-geotile-server"

package/src/helm-charts/prom-operator/rules/cnpg-rules.yaml

@@ -51,12 +51,21 @@ spec:
       for: 1m
       labels:
         severity: warning
-    - alert: DatabaseDeadlockConflicts 
+#   - alert: DatabaseDeadlockConflicts (original)
+#     annotations:
+#       description: There are over 10 deadlock conflicts in {{ $labels.pod }}
+#       summary: Checks the number of database conflicts
+#     expr: |-
+#       cnpg_pg_stat_database_deadlocks > 10
+#     for: 1m
+#     labels:
+#       severity: warning
+    - alert: DatabaseDeadlockConflicts
       annotations:
-        description: There are over 10 deadlock conflicts in {{ $labels.pod }}
+        description: deadlocks are occurring {{ $labels.pod }}
         summary: Checks the number of database conflicts
       expr: |-
-        cnpg_pg_stat_database_deadlocks > 10
+        rate(cnpg_pg_stat_database_deadlocks[5m]) > 0
       for: 1m
       labels:
         severity: warning

package/src/push-model-registry.mjs

@@ -1,145 +0,0 @@
-#!/usr/bin/env node
-
-import fs from 'node:fs';
-import path from 'node:path';
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import {Storage} from '@google-cloud/storage';
-import crc32c from 'fast-crc32c';
-
-const storage = new Storage();
-
-function getAllFiles(dirPath, arrayOfFiles = []) {
-  const files = fs.readdirSync(dirPath);
-
-  files.forEach(file => {
-    const filePath = path.join(dirPath, file);
-    if (fs.lstatSync(filePath).isDirectory()) {
-      arrayOfFiles = getAllFiles(filePath, arrayOfFiles);
-    } else {
-      arrayOfFiles.push(filePath);
-    }
-  });
-
-  return arrayOfFiles;
-}
-
-async function main() {
-  // Get git branch name
-  const branchName = fs.readFileSync('.git/HEAD', 'utf8').split('/').pop().trim();
-
-  const bucketName = `${branchName}-triton-model-registry`;
-
-  // Get all blobs in the bucket
-  let files = [];
-  try {
-    [files] = await storage.bucket(bucketName).getFiles();
-  } catch (error) {
-    if (error.code === 404) {
-      console.error(`Bucket ${bucketName} does not exist.`);
-      return;
-    } else {
-      throw error;
-    }
-  }
-
-  // Get all not hidden blobs in the current path in the filesystem
-  const localFiles = getAllFiles('./models').filter(file => !path.basename(file).startsWith('.'));
-
-  const filesToDelete = files.filter(file => !localFiles.find(localFile => localFile === file.name));
-
-  console.log(`${chalk.underline(filesToDelete.length + " file(s)")} in ${chalk.underline(bucketName)} without a ${chalk.underline("local")} counterpart`);
-  filesToDelete.forEach(file => console.log(chalk.red(file.name)));
-
-  if (filesToDelete.length > 0) console.log("");
-
-  const filesToAdd = [];
-  const filesToReplace = [];
-
-  const metadataPromises = localFiles.map(async file => {
-    const localFileChecksum = Buffer.from(crc32c.calculate(fs.readFileSync(file)).toString(16), 'hex').toString('base64');
-    const remoteFile = files.find(blob => blob.name === file);
-    if (remoteFile) {
-      const [metadata] = await remoteFile.getMetadata();
-      return { file, localFileChecksum, remoteFileChecksum: metadata.crc32c };
-    } else {
-      return { file, localFileChecksum, remoteFileChecksum: null };
-    }
-  });
-
-  const metadataResults = await Promise.all(metadataPromises);
-
-  metadataResults.forEach(({ file, localFileChecksum, remoteFileChecksum }) => {
-    if (remoteFileChecksum) {
-      if (localFileChecksum !== remoteFileChecksum) {
-        filesToReplace.push(file);
-      }
-    } else {
-      filesToAdd.push(file);
-    }
-  });
-
-  console.log(`${chalk.underline(filesToAdd.length + " file(s)")} to be added to ${chalk.underline(bucketName)}`);
-  filesToAdd.forEach(file => console.log(chalk.green(file)));
-
-  if (filesToAdd.length > 0) console.log("");
-
-  console.log(`${chalk.underline(filesToReplace.length + " file(s)")} to be replaced in ${chalk.underline(bucketName)}`);
-  filesToReplace.forEach(file => console.log(chalk.yellow(file)));
-
-  if (filesToReplace.length > 0) console.log("");
-
-  if (filesToDelete.length > 0) {
-    const {confirm} = await inquirer.prompt({
-      type: 'confirm',
-      name: 'confirm',
-      message: `Do you want to delete ${filesToDelete.length} file(s) from ${bucketName}?`,
-    });
-
-    if (!confirm) {
-      return;
-    }
-
-    // Remove all blobs that are not in the local filesystem
-    const deletePromises = filesToDelete.map(async file => {
-      console.log(`Deleting ${file.name} from ${bucketName}`);
-      return storage.bucket(bucketName).file(file.name).delete();
-    });
-    
-    await Promise.all(deletePromises);
-    console.log("")
-  }
-
-  if (filesToAdd.length > 0 || filesToReplace.length > 0) {
-    const {confirm} = await inquirer.prompt({
-      type: 'confirm',
-      name: 'confirm',
-      message: `Do you want to upload ${filesToAdd.length + filesToReplace.length} file(s) to ${bucketName}?`,
-    });
-
-    if (!confirm) {
-      return;
-    }
-
-    // Upload all new files
-    const uploadPromises = filesToAdd.map(async file => {
-      console.log(`Uploading ${file} to ${bucketName}`);
-      return storage.bucket(bucketName).upload(file, {
-        destination: file,
-      });
-    });
-
-    // Replace all files with different checksums
-    const replacePromises = filesToReplace.map(async file => {
-      console.log(`Replacing ${file} in ${bucketName}`);
-      return storage.bucket(bucketName).upload(file, {
-        destination: file,
-      });
-    });
-    
-    await Promise.all([...uploadPromises, ...replacePromises]);
-    console.log("")
-  }
-}
-
-main().catch(console.error);