@basemaps/lambda-tiler 8.0.0 → 8.1.0

package/dist/node_modules/semver/ranges/to-comparators.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const Range = require('../classes/range')
 
 // Mostly just for testing and legacy API reasons

package/dist/node_modules/semver/ranges/valid.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const Range = require('../classes/range')
 const validRange = (range, options) => {
   try {

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@basemaps/lambda-tiler",
-      "version": "8.0.0",
+      "version": "8.1.0",
       "license": "MIT",
       "dependencies": {
         "lerc": "4.0.4",
@@ -539,9 +539,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,12 +22,12 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^8.0.0",
-    "@basemaps/config-loader": "^8.0.0",
+    "@basemaps/config": "^8.1.0",
+    "@basemaps/config-loader": "^8.1.0",
     "@basemaps/geo": "^8.0.0",
-    "@basemaps/shared": "^8.0.0",
+    "@basemaps/shared": "^8.1.0",
     "@basemaps/tiler": "^8.0.0",
-    "@basemaps/tiler-sharp": "^8.0.0",
+    "@basemaps/tiler-sharp": "^8.1.0",
     "@linzjs/geojson": "^8.0.0",
     "@linzjs/lambda": "^4.0.0",
     "@mapbox/vector-tile": "^2.0.3",
@@ -56,5 +56,5 @@
     "@types/pixelmatch": "^5.0.0",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "852c7c8bcbe06d065de732f23a6ebc2dd6a19cfc"
+  "gitHead": "14a4364d39e226b7ed0396fee9c3adc534d1142b"
 }

package/src/__tests__/index.test.ts

@@ -1,7 +1,10 @@
 import assert from 'node:assert';
 import { afterEach, describe, it } from 'node:test';
 
+import { ConfigProviderMemory } from '@basemaps/config';
+
 import { handler } from '../index.js';
+import { ConfigLoader } from '../util/config.loader.js';
 import { mockRequest } from './xyz.util.js';
 
 describe('LambdaXyz index', () => {
@@ -17,7 +20,10 @@ describe('LambdaXyz index', () => {
       delete process.env['BUILD_ID'];
     });
 
-    it('should return version', async () => {
+    it('should return version', async (t) => {
+      const config = new ConfigProviderMemory();
+      t.mock.method(ConfigLoader, 'getDefaultConfig', () => config);
+
       process.env['GIT_VERSION'] = '1.2.3';
       process.env['GIT_HASH'] = 'abc456';
 
@@ -32,7 +38,10 @@ describe('LambdaXyz index', () => {
       });
     });
 
-    it('should include buildId if exists', async () => {
+    it('should include buildId if exists', async (t) => {
+      const config = new ConfigProviderMemory();
+      t.mock.method(ConfigLoader, 'getDefaultConfig', () => config);
+
       process.env['GIT_VERSION'] = '1.2.3';
       process.env['BUILD_ID'] = '1658821493-3';
 
@@ -46,6 +55,25 @@ describe('LambdaXyz index', () => {
         buildId: '1658821493-3',
       });
     });
+
+    it('should return config information if present', async (t) => {
+      const config = new ConfigProviderMemory();
+      t.mock.method(ConfigLoader, 'getDefaultConfig', () => config);
+      config.id = 'config-id';
+
+      const response = await handler.router.handle(mockRequest('/v1/version'));
+      assert.deepEqual(JSON.parse(response.body), {
+        version: 'dev',
+        config: { id: 'config-id' },
+      });
+
+      config.hash = 'config-hash';
+      const responseHash = await handler.router.handle(mockRequest('/v1/version'));
+      assert.deepEqual(JSON.parse(responseHash.body), {
+        version: 'dev',
+        config: { id: 'config-id', hash: 'config-hash' },
+      });
+    });
   });
 
   it('should respond to /ping', async () => {

package/src/routes/version.ts

@@ -1,6 +1,16 @@
-import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
+import { BasemapsConfigProvider, ConfigProviderMemory } from '@basemaps/config';
+import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 
-export function versionGet(): Promise<LambdaHttpResponse> {
+import { ConfigLoader } from '../util/config.loader.js';
+
+function getConfigHash(cfg: BasemapsConfigProvider): { id: string; hash?: string } | undefined {
+  if (!ConfigProviderMemory.is(cfg)) return undefined;
+  if (cfg.id == null) return undefined;
+  return { id: cfg.id, hash: cfg.hash };
+}
+
+export async function versionGet(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
+  const config = await ConfigLoader.load(req);
   const response = new LambdaHttpResponse(200, 'ok');
   response.header(HttpHeader.CacheControl, 'no-store');
   response.json({
@@ -9,16 +19,26 @@ export function versionGet(): Promise<LambdaHttpResponse> {
      * @example "v6.42.1"
      */
     version: process.env['GIT_VERSION'] ?? 'dev',
+
     /**
      * Full git commit hash
      * @example "e4231b1ee62c276c8657c56677ced02681dfe5d6"
      */
     hash: process.env['GIT_HASH'],
+
     /**
+     *
      * The exact build that this release was run from
      * @example "1658821493-3"
      */
     buildId: process.env['BUILD_ID'],
+
+    /**
+     * Configuration id that was used to power this config
+     * @example { "id": "cb_01JTQ7ZK49F8EY4N5DRJ3XFT73", hash: "HcByZ8WS2zpaTxFJp6wSKg2eUpwahLqAGEQdcDxKxqp6" }
+     */
+    config: getConfigHash(config),
   });
+
   return Promise.resolve(response);
 }