From 4dceac344c299dd4c4c8d4db86bc3bbef2f8d6f2 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Sun, 23 Jul 2023 15:35:42 +0900 Subject: [PATCH 01/21] Add the `afterInvoke` hook --- src/Bref.php | 15 ++++++++++++++- src/Runtime/LambdaRuntime.php | 4 ++++ tests/BrefTest.php | 10 ++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/Bref.php b/src/Bref.php index 180cdbac6..67cb3eb45 100644 --- a/src/Bref.php +++ b/src/Bref.php @@ -14,6 +14,7 @@ class Bref private static array $hooks = [ 'beforeStartup' => [], 'beforeInvoke' => [], + 'afterInvoke' => [], ]; /** @@ -51,7 +52,19 @@ public static function beforeInvoke(Closure $hook): void } /** - * @param 'beforeStartup'|'beforeInvoke' $hookName + * Register a hook to be executed after any Lambda invocation. + * + * Warning: hooks are low-level extension points to be used by framework + * integrations. For user code, it is not recommended to use them. Use your + * framework's extension points instead. + */ + public static function afterInvoke(Closure $hook): void + { + self::$hooks['afterInvoke'][] = $hook; + } + + /** + * @param 'beforeStartup'|'beforeInvoke'|'afterInvoke' $hookName * * @internal Used by the Bref runtime */ diff --git a/src/Runtime/LambdaRuntime.php b/src/Runtime/LambdaRuntime.php index 6fbadb316..854c57113 100755 --- a/src/Runtime/LambdaRuntime.php +++ b/src/Runtime/LambdaRuntime.php @@ -89,9 +89,13 @@ public function processNextEvent(Handler | RequestHandlerInterface | callable $h $result = $this->invoker->invoke($handler, $event, $context); $this->sendResponse($context->getAwsRequestId(), $result); + + Bref::triggerHooks('afterInvoke'); } catch (Throwable $e) { $this->signalFailure($context->getAwsRequestId(), $e); + Bref::triggerHooks('afterInvoke'); + return false; } diff --git a/tests/BrefTest.php b/tests/BrefTest.php index 4ebbd05cd..37c2696d3 100644 --- a/tests/BrefTest.php +++ b/tests/BrefTest.php @@ -36,6 +36,7 @@ public function test hooks(): void $beforeStartup1 = false; $beforeStartup2 = false; $beforeInvoke = false; + $afterInvoke = false; // Check that we can set multiple handlers Bref::beforeStartup(function () use (&$beforeStartup1) { @@ -47,17 +48,26 @@ public function test hooks(): void Bref::beforeInvoke(function () use (&$beforeInvoke) { return $beforeInvoke = true; }); + Bref::afterInvoke(function () use (&$afterInvoke) { + return $afterInvoke = true; + }); $this->assertFalse($beforeStartup1); $this->assertFalse($beforeStartup2); $this->assertFalse($beforeInvoke); + $this->assertFalse($afterInvoke); Bref::triggerHooks('beforeStartup'); $this->assertTrue($beforeStartup1); $this->assertTrue($beforeStartup2); $this->assertFalse($beforeInvoke); + $this->assertFalse($afterInvoke); Bref::triggerHooks('beforeInvoke'); $this->assertTrue($beforeInvoke); + $this->assertFalse($afterInvoke); + + Bref::triggerHooks('afterInvoke'); + $this->assertTrue($afterInvoke); } } From 9ef553848f0b388017440daa0f0e70ebcd04a9fe Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Sun, 23 Jul 2023 23:54:09 +0900 Subject: [PATCH 02/21] Add Bref event subscribers --- src/Bref.php | 25 +++++------- src/ConsoleRuntime/Main.php | 1 + src/FpmRuntime/Main.php | 1 + src/FunctionRuntime/Main.php | 1 + src/Listener/BrefEventSubscriber.php | 52 ++++++++++++++++++++++++ src/Listener/EventDispatcher.php | 56 ++++++++++++++++++++++++++ src/Runtime/LambdaRuntime.php | 5 ++- tests/BrefTest.php | 10 ----- tests/Listener/EventDispatcherTest.php | 31 ++++++++++++++ tests/Listener/FakeSubscriber.php | 27 +++++++++++++ 10 files changed, 183 insertions(+), 26 deletions(-) create mode 100644 src/Listener/BrefEventSubscriber.php create mode 100644 src/Listener/EventDispatcher.php create mode 100644 tests/Listener/EventDispatcherTest.php create mode 100644 tests/Listener/FakeSubscriber.php diff --git a/src/Bref.php b/src/Bref.php index 67cb3eb45..51a0798f9 100644 --- a/src/Bref.php +++ b/src/Bref.php @@ -2,6 +2,7 @@ namespace Bref; +use Bref\Listener\EventDispatcher; use Bref\Runtime\FileHandlerLocator; use Closure; use Psr\Container\ContainerInterface; @@ -14,8 +15,8 @@ class Bref private static array $hooks = [ 'beforeStartup' => [], 'beforeInvoke' => [], - 'afterInvoke' => [], ]; + private static EventDispatcher $eventDispatcher; /** * Configure the container that provides Lambda handlers. @@ -27,6 +28,14 @@ public static function setContainer(Closure $containerProvider): void self::$containerProvider = $containerProvider; } + public static function events(): EventDispatcher + { + if (! isset(self::$eventDispatcher)) { + self::$eventDispatcher = new EventDispatcher(); + } + return self::$eventDispatcher; + } + /** * Register a hook to be executed before the runtime starts. * @@ -52,19 +61,7 @@ public static function beforeInvoke(Closure $hook): void } /** - * Register a hook to be executed after any Lambda invocation. - * - * Warning: hooks are low-level extension points to be used by framework - * integrations. For user code, it is not recommended to use them. Use your - * framework's extension points instead. - */ - public static function afterInvoke(Closure $hook): void - { - self::$hooks['afterInvoke'][] = $hook; - } - - /** - * @param 'beforeStartup'|'beforeInvoke'|'afterInvoke' $hookName + * @param 'beforeStartup'|'beforeInvoke' $hookName * * @internal Used by the Bref runtime */ diff --git a/src/ConsoleRuntime/Main.php b/src/ConsoleRuntime/Main.php index d42435b55..df961a1f2 100755 --- a/src/ConsoleRuntime/Main.php +++ b/src/ConsoleRuntime/Main.php @@ -19,6 +19,7 @@ public static function run(): void LazySecretsLoader::loadSecretEnvironmentVariables(); Bref::triggerHooks('beforeStartup'); + Bref::events()->beforeStartup(); $lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('console'); diff --git a/src/FpmRuntime/Main.php b/src/FpmRuntime/Main.php index 6c8aa842b..ca476a489 100755 --- a/src/FpmRuntime/Main.php +++ b/src/FpmRuntime/Main.php @@ -21,6 +21,7 @@ public static function run(): void LazySecretsLoader::loadSecretEnvironmentVariables(); Bref::triggerHooks('beforeStartup'); + Bref::events()->beforeStartup(); $lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('fpm'); diff --git a/src/FunctionRuntime/Main.php b/src/FunctionRuntime/Main.php index c4843eda4..b121c3f11 100644 --- a/src/FunctionRuntime/Main.php +++ b/src/FunctionRuntime/Main.php @@ -17,6 +17,7 @@ public static function run(): void LazySecretsLoader::loadSecretEnvironmentVariables(); Bref::triggerHooks('beforeStartup'); + Bref::events()->beforeStartup(); $lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('function'); diff --git a/src/Listener/BrefEventSubscriber.php b/src/Listener/BrefEventSubscriber.php new file mode 100644 index 000000000..8d459b3e4 --- /dev/null +++ b/src/Listener/BrefEventSubscriber.php @@ -0,0 +1,52 @@ +subscribers[] = $subscriber; + } + + public function beforeStartup(): void + { + foreach ($this->subscribers as $listener) { + $listener->beforeStartup(); + } + } + + public function beforeInvoke( + Handler|RequestHandlerInterface|callable $handler, + mixed $event, + Context $context, + ): void + { + foreach ($this->subscribers as $listener) { + $listener->beforeInvoke($handler, $event, $context); + } + } + + public function afterInvoke( + Handler|RequestHandlerInterface|callable $handler, + mixed $event, + Context $context, + mixed $result, + Throwable|null $error = null, + ): void + { + foreach ($this->subscribers as $listener) { + $listener->afterInvoke($handler, $event, $context, $result, $error); + } + } +} \ No newline at end of file diff --git a/src/Runtime/LambdaRuntime.php b/src/Runtime/LambdaRuntime.php index 854c57113..bc22d5847 100755 --- a/src/Runtime/LambdaRuntime.php +++ b/src/Runtime/LambdaRuntime.php @@ -82,6 +82,7 @@ public function processNextEvent(Handler | RequestHandlerInterface | callable $h [$event, $context] = $this->waitNextInvocation(); Bref::triggerHooks('beforeInvoke'); + Bref::events()->beforeInvoke($handler, $event, $context); $this->ping(); @@ -90,11 +91,11 @@ public function processNextEvent(Handler | RequestHandlerInterface | callable $h $this->sendResponse($context->getAwsRequestId(), $result); - Bref::triggerHooks('afterInvoke'); + Bref::events()->afterInvoke($handler, $event, $context, $result); } catch (Throwable $e) { $this->signalFailure($context->getAwsRequestId(), $e); - Bref::triggerHooks('afterInvoke'); + Bref::events()->afterInvoke($handler, $event, $context, null, $e); return false; } diff --git a/tests/BrefTest.php b/tests/BrefTest.php index 37c2696d3..4ebbd05cd 100644 --- a/tests/BrefTest.php +++ b/tests/BrefTest.php @@ -36,7 +36,6 @@ public function test hooks(): void $beforeStartup1 = false; $beforeStartup2 = false; $beforeInvoke = false; - $afterInvoke = false; // Check that we can set multiple handlers Bref::beforeStartup(function () use (&$beforeStartup1) { @@ -48,26 +47,17 @@ public function test hooks(): void Bref::beforeInvoke(function () use (&$beforeInvoke) { return $beforeInvoke = true; }); - Bref::afterInvoke(function () use (&$afterInvoke) { - return $afterInvoke = true; - }); $this->assertFalse($beforeStartup1); $this->assertFalse($beforeStartup2); $this->assertFalse($beforeInvoke); - $this->assertFalse($afterInvoke); Bref::triggerHooks('beforeStartup'); $this->assertTrue($beforeStartup1); $this->assertTrue($beforeStartup2); $this->assertFalse($beforeInvoke); - $this->assertFalse($afterInvoke); Bref::triggerHooks('beforeInvoke'); $this->assertTrue($beforeInvoke); - $this->assertFalse($afterInvoke); - - Bref::triggerHooks('afterInvoke'); - $this->assertTrue($afterInvoke); } } diff --git a/tests/Listener/EventDispatcherTest.php b/tests/Listener/EventDispatcherTest.php new file mode 100644 index 000000000..5fbaac3bf --- /dev/null +++ b/tests/Listener/EventDispatcherTest.php @@ -0,0 +1,31 @@ +subscribe($subscriber); + + $eventDispatcher->beforeStartup(); + $this->assertTrue($subscriber->invokedBeforeStartup); + + $handler = fn() => null; + $event = new stdClass; + $context = Context::fake(); + $eventDispatcher->beforeInvoke($handler, $event, $context); + $this->assertEquals([$handler, $event, $context], $subscriber->invokedBeforeInvoke); + + $result = new stdClass; + $eventDispatcher->afterInvoke($handler, $event, $context, $result); + $this->assertEquals([$handler, $event, $context, $result, null], $subscriber->invokedAfterInvoke); + } +} \ No newline at end of file diff --git a/tests/Listener/FakeSubscriber.php b/tests/Listener/FakeSubscriber.php new file mode 100644 index 000000000..ab4e87b9d --- /dev/null +++ b/tests/Listener/FakeSubscriber.php @@ -0,0 +1,27 @@ +invokedBeforeStartup = true; + } + + public function beforeInvoke(...$params): void + { + $this->invokedBeforeInvoke = $params; + } + + public function afterInvoke(...$params): void + { + $this->invokedAfterInvoke = $params; + } +} From 29d2ad4a77b50ec4840c54657527220365538869 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Mon, 24 Jul 2023 20:18:39 +0900 Subject: [PATCH 03/21] Clarify the public vs private API --- src/Listener/EventDispatcher.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Listener/EventDispatcher.php b/src/Listener/EventDispatcher.php index af1a5087e..ff4b9aa46 100644 --- a/src/Listener/EventDispatcher.php +++ b/src/Listener/EventDispatcher.php @@ -7,7 +7,7 @@ use Psr\Http\Server\RequestHandlerInterface; use Throwable; -class EventDispatcher extends BrefEventSubscriber +final class EventDispatcher extends BrefEventSubscriber { /** * @param BrefEventSubscriber[] $subscribers @@ -18,11 +18,19 @@ public function __construct( { } + /** + * Register an event subscriber class. + */ public function subscribe(BrefEventSubscriber $subscriber): void { $this->subscribers[] = $subscriber; } + /** + * Trigger the `beforeStartup` event. + * + * @internal This method is called by Bref and should not be called by user code. + */ public function beforeStartup(): void { foreach ($this->subscribers as $listener) { @@ -30,6 +38,11 @@ public function beforeStartup(): void } } + /** + * Trigger the `beforeInvoke` event. + * + * @internal This method is called by Bref and should not be called by user code. + */ public function beforeInvoke( Handler|RequestHandlerInterface|callable $handler, mixed $event, @@ -41,6 +54,11 @@ public function beforeInvoke( } } + /** + * Trigger the `afterInvoke` event. + * + * @internal This method is called by Bref and should not be called by user code. + */ public function afterInvoke( Handler|RequestHandlerInterface|callable $handler, mixed $event, From 30f7118d634d1397ba742126479be75c3318eaec Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Fri, 28 Jul 2023 12:13:13 +0200 Subject: [PATCH 04/21] Add the `afterStartup` event --- src/ConsoleRuntime/Main.php | 2 ++ src/FpmRuntime/Main.php | 2 ++ src/FunctionRuntime/Main.php | 2 ++ src/Listener/BrefEventSubscriber.php | 7 +++++++ src/Listener/EventDispatcher.php | 12 ++++++++++++ 5 files changed, 25 insertions(+) diff --git a/src/ConsoleRuntime/Main.php b/src/ConsoleRuntime/Main.php index df961a1f2..78cc24e02 100755 --- a/src/ConsoleRuntime/Main.php +++ b/src/ConsoleRuntime/Main.php @@ -29,6 +29,8 @@ public static function run(): void $lambdaRuntime->failInitialization("Handler `$handlerFile` doesn't exist"); } + Bref::events()->afterStartup(); + /** @phpstan-ignore-next-line */ while (true) { $lambdaRuntime->processNextEvent(function ($event, Context $context) use ($handlerFile): array { diff --git a/src/FpmRuntime/Main.php b/src/FpmRuntime/Main.php index ca476a489..4e7ae8a25 100755 --- a/src/FpmRuntime/Main.php +++ b/src/FpmRuntime/Main.php @@ -38,6 +38,8 @@ public static function run(): void $lambdaRuntime->failInitialization('Error while starting PHP-FPM', $e); } + Bref::events()->afterStartup(); + /** @phpstan-ignore-next-line */ while (true) { $lambdaRuntime->processNextEvent($phpFpm); diff --git a/src/FunctionRuntime/Main.php b/src/FunctionRuntime/Main.php index b121c3f11..f55de1b78 100644 --- a/src/FunctionRuntime/Main.php +++ b/src/FunctionRuntime/Main.php @@ -29,6 +29,8 @@ public static function run(): void $lambdaRuntime->failInitialization($e->getMessage()); } + Bref::events()->afterStartup(); + $loopMax = getenv('BREF_LOOP_MAX') ?: 1; $loops = 0; while (true) { diff --git a/src/Listener/BrefEventSubscriber.php b/src/Listener/BrefEventSubscriber.php index 8d459b3e4..49f93ca5d 100644 --- a/src/Listener/BrefEventSubscriber.php +++ b/src/Listener/BrefEventSubscriber.php @@ -23,6 +23,13 @@ public function beforeStartup(): void { } + /** + * Register a hook to be executed after the runtime starts. + */ + public function afterStartup(): void + { + } + /** * Register a hook to be executed before any Lambda invocation. */ diff --git a/src/Listener/EventDispatcher.php b/src/Listener/EventDispatcher.php index ff4b9aa46..1f3e94aea 100644 --- a/src/Listener/EventDispatcher.php +++ b/src/Listener/EventDispatcher.php @@ -38,6 +38,18 @@ public function beforeStartup(): void } } + /** + * Trigger the `afterStartup` event. + * + * @internal This method is called by Bref and should not be called by user code. + */ + public function afterStartup(): void + { + foreach ($this->subscribers as $listener) { + $listener->afterStartup(); + } + } + /** * Trigger the `beforeInvoke` event. * From 0227d433a6e9a9e75586cbb08de94d8793b853f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 14:59:44 +0000 Subject: [PATCH 05/21] Update layer versions --- layers.json | 670 ++++++++++++++++++++++++++-------------------------- 1 file changed, 335 insertions(+), 335 deletions(-) diff --git a/layers.json b/layers.json index 14f14e2bf..75eb541d1 100644 --- a/layers.json +++ b/layers.json @@ -1,115 +1,139 @@ { "php-83": { - "ca-central-1": "6", - "eu-central-1": "6", - "eu-north-1": "6", - "eu-west-1": "6", - "eu-west-2": "6", - "eu-west-3": "6", - "sa-east-1": "6", - "us-east-1": "6", - "us-east-2": "6", - "us-west-1": "6", - "us-west-2": "6", - "ap-east-1": "6", - "ap-south-1": "6", - "ap-northeast-1": "6", - "ap-northeast-2": "6", - "ap-northeast-3": "6", - "ap-southeast-1": "6", - "ap-southeast-2": "6", - "eu-south-1": "6", - "eu-south-2": "6", - "af-south-1": "6", - "me-south-1": "6" + "ca-central-1": "7", + "eu-central-1": "7", + "eu-north-1": "7", + "eu-west-1": "7", + "eu-west-2": "7", + "eu-west-3": "7", + "sa-east-1": "7", + "us-east-1": "7", + "us-east-2": "7", + "us-west-1": "7", + "us-west-2": "7", + "ap-east-1": "7", + "ap-south-1": "7", + "ap-northeast-1": "7", + "ap-northeast-2": "7", + "ap-northeast-3": "7", + "ap-southeast-1": "7", + "ap-southeast-2": "7", + "eu-south-1": "7", + "eu-south-2": "7", + "af-south-1": "7", + "me-south-1": "7" }, "php-83-fpm": { - "ca-central-1": "6", - "eu-central-1": "6", - "eu-north-1": "6", - "eu-west-1": "6", - "eu-west-2": "6", - "eu-west-3": "6", - "sa-east-1": "6", - "us-east-1": "6", - "us-east-2": "6", - "us-west-1": "6", - "us-west-2": "6", - "ap-east-1": "6", - "ap-south-1": "6", - "ap-northeast-1": "6", - "ap-northeast-2": "6", - "ap-northeast-3": "6", - "ap-southeast-1": "6", - "ap-southeast-2": "6", - "eu-south-1": "6", - "eu-south-2": "6", - "af-south-1": "6", - "me-south-1": "6" + "ca-central-1": "7", + "eu-central-1": "7", + "eu-north-1": "7", + "eu-west-1": "7", + "eu-west-2": "7", + "eu-west-3": "7", + "sa-east-1": "7", + "us-east-1": "7", + "us-east-2": "7", + "us-west-1": "7", + "us-west-2": "7", + "ap-east-1": "7", + "ap-south-1": "7", + "ap-northeast-1": "7", + "ap-northeast-2": "7", + "ap-northeast-3": "7", + "ap-southeast-1": "7", + "ap-southeast-2": "7", + "eu-south-1": "7", + "eu-south-2": "7", + "af-south-1": "7", + "me-south-1": "7" }, "php-82": { - "ca-central-1": "50", - "eu-central-1": "50", - "eu-north-1": "50", - "eu-west-1": "50", - "eu-west-2": "50", - "eu-west-3": "50", - "sa-east-1": "50", - "us-east-1": "50", - "us-east-2": "50", - "us-west-1": "50", - "us-west-2": "50", - "ap-east-1": "50", - "ap-south-1": "50", - "ap-northeast-1": "50", - "ap-northeast-2": "50", - "ap-northeast-3": "50", - "ap-southeast-1": "50", - "ap-southeast-2": "50", - "eu-south-1": "50", - "eu-south-2": "49", - "af-south-1": "50", - "me-south-1": "50" + "ca-central-1": "51", + "eu-central-1": "51", + "eu-north-1": "51", + "eu-west-1": "51", + "eu-west-2": "51", + "eu-west-3": "51", + "sa-east-1": "51", + "us-east-1": "51", + "us-east-2": "51", + "us-west-1": "51", + "us-west-2": "51", + "ap-east-1": "51", + "ap-south-1": "51", + "ap-northeast-1": "51", + "ap-northeast-2": "51", + "ap-northeast-3": "51", + "ap-southeast-1": "51", + "ap-southeast-2": "51", + "eu-south-1": "51", + "eu-south-2": "50", + "af-south-1": "51", + "me-south-1": "51" }, "php-82-fpm": { - "ca-central-1": "50", - "eu-central-1": "50", - "eu-north-1": "50", - "eu-west-1": "50", - "eu-west-2": "50", - "eu-west-3": "50", - "sa-east-1": "50", - "us-east-1": "50", - "us-east-2": "50", - "us-west-1": "50", - "us-west-2": "50", - "ap-east-1": "50", - "ap-south-1": "50", - "ap-northeast-1": "50", - "ap-northeast-2": "50", - "ap-northeast-3": "50", - "ap-southeast-1": "50", - "ap-southeast-2": "50", - "eu-south-1": "50", - "eu-south-2": "49", - "af-south-1": "50", - "me-south-1": "50" + "ca-central-1": "51", + "eu-central-1": "51", + "eu-north-1": "51", + "eu-west-1": "51", + "eu-west-2": "51", + "eu-west-3": "51", + "sa-east-1": "51", + "us-east-1": "51", + "us-east-2": "51", + "us-west-1": "51", + "us-west-2": "51", + "ap-east-1": "51", + "ap-south-1": "51", + "ap-northeast-1": "51", + "ap-northeast-2": "51", + "ap-northeast-3": "51", + "ap-southeast-1": "51", + "ap-southeast-2": "51", + "eu-south-1": "51", + "eu-south-2": "50", + "af-south-1": "51", + "me-south-1": "51" }, "php-81": { + "ca-central-1": "62", + "eu-central-1": "62", + "eu-north-1": "62", + "eu-west-1": "62", + "eu-west-2": "62", + "eu-west-3": "62", + "sa-east-1": "62", + "us-east-1": "62", + "us-east-2": "62", + "us-west-1": "62", + "us-west-2": "62", + "ap-east-1": "54", + "ap-south-1": "61", + "ap-northeast-1": "61", + "ap-northeast-2": "61", + "ap-northeast-3": "61", + "ap-southeast-1": "61", + "ap-southeast-2": "61", + "eu-south-1": "54", + "eu-south-2": "51", + "af-south-1": "54", + "me-south-1": "54" + }, + "php-81-fpm": { "ca-central-1": "61", "eu-central-1": "61", - "eu-north-1": "61", - "eu-west-1": "61", + "eu-north-1": "62", + "eu-west-1": "62", "eu-west-2": "61", "eu-west-3": "61", "sa-east-1": "61", - "us-east-1": "61", + "us-east-1": "62", "us-east-2": "61", "us-west-1": "61", - "us-west-2": "61", - "ap-east-1": "53", + "us-west-2": "62", + "ap-east-1": "54", "ap-south-1": "60", - "ap-northeast-1": "60", + "ap-northeast-1": "61", "ap-northeast-2": "60", "ap-northeast-3": "60", "ap-southeast-1": "60", @@ -119,292 +143,268 @@ "af-south-1": "53", "me-south-1": "53" }, - "php-81-fpm": { - "ca-central-1": "60", - "eu-central-1": "60", - "eu-north-1": "61", - "eu-west-1": "61", - "eu-west-2": "60", - "eu-west-3": "60", - "sa-east-1": "60", - "us-east-1": "61", - "us-east-2": "60", - "us-west-1": "60", - "us-west-2": "61", - "ap-east-1": "53", - "ap-south-1": "59", - "ap-northeast-1": "60", - "ap-northeast-2": "59", - "ap-northeast-3": "59", - "ap-southeast-1": "59", - "ap-southeast-2": "59", - "eu-south-1": "52", - "eu-south-2": "49", - "af-south-1": "52", - "me-south-1": "52" - }, "php-80": { - "ca-central-1": "64", - "eu-central-1": "63", - "eu-north-1": "64", - "eu-west-1": "64", - "eu-west-2": "64", - "eu-west-3": "64", - "sa-east-1": "64", - "us-east-1": "64", - "us-east-2": "64", - "us-west-1": "64", - "us-west-2": "64", + "ca-central-1": "65", + "eu-central-1": "64", + "eu-north-1": "65", + "eu-west-1": "65", + "eu-west-2": "65", + "eu-west-3": "65", + "sa-east-1": "65", + "us-east-1": "65", + "us-east-2": "65", + "us-west-1": "65", + "us-west-2": "65", + "ap-east-1": "55", + "ap-south-1": "64", + "ap-northeast-1": "62", + "ap-northeast-2": "61", + "ap-northeast-3": "62", + "ap-southeast-1": "61", + "ap-southeast-2": "63", + "eu-south-1": "55", + "eu-south-2": "51", + "af-south-1": "55", + "me-south-1": "55" + }, + "php-80-fpm": { + "ca-central-1": "62", + "eu-central-1": "62", + "eu-north-1": "62", + "eu-west-1": "62", + "eu-west-2": "62", + "eu-west-3": "62", + "sa-east-1": "62", + "us-east-1": "62", + "us-east-2": "62", + "us-west-1": "62", + "us-west-2": "62", "ap-east-1": "54", - "ap-south-1": "63", + "ap-south-1": "61", "ap-northeast-1": "61", - "ap-northeast-2": "60", + "ap-northeast-2": "61", "ap-northeast-3": "61", - "ap-southeast-1": "60", - "ap-southeast-2": "62", + "ap-southeast-1": "61", + "ap-southeast-2": "61", "eu-south-1": "54", - "eu-south-2": "50", + "eu-south-2": "51", "af-south-1": "54", "me-south-1": "54" }, - "php-80-fpm": { - "ca-central-1": "61", - "eu-central-1": "61", - "eu-north-1": "61", - "eu-west-1": "61", - "eu-west-2": "61", - "eu-west-3": "61", - "sa-east-1": "61", - "us-east-1": "61", - "us-east-2": "61", - "us-west-1": "61", - "us-west-2": "61", - "ap-east-1": "53", - "ap-south-1": "60", - "ap-northeast-1": "60", - "ap-northeast-2": "60", - "ap-northeast-3": "60", - "ap-southeast-1": "60", - "ap-southeast-2": "60", - "eu-south-1": "53", - "eu-south-2": "50", - "af-south-1": "53", - "me-south-1": "53" - }, "arm-php-83": { - "ca-central-1": "6", - "eu-central-1": "6", - "eu-north-1": "6", - "eu-west-1": "6", - "eu-west-2": "6", - "eu-west-3": "6", - "sa-east-1": "6", - "us-east-1": "6", - "us-east-2": "6", - "us-west-1": "6", - "us-west-2": "6", - "ap-east-1": "6", - "ap-south-1": "6", - "ap-northeast-1": "6", - "ap-northeast-2": "6", - "ap-northeast-3": "6", - "ap-southeast-1": "6", - "ap-southeast-2": "6", - "eu-south-1": "6", - "eu-south-2": "6", - "af-south-1": "6", - "me-south-1": "6" + "ca-central-1": "7", + "eu-central-1": "7", + "eu-north-1": "7", + "eu-west-1": "7", + "eu-west-2": "7", + "eu-west-3": "7", + "sa-east-1": "7", + "us-east-1": "7", + "us-east-2": "7", + "us-west-1": "7", + "us-west-2": "7", + "ap-east-1": "7", + "ap-south-1": "7", + "ap-northeast-1": "7", + "ap-northeast-2": "7", + "ap-northeast-3": "7", + "ap-southeast-1": "7", + "ap-southeast-2": "7", + "eu-south-1": "7", + "eu-south-2": "7", + "af-south-1": "7", + "me-south-1": "7" }, "arm-php-83-fpm": { - "ca-central-1": "6", - "eu-central-1": "6", - "eu-north-1": "6", - "eu-west-1": "6", - "eu-west-2": "6", - "eu-west-3": "6", - "sa-east-1": "6", - "us-east-1": "6", - "us-east-2": "6", - "us-west-1": "6", - "us-west-2": "6", - "ap-east-1": "6", - "ap-south-1": "6", - "ap-northeast-1": "6", - "ap-northeast-2": "6", - "ap-northeast-3": "6", - "ap-southeast-1": "6", - "ap-southeast-2": "6", - "eu-south-1": "6", - "eu-south-2": "6", - "af-south-1": "6", - "me-south-1": "6" + "ca-central-1": "7", + "eu-central-1": "7", + "eu-north-1": "7", + "eu-west-1": "7", + "eu-west-2": "7", + "eu-west-3": "7", + "sa-east-1": "7", + "us-east-1": "7", + "us-east-2": "7", + "us-west-1": "7", + "us-west-2": "7", + "ap-east-1": "7", + "ap-south-1": "7", + "ap-northeast-1": "7", + "ap-northeast-2": "7", + "ap-northeast-3": "7", + "ap-southeast-1": "7", + "ap-southeast-2": "7", + "eu-south-1": "7", + "eu-south-2": "7", + "af-south-1": "7", + "me-south-1": "7" }, "arm-php-82": { - "ca-central-1": "38", - "eu-central-1": "38", - "eu-north-1": "38", - "eu-west-1": "38", - "eu-west-2": "38", - "eu-west-3": "38", - "sa-east-1": "38", - "us-east-1": "38", - "us-east-2": "38", - "us-west-1": "38", - "us-west-2": "38", - "ap-east-1": "38", - "ap-south-1": "38", - "ap-northeast-1": "38", - "ap-northeast-2": "38", - "ap-northeast-3": "38", - "ap-southeast-1": "38", - "ap-southeast-2": "38", - "eu-south-1": "38", - "eu-south-2": "38", - "af-south-1": "38", - "me-south-1": "38" + "ca-central-1": "39", + "eu-central-1": "39", + "eu-north-1": "39", + "eu-west-1": "39", + "eu-west-2": "39", + "eu-west-3": "39", + "sa-east-1": "39", + "us-east-1": "39", + "us-east-2": "39", + "us-west-1": "39", + "us-west-2": "39", + "ap-east-1": "39", + "ap-south-1": "39", + "ap-northeast-1": "39", + "ap-northeast-2": "39", + "ap-northeast-3": "39", + "ap-southeast-1": "39", + "ap-southeast-2": "39", + "eu-south-1": "39", + "eu-south-2": "39", + "af-south-1": "39", + "me-south-1": "39" }, "arm-php-82-fpm": { - "ca-central-1": "38", - "eu-central-1": "38", - "eu-north-1": "38", - "eu-west-1": "38", - "eu-west-2": "38", - "eu-west-3": "38", - "sa-east-1": "38", - "us-east-1": "38", - "us-east-2": "38", - "us-west-1": "38", - "us-west-2": "38", - "ap-east-1": "38", - "ap-south-1": "38", - "ap-northeast-1": "38", - "ap-northeast-2": "38", - "ap-northeast-3": "38", - "ap-southeast-1": "38", - "ap-southeast-2": "38", - "eu-south-1": "38", - "eu-south-2": "38", - "af-south-1": "38", - "me-south-1": "38" + "ca-central-1": "39", + "eu-central-1": "39", + "eu-north-1": "39", + "eu-west-1": "39", + "eu-west-2": "39", + "eu-west-3": "39", + "sa-east-1": "39", + "us-east-1": "39", + "us-east-2": "39", + "us-west-1": "39", + "us-west-2": "39", + "ap-east-1": "39", + "ap-south-1": "39", + "ap-northeast-1": "39", + "ap-northeast-2": "39", + "ap-northeast-3": "39", + "ap-southeast-1": "39", + "ap-southeast-2": "39", + "eu-south-1": "39", + "eu-south-2": "39", + "af-south-1": "39", + "me-south-1": "39" }, "arm-php-81": { - "ca-central-1": "41", - "eu-central-1": "41", - "eu-north-1": "41", - "eu-west-1": "41", - "eu-west-2": "41", - "eu-west-3": "41", - "sa-east-1": "41", - "us-east-1": "41", - "us-east-2": "41", - "us-west-1": "41", - "us-west-2": "41", - "ap-east-1": "41", - "ap-south-1": "41", - "ap-northeast-1": "41", - "ap-northeast-2": "41", - "ap-northeast-3": "41", - "ap-southeast-1": "41", - "ap-southeast-2": "41", - "eu-south-1": "41", - "eu-south-2": "41", - "af-south-1": "41", - "me-south-1": "41" + "ca-central-1": "42", + "eu-central-1": "42", + "eu-north-1": "42", + "eu-west-1": "42", + "eu-west-2": "42", + "eu-west-3": "42", + "sa-east-1": "42", + "us-east-1": "42", + "us-east-2": "42", + "us-west-1": "42", + "us-west-2": "42", + "ap-east-1": "42", + "ap-south-1": "42", + "ap-northeast-1": "42", + "ap-northeast-2": "42", + "ap-northeast-3": "42", + "ap-southeast-1": "42", + "ap-southeast-2": "42", + "eu-south-1": "42", + "eu-south-2": "42", + "af-south-1": "42", + "me-south-1": "42" }, "arm-php-81-fpm": { - "ca-central-1": "41", - "eu-central-1": "41", - "eu-north-1": "41", - "eu-west-1": "41", - "eu-west-2": "41", - "eu-west-3": "41", - "sa-east-1": "41", - "us-east-1": "41", - "us-east-2": "41", - "us-west-1": "41", - "us-west-2": "41", - "ap-east-1": "41", - "ap-south-1": "41", - "ap-northeast-1": "41", - "ap-northeast-2": "41", - "ap-northeast-3": "41", - "ap-southeast-1": "41", - "ap-southeast-2": "41", - "eu-south-1": "41", - "eu-south-2": "41", - "af-south-1": "41", - "me-south-1": "41" + "ca-central-1": "42", + "eu-central-1": "42", + "eu-north-1": "42", + "eu-west-1": "42", + "eu-west-2": "42", + "eu-west-3": "42", + "sa-east-1": "42", + "us-east-1": "42", + "us-east-2": "42", + "us-west-1": "42", + "us-west-2": "42", + "ap-east-1": "42", + "ap-south-1": "42", + "ap-northeast-1": "42", + "ap-northeast-2": "42", + "ap-northeast-3": "42", + "ap-southeast-1": "42", + "ap-southeast-2": "42", + "eu-south-1": "42", + "eu-south-2": "42", + "af-south-1": "42", + "me-south-1": "42" }, "arm-php-80": { + "ca-central-1": "64", + "eu-central-1": "63", + "eu-north-1": "64", + "eu-west-1": "64", + "eu-west-2": "64", + "eu-west-3": "64", + "sa-east-1": "64", + "us-east-1": "64", + "us-east-2": "64", + "us-west-1": "64", + "us-west-2": "64", + "ap-east-1": "56", + "ap-south-1": "63", + "ap-northeast-1": "63", + "ap-northeast-2": "63", + "ap-northeast-3": "63", + "ap-southeast-1": "63", + "ap-southeast-2": "63", + "eu-south-1": "56", + "eu-south-2": "52", + "af-south-1": "56", + "me-south-1": "56" + }, + "arm-php-80-fpm": { "ca-central-1": "63", "eu-central-1": "62", "eu-north-1": "63", "eu-west-1": "63", - "eu-west-2": "63", - "eu-west-3": "63", - "sa-east-1": "63", + "eu-west-2": "62", + "eu-west-3": "62", + "sa-east-1": "62", "us-east-1": "63", "us-east-2": "63", - "us-west-1": "63", + "us-west-1": "62", "us-west-2": "63", "ap-east-1": "55", - "ap-south-1": "62", + "ap-south-1": "61", "ap-northeast-1": "62", - "ap-northeast-2": "62", - "ap-northeast-3": "62", - "ap-southeast-1": "62", - "ap-southeast-2": "62", - "eu-south-1": "55", + "ap-northeast-2": "61", + "ap-northeast-3": "61", + "ap-southeast-1": "61", + "ap-southeast-2": "61", + "eu-south-1": "54", "eu-south-2": "51", "af-south-1": "55", - "me-south-1": "55" + "me-south-1": "54" }, - "arm-php-80-fpm": { - "ca-central-1": "62", + "console": { + "ca-central-1": "61", "eu-central-1": "61", - "eu-north-1": "62", - "eu-west-1": "62", + "eu-north-1": "61", + "eu-west-1": "61", "eu-west-2": "61", "eu-west-3": "61", "sa-east-1": "61", - "us-east-1": "62", - "us-east-2": "62", + "us-east-1": "61", + "us-east-2": "61", "us-west-1": "61", - "us-west-2": "62", - "ap-east-1": "54", + "us-west-2": "61", + "ap-east-1": "53", "ap-south-1": "60", - "ap-northeast-1": "61", + "ap-northeast-1": "60", "ap-northeast-2": "60", "ap-northeast-3": "60", "ap-southeast-1": "60", "ap-southeast-2": "60", "eu-south-1": "53", "eu-south-2": "50", - "af-south-1": "54", + "af-south-1": "53", "me-south-1": "53" - }, - "console": { - "ca-central-1": "60", - "eu-central-1": "60", - "eu-north-1": "60", - "eu-west-1": "60", - "eu-west-2": "60", - "eu-west-3": "60", - "sa-east-1": "60", - "us-east-1": "60", - "us-east-2": "60", - "us-west-1": "60", - "us-west-2": "60", - "ap-east-1": "52", - "ap-south-1": "59", - "ap-northeast-1": "59", - "ap-northeast-2": "59", - "ap-northeast-3": "59", - "ap-southeast-1": "59", - "ap-southeast-2": "59", - "eu-south-1": "52", - "eu-south-2": "49", - "af-south-1": "52", - "me-south-1": "52" } } \ No newline at end of file From 15b4b8e627a3f0897ee71f6bf812a0a8746d8f48 Mon Sep 17 00:00:00 2001 From: Miguel Lima <33354683+vmiguellima@users.noreply.github.com> Date: Sat, 11 Nov 2023 22:29:23 +0000 Subject: [PATCH 06/21] Add ability to get queue name for ansqs event --- src/Event/Sqs/SqsRecord.php | 14 ++++++++++++++ tests/Event/Sqs/SqsRecordTest.php | 17 +++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 tests/Event/Sqs/SqsRecordTest.php diff --git a/src/Event/Sqs/SqsRecord.php b/src/Event/Sqs/SqsRecord.php index 4c9db8058..13f9e2f03 100644 --- a/src/Event/Sqs/SqsRecord.php +++ b/src/Event/Sqs/SqsRecord.php @@ -57,6 +57,20 @@ public function getReceiptHandle(): string return $this->record['receiptHandle']; } + /** + * Returns the name of the SQS queue that contains the message. + * + * Queue naming constraints: + * + * https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/quotas-queues.html + */ + public function getQueueName(): string + { + $parts = explode(':', $this->record['eventSourceARN']); + + return $parts[count($parts) - 1]; + } + /** * Returns the record original data as an array. * diff --git a/tests/Event/Sqs/SqsRecordTest.php b/tests/Event/Sqs/SqsRecordTest.php new file mode 100644 index 000000000..d1277be0d --- /dev/null +++ b/tests/Event/Sqs/SqsRecordTest.php @@ -0,0 +1,17 @@ +assertSame($sqsRecord->getQueueName(), 'my-queue'); + } +} From 36aa4757bc7c42cf3dcbd03e781c8c16719ebd58 Mon Sep 17 00:00:00 2001 From: Miguel Lima <33354683+vmiguellima@users.noreply.github.com> Date: Sat, 11 Nov 2023 23:37:49 +0000 Subject: [PATCH 07/21] Fix php sniffer errors --- src/Event/Sqs/SqsRecord.php | 5 +---- tests/Event/Sqs/SqsRecordTest.php | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Event/Sqs/SqsRecord.php b/src/Event/Sqs/SqsRecord.php index 13f9e2f03..300b27ebc 100644 --- a/src/Event/Sqs/SqsRecord.php +++ b/src/Event/Sqs/SqsRecord.php @@ -59,10 +59,7 @@ public function getReceiptHandle(): string /** * Returns the name of the SQS queue that contains the message. - * - * Queue naming constraints: - * - * https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/quotas-queues.html + * Queue naming constraints: https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/quotas-queues.html */ public function getQueueName(): string { diff --git a/tests/Event/Sqs/SqsRecordTest.php b/tests/Event/Sqs/SqsRecordTest.php index d1277be0d..b83f190ff 100644 --- a/tests/Event/Sqs/SqsRecordTest.php +++ b/tests/Event/Sqs/SqsRecordTest.php @@ -7,9 +7,10 @@ class SqsRecordTest extends TestCase { - public function test_it_can_get_queue_name_from_sqs_event() { + public function test_it_can_get_queue_name_from_sqs_event() + { $event = json_decode(file_get_contents(__DIR__ . '/sqs.json'), true); - + $sqsRecord = new SqsRecord($event['Records'][0]); $this->assertSame($sqsRecord->getQueueName(), 'my-queue'); From 52b594c1a08ec1b731d822e15f566bd0400de502 Mon Sep 17 00:00:00 2001 From: Dave Bernier Date: Mon, 20 Nov 2023 09:07:10 -0500 Subject: [PATCH 08/21] Specifying SSM SecureString possibility Since the example only talks about the `String` parameter type, I did not felt comfortable in storing the secrets as plain text in SSM. Upon digging in github, I found this [comment on a PR](https://github.com/brefphp/bref/pull/1376#issuecomment-1405754051). Thought it would be helpful to specify that both SecureString and String are taken into account. --- docs/environment/variables.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/environment/variables.mdx b/docs/environment/variables.mdx index e76c469b2..4c634bd53 100644 --- a/docs/environment/variables.mdx +++ b/docs/environment/variables.mdx @@ -60,6 +60,8 @@ aws ssm put-parameter --region us-east-1 --name '//my-app\my-parameter' --type S It is recommended to prefix the parameter name with your application name, for example: `/my-app/my-parameter`. +SSM also allows to store a SecureString parameter, which is encrypted with AWS KMS. To use a SecureString, simply change the `--type` argument to `--type SecureString`. Bref takes care of decrypting the value. + ### Retrieving secrets You can inject a secret in an environment variable: From 1289850994363c4522f581c2594710910524a702 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 21 Nov 2023 21:17:00 +0100 Subject: [PATCH 09/21] Fix internal error on invalid cookies --- src/Event/Http/HttpRequestEvent.php | 6 ++- tests/Event/Http/CommonHttpTest.php | 12 ++++- .../Http/Fixture/ag-v1-cookies-invalid.json | 53 +++++++++++++++++++ .../Http/Fixture/ag-v2-cookies-invalid.json | 41 ++++++++++++++ tests/Event/Http/HttpRequestEventTest.php | 13 +++-- tests/Event/Http/Psr7BridgeTest.php | 2 +- tests/FpmRuntime/FpmHandlerTest.php | 36 +++++++++++++ tests/HttpRequestProxyTest.php | 2 + 8 files changed, 157 insertions(+), 8 deletions(-) create mode 100644 tests/Event/Http/Fixture/ag-v1-cookies-invalid.json create mode 100644 tests/Event/Http/Fixture/ag-v2-cookies-invalid.json diff --git a/src/Event/Http/HttpRequestEvent.php b/src/Event/Http/HttpRequestEvent.php index c4cbff55a..736b23728 100644 --- a/src/Event/Http/HttpRequestEvent.php +++ b/src/Event/Http/HttpRequestEvent.php @@ -190,7 +190,11 @@ public function getCookies(): array $cookies = []; foreach ($cookieParts as $cookiePart) { - [$cookieName, $cookieValue] = explode('=', $cookiePart, 2); + $explode = explode('=', $cookiePart, 2); + if (count($explode) !== 2) { + continue; + } + [$cookieName, $cookieValue] = $explode; $cookies[$cookieName] = urldecode($cookieValue); } return $cookies; diff --git a/tests/Event/Http/CommonHttpTest.php b/tests/Event/Http/CommonHttpTest.php index 3e931a97b..fa5e33001 100644 --- a/tests/Event/Http/CommonHttpTest.php +++ b/tests/Event/Http/CommonHttpTest.php @@ -416,6 +416,16 @@ public function test request with cookies(int $version) ]); } + /** + * @dataProvider provide API Gateway versions + */ + public function test request with invalid cookies(int $version) + { + $this->fromFixture(__DIR__ . "/Fixture/ag-v$version-cookies-invalid.json"); + + $this->assertCookies([], 'foo'); + } + /** * @dataProvider provide API Gateway versions */ @@ -497,7 +507,7 @@ abstract protected function assertBody(string $expected): void; abstract protected function assertContentType(?string $expected): void; - abstract protected function assertCookies(array $expected): void; + abstract protected function assertCookies(array $expected, string|null $expectedHeader = null): void; abstract protected function assertHeaders(array $expected): void; diff --git a/tests/Event/Http/Fixture/ag-v1-cookies-invalid.json b/tests/Event/Http/Fixture/ag-v1-cookies-invalid.json new file mode 100644 index 000000000..5bcfcde0d --- /dev/null +++ b/tests/Event/Http/Fixture/ag-v1-cookies-invalid.json @@ -0,0 +1,53 @@ +{ + "version": "1.0", + "resource": "/path", + "path": "/path", + "httpMethod": "GET", + "headers": { + "Accept": "*/*", + "Accept-Encoding": "gzip, deflate", + "Cache-Control": "no-cache", + "Host": "example.org", + "User-Agent": "PostmanRuntime/7.20.1", + "X-Amzn-Trace-Id": "Root=1-ffffffff-ffffffffffffffffffffffff", + "X-Forwarded-For": "1.1.1.1", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https", + "Cookie": "foo" + }, + "queryStringParameters": null, + "pathParameters": null, + "stageVariables": null, + "requestContext": { + "resourceId": "xxxxxx", + "resourcePath": "/path", + "httpMethod": "PUT", + "extendedRequestId": "XXXXXX-xxxxxxxx=", + "requestTime": "24/Nov/2019:18:55:08 +0000", + "path": "/path", + "accountId": "123400000000", + "protocol": "HTTP/1.1", + "stage": "dev", + "domainPrefix": "dev", + "requestTimeEpoch": 1574621708700, + "requestId": "ffffffff-ffff-4fff-ffff-ffffffffffff", + "identity": { + "cognitoIdentityPoolId": null, + "accountId": null, + "cognitoIdentityId": null, + "caller": null, + "sourceIp": "1.1.1.1", + "principalOrgId": null, + "accessKey": null, + "cognitoAuthenticationType": null, + "cognitoAuthenticationProvider": null, + "userArn": null, + "userAgent": "PostmanRuntime/7.20.1", + "user": null + }, + "domainName": "example.org", + "apiId": "xxxxxxxxxx" + }, + "body": "", + "isBase64Encoded": false +} diff --git a/tests/Event/Http/Fixture/ag-v2-cookies-invalid.json b/tests/Event/Http/Fixture/ag-v2-cookies-invalid.json new file mode 100644 index 000000000..1e4908fe2 --- /dev/null +++ b/tests/Event/Http/Fixture/ag-v2-cookies-invalid.json @@ -0,0 +1,41 @@ +{ + "version": "2.0", + "routeKey": "ANY /path", + "rawPath": "/path", + "rawQueryString": "", + "cookies": ["foo"], + "headers": { + "Accept": "*/*", + "Accept-Encoding": "gzip, deflate", + "Cache-Control": "no-cache", + "Host": "example.org", + "User-Agent": "PostmanRuntime/7.20.1", + "X-Amzn-Trace-Id": "Root=1-ffffffff-ffffffffffffffffffffffff", + "X-Forwarded-For": "1.1.1.1", + "X-Forwarded-Port": "443", + "X-Forwarded-Proto": "https" + }, + "queryStringParameters": null, + "stageVariables": null, + "requestContext": { + "accountId": "123400000000", + "apiId": "xxxxxxxxxx", + "domainName": "example.org", + "domainPrefix": "0000000000", + "http": { + "method": "GET", + "path": "/path", + "protocol": "HTTP/1.1", + "sourceIp": "1.1.1.1", + "userAgent": "PostmanRuntime/7.20.1" + }, + "requestId": "JTHoQgr2oAMEPMg=", + "routeId": "47matwk", + "routeKey": "ANY /path", + "stage": "$default", + "time": "24/Nov/2019:18:55:08 +0000", + "timeEpoch": 1574621708700 + }, + "body": "", + "isBase64Encoded": false +} diff --git a/tests/Event/Http/HttpRequestEventTest.php b/tests/Event/Http/HttpRequestEventTest.php index 20d7ec9c5..841593411 100644 --- a/tests/Event/Http/HttpRequestEventTest.php +++ b/tests/Event/Http/HttpRequestEventTest.php @@ -27,15 +27,18 @@ protected function assertContentType(?string $expected): void } } - protected function assertCookies(array $expected): void + protected function assertCookies(array $expected, string|null $expectedHeader = null): void { $this->assertEquals($expected, $this->event->getCookies()); // Also check that the cookies are available in the HTTP headers (they should be) - $expectedHeader = array_map(function (string $value, string $key): string { - return $key . '=' . urlencode($value); - }, $expected, array_keys($expected)); - $this->assertEquals(implode('; ', $expectedHeader), $this->event->getHeaders()['cookie'][0] ?? ''); + if ($expectedHeader === null) { + $expectedHeader = array_map(function (string $value, string $key): string { + return $key . '=' . urlencode($value); + }, $expected, array_keys($expected)); + $expectedHeader = implode('; ', $expectedHeader); + } + $this->assertEquals($expectedHeader, $this->event->getHeaders()['cookie'][0] ?? ''); } protected function assertHeaders(array $expected): void diff --git a/tests/Event/Http/Psr7BridgeTest.php b/tests/Event/Http/Psr7BridgeTest.php index 869a7e347..6100eb671 100644 --- a/tests/Event/Http/Psr7BridgeTest.php +++ b/tests/Event/Http/Psr7BridgeTest.php @@ -48,7 +48,7 @@ protected function assertContentType(?string $expected): void $this->assertEquals($expected, $this->request->getHeaderLine('Content-Type')); } - protected function assertCookies(array $expected): void + protected function assertCookies(array $expected, string|null $expectedHeader = null): void { $this->assertEquals($expected, $this->request->getCookieParams()); } diff --git a/tests/FpmRuntime/FpmHandlerTest.php b/tests/FpmRuntime/FpmHandlerTest.php index 388803894..1515150f6 100644 --- a/tests/FpmRuntime/FpmHandlerTest.php +++ b/tests/FpmRuntime/FpmHandlerTest.php @@ -777,6 +777,42 @@ public function test request with cookies(int $version) ]); } + /** + * @dataProvider provide API Gateway versions + */ + public function test request with invalid cookies(int $version) + { + $event = [ + 'version' => '1.0', + 'httpMethod' => 'GET', + 'headers' => [ + 'Cookie' => 'foo', + ], + ]; + $this->assertGlobalVariables($event, [ + '$_GET' => [], + '$_POST' => [], + '$_FILES' => [], + '$_COOKIE' => [ + 'foo' => '', + ], + '$_REQUEST' => [], + '$_SERVER' => [ + 'REQUEST_URI' => '/', + 'PHP_SELF' => '/', + 'PATH_INFO' => '/', + 'REQUEST_METHOD' => 'GET', + 'QUERY_STRING' => '', + 'HTTP_COOKIE' => 'foo', + 'CONTENT_LENGTH' => '0', + 'CONTENT_TYPE' => 'application/x-www-form-urlencoded', + 'LAMBDA_INVOCATION_CONTEXT' => json_encode($this->fakeContext), + 'LAMBDA_REQUEST_CONTEXT' => '[]', + ], + 'HTTP_RAW_BODY' => '', + ]); + } + /** * @dataProvider provide API Gateway versions */ diff --git a/tests/HttpRequestProxyTest.php b/tests/HttpRequestProxyTest.php index 4164546ad..725f1c1e2 100644 --- a/tests/HttpRequestProxyTest.php +++ b/tests/HttpRequestProxyTest.php @@ -47,6 +47,8 @@ public function test POST request with multipart file uploads(int $version public function test request with cookies(int $version); + public function test request with invalid cookies(int $version); + public function test POST request with base64 encoded body(int $version); public function test PUT request(int $version); From 2885dac9e5326eb0af09329810beb685ef1d22c3 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 21 Nov 2023 21:18:04 +0100 Subject: [PATCH 10/21] Document implementation choice --- tests/Event/Http/CommonHttpTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Event/Http/CommonHttpTest.php b/tests/Event/Http/CommonHttpTest.php index fa5e33001..e089972ce 100644 --- a/tests/Event/Http/CommonHttpTest.php +++ b/tests/Event/Http/CommonHttpTest.php @@ -423,6 +423,7 @@ public function test request with invalid cookies(int $version) { $this->fromFixture(__DIR__ . "/Fixture/ag-v$version-cookies-invalid.json"); + // See https://stackoverflow.com/a/61695783/245552 $this->assertCookies([], 'foo'); } From 2cb61e84602d2aa6ba5a1b3e8ab8c2f167460323 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 21 Nov 2023 21:40:58 +0100 Subject: [PATCH 11/21] Fix CS --- tests/Event/Http/CommonHttpTest.php | 2 +- tests/Event/Http/HttpRequestEventTest.php | 2 +- tests/Event/Http/Psr7BridgeTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Event/Http/CommonHttpTest.php b/tests/Event/Http/CommonHttpTest.php index e089972ce..b6cc0e34e 100644 --- a/tests/Event/Http/CommonHttpTest.php +++ b/tests/Event/Http/CommonHttpTest.php @@ -508,7 +508,7 @@ abstract protected function assertBody(string $expected): void; abstract protected function assertContentType(?string $expected): void; - abstract protected function assertCookies(array $expected, string|null $expectedHeader = null): void; + abstract protected function assertCookies(array $expected, string |null $expectedHeader = null): void; abstract protected function assertHeaders(array $expected): void; diff --git a/tests/Event/Http/HttpRequestEventTest.php b/tests/Event/Http/HttpRequestEventTest.php index 841593411..d1f2f516d 100644 --- a/tests/Event/Http/HttpRequestEventTest.php +++ b/tests/Event/Http/HttpRequestEventTest.php @@ -27,7 +27,7 @@ protected function assertContentType(?string $expected): void } } - protected function assertCookies(array $expected, string|null $expectedHeader = null): void + protected function assertCookies(array $expected, string |null $expectedHeader = null): void { $this->assertEquals($expected, $this->event->getCookies()); diff --git a/tests/Event/Http/Psr7BridgeTest.php b/tests/Event/Http/Psr7BridgeTest.php index 6100eb671..e2ab8de1a 100644 --- a/tests/Event/Http/Psr7BridgeTest.php +++ b/tests/Event/Http/Psr7BridgeTest.php @@ -48,7 +48,7 @@ protected function assertContentType(?string $expected): void $this->assertEquals($expected, $this->request->getHeaderLine('Content-Type')); } - protected function assertCookies(array $expected, string|null $expectedHeader = null): void + protected function assertCookies(array $expected, string |null $expectedHeader = null): void { $this->assertEquals($expected, $this->request->getCookieParams()); } From 0902ae148ebe80227a9282e1802988fc8570976d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:17:38 +0000 Subject: [PATCH 12/21] Update layer versions --- layers.json | 670 ++++++++++++++++++++++++++-------------------------- 1 file changed, 335 insertions(+), 335 deletions(-) diff --git a/layers.json b/layers.json index 75eb541d1..f15a63b8a 100644 --- a/layers.json +++ b/layers.json @@ -1,115 +1,139 @@ { "php-83": { - "ca-central-1": "7", - "eu-central-1": "7", - "eu-north-1": "7", - "eu-west-1": "7", - "eu-west-2": "7", - "eu-west-3": "7", - "sa-east-1": "7", - "us-east-1": "7", - "us-east-2": "7", - "us-west-1": "7", - "us-west-2": "7", - "ap-east-1": "7", - "ap-south-1": "7", - "ap-northeast-1": "7", - "ap-northeast-2": "7", - "ap-northeast-3": "7", - "ap-southeast-1": "7", - "ap-southeast-2": "7", - "eu-south-1": "7", - "eu-south-2": "7", - "af-south-1": "7", - "me-south-1": "7" + "ca-central-1": "8", + "eu-central-1": "8", + "eu-north-1": "8", + "eu-west-1": "8", + "eu-west-2": "8", + "eu-west-3": "8", + "sa-east-1": "8", + "us-east-1": "8", + "us-east-2": "8", + "us-west-1": "8", + "us-west-2": "8", + "ap-east-1": "8", + "ap-south-1": "8", + "ap-northeast-1": "8", + "ap-northeast-2": "8", + "ap-northeast-3": "8", + "ap-southeast-1": "8", + "ap-southeast-2": "8", + "eu-south-1": "8", + "eu-south-2": "8", + "af-south-1": "8", + "me-south-1": "8" }, "php-83-fpm": { - "ca-central-1": "7", - "eu-central-1": "7", - "eu-north-1": "7", - "eu-west-1": "7", - "eu-west-2": "7", - "eu-west-3": "7", - "sa-east-1": "7", - "us-east-1": "7", - "us-east-2": "7", - "us-west-1": "7", - "us-west-2": "7", - "ap-east-1": "7", - "ap-south-1": "7", - "ap-northeast-1": "7", - "ap-northeast-2": "7", - "ap-northeast-3": "7", - "ap-southeast-1": "7", - "ap-southeast-2": "7", - "eu-south-1": "7", - "eu-south-2": "7", - "af-south-1": "7", - "me-south-1": "7" + "ca-central-1": "8", + "eu-central-1": "8", + "eu-north-1": "8", + "eu-west-1": "8", + "eu-west-2": "8", + "eu-west-3": "8", + "sa-east-1": "8", + "us-east-1": "8", + "us-east-2": "8", + "us-west-1": "8", + "us-west-2": "8", + "ap-east-1": "8", + "ap-south-1": "8", + "ap-northeast-1": "8", + "ap-northeast-2": "8", + "ap-northeast-3": "8", + "ap-southeast-1": "8", + "ap-southeast-2": "8", + "eu-south-1": "8", + "eu-south-2": "8", + "af-south-1": "8", + "me-south-1": "8" }, "php-82": { - "ca-central-1": "51", - "eu-central-1": "51", - "eu-north-1": "51", - "eu-west-1": "51", - "eu-west-2": "51", - "eu-west-3": "51", - "sa-east-1": "51", - "us-east-1": "51", - "us-east-2": "51", - "us-west-1": "51", - "us-west-2": "51", - "ap-east-1": "51", - "ap-south-1": "51", - "ap-northeast-1": "51", - "ap-northeast-2": "51", - "ap-northeast-3": "51", - "ap-southeast-1": "51", - "ap-southeast-2": "51", - "eu-south-1": "51", - "eu-south-2": "50", - "af-south-1": "51", - "me-south-1": "51" + "ca-central-1": "52", + "eu-central-1": "52", + "eu-north-1": "52", + "eu-west-1": "52", + "eu-west-2": "52", + "eu-west-3": "52", + "sa-east-1": "52", + "us-east-1": "52", + "us-east-2": "52", + "us-west-1": "52", + "us-west-2": "52", + "ap-east-1": "52", + "ap-south-1": "52", + "ap-northeast-1": "52", + "ap-northeast-2": "52", + "ap-northeast-3": "52", + "ap-southeast-1": "52", + "ap-southeast-2": "52", + "eu-south-1": "52", + "eu-south-2": "51", + "af-south-1": "52", + "me-south-1": "52" }, "php-82-fpm": { - "ca-central-1": "51", - "eu-central-1": "51", - "eu-north-1": "51", - "eu-west-1": "51", - "eu-west-2": "51", - "eu-west-3": "51", - "sa-east-1": "51", - "us-east-1": "51", - "us-east-2": "51", - "us-west-1": "51", - "us-west-2": "51", - "ap-east-1": "51", - "ap-south-1": "51", - "ap-northeast-1": "51", - "ap-northeast-2": "51", - "ap-northeast-3": "51", - "ap-southeast-1": "51", - "ap-southeast-2": "51", - "eu-south-1": "51", - "eu-south-2": "50", - "af-south-1": "51", - "me-south-1": "51" + "ca-central-1": "52", + "eu-central-1": "52", + "eu-north-1": "52", + "eu-west-1": "52", + "eu-west-2": "52", + "eu-west-3": "52", + "sa-east-1": "52", + "us-east-1": "52", + "us-east-2": "52", + "us-west-1": "52", + "us-west-2": "52", + "ap-east-1": "52", + "ap-south-1": "52", + "ap-northeast-1": "52", + "ap-northeast-2": "52", + "ap-northeast-3": "52", + "ap-southeast-1": "52", + "ap-southeast-2": "52", + "eu-south-1": "52", + "eu-south-2": "51", + "af-south-1": "52", + "me-south-1": "52" }, "php-81": { + "ca-central-1": "63", + "eu-central-1": "63", + "eu-north-1": "63", + "eu-west-1": "63", + "eu-west-2": "63", + "eu-west-3": "63", + "sa-east-1": "63", + "us-east-1": "63", + "us-east-2": "63", + "us-west-1": "63", + "us-west-2": "63", + "ap-east-1": "55", + "ap-south-1": "62", + "ap-northeast-1": "62", + "ap-northeast-2": "62", + "ap-northeast-3": "62", + "ap-southeast-1": "62", + "ap-southeast-2": "62", + "eu-south-1": "55", + "eu-south-2": "52", + "af-south-1": "55", + "me-south-1": "55" + }, + "php-81-fpm": { "ca-central-1": "62", "eu-central-1": "62", - "eu-north-1": "62", - "eu-west-1": "62", + "eu-north-1": "63", + "eu-west-1": "63", "eu-west-2": "62", "eu-west-3": "62", "sa-east-1": "62", - "us-east-1": "62", + "us-east-1": "63", "us-east-2": "62", "us-west-1": "62", - "us-west-2": "62", - "ap-east-1": "54", + "us-west-2": "63", + "ap-east-1": "55", "ap-south-1": "61", - "ap-northeast-1": "61", + "ap-northeast-1": "62", "ap-northeast-2": "61", "ap-northeast-3": "61", "ap-southeast-1": "61", @@ -119,292 +143,268 @@ "af-south-1": "54", "me-south-1": "54" }, - "php-81-fpm": { - "ca-central-1": "61", - "eu-central-1": "61", - "eu-north-1": "62", - "eu-west-1": "62", - "eu-west-2": "61", - "eu-west-3": "61", - "sa-east-1": "61", - "us-east-1": "62", - "us-east-2": "61", - "us-west-1": "61", - "us-west-2": "62", - "ap-east-1": "54", - "ap-south-1": "60", - "ap-northeast-1": "61", - "ap-northeast-2": "60", - "ap-northeast-3": "60", - "ap-southeast-1": "60", - "ap-southeast-2": "60", - "eu-south-1": "53", - "eu-south-2": "50", - "af-south-1": "53", - "me-south-1": "53" - }, "php-80": { - "ca-central-1": "65", - "eu-central-1": "64", - "eu-north-1": "65", - "eu-west-1": "65", - "eu-west-2": "65", - "eu-west-3": "65", - "sa-east-1": "65", - "us-east-1": "65", - "us-east-2": "65", - "us-west-1": "65", - "us-west-2": "65", + "ca-central-1": "66", + "eu-central-1": "65", + "eu-north-1": "66", + "eu-west-1": "66", + "eu-west-2": "66", + "eu-west-3": "66", + "sa-east-1": "66", + "us-east-1": "66", + "us-east-2": "66", + "us-west-1": "66", + "us-west-2": "66", + "ap-east-1": "56", + "ap-south-1": "65", + "ap-northeast-1": "63", + "ap-northeast-2": "62", + "ap-northeast-3": "63", + "ap-southeast-1": "62", + "ap-southeast-2": "64", + "eu-south-1": "56", + "eu-south-2": "52", + "af-south-1": "56", + "me-south-1": "56" + }, + "php-80-fpm": { + "ca-central-1": "63", + "eu-central-1": "63", + "eu-north-1": "63", + "eu-west-1": "63", + "eu-west-2": "63", + "eu-west-3": "63", + "sa-east-1": "63", + "us-east-1": "63", + "us-east-2": "63", + "us-west-1": "63", + "us-west-2": "63", "ap-east-1": "55", - "ap-south-1": "64", + "ap-south-1": "62", "ap-northeast-1": "62", - "ap-northeast-2": "61", + "ap-northeast-2": "62", "ap-northeast-3": "62", - "ap-southeast-1": "61", - "ap-southeast-2": "63", + "ap-southeast-1": "62", + "ap-southeast-2": "62", "eu-south-1": "55", - "eu-south-2": "51", + "eu-south-2": "52", "af-south-1": "55", "me-south-1": "55" }, - "php-80-fpm": { - "ca-central-1": "62", - "eu-central-1": "62", - "eu-north-1": "62", - "eu-west-1": "62", - "eu-west-2": "62", - "eu-west-3": "62", - "sa-east-1": "62", - "us-east-1": "62", - "us-east-2": "62", - "us-west-1": "62", - "us-west-2": "62", - "ap-east-1": "54", - "ap-south-1": "61", - "ap-northeast-1": "61", - "ap-northeast-2": "61", - "ap-northeast-3": "61", - "ap-southeast-1": "61", - "ap-southeast-2": "61", - "eu-south-1": "54", - "eu-south-2": "51", - "af-south-1": "54", - "me-south-1": "54" - }, "arm-php-83": { - "ca-central-1": "7", - "eu-central-1": "7", - "eu-north-1": "7", - "eu-west-1": "7", - "eu-west-2": "7", - "eu-west-3": "7", - "sa-east-1": "7", - "us-east-1": "7", - "us-east-2": "7", - "us-west-1": "7", - "us-west-2": "7", - "ap-east-1": "7", - "ap-south-1": "7", - "ap-northeast-1": "7", - "ap-northeast-2": "7", - "ap-northeast-3": "7", - "ap-southeast-1": "7", - "ap-southeast-2": "7", - "eu-south-1": "7", - "eu-south-2": "7", - "af-south-1": "7", - "me-south-1": "7" + "ca-central-1": "8", + "eu-central-1": "8", + "eu-north-1": "8", + "eu-west-1": "8", + "eu-west-2": "8", + "eu-west-3": "8", + "sa-east-1": "8", + "us-east-1": "8", + "us-east-2": "8", + "us-west-1": "8", + "us-west-2": "8", + "ap-east-1": "8", + "ap-south-1": "8", + "ap-northeast-1": "8", + "ap-northeast-2": "8", + "ap-northeast-3": "8", + "ap-southeast-1": "8", + "ap-southeast-2": "8", + "eu-south-1": "8", + "eu-south-2": "8", + "af-south-1": "8", + "me-south-1": "8" }, "arm-php-83-fpm": { - "ca-central-1": "7", - "eu-central-1": "7", - "eu-north-1": "7", - "eu-west-1": "7", - "eu-west-2": "7", - "eu-west-3": "7", - "sa-east-1": "7", - "us-east-1": "7", - "us-east-2": "7", - "us-west-1": "7", - "us-west-2": "7", - "ap-east-1": "7", - "ap-south-1": "7", - "ap-northeast-1": "7", - "ap-northeast-2": "7", - "ap-northeast-3": "7", - "ap-southeast-1": "7", - "ap-southeast-2": "7", - "eu-south-1": "7", - "eu-south-2": "7", - "af-south-1": "7", - "me-south-1": "7" + "ca-central-1": "8", + "eu-central-1": "8", + "eu-north-1": "8", + "eu-west-1": "8", + "eu-west-2": "8", + "eu-west-3": "8", + "sa-east-1": "8", + "us-east-1": "8", + "us-east-2": "8", + "us-west-1": "8", + "us-west-2": "8", + "ap-east-1": "8", + "ap-south-1": "8", + "ap-northeast-1": "8", + "ap-northeast-2": "8", + "ap-northeast-3": "8", + "ap-southeast-1": "8", + "ap-southeast-2": "8", + "eu-south-1": "8", + "eu-south-2": "8", + "af-south-1": "8", + "me-south-1": "8" }, "arm-php-82": { - "ca-central-1": "39", - "eu-central-1": "39", - "eu-north-1": "39", - "eu-west-1": "39", - "eu-west-2": "39", - "eu-west-3": "39", - "sa-east-1": "39", - "us-east-1": "39", - "us-east-2": "39", - "us-west-1": "39", - "us-west-2": "39", - "ap-east-1": "39", - "ap-south-1": "39", - "ap-northeast-1": "39", - "ap-northeast-2": "39", - "ap-northeast-3": "39", - "ap-southeast-1": "39", - "ap-southeast-2": "39", - "eu-south-1": "39", - "eu-south-2": "39", - "af-south-1": "39", - "me-south-1": "39" + "ca-central-1": "40", + "eu-central-1": "40", + "eu-north-1": "40", + "eu-west-1": "40", + "eu-west-2": "40", + "eu-west-3": "40", + "sa-east-1": "40", + "us-east-1": "40", + "us-east-2": "40", + "us-west-1": "40", + "us-west-2": "40", + "ap-east-1": "40", + "ap-south-1": "40", + "ap-northeast-1": "40", + "ap-northeast-2": "40", + "ap-northeast-3": "40", + "ap-southeast-1": "40", + "ap-southeast-2": "40", + "eu-south-1": "40", + "eu-south-2": "40", + "af-south-1": "40", + "me-south-1": "40" }, "arm-php-82-fpm": { - "ca-central-1": "39", - "eu-central-1": "39", - "eu-north-1": "39", - "eu-west-1": "39", - "eu-west-2": "39", - "eu-west-3": "39", - "sa-east-1": "39", - "us-east-1": "39", - "us-east-2": "39", - "us-west-1": "39", - "us-west-2": "39", - "ap-east-1": "39", - "ap-south-1": "39", - "ap-northeast-1": "39", - "ap-northeast-2": "39", - "ap-northeast-3": "39", - "ap-southeast-1": "39", - "ap-southeast-2": "39", - "eu-south-1": "39", - "eu-south-2": "39", - "af-south-1": "39", - "me-south-1": "39" + "ca-central-1": "40", + "eu-central-1": "40", + "eu-north-1": "40", + "eu-west-1": "40", + "eu-west-2": "40", + "eu-west-3": "40", + "sa-east-1": "40", + "us-east-1": "40", + "us-east-2": "40", + "us-west-1": "40", + "us-west-2": "40", + "ap-east-1": "40", + "ap-south-1": "40", + "ap-northeast-1": "40", + "ap-northeast-2": "40", + "ap-northeast-3": "40", + "ap-southeast-1": "40", + "ap-southeast-2": "40", + "eu-south-1": "40", + "eu-south-2": "40", + "af-south-1": "40", + "me-south-1": "40" }, "arm-php-81": { - "ca-central-1": "42", - "eu-central-1": "42", - "eu-north-1": "42", - "eu-west-1": "42", - "eu-west-2": "42", - "eu-west-3": "42", - "sa-east-1": "42", - "us-east-1": "42", - "us-east-2": "42", - "us-west-1": "42", - "us-west-2": "42", - "ap-east-1": "42", - "ap-south-1": "42", - "ap-northeast-1": "42", - "ap-northeast-2": "42", - "ap-northeast-3": "42", - "ap-southeast-1": "42", - "ap-southeast-2": "42", - "eu-south-1": "42", - "eu-south-2": "42", - "af-south-1": "42", - "me-south-1": "42" + "ca-central-1": "43", + "eu-central-1": "43", + "eu-north-1": "43", + "eu-west-1": "43", + "eu-west-2": "43", + "eu-west-3": "43", + "sa-east-1": "43", + "us-east-1": "43", + "us-east-2": "43", + "us-west-1": "43", + "us-west-2": "43", + "ap-east-1": "43", + "ap-south-1": "43", + "ap-northeast-1": "43", + "ap-northeast-2": "43", + "ap-northeast-3": "43", + "ap-southeast-1": "43", + "ap-southeast-2": "43", + "eu-south-1": "43", + "eu-south-2": "43", + "af-south-1": "43", + "me-south-1": "43" }, "arm-php-81-fpm": { - "ca-central-1": "42", - "eu-central-1": "42", - "eu-north-1": "42", - "eu-west-1": "42", - "eu-west-2": "42", - "eu-west-3": "42", - "sa-east-1": "42", - "us-east-1": "42", - "us-east-2": "42", - "us-west-1": "42", - "us-west-2": "42", - "ap-east-1": "42", - "ap-south-1": "42", - "ap-northeast-1": "42", - "ap-northeast-2": "42", - "ap-northeast-3": "42", - "ap-southeast-1": "42", - "ap-southeast-2": "42", - "eu-south-1": "42", - "eu-south-2": "42", - "af-south-1": "42", - "me-south-1": "42" + "ca-central-1": "43", + "eu-central-1": "43", + "eu-north-1": "43", + "eu-west-1": "43", + "eu-west-2": "43", + "eu-west-3": "43", + "sa-east-1": "43", + "us-east-1": "43", + "us-east-2": "43", + "us-west-1": "43", + "us-west-2": "43", + "ap-east-1": "43", + "ap-south-1": "43", + "ap-northeast-1": "43", + "ap-northeast-2": "43", + "ap-northeast-3": "43", + "ap-southeast-1": "43", + "ap-southeast-2": "43", + "eu-south-1": "43", + "eu-south-2": "43", + "af-south-1": "43", + "me-south-1": "43" }, "arm-php-80": { + "ca-central-1": "65", + "eu-central-1": "64", + "eu-north-1": "65", + "eu-west-1": "65", + "eu-west-2": "65", + "eu-west-3": "65", + "sa-east-1": "65", + "us-east-1": "65", + "us-east-2": "65", + "us-west-1": "65", + "us-west-2": "65", + "ap-east-1": "57", + "ap-south-1": "64", + "ap-northeast-1": "64", + "ap-northeast-2": "64", + "ap-northeast-3": "64", + "ap-southeast-1": "64", + "ap-southeast-2": "64", + "eu-south-1": "57", + "eu-south-2": "53", + "af-south-1": "57", + "me-south-1": "57" + }, + "arm-php-80-fpm": { "ca-central-1": "64", "eu-central-1": "63", "eu-north-1": "64", "eu-west-1": "64", - "eu-west-2": "64", - "eu-west-3": "64", - "sa-east-1": "64", + "eu-west-2": "63", + "eu-west-3": "63", + "sa-east-1": "63", "us-east-1": "64", "us-east-2": "64", - "us-west-1": "64", + "us-west-1": "63", "us-west-2": "64", "ap-east-1": "56", - "ap-south-1": "63", + "ap-south-1": "62", "ap-northeast-1": "63", - "ap-northeast-2": "63", - "ap-northeast-3": "63", - "ap-southeast-1": "63", - "ap-southeast-2": "63", - "eu-south-1": "56", + "ap-northeast-2": "62", + "ap-northeast-3": "62", + "ap-southeast-1": "62", + "ap-southeast-2": "62", + "eu-south-1": "55", "eu-south-2": "52", "af-south-1": "56", - "me-south-1": "56" + "me-south-1": "55" }, - "arm-php-80-fpm": { - "ca-central-1": "63", + "console": { + "ca-central-1": "62", "eu-central-1": "62", - "eu-north-1": "63", - "eu-west-1": "63", + "eu-north-1": "62", + "eu-west-1": "62", "eu-west-2": "62", "eu-west-3": "62", "sa-east-1": "62", - "us-east-1": "63", - "us-east-2": "63", + "us-east-1": "62", + "us-east-2": "62", "us-west-1": "62", - "us-west-2": "63", - "ap-east-1": "55", + "us-west-2": "62", + "ap-east-1": "54", "ap-south-1": "61", - "ap-northeast-1": "62", + "ap-northeast-1": "61", "ap-northeast-2": "61", "ap-northeast-3": "61", "ap-southeast-1": "61", "ap-southeast-2": "61", "eu-south-1": "54", "eu-south-2": "51", - "af-south-1": "55", + "af-south-1": "54", "me-south-1": "54" - }, - "console": { - "ca-central-1": "61", - "eu-central-1": "61", - "eu-north-1": "61", - "eu-west-1": "61", - "eu-west-2": "61", - "eu-west-3": "61", - "sa-east-1": "61", - "us-east-1": "61", - "us-east-2": "61", - "us-west-1": "61", - "us-west-2": "61", - "ap-east-1": "53", - "ap-south-1": "60", - "ap-northeast-1": "60", - "ap-northeast-2": "60", - "ap-northeast-3": "60", - "ap-southeast-1": "60", - "ap-southeast-2": "60", - "eu-south-1": "53", - "eu-south-2": "50", - "af-south-1": "53", - "me-south-1": "53" } } \ No newline at end of file From ca85b27f70be036ec3d63bb8941e02f35fc67de4 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Thu, 23 Nov 2023 14:45:08 +0100 Subject: [PATCH 13/21] Demo changes --- serverless.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/serverless.yml b/serverless.yml index 43244fa3d..3dc3d8a6d 100644 --- a/serverless.yml +++ b/serverless.yml @@ -38,25 +38,19 @@ functions: timeout: 5 # in seconds (API Gateway has a timeout of 29 seconds) events: - http: 'ANY /' + - httpApi: '*' psr7: handler: demo/psr7.php runtime: php-83 description: 'Bref HTTP demo with a PSR-7 handler' timeout: 5 # in seconds (API Gateway has a timeout of 29 seconds) + url: true events: - http: 'ANY /psr7' - httpApi: 'GET /psr7' environment: - BREF_LOOP_MAX: 100 - - http-api: - handler: demo/http.php - runtime: php-83-fpm - description: 'Bref HTTP demo' - timeout: 5 # in seconds (API Gateway has a timeout of 29 seconds) - events: - - httpApi: '*' + #BREF_LOOP_MAX: 100 console: handler: demo/console.php From 99309fa2d71da255f524a3cf55d5d64e2f10f357 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Fri, 24 Nov 2023 18:48:06 +0100 Subject: [PATCH 14/21] Add the invocation ID to the logs to facilitate debugging --- src/FpmRuntime/FpmHandler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/FpmRuntime/FpmHandler.php b/src/FpmRuntime/FpmHandler.php index 2205966f8..6f7136184 100644 --- a/src/FpmRuntime/FpmHandler.php +++ b/src/FpmRuntime/FpmHandler.php @@ -136,7 +136,8 @@ public function handleRequest(HttpRequestEvent $event, Context $context): HttpRe $response = $this->client->readResponse($socketId, $timeoutDelayInMs); } catch (TimedoutException) { - echo "The PHP script timed out. Bref will now restart PHP-FPM to start from a clean slate and flush the PHP logs.\nTimeouts can happen for example when trying to connect to a remote API or database, if this happens continuously check for those.\nIf you are using a RDS database, read this: https://bref.sh/docs/environment/database.html#accessing-the-internet\n"; + $invocationId = $context->getAwsRequestId(); + echo "$invocationId The PHP script timed out. Bref will now restart PHP-FPM to start from a clean slate and flush the PHP logs.\nTimeouts can happen for example when trying to connect to a remote API or database, if this happens continuously check for those.\nIf you are using a RDS database, read this: https://bref.sh/docs/environment/database.html#accessing-the-internet\n"; /** * Restart FPM so that the blocked script is 100% terminated and that its logs are flushed to stderr. From f3bbfd4cdc7615b1f505710f8e4a9a3a668b858f Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Fri, 24 Nov 2023 19:10:32 +0100 Subject: [PATCH 15/21] Mark the new event subscribers as experimental for now --- src/Bref.php | 3 +++ src/Listener/BrefEventSubscriber.php | 4 +++- src/Listener/EventDispatcher.php | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Bref.php b/src/Bref.php index 51a0798f9..ed8e5d5cf 100644 --- a/src/Bref.php +++ b/src/Bref.php @@ -12,6 +12,9 @@ class Bref { private static ?Closure $containerProvider = null; private static ?ContainerInterface $container = null; + /** + * TODO deprecate hooks when the event dispatcher is stable. + */ private static array $hooks = [ 'beforeStartup' => [], 'beforeInvoke' => [], diff --git a/src/Listener/BrefEventSubscriber.php b/src/Listener/BrefEventSubscriber.php index 49f93ca5d..163d15411 100644 --- a/src/Listener/BrefEventSubscriber.php +++ b/src/Listener/BrefEventSubscriber.php @@ -13,6 +13,8 @@ * Warning: Bref events are low-level extension points to be used by framework * integrations. For user code, it is not recommended to use them. Use your * framework's extension points instead. + * + * @internal This API is experimental and may change at any time. */ abstract class BrefEventSubscriber { @@ -24,7 +26,7 @@ public function beforeStartup(): void } /** - * Register a hook to be executed after the runtime starts. + * Register a hook to be executed after the runtime has started. */ public function afterStartup(): void { diff --git a/src/Listener/EventDispatcher.php b/src/Listener/EventDispatcher.php index 1f3e94aea..5da5dc635 100644 --- a/src/Listener/EventDispatcher.php +++ b/src/Listener/EventDispatcher.php @@ -7,6 +7,9 @@ use Psr\Http\Server\RequestHandlerInterface; use Throwable; +/** + * @internal This API is experimental and may change at any time. + */ final class EventDispatcher extends BrefEventSubscriber { /** From e3e1f223454dab76fab7c2ee73a0a9e3217f2449 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Fri, 24 Nov 2023 19:17:55 +0100 Subject: [PATCH 16/21] Fix CS --- src/Bref.php | 2 +- src/Listener/BrefEventSubscriber.php | 16 +++++++--------- src/Listener/EventDispatcher.php | 19 ++++++++----------- tests/Listener/EventDispatcherTest.php | 4 ++-- tests/Listener/FakeSubscriber.php | 6 ++++++ 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/Bref.php b/src/Bref.php index ed8e5d5cf..dcdeb4b9f 100644 --- a/src/Bref.php +++ b/src/Bref.php @@ -34,7 +34,7 @@ public static function setContainer(Closure $containerProvider): void public static function events(): EventDispatcher { if (! isset(self::$eventDispatcher)) { - self::$eventDispatcher = new EventDispatcher(); + self::$eventDispatcher = new EventDispatcher; } return self::$eventDispatcher; } diff --git a/src/Listener/BrefEventSubscriber.php b/src/Listener/BrefEventSubscriber.php index 163d15411..489c3cfbe 100644 --- a/src/Listener/BrefEventSubscriber.php +++ b/src/Listener/BrefEventSubscriber.php @@ -3,9 +3,9 @@ namespace Bref\Listener; use Bref\Context\Context; +// @phpcs:disable use Bref\Event\Handler; use Psr\Http\Server\RequestHandlerInterface; -use Throwable; /** * Listen to Bref internal events. @@ -36,11 +36,10 @@ public function afterStartup(): void * Register a hook to be executed before any Lambda invocation. */ public function beforeInvoke( - Handler|RequestHandlerInterface|callable $handler, + callable | Handler | RequestHandlerInterface $handler, mixed $event, Context $context, - ): void - { + ): void { } /** @@ -50,12 +49,11 @@ public function beforeInvoke( * `$result` will be `null`. */ public function afterInvoke( - Handler|RequestHandlerInterface|callable $handler, + callable | Handler | RequestHandlerInterface $handler, mixed $event, Context $context, mixed $result, - Throwable|null $error = null, - ): void - { + \Throwable | null $error = null, + ): void { } -} \ No newline at end of file +} diff --git a/src/Listener/EventDispatcher.php b/src/Listener/EventDispatcher.php index 5da5dc635..f8da3fe6e 100644 --- a/src/Listener/EventDispatcher.php +++ b/src/Listener/EventDispatcher.php @@ -3,9 +3,9 @@ namespace Bref\Listener; use Bref\Context\Context; +// @phpcs:disable use Bref\Event\Handler; use Psr\Http\Server\RequestHandlerInterface; -use Throwable; /** * @internal This API is experimental and may change at any time. @@ -17,8 +17,7 @@ final class EventDispatcher extends BrefEventSubscriber */ public function __construct( private array $subscribers = [], - ) - { + ) { } /** @@ -59,11 +58,10 @@ public function afterStartup(): void * @internal This method is called by Bref and should not be called by user code. */ public function beforeInvoke( - Handler|RequestHandlerInterface|callable $handler, + callable | Handler | RequestHandlerInterface $handler, mixed $event, Context $context, - ): void - { + ): void { foreach ($this->subscribers as $listener) { $listener->beforeInvoke($handler, $event, $context); } @@ -75,15 +73,14 @@ public function beforeInvoke( * @internal This method is called by Bref and should not be called by user code. */ public function afterInvoke( - Handler|RequestHandlerInterface|callable $handler, + callable | Handler | RequestHandlerInterface $handler, mixed $event, Context $context, mixed $result, - Throwable|null $error = null, - ): void - { + \Throwable | null $error = null, + ): void { foreach ($this->subscribers as $listener) { $listener->afterInvoke($handler, $event, $context, $result, $error); } } -} \ No newline at end of file +} diff --git a/tests/Listener/EventDispatcherTest.php b/tests/Listener/EventDispatcherTest.php index 5fbaac3bf..701753bfb 100644 --- a/tests/Listener/EventDispatcherTest.php +++ b/tests/Listener/EventDispatcherTest.php @@ -18,7 +18,7 @@ public function test subscribe(): void $eventDispatcher->beforeStartup(); $this->assertTrue($subscriber->invokedBeforeStartup); - $handler = fn() => null; + $handler = fn () => null; $event = new stdClass; $context = Context::fake(); $eventDispatcher->beforeInvoke($handler, $event, $context); @@ -28,4 +28,4 @@ public function test subscribe(): void $eventDispatcher->afterInvoke($handler, $event, $context, $result); $this->assertEquals([$handler, $event, $context, $result, null], $subscriber->invokedAfterInvoke); } -} \ No newline at end of file +} diff --git a/tests/Listener/FakeSubscriber.php b/tests/Listener/FakeSubscriber.php index ab4e87b9d..446db1126 100644 --- a/tests/Listener/FakeSubscriber.php +++ b/tests/Listener/FakeSubscriber.php @@ -15,11 +15,17 @@ public function beforeStartup(): void $this->invokedBeforeStartup = true; } + /** + * @param mixed ...$params + */ public function beforeInvoke(...$params): void { $this->invokedBeforeInvoke = $params; } + /** + * @param mixed ...$params + */ public function afterInvoke(...$params): void { $this->invokedAfterInvoke = $params; From 81e3ddca248eefe6a75f445097eab6464ab59380 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Fri, 24 Nov 2023 21:03:15 +0100 Subject: [PATCH 17/21] Add phpdoc --- src/Bref.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Bref.php b/src/Bref.php index dcdeb4b9f..06d93a52c 100644 --- a/src/Bref.php +++ b/src/Bref.php @@ -31,6 +31,9 @@ public static function setContainer(Closure $containerProvider): void self::$containerProvider = $containerProvider; } + /** + * @internal This API is experimental and may change at any time. + */ public static function events(): EventDispatcher { if (! isset(self::$eventDispatcher)) { From 9acd840aed468d6281dd6a8c07379a27d7ce27b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 08:44:20 +0000 Subject: [PATCH 18/21] Update layer versions --- layers.json | 616 ++++++++++++++++++++++++++-------------------------- 1 file changed, 308 insertions(+), 308 deletions(-) diff --git a/layers.json b/layers.json index f15a63b8a..71607d2c8 100644 --- a/layers.json +++ b/layers.json @@ -1,151 +1,103 @@ { "php-83": { - "ca-central-1": "8", - "eu-central-1": "8", - "eu-north-1": "8", - "eu-west-1": "8", - "eu-west-2": "8", - "eu-west-3": "8", - "sa-east-1": "8", - "us-east-1": "8", - "us-east-2": "8", - "us-west-1": "8", - "us-west-2": "8", - "ap-east-1": "8", - "ap-south-1": "8", - "ap-northeast-1": "8", - "ap-northeast-2": "8", - "ap-northeast-3": "8", - "ap-southeast-1": "8", - "ap-southeast-2": "8", - "eu-south-1": "8", - "eu-south-2": "8", - "af-south-1": "8", - "me-south-1": "8" + "ca-central-1": "11", + "eu-central-1": "11", + "eu-north-1": "11", + "eu-west-1": "11", + "eu-west-2": "11", + "eu-west-3": "11", + "sa-east-1": "11", + "us-east-1": "11", + "us-east-2": "11", + "us-west-1": "11", + "us-west-2": "11", + "ap-east-1": "11", + "ap-south-1": "11", + "ap-northeast-1": "11", + "ap-northeast-2": "11", + "ap-northeast-3": "11", + "ap-southeast-1": "11", + "ap-southeast-2": "11", + "eu-south-1": "11", + "eu-south-2": "11", + "af-south-1": "11", + "me-south-1": "11" }, "php-83-fpm": { - "ca-central-1": "8", - "eu-central-1": "8", - "eu-north-1": "8", - "eu-west-1": "8", - "eu-west-2": "8", - "eu-west-3": "8", - "sa-east-1": "8", - "us-east-1": "8", - "us-east-2": "8", - "us-west-1": "8", - "us-west-2": "8", - "ap-east-1": "8", - "ap-south-1": "8", - "ap-northeast-1": "8", - "ap-northeast-2": "8", - "ap-northeast-3": "8", - "ap-southeast-1": "8", - "ap-southeast-2": "8", - "eu-south-1": "8", - "eu-south-2": "8", - "af-south-1": "8", - "me-south-1": "8" + "ca-central-1": "11", + "eu-central-1": "11", + "eu-north-1": "11", + "eu-west-1": "11", + "eu-west-2": "11", + "eu-west-3": "11", + "sa-east-1": "11", + "us-east-1": "11", + "us-east-2": "11", + "us-west-1": "11", + "us-west-2": "11", + "ap-east-1": "11", + "ap-south-1": "11", + "ap-northeast-1": "11", + "ap-northeast-2": "11", + "ap-northeast-3": "11", + "ap-southeast-1": "11", + "ap-southeast-2": "11", + "eu-south-1": "11", + "eu-south-2": "11", + "af-south-1": "11", + "me-south-1": "11" }, "php-82": { - "ca-central-1": "52", - "eu-central-1": "52", - "eu-north-1": "52", - "eu-west-1": "52", - "eu-west-2": "52", - "eu-west-3": "52", - "sa-east-1": "52", - "us-east-1": "52", - "us-east-2": "52", - "us-west-1": "52", - "us-west-2": "52", - "ap-east-1": "52", - "ap-south-1": "52", - "ap-northeast-1": "52", - "ap-northeast-2": "52", - "ap-northeast-3": "52", - "ap-southeast-1": "52", - "ap-southeast-2": "52", - "eu-south-1": "52", - "eu-south-2": "51", - "af-south-1": "52", - "me-south-1": "52" - }, - "php-82-fpm": { - "ca-central-1": "52", - "eu-central-1": "52", - "eu-north-1": "52", - "eu-west-1": "52", - "eu-west-2": "52", - "eu-west-3": "52", - "sa-east-1": "52", - "us-east-1": "52", - "us-east-2": "52", - "us-west-1": "52", - "us-west-2": "52", - "ap-east-1": "52", - "ap-south-1": "52", - "ap-northeast-1": "52", - "ap-northeast-2": "52", - "ap-northeast-3": "52", - "ap-southeast-1": "52", - "ap-southeast-2": "52", - "eu-south-1": "52", - "eu-south-2": "51", - "af-south-1": "52", - "me-south-1": "52" - }, - "php-81": { - "ca-central-1": "63", - "eu-central-1": "63", - "eu-north-1": "63", - "eu-west-1": "63", - "eu-west-2": "63", - "eu-west-3": "63", - "sa-east-1": "63", - "us-east-1": "63", - "us-east-2": "63", - "us-west-1": "63", - "us-west-2": "63", + "ca-central-1": "55", + "eu-central-1": "55", + "eu-north-1": "55", + "eu-west-1": "55", + "eu-west-2": "55", + "eu-west-3": "55", + "sa-east-1": "55", + "us-east-1": "55", + "us-east-2": "55", + "us-west-1": "55", + "us-west-2": "55", "ap-east-1": "55", - "ap-south-1": "62", - "ap-northeast-1": "62", - "ap-northeast-2": "62", - "ap-northeast-3": "62", - "ap-southeast-1": "62", - "ap-southeast-2": "62", + "ap-south-1": "55", + "ap-northeast-1": "55", + "ap-northeast-2": "55", + "ap-northeast-3": "55", + "ap-southeast-1": "55", + "ap-southeast-2": "55", "eu-south-1": "55", - "eu-south-2": "52", + "eu-south-2": "54", "af-south-1": "55", "me-south-1": "55" }, - "php-81-fpm": { - "ca-central-1": "62", - "eu-central-1": "62", - "eu-north-1": "63", - "eu-west-1": "63", - "eu-west-2": "62", - "eu-west-3": "62", - "sa-east-1": "62", - "us-east-1": "63", - "us-east-2": "62", - "us-west-1": "62", - "us-west-2": "63", + "php-82-fpm": { + "ca-central-1": "55", + "eu-central-1": "55", + "eu-north-1": "55", + "eu-west-1": "55", + "eu-west-2": "55", + "eu-west-3": "55", + "sa-east-1": "55", + "us-east-1": "55", + "us-east-2": "55", + "us-west-1": "55", + "us-west-2": "55", "ap-east-1": "55", - "ap-south-1": "61", - "ap-northeast-1": "62", - "ap-northeast-2": "61", - "ap-northeast-3": "61", - "ap-southeast-1": "61", - "ap-southeast-2": "61", - "eu-south-1": "54", - "eu-south-2": "51", - "af-south-1": "54", - "me-south-1": "54" + "ap-south-1": "55", + "ap-northeast-1": "55", + "ap-northeast-2": "55", + "ap-northeast-3": "55", + "ap-southeast-1": "55", + "ap-southeast-2": "55", + "eu-south-1": "55", + "eu-south-2": "54", + "af-south-1": "55", + "me-south-1": "55" }, - "php-80": { + "php-81": { "ca-central-1": "66", - "eu-central-1": "65", + "eu-central-1": "66", "eu-north-1": "66", "eu-west-1": "66", "eu-west-2": "66", @@ -155,139 +107,139 @@ "us-east-2": "66", "us-west-1": "66", "us-west-2": "66", - "ap-east-1": "56", + "ap-east-1": "58", "ap-south-1": "65", - "ap-northeast-1": "63", - "ap-northeast-2": "62", - "ap-northeast-3": "63", - "ap-southeast-1": "62", + "ap-northeast-1": "65", + "ap-northeast-2": "65", + "ap-northeast-3": "65", + "ap-southeast-1": "65", + "ap-southeast-2": "65", + "eu-south-1": "58", + "eu-south-2": "55", + "af-south-1": "58", + "me-south-1": "58" + }, + "php-81-fpm": { + "ca-central-1": "65", + "eu-central-1": "65", + "eu-north-1": "66", + "eu-west-1": "66", + "eu-west-2": "65", + "eu-west-3": "65", + "sa-east-1": "65", + "us-east-1": "66", + "us-east-2": "65", + "us-west-1": "65", + "us-west-2": "66", + "ap-east-1": "58", + "ap-south-1": "64", + "ap-northeast-1": "65", + "ap-northeast-2": "64", + "ap-northeast-3": "64", + "ap-southeast-1": "64", "ap-southeast-2": "64", - "eu-south-1": "56", - "eu-south-2": "52", - "af-south-1": "56", - "me-south-1": "56" + "eu-south-1": "57", + "eu-south-2": "54", + "af-south-1": "57", + "me-south-1": "57" + }, + "php-80": { + "ca-central-1": "69", + "eu-central-1": "68", + "eu-north-1": "69", + "eu-west-1": "69", + "eu-west-2": "69", + "eu-west-3": "69", + "sa-east-1": "69", + "us-east-1": "69", + "us-east-2": "69", + "us-west-1": "69", + "us-west-2": "69", + "ap-east-1": "59", + "ap-south-1": "68", + "ap-northeast-1": "66", + "ap-northeast-2": "65", + "ap-northeast-3": "66", + "ap-southeast-1": "65", + "ap-southeast-2": "67", + "eu-south-1": "59", + "eu-south-2": "55", + "af-south-1": "59", + "me-south-1": "59" }, "php-80-fpm": { - "ca-central-1": "63", - "eu-central-1": "63", - "eu-north-1": "63", - "eu-west-1": "63", - "eu-west-2": "63", - "eu-west-3": "63", - "sa-east-1": "63", - "us-east-1": "63", - "us-east-2": "63", - "us-west-1": "63", - "us-west-2": "63", - "ap-east-1": "55", - "ap-south-1": "62", - "ap-northeast-1": "62", - "ap-northeast-2": "62", - "ap-northeast-3": "62", - "ap-southeast-1": "62", - "ap-southeast-2": "62", - "eu-south-1": "55", - "eu-south-2": "52", - "af-south-1": "55", - "me-south-1": "55" + "ca-central-1": "66", + "eu-central-1": "66", + "eu-north-1": "66", + "eu-west-1": "66", + "eu-west-2": "66", + "eu-west-3": "66", + "sa-east-1": "66", + "us-east-1": "66", + "us-east-2": "66", + "us-west-1": "66", + "us-west-2": "66", + "ap-east-1": "58", + "ap-south-1": "65", + "ap-northeast-1": "65", + "ap-northeast-2": "65", + "ap-northeast-3": "65", + "ap-southeast-1": "65", + "ap-southeast-2": "65", + "eu-south-1": "58", + "eu-south-2": "55", + "af-south-1": "58", + "me-south-1": "58" }, "arm-php-83": { - "ca-central-1": "8", - "eu-central-1": "8", - "eu-north-1": "8", - "eu-west-1": "8", - "eu-west-2": "8", - "eu-west-3": "8", - "sa-east-1": "8", - "us-east-1": "8", - "us-east-2": "8", - "us-west-1": "8", - "us-west-2": "8", - "ap-east-1": "8", - "ap-south-1": "8", - "ap-northeast-1": "8", - "ap-northeast-2": "8", - "ap-northeast-3": "8", - "ap-southeast-1": "8", - "ap-southeast-2": "8", - "eu-south-1": "8", - "eu-south-2": "8", - "af-south-1": "8", - "me-south-1": "8" + "ca-central-1": "11", + "eu-central-1": "11", + "eu-north-1": "11", + "eu-west-1": "11", + "eu-west-2": "11", + "eu-west-3": "11", + "sa-east-1": "11", + "us-east-1": "11", + "us-east-2": "11", + "us-west-1": "11", + "us-west-2": "11", + "ap-east-1": "11", + "ap-south-1": "11", + "ap-northeast-1": "11", + "ap-northeast-2": "11", + "ap-northeast-3": "11", + "ap-southeast-1": "11", + "ap-southeast-2": "11", + "eu-south-1": "11", + "eu-south-2": "11", + "af-south-1": "11", + "me-south-1": "11" }, "arm-php-83-fpm": { - "ca-central-1": "8", - "eu-central-1": "8", - "eu-north-1": "8", - "eu-west-1": "8", - "eu-west-2": "8", - "eu-west-3": "8", - "sa-east-1": "8", - "us-east-1": "8", - "us-east-2": "8", - "us-west-1": "8", - "us-west-2": "8", - "ap-east-1": "8", - "ap-south-1": "8", - "ap-northeast-1": "8", - "ap-northeast-2": "8", - "ap-northeast-3": "8", - "ap-southeast-1": "8", - "ap-southeast-2": "8", - "eu-south-1": "8", - "eu-south-2": "8", - "af-south-1": "8", - "me-south-1": "8" + "ca-central-1": "11", + "eu-central-1": "11", + "eu-north-1": "11", + "eu-west-1": "11", + "eu-west-2": "11", + "eu-west-3": "11", + "sa-east-1": "11", + "us-east-1": "11", + "us-east-2": "11", + "us-west-1": "11", + "us-west-2": "11", + "ap-east-1": "11", + "ap-south-1": "11", + "ap-northeast-1": "11", + "ap-northeast-2": "11", + "ap-northeast-3": "11", + "ap-southeast-1": "11", + "ap-southeast-2": "11", + "eu-south-1": "11", + "eu-south-2": "11", + "af-south-1": "11", + "me-south-1": "11" }, "arm-php-82": { - "ca-central-1": "40", - "eu-central-1": "40", - "eu-north-1": "40", - "eu-west-1": "40", - "eu-west-2": "40", - "eu-west-3": "40", - "sa-east-1": "40", - "us-east-1": "40", - "us-east-2": "40", - "us-west-1": "40", - "us-west-2": "40", - "ap-east-1": "40", - "ap-south-1": "40", - "ap-northeast-1": "40", - "ap-northeast-2": "40", - "ap-northeast-3": "40", - "ap-southeast-1": "40", - "ap-southeast-2": "40", - "eu-south-1": "40", - "eu-south-2": "40", - "af-south-1": "40", - "me-south-1": "40" - }, - "arm-php-82-fpm": { - "ca-central-1": "40", - "eu-central-1": "40", - "eu-north-1": "40", - "eu-west-1": "40", - "eu-west-2": "40", - "eu-west-3": "40", - "sa-east-1": "40", - "us-east-1": "40", - "us-east-2": "40", - "us-west-1": "40", - "us-west-2": "40", - "ap-east-1": "40", - "ap-south-1": "40", - "ap-northeast-1": "40", - "ap-northeast-2": "40", - "ap-northeast-3": "40", - "ap-southeast-1": "40", - "ap-southeast-2": "40", - "eu-south-1": "40", - "eu-south-2": "40", - "af-south-1": "40", - "me-south-1": "40" - }, - "arm-php-81": { "ca-central-1": "43", "eu-central-1": "43", "eu-north-1": "43", @@ -311,7 +263,7 @@ "af-south-1": "43", "me-south-1": "43" }, - "arm-php-81-fpm": { + "arm-php-82-fpm": { "ca-central-1": "43", "eu-central-1": "43", "eu-north-1": "43", @@ -335,9 +287,105 @@ "af-south-1": "43", "me-south-1": "43" }, + "arm-php-81": { + "ca-central-1": "46", + "eu-central-1": "46", + "eu-north-1": "46", + "eu-west-1": "46", + "eu-west-2": "46", + "eu-west-3": "46", + "sa-east-1": "46", + "us-east-1": "46", + "us-east-2": "46", + "us-west-1": "46", + "us-west-2": "46", + "ap-east-1": "46", + "ap-south-1": "46", + "ap-northeast-1": "46", + "ap-northeast-2": "46", + "ap-northeast-3": "46", + "ap-southeast-1": "46", + "ap-southeast-2": "46", + "eu-south-1": "46", + "eu-south-2": "46", + "af-south-1": "46", + "me-south-1": "46" + }, + "arm-php-81-fpm": { + "ca-central-1": "46", + "eu-central-1": "46", + "eu-north-1": "46", + "eu-west-1": "46", + "eu-west-2": "46", + "eu-west-3": "46", + "sa-east-1": "46", + "us-east-1": "46", + "us-east-2": "46", + "us-west-1": "46", + "us-west-2": "46", + "ap-east-1": "46", + "ap-south-1": "46", + "ap-northeast-1": "46", + "ap-northeast-2": "46", + "ap-northeast-3": "46", + "ap-southeast-1": "46", + "ap-southeast-2": "46", + "eu-south-1": "46", + "eu-south-2": "46", + "af-south-1": "46", + "me-south-1": "46" + }, "arm-php-80": { + "ca-central-1": "68", + "eu-central-1": "67", + "eu-north-1": "68", + "eu-west-1": "68", + "eu-west-2": "68", + "eu-west-3": "68", + "sa-east-1": "68", + "us-east-1": "68", + "us-east-2": "68", + "us-west-1": "68", + "us-west-2": "68", + "ap-east-1": "60", + "ap-south-1": "67", + "ap-northeast-1": "67", + "ap-northeast-2": "67", + "ap-northeast-3": "67", + "ap-southeast-1": "67", + "ap-southeast-2": "67", + "eu-south-1": "60", + "eu-south-2": "56", + "af-south-1": "60", + "me-south-1": "60" + }, + "arm-php-80-fpm": { + "ca-central-1": "67", + "eu-central-1": "66", + "eu-north-1": "67", + "eu-west-1": "67", + "eu-west-2": "66", + "eu-west-3": "66", + "sa-east-1": "66", + "us-east-1": "67", + "us-east-2": "67", + "us-west-1": "66", + "us-west-2": "67", + "ap-east-1": "59", + "ap-south-1": "65", + "ap-northeast-1": "66", + "ap-northeast-2": "65", + "ap-northeast-3": "65", + "ap-southeast-1": "65", + "ap-southeast-2": "65", + "eu-south-1": "58", + "eu-south-2": "55", + "af-south-1": "59", + "me-south-1": "58" + }, + "console": { "ca-central-1": "65", - "eu-central-1": "64", + "eu-central-1": "65", "eu-north-1": "65", "eu-west-1": "65", "eu-west-2": "65", @@ -355,56 +403,8 @@ "ap-southeast-1": "64", "ap-southeast-2": "64", "eu-south-1": "57", - "eu-south-2": "53", + "eu-south-2": "54", "af-south-1": "57", "me-south-1": "57" - }, - "arm-php-80-fpm": { - "ca-central-1": "64", - "eu-central-1": "63", - "eu-north-1": "64", - "eu-west-1": "64", - "eu-west-2": "63", - "eu-west-3": "63", - "sa-east-1": "63", - "us-east-1": "64", - "us-east-2": "64", - "us-west-1": "63", - "us-west-2": "64", - "ap-east-1": "56", - "ap-south-1": "62", - "ap-northeast-1": "63", - "ap-northeast-2": "62", - "ap-northeast-3": "62", - "ap-southeast-1": "62", - "ap-southeast-2": "62", - "eu-south-1": "55", - "eu-south-2": "52", - "af-south-1": "56", - "me-south-1": "55" - }, - "console": { - "ca-central-1": "62", - "eu-central-1": "62", - "eu-north-1": "62", - "eu-west-1": "62", - "eu-west-2": "62", - "eu-west-3": "62", - "sa-east-1": "62", - "us-east-1": "62", - "us-east-2": "62", - "us-west-1": "62", - "us-west-2": "62", - "ap-east-1": "54", - "ap-south-1": "61", - "ap-northeast-1": "61", - "ap-northeast-2": "61", - "ap-northeast-3": "61", - "ap-southeast-1": "61", - "ap-southeast-2": "61", - "eu-south-1": "54", - "eu-south-2": "51", - "af-south-1": "54", - "me-south-1": "54" } } \ No newline at end of file From 637d5b4f801c264b91df1e96f388e2a5f938d0a6 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Wed, 6 Dec 2023 15:32:40 +0100 Subject: [PATCH 19/21] Update sponsors --- website/src/components/home/sponsors.jsx | 6 ++-- .../home/sponsors/logo-shippypro.png | Bin 13569 -> 0 bytes .../home/sponsors/logo-spreaker.svg | 30 ++++++++++++++++++ website/src/github/sponsors.js | 10 ------ 4 files changed, 33 insertions(+), 13 deletions(-) delete mode 100644 website/src/components/home/sponsors/logo-shippypro.png create mode 100644 website/src/components/home/sponsors/logo-spreaker.svg diff --git a/website/src/components/home/sponsors.jsx b/website/src/components/home/sponsors.jsx index 4ce56a581..a02c64cf4 100644 --- a/website/src/components/home/sponsors.jsx +++ b/website/src/components/home/sponsors.jsx @@ -2,7 +2,6 @@ import GoldSponsor from './sponsors/gold-sponsor'; import craftLogo from './sponsors/logo-craft-cms.png'; import tidewaysLogo from './sponsors/logo-tideways.svg'; import myBuilderLogo from './sponsors/logo-mybuilder.svg'; -import shippyProLogo from './sponsors/logo-shippypro.png'; import nullLogo from './sponsors/logo-null.png'; import awsLogo from './sponsors/logo-aws.svg'; import jetbrainsLogo from './sponsors/logo-jetbrains.svg'; @@ -10,6 +9,7 @@ import laravelLogo from './sponsors/logo-laravel.svg'; import depotLogo from './sponsors/logo-depot.svg'; import secumailerLogo from './sponsors/logo-secumailer.svg'; import ecomailLogo from './sponsors/logo-ecomail.png'; +import spreakerLogo from './sponsors/logo-spreaker.svg'; import PremiumSponsor from './sponsors/premium-sponsor'; export default function Sponsors() { @@ -26,9 +26,9 @@ export default function Sponsors() { - - + +

