@basemaps/cli 6.22.0 → 6.22.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.22.1](https://github.com/linz/basemaps/compare/v6.22.0...v6.22.1) (2022-03-23)
+
+
+### Bug Fixes
+
+* **cli:** allow unicode job names ([#2126](https://github.com/linz/basemaps/issues/2126)) ([bab5cef](https://github.com/linz/basemaps/commit/bab5cefdc8365cb52bf687230a078ea599c359ce))
+
+
+
+
+
 # [6.22.0](https://github.com/linz/basemaps/compare/v6.21.1...v6.22.0) (2022-03-20)
 
 

package/build/cli/cogify/__test__/action.batch.test.js

@@ -1,5 +1,5 @@
 import o from 'ospec';
-import { extractResolutionFromName } from '../action.batch.js';
+import { ActionBatchJob, extractResolutionFromName } from '../action.batch.js';
 o.spec('action.batch', () => {
     o('extractResolutionFromName', () => {
         o(extractResolutionFromName('2013')).equals(-1);
@@ -10,4 +10,14 @@ o.spec('action.batch', () => {
         o(extractResolutionFromName('wellington_urban_2017_1.00m')).equals(1000);
         o(extractResolutionFromName('wellington_urban_2017_0.025m')).equals(25);
     });
+    o('should create valid jobNames', () => {
+        const fakeJob = { id: '01FHRPYJ5FV1XAARZAC4T4K6MC', name: 'geographx_nz_texture_shade_2012_8-0m' };
+        o(ActionBatchJob.id(fakeJob, '0')).equals('01FHRPYJ5FV1XAARZAC4T4K6MC-9af5e139bbb3e502-0');
+        fakeJob.name = 'ōtorohanga_urban_2021_0.1m_RGB';
+        o(ActionBatchJob.id(fakeJob, '0')).equals('01FHRPYJ5FV1XAARZAC4T4K6MC-5294acface81c107-0');
+    });
+    o('should truncate job names to 128 characters', () => {
+        const fakeJob = { id: '01FHRPYJ5FV1XAARZAC4T4K6MC', name: 'geographx_nz_texture_shade_2012_8-0m' };
+        o(ActionBatchJob.id(fakeJob, 'this is a really long file name it should over flow 128 characters so it should be truncated at some point.tiff')).equals('01FHRPYJ5FV1XAARZAC4T4K6MC-9af5e139bbb3e502-this is a really long file name it should over flow 128 characters so it should be t');
+    });
 });

package/build/cli/cogify/action.batch.d.ts

@@ -14,7 +14,15 @@ export declare class ActionBatchJob extends CommandLineAction {
     private commit?;
     private oneCog?;
     constructor();
-    static id(job: CogJob, name: string): string;
+    /**
+     * Create a id for a job
+     *
+     * This needs to be within `[a-Z_-]` upto 128 characters log
+     * @param job job to process
+     * @param fileName output filename
+     * @returns job id
+     */
+    static id(job: CogJob, fileName: string): string;
     static batchOne(jobPath: string, job: CogJob, batch: Batch, name: string, isCommit: boolean): Promise<{
         jobName: string;
         jobId: string;

package/build/cli/cogify/action.batch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action.batch.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.batch.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAc,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AACrH,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAS5C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAC,CAA6B;;IAU5C,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;WAI/B,QAAQ,CACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA6B9D;;;OAGG;WACU,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqBrE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;WAanB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyD9G,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAqBrC"}
+{"version":3,"file":"action.batch.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.batch.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAc,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AACrH,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAS5C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,MAAM,CAAC,CAA6B;;IAU5C;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;WAMnC,QAAQ,CACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA6B9D;;;OAGG;WACU,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqBrE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;WAanB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyD9G,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAqBrC"}

package/build/cli/cogify/action.batch.js

@@ -2,6 +2,7 @@ import { TileMatrixSet } from '@basemaps/geo';
 import { Env, fsa, LogConfig, Projection } from '@basemaps/shared';
 import { CommandLineAction } from '@rushstack/ts-command-line';
 import Batch from 'aws-sdk/clients/batch.js';
+import { createHash } from 'crypto';
 import { CogStacJob } from '../../cog/cog.stac.job.js';
 const JobQueue = 'CogBatchJobQueue';
 const JobDefinition = 'CogBatchJob';
@@ -28,8 +29,18 @@ export class ActionBatchJob extends CommandLineAction {
             documentation: 'Submit a list of cogs to a AWS Batch queue to be process',
         });
     }
-    static id(job, name) {
-        return `${job.id}-${job.name}-${name}`;
+    /**
+     * Create a id for a job
+     *
+     * This needs to be within `[a-Z_-]` upto 128 characters log
+     * @param job job to process
+     * @param fileName output filename
+     * @returns job id
+     */
+    static id(job, fileName) {
+        // Job names are uncontrolled so hash the name and grab a small slice to use as a identifier
+        const jobName = createHash('sha256').update(job.name).digest('hex').slice(0, 16);
+        return `${job.id}-${jobName}-${fileName}`.slice(0, 128);
     }
     static async batchOne(jobPath, job, batch, name, isCommit) {
         const jobName = ActionBatchJob.id(job, name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/cli",
-  "version": "6.22.0",
+  "version": "6.22.1",
   "private": false,
   "repository": {
     "type": "git",
@@ -59,5 +59,5 @@
   "files": [
     "build/"
   ],
-  "gitHead": "b85a4a628bcdfea657a37de97faa23dde5c34798"
+  "gitHead": "3190b6a49a91b3220b429a736484a93f3b76c721"
 }