Update for Bref v3

Author: mnapoli

README.md

@@ -32,20 +32,15 @@ Get a layer version:
 ```js
 import { layerVersions } from '@bref.sh/layers';
 
-console.log(layerVersions['php-82']['us-east-1']);
-console.log(layerVersions['php-82-fpm']['eu-west-3']);
+console.log(layerVersions['php-84']['us-east-1']);
+console.log(layerVersions['arm-php-84']['eu-west-3']);
 ```
 
 Helpers to get a full ARN:
 
 ```js
-import { functionLayerArn, fpmLayerArn, consoleLayerArn } from '@bref.sh/layers';
+import { layerArn } from '@bref.sh/layers';
 
-console.log(functionLayerArn(region, '8.2'));
-console.log(functionLayerArn(region, '8.3', 'arm'));
-
-console.log(fpmLayerArn(region, '8.2'));
-console.log(fpmLayerArn(region, '8.3', 'arm'));
-
-console.log(consoleLayerArn(region));
+console.log(layerArn(region, '8.4'));
+console.log(layerArn(region, '8.4', 'arm'));
 ```

layers.js

@@ -8,7 +8,7 @@ const layerVersions = require('./layers.json');
  * @param {'x86'|'arm'} platform
  * @returns {string} Layer ARN
  */
-function functionLayerArn(region, phpVersion, platform = 'x86') {
+function layerArn(region, phpVersion, platform = 'x86') {
     let layerName = 'php-' + phpVersion.replace('.', '');
     if (platform === 'arm') {
         layerName = 'arm-' + layerName;
@@ -20,42 +20,8 @@ function functionLayerArn(region, phpVersion, platform = 'x86') {
     return `arn:aws:lambda:${region}:873528684822:layer:${layerName}:${version}`;
 }
 
-/**
- * Returns the ARN for the FPM layer.
- * @param {string} region
- * @param {string} phpVersion (e.g. '8.1')
- * @param {'x86'|'arm'} platform
- * @returns {string} Layer ARN
- */
-function fpmLayerArn(region, phpVersion, platform = 'x86') {
-    let layerName = 'php-' + phpVersion.replace('.', '') + '-fpm';
-    if (platform === 'arm') {
-        layerName = 'arm-' + layerName;
-    }
-    const version = layerVersions[layerName]?.[region];
-    if (!version) {
-        throw new Error(`PHP version ${phpVersion} in ${region} is not supported`);
-    }
-    return `arn:aws:lambda:${region}:873528684822:layer:${layerName}:${version}`;
-}
-
-/**
- * Returns the ARN for the Console layer.
- * @param {string} region
- * @returns {string} Layer ARN
- */
-function consoleLayerArn(region) {
-    const version = layerVersions.console[region];
-    if (!version) {
-        throw new Error(`Console layer does not exist in region ${region}`);
-    }
-    return `arn:aws:lambda:${region}:873528684822:layer:console:${version}`;
-}
-
 module.exports = {
     // Expose the JSON data as a JS dependency for easier use in programmatic environments
     layerVersions,
-    functionLayerArn,
-    fpmLayerArn,
-    consoleLayerArn,
+    layerArn,
 };

test/layers.test.js

@@ -1,65 +1,33 @@
 import {describe, test, expect} from 'vitest'
 import layerVersions from "../layers.json";
-import {consoleLayerArn, fpmLayerArn, functionLayerArn} from "../layers";
+import {layerArn} from "../layers";
 
 // The two tests marked with concurrent will be run in parallel
 describe('layers', () => {
 
     test('layerVersions', () => {
         expect(layerVersions).to.have.keys([
+            "php-85",
             "php-84",
-            "php-84-fpm",
             "php-83",
-            "php-83-fpm",
             "php-82",
-            "php-82-fpm",
-            "php-81",
-            "php-81-fpm",
-            "php-80",
-            "php-80-fpm",
+            "arm-php-85",
             "arm-php-84",
-            "arm-php-84-fpm",
             "arm-php-83",
-            "arm-php-83-fpm",
             "arm-php-82",
-            "arm-php-82-fpm",
-            "arm-php-81",
-            "arm-php-81-fpm",
-            "arm-php-80",
-            "arm-php-80-fpm",
-            "console",
         ]);
         expect(layerVersions["php-82"]["us-east-1"]).to.be.a("string");
     });
 
-    test('functionLayerArn', () => {
-        expect(functionLayerArn('us-east-1', '8.3')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:php-83:\d+/);
-        expect(functionLayerArn('us-east-1', '8.3', 'arm')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:arm-php-83:\d+/);
-        expect(functionLayerArn('us-east-1', '8.2')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:php-82:\d+/);
-        expect(functionLayerArn('us-east-1', '8.1', 'arm')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:arm-php-81:\d+/);
+    test('layerArn', () => {
+        expect(layerArn('us-east-1', '8.3')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:php-83:\d+/);
+        expect(layerArn('us-east-1', '8.3', 'arm')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:arm-php-83:\d+/);
+        expect(layerArn('us-east-1', '8.2')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:php-82:\d+/);
+        expect(layerArn('us-east-1', '8.5', 'arm')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:arm-php-85:\d+/);
 
         expect(() => {
-            functionLayerArn('us-east-1', '7.4', 'arm');
+            layerArn('us-east-1', '7.4', 'arm');
         }).toThrow('PHP version 7.4 in us-east-1 is not supported');
     });
 
-    test('fpmLayerArn', () => {
-        expect(fpmLayerArn('us-east-1', '8.3')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:php-83-fpm:\d+/);
-        expect(fpmLayerArn('us-east-1', '8.3', 'arm')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:arm-php-83-fpm:\d+/);
-        expect(fpmLayerArn('us-east-1', '8.2')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:php-82-fpm:\d+/);
-        expect(fpmLayerArn('us-east-1', '8.1', 'arm')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:arm-php-81-fpm:\d+/);
-
-        expect(() => {
-            fpmLayerArn('us-east-1', '7.4', 'arm');
-        }).toThrow('PHP version 7.4 in us-east-1 is not supported');
-    });
-
-    test('consoleLayerArn', () => {
-        expect(consoleLayerArn('us-east-1')).matches(/arn:aws:lambda:us-east-1:873528684822:layer:console:\d+/);
-
-        expect(() => {
-            consoleLayerArn('us-east-99');
-        }).toThrow('Console layer does not exist in region us-east-99');
-    });
-
 });