diff --git a/website/src/components/home/sponsors/logo-shippypro.png b/website/src/components/home/sponsors/logo-shippypro.png deleted file mode 100644 index 9bdd2021c930a2d6c9fad9f5a5aa785ce21bb7f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13569 zcmYMb1zgkL_dos`rG$jEAR%4SEew4Nh;&P%lt?#H8!8ea;FOXS5v6+|jdV*mx{zySakpmqPQN$|{GmWQ|Fw8bLf>xNS^@~)+*ZG7`L zd1@b{_HU`TdQYpqU2(s`zPnY*%c$yaKts;C^iq>josofeoR}f1z3(KASAFHjIK{&+ zaSYQO*PqmBr7=y}QWDQTd`I$N5P6-5#j$+N<{%`;0nb>5xwW{%7bG`+&3G6qu2Yz;;vH}R_tSx>DSK+ z6PTyTR!RTKO91?|=ZsoB5c9WM^;ssHfB61{`n?H%?I!UAibda=wQu_0Ajs4_LO<`m zvYHRi>Fc$!3nD5XKu6vug{}8c_FVZVk}E+5r@si$($%6=#6GZca8^tG#QtV;c=#|vs z;j6iixc*6zsk#4X&HHBb_qxrxE-o>mS)`bAH~hC1^aIcGNN{YTjh0B&TWVd%r7#?_ zWQaBZ@su+Wx&U$`qzujJ{_g{C&~f{FcQQn-(=KaThBL85!T(Jn1#breV6+< zY1^?V_kThF72JW6P?cYnPujpQi-w*Bjr7lO?uQS_6N=$c&{aP6Z`b~>V~I+vm$2|$ zx2cEg8<_Gbrm9u6m~&I*WYdM1o)DleM2JtVcod)k$p6o??15bo{4C=3*v-gTLL=<- ziqyJFbL-J2f#S0NAI`=`Sv>!y53m5MKVW8t6!Md`Q6hNF#T?_lrfN)q*I&oDA312m z&A=@3pI?Rkjp9e{hdgZggKeI5DQ-Mp@#OaUo`4&y2EXv36CA76;DZM4YE=IJ$#NxA z!6nfnfA`$~S+$OjH9Qw1Kg^f<0%i^lp{mbxx|?F?U%N@SV_ksyC$O0BC2=sfFIK0` zwFEp{>&GN)xwNg+hXVJW(cUGlh{}C#<$YjT=TocY?x1K!I2P7gWgUw8?;#*4&jv%dI!^BfnJ9 z%c__9(|@4<8t9D2P{C(TyG!T^lrmoJorJwgyTzdGx{yU&nb%!h$E!R1vzuf8b2K!a zCYc&D+Rhsdn|(OaihJsDF{zq>jV9mfEirw18Gr$JJPS~}_ZFGY_px?q1$J^lDc;(Q zBIxVi!apW*<_&N{IlErQZU7#97)Sz-Bg7EQV+d$y=%4h({qWgFW^nS5Nhh{|j}WeC zNVH@%q6l&7e7^f&+sf@q4H(eX$S#MgVKJu0aPc4R;G%kT(rpCqd60GRR|B+d+iKNY zxgj8lZP_km0#Osz37tnwRG|W&%7R^1T!Tl(1?|J;!w(t{l;d=gnm^1>V#`I821WZa zuyvzuVHcd+G_d_1yD-1I8#4uLJop}M)#s0p?Vk2&Ps+Bt*Pgm>CrLK&xo$?Nu&`l> z-S#97N4ARZ?K`=76t}H9b;S}^OCDz+wm&7(f&Gd4&b-8WF{>aFEMpwQx+XBq^yt2KO^s% zZ#o}aAh^X(2OQ^%7rvPq_&v3?xoJbVc$6d~(QWcCWGwytdq?+Q^cLRI(3@Rv$YZQqm6TC4*z zYmxdRcYl(>XWKc}bb?D70U60rnEiRg`uh!Do1|T+8ZH`YYqVG>=VmH^+U}q9iS(rk<*uMgYfYU6fVEygA>NS5HJVEB>L}2=-8qwJ zs#OXehY~gNX6MxcoJl7%PJ5wzDlu3Z=cbyMcRq96WPJM2(ol8qyOUMS0tY%H&8&vbMgN(%W0)BjSy& zrKJ*9kX(DRHWf)h4FH?#|AR0&+|C>FO}=hwFb1f39DLF zM~)80V^eu&H+$v!5gg|JDRRZu2n&&F>rk2m;qJ6Z%A|WxIbTCVLxubH*a?T=A=1<@ zM1X-w3ZIHc{1%IYvn%z33E-QDmrU|J#aaep*hv?==s-!sKvlvi>{`@&|u&ZqKwL78CyNXmQh6#!TuV?S*wDQH_EOB94! zsWS_4%sP_@=t>bBN@bWOo}8Uz&Wm%YGd(R>92Nt$b!1DPW5}(3d(+&IkeMg#WZ}@q zsPt;93uZMY>s0q>O*W{R{gsyWYLU)35in=rQqJPg;7F{tO9rp9c;s$8)&Vwc#-Ut+ z`T3dCurI7Rp8&^VM+NAi^l2$3-Q3FZr8+?B( zLb>IL+xGA-V)KrsMz!*FX*+H*Av7vy(+iWgFK)8>8JgLt;q>KgUzF@0Op;8!^N``Q zF+e^e7OnsB+S?c1n)x~L6*(=(90~#?`MckL%N{cT7+_8FFuv_sf5dgv#?IZeISu+I zc*DuiFn5k1my0*_Z8I90qu*ylZ<0T)bmzfi(tymDR8Cr2hbdqTtnY}=(*bmVLl?l& z9Ro8Ta{#BON2gqaS>Nsn=x;|mv+u1F>0`6J7m_Q4O%T5c zo&@_?(3ooNus-h*OWBX@f|-sb6NQ;ja7X6gVkfkbWSC^r zbOFtuCB>YeVS@$STG1QQ}5ytI~~H>&R%V2(RThcBK#^YX0JV$NW(&(Fzs}|N?aVLxP z_KPx!rWdLArW2mYn?B5)oS zLJXRXqG%qz$ksW|RP6JWx}k(kx^WCl0k<{5BAniTbZ4r-p>NgAqpS891}9%q)~)RK22Xh^R!CNw z4(OZ`?;y0#)P@vO6m;N0O&b{}Gt#Zm*k~Sbeu(e=d-dK_YC%PWbKcPnIAvHF{UHcu z+I8VO*>-{LzpfHZEdo~+E?{5?oBBHNL<;h31dkgbJVJI6hN{=2I4>|>Slv!oi41YL zU4G~}W0RE-2Xp)%b8R?x%g|=pP0;|vIJhNrR zo9Zx27p>;ue;VCp*={Py^50*Ob1?1E=$=~@{TkqdYRD)!XCJ{ z7ND+<;HW^E&HeJtKPLv%-epJiMBM4*K{fSC_|Cl(D2R&SgqFIomv&;Ve-b#`Q)`j!fw{{_|Fl^#93MBV`y zq-_yAUem4+NLD!Mx%5CsuSOPDP`oyyTo5@{lm?vn0^({Kz2b!$xk{zvvN6gFReY|3 zu9}9G9WD8h%JLM;S6(?`WE=GjRJV=4AN(g}P3=A~UHMlkR4tTxe)56N7mi?JcH$hj zGpZrhStXO3p`Igp*V)({@*7Ft9E9=JE*!`L_xz&eKv%nir6quOw=@7fM(r-j*i7A4 z)^jCHafoJx10Gd>`isTb&;XKR!$=1n&JM&i^OG_!JKSOWSsi!T5qK2yWKZc$Uy?tlDpFbfNAWu^;eKo_!ZDMT7 z&FgKcZl#mTYfqr!JQ15?hI1h5)ReDBJEDrpH15)|2Fu(nIHRho8>)~n5SAH!pp!)UVfx@;VbMJvPh6pK<`sSDl4-D z&HPlqacG&Klu-&ju2Q;;@Y?e$4VQ;+qi5m}ns;(=wWa4Q?NGmQ7-4SQ%5cc#fZ;?R zSbaR(lxSM^NJQ0zWWTW5!EtE9|_hTU6ceAM!-H$QWGd&fxUrD)<0 zB6JQ7I+1+o{U%FW02SQ&27s7w+6aE;Jbx_uO1gSd0@8G)>LzniRNIUE2($C4*u9oh zhPyiN_?Vwolijm4QE5R*z!h!DH=hUp3@sV((*2^4_U@!pMzihS5HJPqZR&JP3?Z!( z$`7|YyDJvwT>4E}?&YHy=@~`a$7wlfZzzgesQKa0nTK-f;bV%SLr#2-hB$GOscgp) zwHtnUyU$g3NhEq2A;V}iX3DH)Cns5iK9w=Or3ZDmN~ZSUu3t`JA~w+iG}kM!J6}H~ zHOiLVbGH_XFt=86PhQTZEE`R=CF=SOUtCd7%}Qc?!9?~$;pG}yWnnDg*BOO)Rzyv9 zVgiTF;F5xcLM*w#%rOxQ5JR{X3)2C_`=#sMFmYkd(!(=C+6Ye;hu39SuMtVDIz$~0 z2^1jSsre}K@T(b5*PBt(1J~*Ek5M+dIO?oNmCrY2o@T6@n!>SWd!+pIDHkz5nt(&BZnu*LG zdIj5kk!P|g;!x1`lVv;rb8a^6N}X~XlYY?Hv2?DkAB$e(SlmJ(i;Fb zXY%&ieH`a3i6AL1}}+oT$maTCqEh8{4`q)WEUF>OygnC1fA~r+&?( zYrrxZN4Fu~%dZEo?}V|V!*Wo~UrT5E17`@2cgElCT=W80w?0*LRNM#G$1x#^<8~Ca zZ)xpKQs2b`)q*yJG--CyNsTnAQg<5v3a@NRFOeY0@sC}!idX$j(lClKvv~9!$vu(T zhB9|1obqtUVpb<`)wL)71O_@3(B>~AeUfAuxHBcaKc)75-=RrO)VgyQ{qT(r{~?z~ zMt9n$6=i|e-w9V<>}Q^f-wT6%(_&qr1Ec_2Fj7xDJfMH|vKA@66+*Un_FR1=8{_M`^n^kl`6Zct9nwk~_yCA0j zv(A)3)zrb@;viVf)Zh4N%Jjamp~kN;vc>cGypyIk-D##;Vs3jCKsd5xqFKpIK zMPl~WMI~Nbpx*55cCtyeJx~#I3oi+=pCK(jeB>51r&t%!J?m&;G|w`QL?L|zNt6*v zSH3)L$oku`(kgP3m}>!O5_hezgEp#`HI#=C5k2PX2v>PFQsy?Yth%R2QL(cxvj3-? zFJY8{yX;Z_(z)lCM;FlhE4CPok(084&O3wgf{7}#t4*=?eJsZF=Mner5M3t5Xnv7! zDZDO82Z)(>H@LA4YjI@jd>yM*`Bk-nzblT@Q8PE)JbEmxlKu72^B;_zx`Sy*G{fio z!xa?r6B|86KY%y6Ciz=pjulL8DfyJB8H>s6`Imw7rM3TIFd#54aT`&f{OtRR>_w(D zYDR9zThm*fG3R@OGE%jaoe$rGDn!;ISF-nZBqMOB1*o7TuM`iyIEKKb127r)ekA|t z1M%hnqvnU=luW0`*oxZIDP^#s7D^^FhhRJD3G2gdQvsZQ&H4J^i@5xr`QX@>&aY>V zt7?&9V-A%21n@2(m8bHF%Q0NXQ_-+#e|_Hxvug$Y^e92Z^HIP~_(s0?QudyyR$^Dp z`l8<~4VjvA9##WdkV}JxHMKQ&*pukMC%&(FQuWT1&6eeF*D$7+)()j*Uzr$5Yk`T^ z-^{&9bBqM@<~#}WJEFUmi;@F(YJMk#X8B2yPFa&*<@O0c*lYqD=SB4GGz#P8+bx#+ z#fqmc8io`X@9I~Re0K46-UodHl9X;9lPb}xy?|9a&|5}MYyLADn7!)(PvuylMEX`-=sIJ6^Sj;JyKvu6su40G&`Z z1OB#eN7xWO)vKV0^O#?$%15m`y^8BXo&MHA9*r$!JzSRm$pTO42%)HUg(pKw z43Ur6VK(E@gf&r)qy+UHHF95ikDG`Wi+jV(X!okqtn|+V;t3&;f|aRd5_eV)f%mqPsDan?uaOhW?rf0% z%q?0l7ftsyUq z@K|Hvzzji3p~B|d_>g<`HfUufPv8}akO`|SXy_<@-qBxQmG$tstc@>m-0Cil)g}_& z8p~fgz4$8}Duy?8qx2p^>ypQ78?#lQhBT#n$oalS%q{hS`~o znMbVhz-#We2{Wf;lux@s|9~xX6LZ0w+kRTkax{8jGV=%G0@;y75jz{i+8sBgKKd$a zD!C5n{v8-2cLGgc>drKB@c>8RLm&DZ$FdO&?WlBpwzr4Uu=AO0l5|G$YJqu~pF|9u z_g`N+ABmg`oi+Ln{0uddGV3F#9l~XAoXhw#^s#QAz@#z$?*h@5TG{CCMm{vwj$3b; zU~n(_c$ModRZf-o+oTuIE1AnRTOWp!&^{re2hcP<@f?%=aYp5mK%CRnT@rT+QPM~A z>__S|Ba}JqPp|rY$#{>?eEbZqiJUw3=fzdCFXl`3F#A?5oZB7`d}&jiixKuy4ZCb9 za@d>-ey9`K!(bzy=IGPT7(ya-J>E%{YiN7}jmn91G*Jt*2+AWocJr84(XZy1ba$3< z5KB5Jxy5D*q|RzuF53QLz~1i z+hhIcBMD_S6MqYlAJX9Z(^mYP$ya_sa}td(i-oU4!QB@mXneMbWN#`z> z@oS$fTN+o9H#)S%M`yvjQ=#grBydj_Ai9<<2@pwuDiy79*2UT%X?AT!ThA%+Rgwj+ zmzmhth-`$v`q=ZojRKR=!$f*RIKeS*{Z*Aht2n_|o*=-ZeF5W;LPg*Q53w9CUuMj7xQ&@Tu@@k!vvr_$MDe zlh8KyXM7Y*PR0s9yM7`tatrQ_R-`eO2f{KwluH01es5TSG|=3=+fBR7g~ZmDgiUrr zLOvVf_7=9$Rr`cT4M_!z1X)K{WSbt3BB={*9_+`&W5`_En%}}Tj5Kft30!JYprCEM91BnEFkUr$`UC(N zzFu+x>?jVi{!mV_srF$18WjCDj;ECRp=0T~6DY;ai!T#1>99*o06?74Tz>>(=`NC1l*p>uXi_q_05bd8@uKxnAu7ydjz5o3|%H@dn(JF;+BG1!QKUB6)*=j(6 zisRLs5yEo^9qBJ4%f}mmG}3_5CslVaKV;fn4MXSr9+9|C;LAc(@-1f3i< z?Z(IniCE)&`ShbC#yMR;RsNx+R?h=Z-IJE}12=#qj7klm#7?S)%8>OM)AzI}KilvGzz+tD`T$5&WF z5p=q^u@8gA5q7G-xv5aUTj~CL-Izn_^++23=tqA~v6H{YNDY1`p_g|9iXg%(&@i;u zt`KXofAPsmDin6+r+=}PiaXrdLc5yf))wWziEL>Uo7Q-I4X8^xmvb9oa~QL92W$Bj80?xb1_B^tX+M>fr(c>(8 z$H$J6#aL%TaSZV80py7H#{)e=Up^a+ArN=98ftZ?fRjBkZ}twkLcg?jcTA^u2e4tV zqHT4LXXSmDu*2a$kZmW|dE(qFPU({lNDe0^CH9K4IW$f3N_G$4a5$4BK~2s-UwwaF z(=NC#-#cpLwqzG~2R4CGv%pJKNv1#+<`)KfuR?wHyNRzHzzRX)l50>mI8Y8lPgJ)a zr%&Rh%%!gL+eD(2C}z=isU8frON#FrZ+!m7%Hm)tNuB|QLiyKMY&J*4d&|isPLes4 z_{~<+IJ2l~HmWGA2C`?W^Li(2DN0ow8cH1(N*9xbW=fL()YGXM1`c~tDV+$Jr~NY5 zF#%&KA}02skPHim)u4vpDE@f(?OYSj?j}hyz|}pmgvT+p@vDoh2b?14<;3)rA6DP4 zU>9yF=40hdGPCyW*t1Rjn#LpI8PRF#FD61Z{UZPCSBubYRK{0^#KLB$(my_Pf(a$F z&jpMUenoVr6-nnz{f!=6t@2y3JO)cRXT~=?KFdC%UA^%ueF^|;zx$3{F_vxM;l#;@ ze=FAajkkE#tLgc6l)gu6Lln7p1=h=X=~FA;tlH9ic>Og-JEk^Uo+VZXok^Bz-^?r7 ze#i{Z9s(=I(&whQMV8b}W_!z&Ebl!Qhi&@dcX5&h9`URX8-Cz|NqOk2RJIycXR24@ zKPcq5is_e+Cw{-sa0~MDN{OTAGIe2~;+>~uByii+FfJCHB5r*yg>HpFnV4&PP~YlN zxKPx$aeBF_t~TWWMVNmv^4?{@b+oLU zmkcMeGAG)~bniAG=Vr63%f#M48xi{}A~&PYwXo0_NX$UwwwEyL)Ovk2(E?E;gIvJS z#JuVEoY!9o*&AwZB+#=0AcT7if*aH2ufz@@R!(FfIHUu|;#p@ux;OR-h3Y!+!B~Qg zPm6MC^z7rEa--|#q2G1T(5oN50P8)!G6xgW)n=-Hi)8$;oR#f%=i{XS;#dS~Z43u^ zx2@im>$^Jt+PC_gE3*vqbjtTqr1mz))zJ~o-w+Vzx2KPW#@^)2J^wWlrnmwtP5y)) zOYyKjx_RjR-oLp`w}Nkw8~$>NaavM!I>^Q2p^}VVa{ijEmr4SE)8 z-5T9L{F+V8Y&E~hMSFkyYDdr$VlD>@z{p>9mpqlijs$II9yY1DW`<*P(^$0go1NR; zZP|8FCZ!{os+($7%Ya?v;FjfnLN;1_`x|Nlqq46|rHV0%?8(OdDPUaPsWZ7l%*^Hb zF>Ygfh)Z?Wkj!Z-O?;}~p2xbx!;9)Dgf|!2EV-kTAn?JObU8B?h6!cWssm&7;>bn2 zpG$d@>{pOcuDL<;q`VSy;NRMMY$g^(v% zF3NGj=#9PJwJ5Es<^(68UKBpS>K;$3rT+^l?^~OTLdqA#1zw0dUsS*10{7|Lg3gT6 z?-y&#!^p)PY4A`)SMkkqas42f5@#vD0pJ?{H<0N`B%C$gq*vsfEm05X$mw<_7JU=@Ho0;~*)-$$#Kc-j>tky`BRL>W+e0 zIE(G9MxE?$>A-tFw0gbFD1qVD)Eogr0~o!}A^TBlF{`VC+jjd_4ISk&vGm zR&#y95~}6jfOI^;d_if1QD~_ z0ng*!z4k0~lH73y>)Jgw2l@y|?!w#?&1rpION2iUr3QQ!eefVegSGrHM+|L;@c;T? zX_hzqC<){*gGyfaXc5RM$|5-P*e-&j}CjGL;!Z0oB zoiSZ8$G0obirgO-<^Rfd*a;NO3pHg}jSB02pp2R+>3Z;4r`N#?kz9cNr2D&rl${mQ z0b2MW7z*ULmhFNH@%kHDSQi6aqa7P-u_o{Fj=cWG3gLUe_J2_S;|Xz9+N8tsMiatl zaC%?6f$MpLHtRF}+nvy4wE7Ttwse(_>o8LS&iOVBTce0&lxQ>(SS*JcA2LC56S zdUW75*AN4qgT!mkZAKo(%UI^<)hy&p0p6q#E5+^O=UV2xD#o)5o1iOwbWMYR+wd94 zskE70m@+h(CWI~Un+JBa#^Mv>d5?2T7QEcI{OYu`>}tQj{O&r7JwFDyRF0?_DYp*x zgj8J$Lf0vL$I5LWF0SFV=i0vT%%5`aY*r#!$nE?)i5fz=>1C%-BynnB<(972#=Qnh zncq}pVv`(q5{6va3s+JZg6$89A#Lt9f64rF@f;ISifpdDT_|3- zm|?Zs!-W;`O!_syqWXSAE14cG?hvqXzE*(om_W z>Hfwu7Y00Ki#&+72AgLY_je2V=-@FxnsxJqUhmI4Hy#$8a8~5(RBHQre5xY?QpvxtLX=D!dYhyI3)NCv|DP;@W>r`wfa?Dq8JdSvGq4^zR}S zS6oaP(%%RC{XQ&LFWb`*qN1y@Uto>gFH7tQ$l?rens!6_xTc!Ps<#f`*jqaqtFj3pj&Id5Q{<7b)PJB&OyPBev&^l=}$%tSAHPR8sIicGz6+-ZsQ9(6*PjaQc=A71H{@TAX`GHJ(@l7<^(3A(MC$PqkbQSuinx3Avny47m&Kq zIH=(4buPkWK>qFEZ1jn5@tiQAn8mZ&6O3`#YzZ8b3epdaXl^*Np#kp1z_iYabIyOt zho40roUgt4nr(9*_i~kJ1*)tN9kLlQ`&AtPeD!~=x?OYC>wWBABh5rl%Ep!)){@qE zqv9c^M+(=j%J@*Xn^SXtn z>?_FY9|k391^1D3cA8;zf_Ms$_t};Xh-nqeNUp%Hw>V>nwOzcLk%?IGOl-LkniDMf z2U~L36Iom7F&%oHsNIUjvTZ0sBknHDIoa8DI1{I}HcIRRCqlaTgub^9 zT7gy`TiKodNR-!`Z#lR^N0`1TZgPHU3M(v|!x_S}_aL1>*NB*@kx{#Q4fI2Q-Yh># zBFC4-AfOCEfD6CN3|s3joON0B*e%?kC8R$#MH*`2h{2}~gw8~|)4;lR8#&<%3(We> z3Ji!G40rP=@&ciXq2Y(?HEKa517-P)E;IT4ewd5#I*VyH#B=Et=+oQ1a!NA9010nk zk=`112_#M09iF;tHLR`Hmek&X3()Qy)xA{B@SX#WAU6I6c|m~{XqZGn zKb52>B|jvy3!l*8W{3MEkOT5&=|s*c5%}9H&_VQ%=b$Bl@tiEneg-8kkJwsqu{$2?UzA3kICQ6EtK*_&ZD|Rh`cl2+i90Ju z7w>orN9IQ}nqG@OnMythw%oW7kR!5AIGKppm&VO|N%@`mDtxJa`8Oo82=| zu?=rsfij}G3J}{1^W^dsuDlY)I%tn62BBbSsWbs+C=A}=vr$(sPP4NWgFZ@g|J+{& z1^Z*?!YhNTM+T>%x8L-nQ26@v%5}YA!TDCOn!3B;Yrp8JYSSFMwFGc zdw}7R6Pou=ixbI^_4i<$0p!m6+<;_(Sc{csY3fHS~@u?R*+L}ge zqcosubcINvYw7Q&TmYHcGYvI6qgv3H-__hIyzN?$d(p6e9~R9WkxTb8)g;+MM42b| zaJ4I)2h;%>CEtqx&q`Q@(TVg(cUnQHp5EJ9WdBu_s^(&ZXFh`)IA>ZsXe|qQ z;v&Sb%OQ_@LTm&@8LtbOV?w!||o301B@Hw3KgqvOL)KLxO9U`}DP%`q)Bweq2YX_Kk*eRo9Dj36dAA z;s~;<5trrwRnit%zBSk-w4}~Y##rpZY{Le~Yv_1VP4~|e@*&FS-=)bCZitWJSxM;M vGQU#&r)2-{|E0Fdho@ko`tk+G9TOmr>PUkVe?NSE`GuCc-u<$B_AmY)ySE}P diff --git a/website/src/components/home/sponsors/logo-spreaker.svg b/website/src/components/home/sponsors/logo-spreaker.svg new file mode 100644 index 000000000..5dd75d864 --- /dev/null +++ b/website/src/components/home/sponsors/logo-spreaker.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/website/src/github/sponsors.js b/website/src/github/sponsors.js index 8cebeba1b..19589abf0 100644 --- a/website/src/github/sponsors.js +++ b/website/src/github/sponsors.js @@ -21,16 +21,6 @@ const nonGitHubSponsors = [ }, isOneTimePayment: false, }, - { - isActive: true, - sponsorEntity: { - __typename: 'Organization', - login: 'ShippyPro', - name: 'ShippyPro', - websiteUrl: 'https://www.shippypro.com/?ref=bref.sh', - }, - isOneTimePayment: false, - }, { isActive: true, sponsorEntity: { From e0602bc576ad62dd1ba53b29ffa9f0bd7d543b7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 09:41:31 +0000 Subject: [PATCH 20/21] Update layer versions --- layers.json | 670 ++++++++++++++++++++++++++-------------------------- 1 file changed, 335 insertions(+), 335 deletions(-) diff --git a/layers.json b/layers.json index 71607d2c8..54e0bbb75 100644 --- a/layers.json +++ b/layers.json @@ -1,115 +1,139 @@ { "php-83": { - "ca-central-1": "11", - "eu-central-1": "11", - "eu-north-1": "11", - "eu-west-1": "11", - "eu-west-2": "11", - "eu-west-3": "11", - "sa-east-1": "11", - "us-east-1": "11", - "us-east-2": "11", - "us-west-1": "11", - "us-west-2": "11", - "ap-east-1": "11", - "ap-south-1": "11", - "ap-northeast-1": "11", - "ap-northeast-2": "11", - "ap-northeast-3": "11", - "ap-southeast-1": "11", - "ap-southeast-2": "11", - "eu-south-1": "11", - "eu-south-2": "11", - "af-south-1": "11", - "me-south-1": "11" + "ca-central-1": "12", + "eu-central-1": "12", + "eu-north-1": "12", + "eu-west-1": "12", + "eu-west-2": "12", + "eu-west-3": "12", + "sa-east-1": "12", + "us-east-1": "12", + "us-east-2": "12", + "us-west-1": "12", + "us-west-2": "12", + "ap-east-1": "12", + "ap-south-1": "12", + "ap-northeast-1": "12", + "ap-northeast-2": "12", + "ap-northeast-3": "12", + "ap-southeast-1": "12", + "ap-southeast-2": "12", + "eu-south-1": "12", + "eu-south-2": "12", + "af-south-1": "12", + "me-south-1": "12" }, "php-83-fpm": { - "ca-central-1": "11", - "eu-central-1": "11", - "eu-north-1": "11", - "eu-west-1": "11", - "eu-west-2": "11", - "eu-west-3": "11", - "sa-east-1": "11", - "us-east-1": "11", - "us-east-2": "11", - "us-west-1": "11", - "us-west-2": "11", - "ap-east-1": "11", - "ap-south-1": "11", - "ap-northeast-1": "11", - "ap-northeast-2": "11", - "ap-northeast-3": "11", - "ap-southeast-1": "11", - "ap-southeast-2": "11", - "eu-south-1": "11", - "eu-south-2": "11", - "af-south-1": "11", - "me-south-1": "11" + "ca-central-1": "12", + "eu-central-1": "12", + "eu-north-1": "12", + "eu-west-1": "12", + "eu-west-2": "12", + "eu-west-3": "12", + "sa-east-1": "12", + "us-east-1": "12", + "us-east-2": "12", + "us-west-1": "12", + "us-west-2": "12", + "ap-east-1": "12", + "ap-south-1": "12", + "ap-northeast-1": "12", + "ap-northeast-2": "12", + "ap-northeast-3": "12", + "ap-southeast-1": "12", + "ap-southeast-2": "12", + "eu-south-1": "12", + "eu-south-2": "12", + "af-south-1": "12", + "me-south-1": "12" }, "php-82": { - "ca-central-1": "55", - "eu-central-1": "55", - "eu-north-1": "55", - "eu-west-1": "55", - "eu-west-2": "55", - "eu-west-3": "55", - "sa-east-1": "55", - "us-east-1": "55", - "us-east-2": "55", - "us-west-1": "55", - "us-west-2": "55", - "ap-east-1": "55", - "ap-south-1": "55", - "ap-northeast-1": "55", - "ap-northeast-2": "55", - "ap-northeast-3": "55", - "ap-southeast-1": "55", - "ap-southeast-2": "55", - "eu-south-1": "55", - "eu-south-2": "54", - "af-south-1": "55", - "me-south-1": "55" + "ca-central-1": "56", + "eu-central-1": "56", + "eu-north-1": "56", + "eu-west-1": "56", + "eu-west-2": "56", + "eu-west-3": "56", + "sa-east-1": "56", + "us-east-1": "56", + "us-east-2": "56", + "us-west-1": "56", + "us-west-2": "56", + "ap-east-1": "56", + "ap-south-1": "56", + "ap-northeast-1": "56", + "ap-northeast-2": "56", + "ap-northeast-3": "56", + "ap-southeast-1": "56", + "ap-southeast-2": "56", + "eu-south-1": "56", + "eu-south-2": "55", + "af-south-1": "56", + "me-south-1": "56" }, "php-82-fpm": { - "ca-central-1": "55", - "eu-central-1": "55", - "eu-north-1": "55", - "eu-west-1": "55", - "eu-west-2": "55", - "eu-west-3": "55", - "sa-east-1": "55", - "us-east-1": "55", - "us-east-2": "55", - "us-west-1": "55", - "us-west-2": "55", - "ap-east-1": "55", - "ap-south-1": "55", - "ap-northeast-1": "55", - "ap-northeast-2": "55", - "ap-northeast-3": "55", - "ap-southeast-1": "55", - "ap-southeast-2": "55", - "eu-south-1": "55", - "eu-south-2": "54", - "af-south-1": "55", - "me-south-1": "55" + "ca-central-1": "56", + "eu-central-1": "56", + "eu-north-1": "56", + "eu-west-1": "56", + "eu-west-2": "56", + "eu-west-3": "56", + "sa-east-1": "56", + "us-east-1": "56", + "us-east-2": "56", + "us-west-1": "56", + "us-west-2": "56", + "ap-east-1": "56", + "ap-south-1": "56", + "ap-northeast-1": "56", + "ap-northeast-2": "56", + "ap-northeast-3": "56", + "ap-southeast-1": "56", + "ap-southeast-2": "56", + "eu-south-1": "56", + "eu-south-2": "55", + "af-south-1": "56", + "me-south-1": "56" }, "php-81": { + "ca-central-1": "67", + "eu-central-1": "67", + "eu-north-1": "67", + "eu-west-1": "67", + "eu-west-2": "67", + "eu-west-3": "67", + "sa-east-1": "67", + "us-east-1": "67", + "us-east-2": "67", + "us-west-1": "67", + "us-west-2": "67", + "ap-east-1": "59", + "ap-south-1": "66", + "ap-northeast-1": "66", + "ap-northeast-2": "66", + "ap-northeast-3": "66", + "ap-southeast-1": "66", + "ap-southeast-2": "66", + "eu-south-1": "59", + "eu-south-2": "56", + "af-south-1": "59", + "me-south-1": "59" + }, + "php-81-fpm": { "ca-central-1": "66", "eu-central-1": "66", - "eu-north-1": "66", - "eu-west-1": "66", + "eu-north-1": "67", + "eu-west-1": "67", "eu-west-2": "66", "eu-west-3": "66", "sa-east-1": "66", - "us-east-1": "66", + "us-east-1": "67", "us-east-2": "66", "us-west-1": "66", - "us-west-2": "66", - "ap-east-1": "58", + "us-west-2": "67", + "ap-east-1": "59", "ap-south-1": "65", - "ap-northeast-1": "65", + "ap-northeast-1": "66", "ap-northeast-2": "65", "ap-northeast-3": "65", "ap-southeast-1": "65", @@ -119,292 +143,268 @@ "af-south-1": "58", "me-south-1": "58" }, - "php-81-fpm": { - "ca-central-1": "65", - "eu-central-1": "65", - "eu-north-1": "66", - "eu-west-1": "66", - "eu-west-2": "65", - "eu-west-3": "65", - "sa-east-1": "65", - "us-east-1": "66", - "us-east-2": "65", - "us-west-1": "65", - "us-west-2": "66", - "ap-east-1": "58", - "ap-south-1": "64", - "ap-northeast-1": "65", - "ap-northeast-2": "64", - "ap-northeast-3": "64", - "ap-southeast-1": "64", - "ap-southeast-2": "64", - "eu-south-1": "57", - "eu-south-2": "54", - "af-south-1": "57", - "me-south-1": "57" - }, "php-80": { - "ca-central-1": "69", - "eu-central-1": "68", - "eu-north-1": "69", - "eu-west-1": "69", - "eu-west-2": "69", - "eu-west-3": "69", - "sa-east-1": "69", - "us-east-1": "69", - "us-east-2": "69", - "us-west-1": "69", - "us-west-2": "69", + "ca-central-1": "70", + "eu-central-1": "69", + "eu-north-1": "70", + "eu-west-1": "70", + "eu-west-2": "70", + "eu-west-3": "70", + "sa-east-1": "70", + "us-east-1": "70", + "us-east-2": "70", + "us-west-1": "70", + "us-west-2": "70", + "ap-east-1": "60", + "ap-south-1": "69", + "ap-northeast-1": "67", + "ap-northeast-2": "66", + "ap-northeast-3": "67", + "ap-southeast-1": "66", + "ap-southeast-2": "68", + "eu-south-1": "60", + "eu-south-2": "56", + "af-south-1": "60", + "me-south-1": "60" + }, + "php-80-fpm": { + "ca-central-1": "67", + "eu-central-1": "67", + "eu-north-1": "67", + "eu-west-1": "67", + "eu-west-2": "67", + "eu-west-3": "67", + "sa-east-1": "67", + "us-east-1": "67", + "us-east-2": "67", + "us-west-1": "67", + "us-west-2": "67", "ap-east-1": "59", - "ap-south-1": "68", + "ap-south-1": "66", "ap-northeast-1": "66", - "ap-northeast-2": "65", + "ap-northeast-2": "66", "ap-northeast-3": "66", - "ap-southeast-1": "65", - "ap-southeast-2": "67", + "ap-southeast-1": "66", + "ap-southeast-2": "66", "eu-south-1": "59", - "eu-south-2": "55", + "eu-south-2": "56", "af-south-1": "59", "me-south-1": "59" }, - "php-80-fpm": { - "ca-central-1": "66", - "eu-central-1": "66", - "eu-north-1": "66", - "eu-west-1": "66", - "eu-west-2": "66", - "eu-west-3": "66", - "sa-east-1": "66", - "us-east-1": "66", - "us-east-2": "66", - "us-west-1": "66", - "us-west-2": "66", - "ap-east-1": "58", - "ap-south-1": "65", - "ap-northeast-1": "65", - "ap-northeast-2": "65", - "ap-northeast-3": "65", - "ap-southeast-1": "65", - "ap-southeast-2": "65", - "eu-south-1": "58", - "eu-south-2": "55", - "af-south-1": "58", - "me-south-1": "58" - }, "arm-php-83": { - "ca-central-1": "11", - "eu-central-1": "11", - "eu-north-1": "11", - "eu-west-1": "11", - "eu-west-2": "11", - "eu-west-3": "11", - "sa-east-1": "11", - "us-east-1": "11", - "us-east-2": "11", - "us-west-1": "11", - "us-west-2": "11", - "ap-east-1": "11", - "ap-south-1": "11", - "ap-northeast-1": "11", - "ap-northeast-2": "11", - "ap-northeast-3": "11", - "ap-southeast-1": "11", - "ap-southeast-2": "11", - "eu-south-1": "11", - "eu-south-2": "11", - "af-south-1": "11", - "me-south-1": "11" + "ca-central-1": "12", + "eu-central-1": "12", + "eu-north-1": "12", + "eu-west-1": "12", + "eu-west-2": "12", + "eu-west-3": "12", + "sa-east-1": "12", + "us-east-1": "12", + "us-east-2": "12", + "us-west-1": "12", + "us-west-2": "12", + "ap-east-1": "12", + "ap-south-1": "12", + "ap-northeast-1": "12", + "ap-northeast-2": "12", + "ap-northeast-3": "12", + "ap-southeast-1": "12", + "ap-southeast-2": "12", + "eu-south-1": "12", + "eu-south-2": "12", + "af-south-1": "12", + "me-south-1": "12" }, "arm-php-83-fpm": { - "ca-central-1": "11", - "eu-central-1": "11", - "eu-north-1": "11", - "eu-west-1": "11", - "eu-west-2": "11", - "eu-west-3": "11", - "sa-east-1": "11", - "us-east-1": "11", - "us-east-2": "11", - "us-west-1": "11", - "us-west-2": "11", - "ap-east-1": "11", - "ap-south-1": "11", - "ap-northeast-1": "11", - "ap-northeast-2": "11", - "ap-northeast-3": "11", - "ap-southeast-1": "11", - "ap-southeast-2": "11", - "eu-south-1": "11", - "eu-south-2": "11", - "af-south-1": "11", - "me-south-1": "11" + "ca-central-1": "12", + "eu-central-1": "12", + "eu-north-1": "12", + "eu-west-1": "12", + "eu-west-2": "12", + "eu-west-3": "12", + "sa-east-1": "12", + "us-east-1": "12", + "us-east-2": "12", + "us-west-1": "12", + "us-west-2": "12", + "ap-east-1": "12", + "ap-south-1": "12", + "ap-northeast-1": "12", + "ap-northeast-2": "12", + "ap-northeast-3": "12", + "ap-southeast-1": "12", + "ap-southeast-2": "12", + "eu-south-1": "12", + "eu-south-2": "12", + "af-south-1": "12", + "me-south-1": "12" }, "arm-php-82": { - "ca-central-1": "43", - "eu-central-1": "43", - "eu-north-1": "43", - "eu-west-1": "43", - "eu-west-2": "43", - "eu-west-3": "43", - "sa-east-1": "43", - "us-east-1": "43", - "us-east-2": "43", - "us-west-1": "43", - "us-west-2": "43", - "ap-east-1": "43", - "ap-south-1": "43", - "ap-northeast-1": "43", - "ap-northeast-2": "43", - "ap-northeast-3": "43", - "ap-southeast-1": "43", - "ap-southeast-2": "43", - "eu-south-1": "43", - "eu-south-2": "43", - "af-south-1": "43", - "me-south-1": "43" + "ca-central-1": "44", + "eu-central-1": "44", + "eu-north-1": "44", + "eu-west-1": "44", + "eu-west-2": "44", + "eu-west-3": "44", + "sa-east-1": "44", + "us-east-1": "44", + "us-east-2": "44", + "us-west-1": "44", + "us-west-2": "44", + "ap-east-1": "44", + "ap-south-1": "44", + "ap-northeast-1": "44", + "ap-northeast-2": "44", + "ap-northeast-3": "44", + "ap-southeast-1": "44", + "ap-southeast-2": "44", + "eu-south-1": "44", + "eu-south-2": "44", + "af-south-1": "44", + "me-south-1": "44" }, "arm-php-82-fpm": { - "ca-central-1": "43", - "eu-central-1": "43", - "eu-north-1": "43", - "eu-west-1": "43", - "eu-west-2": "43", - "eu-west-3": "43", - "sa-east-1": "43", - "us-east-1": "43", - "us-east-2": "43", - "us-west-1": "43", - "us-west-2": "43", - "ap-east-1": "43", - "ap-south-1": "43", - "ap-northeast-1": "43", - "ap-northeast-2": "43", - "ap-northeast-3": "43", - "ap-southeast-1": "43", - "ap-southeast-2": "43", - "eu-south-1": "43", - "eu-south-2": "43", - "af-south-1": "43", - "me-south-1": "43" + "ca-central-1": "44", + "eu-central-1": "44", + "eu-north-1": "44", + "eu-west-1": "44", + "eu-west-2": "44", + "eu-west-3": "44", + "sa-east-1": "44", + "us-east-1": "44", + "us-east-2": "44", + "us-west-1": "44", + "us-west-2": "44", + "ap-east-1": "44", + "ap-south-1": "44", + "ap-northeast-1": "44", + "ap-northeast-2": "44", + "ap-northeast-3": "44", + "ap-southeast-1": "44", + "ap-southeast-2": "44", + "eu-south-1": "44", + "eu-south-2": "44", + "af-south-1": "44", + "me-south-1": "44" }, "arm-php-81": { - "ca-central-1": "46", - "eu-central-1": "46", - "eu-north-1": "46", - "eu-west-1": "46", - "eu-west-2": "46", - "eu-west-3": "46", - "sa-east-1": "46", - "us-east-1": "46", - "us-east-2": "46", - "us-west-1": "46", - "us-west-2": "46", - "ap-east-1": "46", - "ap-south-1": "46", - "ap-northeast-1": "46", - "ap-northeast-2": "46", - "ap-northeast-3": "46", - "ap-southeast-1": "46", - "ap-southeast-2": "46", - "eu-south-1": "46", - "eu-south-2": "46", - "af-south-1": "46", - "me-south-1": "46" + "ca-central-1": "47", + "eu-central-1": "47", + "eu-north-1": "47", + "eu-west-1": "47", + "eu-west-2": "47", + "eu-west-3": "47", + "sa-east-1": "47", + "us-east-1": "47", + "us-east-2": "47", + "us-west-1": "47", + "us-west-2": "47", + "ap-east-1": "47", + "ap-south-1": "47", + "ap-northeast-1": "47", + "ap-northeast-2": "47", + "ap-northeast-3": "47", + "ap-southeast-1": "47", + "ap-southeast-2": "47", + "eu-south-1": "47", + "eu-south-2": "47", + "af-south-1": "47", + "me-south-1": "47" }, "arm-php-81-fpm": { - "ca-central-1": "46", - "eu-central-1": "46", - "eu-north-1": "46", - "eu-west-1": "46", - "eu-west-2": "46", - "eu-west-3": "46", - "sa-east-1": "46", - "us-east-1": "46", - "us-east-2": "46", - "us-west-1": "46", - "us-west-2": "46", - "ap-east-1": "46", - "ap-south-1": "46", - "ap-northeast-1": "46", - "ap-northeast-2": "46", - "ap-northeast-3": "46", - "ap-southeast-1": "46", - "ap-southeast-2": "46", - "eu-south-1": "46", - "eu-south-2": "46", - "af-south-1": "46", - "me-south-1": "46" + "ca-central-1": "47", + "eu-central-1": "47", + "eu-north-1": "47", + "eu-west-1": "47", + "eu-west-2": "47", + "eu-west-3": "47", + "sa-east-1": "47", + "us-east-1": "47", + "us-east-2": "47", + "us-west-1": "47", + "us-west-2": "47", + "ap-east-1": "47", + "ap-south-1": "47", + "ap-northeast-1": "47", + "ap-northeast-2": "47", + "ap-northeast-3": "47", + "ap-southeast-1": "47", + "ap-southeast-2": "47", + "eu-south-1": "47", + "eu-south-2": "47", + "af-south-1": "47", + "me-south-1": "47" }, "arm-php-80": { + "ca-central-1": "69", + "eu-central-1": "68", + "eu-north-1": "69", + "eu-west-1": "69", + "eu-west-2": "69", + "eu-west-3": "69", + "sa-east-1": "69", + "us-east-1": "69", + "us-east-2": "69", + "us-west-1": "69", + "us-west-2": "69", + "ap-east-1": "61", + "ap-south-1": "68", + "ap-northeast-1": "68", + "ap-northeast-2": "68", + "ap-northeast-3": "68", + "ap-southeast-1": "68", + "ap-southeast-2": "68", + "eu-south-1": "61", + "eu-south-2": "57", + "af-south-1": "61", + "me-south-1": "61" + }, + "arm-php-80-fpm": { "ca-central-1": "68", "eu-central-1": "67", "eu-north-1": "68", "eu-west-1": "68", - "eu-west-2": "68", - "eu-west-3": "68", - "sa-east-1": "68", + "eu-west-2": "67", + "eu-west-3": "67", + "sa-east-1": "67", "us-east-1": "68", "us-east-2": "68", - "us-west-1": "68", + "us-west-1": "67", "us-west-2": "68", "ap-east-1": "60", - "ap-south-1": "67", + "ap-south-1": "66", "ap-northeast-1": "67", - "ap-northeast-2": "67", - "ap-northeast-3": "67", - "ap-southeast-1": "67", - "ap-southeast-2": "67", - "eu-south-1": "60", + "ap-northeast-2": "66", + "ap-northeast-3": "66", + "ap-southeast-1": "66", + "ap-southeast-2": "66", + "eu-south-1": "59", "eu-south-2": "56", "af-south-1": "60", - "me-south-1": "60" + "me-south-1": "59" }, - "arm-php-80-fpm": { - "ca-central-1": "67", + "console": { + "ca-central-1": "66", "eu-central-1": "66", - "eu-north-1": "67", - "eu-west-1": "67", + "eu-north-1": "66", + "eu-west-1": "66", "eu-west-2": "66", "eu-west-3": "66", "sa-east-1": "66", - "us-east-1": "67", - "us-east-2": "67", + "us-east-1": "66", + "us-east-2": "66", "us-west-1": "66", - "us-west-2": "67", - "ap-east-1": "59", + "us-west-2": "66", + "ap-east-1": "58", "ap-south-1": "65", - "ap-northeast-1": "66", + "ap-northeast-1": "65", "ap-northeast-2": "65", "ap-northeast-3": "65", "ap-southeast-1": "65", "ap-southeast-2": "65", "eu-south-1": "58", "eu-south-2": "55", - "af-south-1": "59", + "af-south-1": "58", "me-south-1": "58" - }, - "console": { - "ca-central-1": "65", - "eu-central-1": "65", - "eu-north-1": "65", - "eu-west-1": "65", - "eu-west-2": "65", - "eu-west-3": "65", - "sa-east-1": "65", - "us-east-1": "65", - "us-east-2": "65", - "us-west-1": "65", - "us-west-2": "65", - "ap-east-1": "57", - "ap-south-1": "64", - "ap-northeast-1": "64", - "ap-northeast-2": "64", - "ap-northeast-3": "64", - "ap-southeast-1": "64", - "ap-southeast-2": "64", - "eu-south-1": "57", - "eu-south-2": "54", - "af-south-1": "57", - "me-south-1": "57" } } \ No newline at end of file From aa99840b79cb61e52d54e20ed67e0d8c2de2feae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 10:39:54 +0000 Subject: [PATCH 21/21] Update layer versions --- layers.json | 670 ++++++++++++++++++++++++++-------------------------- 1 file changed, 335 insertions(+), 335 deletions(-) diff --git a/layers.json b/layers.json index 54e0bbb75..b14462807 100644 --- a/layers.json +++ b/layers.json @@ -1,115 +1,139 @@ { "php-83": { - "ca-central-1": "12", - "eu-central-1": "12", - "eu-north-1": "12", - "eu-west-1": "12", - "eu-west-2": "12", - "eu-west-3": "12", - "sa-east-1": "12", - "us-east-1": "12", - "us-east-2": "12", - "us-west-1": "12", - "us-west-2": "12", - "ap-east-1": "12", - "ap-south-1": "12", - "ap-northeast-1": "12", - "ap-northeast-2": "12", - "ap-northeast-3": "12", - "ap-southeast-1": "12", - "ap-southeast-2": "12", - "eu-south-1": "12", - "eu-south-2": "12", - "af-south-1": "12", - "me-south-1": "12" + "ca-central-1": "13", + "eu-central-1": "13", + "eu-north-1": "13", + "eu-west-1": "13", + "eu-west-2": "13", + "eu-west-3": "13", + "sa-east-1": "13", + "us-east-1": "13", + "us-east-2": "13", + "us-west-1": "13", + "us-west-2": "13", + "ap-east-1": "13", + "ap-south-1": "13", + "ap-northeast-1": "13", + "ap-northeast-2": "13", + "ap-northeast-3": "13", + "ap-southeast-1": "13", + "ap-southeast-2": "13", + "eu-south-1": "13", + "eu-south-2": "13", + "af-south-1": "13", + "me-south-1": "13" }, "php-83-fpm": { - "ca-central-1": "12", - "eu-central-1": "12", - "eu-north-1": "12", - "eu-west-1": "12", - "eu-west-2": "12", - "eu-west-3": "12", - "sa-east-1": "12", - "us-east-1": "12", - "us-east-2": "12", - "us-west-1": "12", - "us-west-2": "12", - "ap-east-1": "12", - "ap-south-1": "12", - "ap-northeast-1": "12", - "ap-northeast-2": "12", - "ap-northeast-3": "12", - "ap-southeast-1": "12", - "ap-southeast-2": "12", - "eu-south-1": "12", - "eu-south-2": "12", - "af-south-1": "12", - "me-south-1": "12" + "ca-central-1": "13", + "eu-central-1": "13", + "eu-north-1": "13", + "eu-west-1": "13", + "eu-west-2": "13", + "eu-west-3": "13", + "sa-east-1": "13", + "us-east-1": "13", + "us-east-2": "13", + "us-west-1": "13", + "us-west-2": "13", + "ap-east-1": "13", + "ap-south-1": "13", + "ap-northeast-1": "13", + "ap-northeast-2": "13", + "ap-northeast-3": "13", + "ap-southeast-1": "13", + "ap-southeast-2": "13", + "eu-south-1": "13", + "eu-south-2": "13", + "af-south-1": "13", + "me-south-1": "13" }, "php-82": { - "ca-central-1": "56", - "eu-central-1": "56", - "eu-north-1": "56", - "eu-west-1": "56", - "eu-west-2": "56", - "eu-west-3": "56", - "sa-east-1": "56", - "us-east-1": "56", - "us-east-2": "56", - "us-west-1": "56", - "us-west-2": "56", - "ap-east-1": "56", - "ap-south-1": "56", - "ap-northeast-1": "56", - "ap-northeast-2": "56", - "ap-northeast-3": "56", - "ap-southeast-1": "56", - "ap-southeast-2": "56", - "eu-south-1": "56", - "eu-south-2": "55", - "af-south-1": "56", - "me-south-1": "56" + "ca-central-1": "57", + "eu-central-1": "57", + "eu-north-1": "57", + "eu-west-1": "57", + "eu-west-2": "57", + "eu-west-3": "57", + "sa-east-1": "57", + "us-east-1": "57", + "us-east-2": "57", + "us-west-1": "57", + "us-west-2": "57", + "ap-east-1": "57", + "ap-south-1": "57", + "ap-northeast-1": "57", + "ap-northeast-2": "57", + "ap-northeast-3": "57", + "ap-southeast-1": "57", + "ap-southeast-2": "57", + "eu-south-1": "57", + "eu-south-2": "56", + "af-south-1": "57", + "me-south-1": "57" }, "php-82-fpm": { - "ca-central-1": "56", - "eu-central-1": "56", - "eu-north-1": "56", - "eu-west-1": "56", - "eu-west-2": "56", - "eu-west-3": "56", - "sa-east-1": "56", - "us-east-1": "56", - "us-east-2": "56", - "us-west-1": "56", - "us-west-2": "56", - "ap-east-1": "56", - "ap-south-1": "56", - "ap-northeast-1": "56", - "ap-northeast-2": "56", - "ap-northeast-3": "56", - "ap-southeast-1": "56", - "ap-southeast-2": "56", - "eu-south-1": "56", - "eu-south-2": "55", - "af-south-1": "56", - "me-south-1": "56" + "ca-central-1": "57", + "eu-central-1": "57", + "eu-north-1": "57", + "eu-west-1": "57", + "eu-west-2": "57", + "eu-west-3": "57", + "sa-east-1": "57", + "us-east-1": "57", + "us-east-2": "57", + "us-west-1": "57", + "us-west-2": "57", + "ap-east-1": "57", + "ap-south-1": "57", + "ap-northeast-1": "57", + "ap-northeast-2": "57", + "ap-northeast-3": "57", + "ap-southeast-1": "57", + "ap-southeast-2": "57", + "eu-south-1": "57", + "eu-south-2": "56", + "af-south-1": "57", + "me-south-1": "57" }, "php-81": { + "ca-central-1": "68", + "eu-central-1": "68", + "eu-north-1": "68", + "eu-west-1": "68", + "eu-west-2": "68", + "eu-west-3": "68", + "sa-east-1": "68", + "us-east-1": "68", + "us-east-2": "68", + "us-west-1": "68", + "us-west-2": "68", + "ap-east-1": "60", + "ap-south-1": "67", + "ap-northeast-1": "67", + "ap-northeast-2": "67", + "ap-northeast-3": "67", + "ap-southeast-1": "67", + "ap-southeast-2": "67", + "eu-south-1": "60", + "eu-south-2": "57", + "af-south-1": "60", + "me-south-1": "60" + }, + "php-81-fpm": { "ca-central-1": "67", "eu-central-1": "67", - "eu-north-1": "67", - "eu-west-1": "67", + "eu-north-1": "68", + "eu-west-1": "68", "eu-west-2": "67", "eu-west-3": "67", "sa-east-1": "67", - "us-east-1": "67", + "us-east-1": "68", "us-east-2": "67", "us-west-1": "67", - "us-west-2": "67", - "ap-east-1": "59", + "us-west-2": "68", + "ap-east-1": "60", "ap-south-1": "66", - "ap-northeast-1": "66", + "ap-northeast-1": "67", "ap-northeast-2": "66", "ap-northeast-3": "66", "ap-southeast-1": "66", @@ -119,292 +143,268 @@ "af-south-1": "59", "me-south-1": "59" }, - "php-81-fpm": { - "ca-central-1": "66", - "eu-central-1": "66", - "eu-north-1": "67", - "eu-west-1": "67", - "eu-west-2": "66", - "eu-west-3": "66", - "sa-east-1": "66", - "us-east-1": "67", - "us-east-2": "66", - "us-west-1": "66", - "us-west-2": "67", - "ap-east-1": "59", - "ap-south-1": "65", - "ap-northeast-1": "66", - "ap-northeast-2": "65", - "ap-northeast-3": "65", - "ap-southeast-1": "65", - "ap-southeast-2": "65", - "eu-south-1": "58", - "eu-south-2": "55", - "af-south-1": "58", - "me-south-1": "58" - }, "php-80": { - "ca-central-1": "70", - "eu-central-1": "69", - "eu-north-1": "70", - "eu-west-1": "70", - "eu-west-2": "70", - "eu-west-3": "70", - "sa-east-1": "70", - "us-east-1": "70", - "us-east-2": "70", - "us-west-1": "70", - "us-west-2": "70", + "ca-central-1": "71", + "eu-central-1": "70", + "eu-north-1": "71", + "eu-west-1": "71", + "eu-west-2": "71", + "eu-west-3": "71", + "sa-east-1": "71", + "us-east-1": "71", + "us-east-2": "71", + "us-west-1": "71", + "us-west-2": "71", + "ap-east-1": "61", + "ap-south-1": "70", + "ap-northeast-1": "68", + "ap-northeast-2": "67", + "ap-northeast-3": "68", + "ap-southeast-1": "67", + "ap-southeast-2": "69", + "eu-south-1": "61", + "eu-south-2": "57", + "af-south-1": "61", + "me-south-1": "61" + }, + "php-80-fpm": { + "ca-central-1": "68", + "eu-central-1": "68", + "eu-north-1": "68", + "eu-west-1": "68", + "eu-west-2": "68", + "eu-west-3": "68", + "sa-east-1": "68", + "us-east-1": "68", + "us-east-2": "68", + "us-west-1": "68", + "us-west-2": "68", "ap-east-1": "60", - "ap-south-1": "69", + "ap-south-1": "67", "ap-northeast-1": "67", - "ap-northeast-2": "66", + "ap-northeast-2": "67", "ap-northeast-3": "67", - "ap-southeast-1": "66", - "ap-southeast-2": "68", + "ap-southeast-1": "67", + "ap-southeast-2": "67", "eu-south-1": "60", - "eu-south-2": "56", + "eu-south-2": "57", "af-south-1": "60", "me-south-1": "60" }, - "php-80-fpm": { - "ca-central-1": "67", - "eu-central-1": "67", - "eu-north-1": "67", - "eu-west-1": "67", - "eu-west-2": "67", - "eu-west-3": "67", - "sa-east-1": "67", - "us-east-1": "67", - "us-east-2": "67", - "us-west-1": "67", - "us-west-2": "67", - "ap-east-1": "59", - "ap-south-1": "66", - "ap-northeast-1": "66", - "ap-northeast-2": "66", - "ap-northeast-3": "66", - "ap-southeast-1": "66", - "ap-southeast-2": "66", - "eu-south-1": "59", - "eu-south-2": "56", - "af-south-1": "59", - "me-south-1": "59" - }, "arm-php-83": { - "ca-central-1": "12", - "eu-central-1": "12", - "eu-north-1": "12", - "eu-west-1": "12", - "eu-west-2": "12", - "eu-west-3": "12", - "sa-east-1": "12", - "us-east-1": "12", - "us-east-2": "12", - "us-west-1": "12", - "us-west-2": "12", - "ap-east-1": "12", - "ap-south-1": "12", - "ap-northeast-1": "12", - "ap-northeast-2": "12", - "ap-northeast-3": "12", - "ap-southeast-1": "12", - "ap-southeast-2": "12", - "eu-south-1": "12", - "eu-south-2": "12", - "af-south-1": "12", - "me-south-1": "12" + "ca-central-1": "13", + "eu-central-1": "13", + "eu-north-1": "13", + "eu-west-1": "13", + "eu-west-2": "13", + "eu-west-3": "13", + "sa-east-1": "13", + "us-east-1": "13", + "us-east-2": "13", + "us-west-1": "13", + "us-west-2": "13", + "ap-east-1": "13", + "ap-south-1": "13", + "ap-northeast-1": "13", + "ap-northeast-2": "13", + "ap-northeast-3": "13", + "ap-southeast-1": "13", + "ap-southeast-2": "13", + "eu-south-1": "13", + "eu-south-2": "13", + "af-south-1": "13", + "me-south-1": "13" }, "arm-php-83-fpm": { - "ca-central-1": "12", - "eu-central-1": "12", - "eu-north-1": "12", - "eu-west-1": "12", - "eu-west-2": "12", - "eu-west-3": "12", - "sa-east-1": "12", - "us-east-1": "12", - "us-east-2": "12", - "us-west-1": "12", - "us-west-2": "12", - "ap-east-1": "12", - "ap-south-1": "12", - "ap-northeast-1": "12", - "ap-northeast-2": "12", - "ap-northeast-3": "12", - "ap-southeast-1": "12", - "ap-southeast-2": "12", - "eu-south-1": "12", - "eu-south-2": "12", - "af-south-1": "12", - "me-south-1": "12" + "ca-central-1": "13", + "eu-central-1": "13", + "eu-north-1": "13", + "eu-west-1": "13", + "eu-west-2": "13", + "eu-west-3": "13", + "sa-east-1": "13", + "us-east-1": "13", + "us-east-2": "13", + "us-west-1": "13", + "us-west-2": "13", + "ap-east-1": "13", + "ap-south-1": "13", + "ap-northeast-1": "13", + "ap-northeast-2": "13", + "ap-northeast-3": "13", + "ap-southeast-1": "13", + "ap-southeast-2": "13", + "eu-south-1": "13", + "eu-south-2": "13", + "af-south-1": "13", + "me-south-1": "13" }, "arm-php-82": { - "ca-central-1": "44", - "eu-central-1": "44", - "eu-north-1": "44", - "eu-west-1": "44", - "eu-west-2": "44", - "eu-west-3": "44", - "sa-east-1": "44", - "us-east-1": "44", - "us-east-2": "44", - "us-west-1": "44", - "us-west-2": "44", - "ap-east-1": "44", - "ap-south-1": "44", - "ap-northeast-1": "44", - "ap-northeast-2": "44", - "ap-northeast-3": "44", - "ap-southeast-1": "44", - "ap-southeast-2": "44", - "eu-south-1": "44", - "eu-south-2": "44", - "af-south-1": "44", - "me-south-1": "44" + "ca-central-1": "45", + "eu-central-1": "45", + "eu-north-1": "45", + "eu-west-1": "45", + "eu-west-2": "45", + "eu-west-3": "45", + "sa-east-1": "45", + "us-east-1": "45", + "us-east-2": "45", + "us-west-1": "45", + "us-west-2": "45", + "ap-east-1": "45", + "ap-south-1": "45", + "ap-northeast-1": "45", + "ap-northeast-2": "45", + "ap-northeast-3": "45", + "ap-southeast-1": "45", + "ap-southeast-2": "45", + "eu-south-1": "45", + "eu-south-2": "45", + "af-south-1": "45", + "me-south-1": "45" }, "arm-php-82-fpm": { - "ca-central-1": "44", - "eu-central-1": "44", - "eu-north-1": "44", - "eu-west-1": "44", - "eu-west-2": "44", - "eu-west-3": "44", - "sa-east-1": "44", - "us-east-1": "44", - "us-east-2": "44", - "us-west-1": "44", - "us-west-2": "44", - "ap-east-1": "44", - "ap-south-1": "44", - "ap-northeast-1": "44", - "ap-northeast-2": "44", - "ap-northeast-3": "44", - "ap-southeast-1": "44", - "ap-southeast-2": "44", - "eu-south-1": "44", - "eu-south-2": "44", - "af-south-1": "44", - "me-south-1": "44" + "ca-central-1": "45", + "eu-central-1": "45", + "eu-north-1": "45", + "eu-west-1": "45", + "eu-west-2": "45", + "eu-west-3": "45", + "sa-east-1": "45", + "us-east-1": "45", + "us-east-2": "45", + "us-west-1": "45", + "us-west-2": "45", + "ap-east-1": "45", + "ap-south-1": "45", + "ap-northeast-1": "45", + "ap-northeast-2": "45", + "ap-northeast-3": "45", + "ap-southeast-1": "45", + "ap-southeast-2": "45", + "eu-south-1": "45", + "eu-south-2": "45", + "af-south-1": "45", + "me-south-1": "45" }, "arm-php-81": { - "ca-central-1": "47", - "eu-central-1": "47", - "eu-north-1": "47", - "eu-west-1": "47", - "eu-west-2": "47", - "eu-west-3": "47", - "sa-east-1": "47", - "us-east-1": "47", - "us-east-2": "47", - "us-west-1": "47", - "us-west-2": "47", - "ap-east-1": "47", - "ap-south-1": "47", - "ap-northeast-1": "47", - "ap-northeast-2": "47", - "ap-northeast-3": "47", - "ap-southeast-1": "47", - "ap-southeast-2": "47", - "eu-south-1": "47", - "eu-south-2": "47", - "af-south-1": "47", - "me-south-1": "47" + "ca-central-1": "48", + "eu-central-1": "48", + "eu-north-1": "48", + "eu-west-1": "48", + "eu-west-2": "48", + "eu-west-3": "48", + "sa-east-1": "48", + "us-east-1": "48", + "us-east-2": "48", + "us-west-1": "48", + "us-west-2": "48", + "ap-east-1": "48", + "ap-south-1": "48", + "ap-northeast-1": "48", + "ap-northeast-2": "48", + "ap-northeast-3": "48", + "ap-southeast-1": "48", + "ap-southeast-2": "48", + "eu-south-1": "48", + "eu-south-2": "48", + "af-south-1": "48", + "me-south-1": "48" }, "arm-php-81-fpm": { - "ca-central-1": "47", - "eu-central-1": "47", - "eu-north-1": "47", - "eu-west-1": "47", - "eu-west-2": "47", - "eu-west-3": "47", - "sa-east-1": "47", - "us-east-1": "47", - "us-east-2": "47", - "us-west-1": "47", - "us-west-2": "47", - "ap-east-1": "47", - "ap-south-1": "47", - "ap-northeast-1": "47", - "ap-northeast-2": "47", - "ap-northeast-3": "47", - "ap-southeast-1": "47", - "ap-southeast-2": "47", - "eu-south-1": "47", - "eu-south-2": "47", - "af-south-1": "47", - "me-south-1": "47" + "ca-central-1": "48", + "eu-central-1": "48", + "eu-north-1": "48", + "eu-west-1": "48", + "eu-west-2": "48", + "eu-west-3": "48", + "sa-east-1": "48", + "us-east-1": "48", + "us-east-2": "48", + "us-west-1": "48", + "us-west-2": "48", + "ap-east-1": "48", + "ap-south-1": "48", + "ap-northeast-1": "48", + "ap-northeast-2": "48", + "ap-northeast-3": "48", + "ap-southeast-1": "48", + "ap-southeast-2": "48", + "eu-south-1": "48", + "eu-south-2": "48", + "af-south-1": "48", + "me-south-1": "48" }, "arm-php-80": { + "ca-central-1": "70", + "eu-central-1": "69", + "eu-north-1": "70", + "eu-west-1": "70", + "eu-west-2": "70", + "eu-west-3": "70", + "sa-east-1": "70", + "us-east-1": "70", + "us-east-2": "70", + "us-west-1": "70", + "us-west-2": "70", + "ap-east-1": "62", + "ap-south-1": "69", + "ap-northeast-1": "69", + "ap-northeast-2": "69", + "ap-northeast-3": "69", + "ap-southeast-1": "69", + "ap-southeast-2": "69", + "eu-south-1": "62", + "eu-south-2": "58", + "af-south-1": "62", + "me-south-1": "62" + }, + "arm-php-80-fpm": { "ca-central-1": "69", "eu-central-1": "68", "eu-north-1": "69", "eu-west-1": "69", - "eu-west-2": "69", - "eu-west-3": "69", - "sa-east-1": "69", + "eu-west-2": "68", + "eu-west-3": "68", + "sa-east-1": "68", "us-east-1": "69", "us-east-2": "69", - "us-west-1": "69", + "us-west-1": "68", "us-west-2": "69", "ap-east-1": "61", - "ap-south-1": "68", + "ap-south-1": "67", "ap-northeast-1": "68", - "ap-northeast-2": "68", - "ap-northeast-3": "68", - "ap-southeast-1": "68", - "ap-southeast-2": "68", - "eu-south-1": "61", + "ap-northeast-2": "67", + "ap-northeast-3": "67", + "ap-southeast-1": "67", + "ap-southeast-2": "67", + "eu-south-1": "60", "eu-south-2": "57", "af-south-1": "61", - "me-south-1": "61" + "me-south-1": "60" }, - "arm-php-80-fpm": { - "ca-central-1": "68", + "console": { + "ca-central-1": "67", "eu-central-1": "67", - "eu-north-1": "68", - "eu-west-1": "68", + "eu-north-1": "67", + "eu-west-1": "67", "eu-west-2": "67", "eu-west-3": "67", "sa-east-1": "67", - "us-east-1": "68", - "us-east-2": "68", + "us-east-1": "67", + "us-east-2": "67", "us-west-1": "67", - "us-west-2": "68", - "ap-east-1": "60", + "us-west-2": "67", + "ap-east-1": "59", "ap-south-1": "66", - "ap-northeast-1": "67", + "ap-northeast-1": "66", "ap-northeast-2": "66", "ap-northeast-3": "66", "ap-southeast-1": "66", "ap-southeast-2": "66", "eu-south-1": "59", "eu-south-2": "56", - "af-south-1": "60", + "af-south-1": "59", "me-south-1": "59" - }, - "console": { - "ca-central-1": "66", - "eu-central-1": "66", - "eu-north-1": "66", - "eu-west-1": "66", - "eu-west-2": "66", - "eu-west-3": "66", - "sa-east-1": "66", - "us-east-1": "66", - "us-east-2": "66", - "us-west-1": "66", - "us-west-2": "66", - "ap-east-1": "58", - "ap-south-1": "65", - "ap-northeast-1": "65", - "ap-northeast-2": "65", - "ap-northeast-3": "65", - "ap-southeast-1": "65", - "ap-southeast-2": "65", - "eu-south-1": "58", - "eu-south-2": "55", - "af-south-1": "58", - "me-south-1": "58" } } \ No newline at end of file