From c049627a5effe57cc32add0f9118cb54382b7982 Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Wed, 10 Jan 2024 08:27:37 +0000 Subject: [PATCH] [1.x] Updates manifest validation (#243) * update manifest validation * Apply fixes from StyleCI --------- Co-authored-by: StyleCI Bot --- src/BuildProcess/ValidateManifest.php | 15 +---- src/CacheInstanceClasses.php | 22 +++---- src/Commands/DatabaseScaleCommand.php | 2 +- src/Commands/EnvCommand.php | 6 +- src/Commands/EnvDescribeCommand.php | 26 ++++---- src/Commands/LocalCommand.php | 18 +++--- src/Commands/ProjectDescribeCommand.php | 12 ++-- src/Commands/RetrievesProviderCredentials.php | 4 +- src/ConsoleVaporClient.php | 62 +++++++++---------- src/DatabaseInstanceClasses.php | 26 ++++---- src/Regions.php | 26 ++++---- tests/DockerTest.php | 6 +- 12 files changed, 107 insertions(+), 118 deletions(-) diff --git a/src/BuildProcess/ValidateManifest.php b/src/BuildProcess/ValidateManifest.php index 9428774d..976de699 100644 --- a/src/BuildProcess/ValidateManifest.php +++ b/src/BuildProcess/ValidateManifest.php @@ -39,23 +39,12 @@ protected function warnAboutDeprecations() if (in_array(Manifest::runtime($this->environment), [ 'php-7.3', 'php-7.4', - 'php-8.0', - ])) { - Helpers::warn( - 'The runtimes "php-7.3", "php-7.4", and "php-8.0" are deprecated and support will be fully removed from Vapor on December 31st, 2023.' - .' Those runtimes are based on Amazon Linux 1, for which AWS standard support has ended.' - .' Amazon Linux 1 is only receiving critical and important security updates and it may not work with new Vapor/AWS features.' - .' Please use Amazon Linux 2 with "php-7.4:al2" or "php-8.0:al2" instead.' - ); - } - - if (in_array(Manifest::runtime($this->environment), [ 'php-7.4:al2', 'php-7.4:imagick', + 'php-8.0', ])) { Helpers::warn( - 'The runtimes "php-7.4:al2", and "php-7.4:imagick" are deprecated and support will be fully removed from Vapor on December 31st, 2023.' - .' PHP 7.4 is no longer being maintained or receiving security updates.' + 'The runtimes "php-7.3", "php-7.4", "php-7.4:al2", "php-7.4:imagick", and "php-8.0" are deprecated and will no longer be supported or receiving any updates.' .' For a full list of supported runtimes, please see: https://docs.vapor.build/1.0/projects/environments.html#runtime' ); } diff --git a/src/CacheInstanceClasses.php b/src/CacheInstanceClasses.php index edc6c395..6b7557e4 100644 --- a/src/CacheInstanceClasses.php +++ b/src/CacheInstanceClasses.php @@ -12,13 +12,13 @@ class CacheInstanceClasses public static function general() { return [ - 'cache.t3.micro' => 'cache.t3.micro - (2 VCPU, 0.5Gib RAM) - Free Tier Eligible ~$13 / month', - 'cache.t3.small' => 'cache.t3.small - (2 VCPU, 1.37Gib RAM) - ~$25 / month', - 'cache.t3.medium' => 'cache.t3.medium - (2 VCPU, 3.09Gib RAM) - ~$50 / month', - 'cache.m5.large' => 'cache.m5.large - (2 VCPU, 6.38Gib RAM) - ~$112 / month', - 'cache.m5.xlarge' => 'cache.m5.xlarge - (4 VCPU, 12.93Gib RAM) - ~$224 / month', - 'cache.m5.2xlarge' => 'cache.m5.2xlarge - (8 VCPU, 26.04Gib RAM) - ~$449 / month', - 'cache.m5.4xlarge' => 'cache.m5.4xlarge - (16 VCPU, 52.26Gib RAM) - ~$897 / month', + 'cache.t3.micro' => 'cache.t3.micro - (2 VCPU, 0.5Gib RAM) - Free Tier Eligible ~$13 / month', + 'cache.t3.small' => 'cache.t3.small - (2 VCPU, 1.37Gib RAM) - ~$25 / month', + 'cache.t3.medium' => 'cache.t3.medium - (2 VCPU, 3.09Gib RAM) - ~$50 / month', + 'cache.m5.large' => 'cache.m5.large - (2 VCPU, 6.38Gib RAM) - ~$112 / month', + 'cache.m5.xlarge' => 'cache.m5.xlarge - (4 VCPU, 12.93Gib RAM) - ~$224 / month', + 'cache.m5.2xlarge' => 'cache.m5.2xlarge - (8 VCPU, 26.04Gib RAM) - ~$449 / month', + 'cache.m5.4xlarge' => 'cache.m5.4xlarge - (16 VCPU, 52.26Gib RAM) - ~$897 / month', 'cache.m5.12xlarge' => 'cache.m5.12xlarge - (48 VCPU, 157.12Gib RAM) - ~$2696 / month', 'cache.m5.24xlarge' => 'cache.m5.24xlarge - (96 VCPU, 314.32Gib RAM) - ~$5392 / month', ]; @@ -32,10 +32,10 @@ public static function general() public static function memory() { return [ - 'cache.r5.large' => 'cache.r5.large - (2 VCPU, 13.07Gib RAM) - ~$156 / month', - 'cache.r5.xlarge' => 'cache.r5.xlarge - (4 VCPU, 26.32GiB RAM) - ~$310 / month', - 'cache.r5.2xlarge' => 'cache.r5.2xlarge - (8 VCPU, 52.82GiB RAM) - ~$621 / month', - 'cache.r5.4xlarge' => 'cache.r5.4xlarge - (16 VCPU, 105.81GiB RAM) - ~$1241 / month', + 'cache.r5.large' => 'cache.r5.large - (2 VCPU, 13.07Gib RAM) - ~$156 / month', + 'cache.r5.xlarge' => 'cache.r5.xlarge - (4 VCPU, 26.32GiB RAM) - ~$310 / month', + 'cache.r5.2xlarge' => 'cache.r5.2xlarge - (8 VCPU, 52.82GiB RAM) - ~$621 / month', + 'cache.r5.4xlarge' => 'cache.r5.4xlarge - (16 VCPU, 105.81GiB RAM) - ~$1241 / month', 'cache.r5.12xlarge' => 'cache.r5.12xlarge - (48 VCPU, 317.77GiB RAM) - ~$3732 / month', 'cache.r5.24xlarge' => 'cache.r5.24xlarge - (96 VCPU, 635.61GiB RAM) - ~$7465 / month', ]; diff --git a/src/Commands/DatabaseScaleCommand.php b/src/Commands/DatabaseScaleCommand.php index 3f70754d..ea22cf30 100644 --- a/src/Commands/DatabaseScaleCommand.php +++ b/src/Commands/DatabaseScaleCommand.php @@ -64,7 +64,7 @@ protected function determineRdsInstanceClass() { $type = $this->menu('Which type of database instance would you like to scale to?', [ 'general' => 'General Purpose', - 'memory' => 'Memory Optimized', + 'memory' => 'Memory Optimized', ]); if ($type == 'general') { diff --git a/src/Commands/EnvCommand.php b/src/Commands/EnvCommand.php index f0d19c36..2077523a 100644 --- a/src/Commands/EnvCommand.php +++ b/src/Commands/EnvCommand.php @@ -44,10 +44,10 @@ public function handle() ); Manifest::addEnvironment($environment, [ - 'memory' => 1024, + 'memory' => 1024, 'cli-memory' => 512, - 'runtime' => $this->option('docker') ? 'docker' : 'php-8.2:al2', - 'build' => [ + 'runtime' => $this->option('docker') ? 'docker' : 'php-8.2:al2', + 'build' => [ 'COMPOSER_MIRROR_PATH_REPOS=1 composer install --no-dev', 'php artisan event:cache', file_exists(Path::current().'/webpack.mix.js') diff --git a/src/Commands/EnvDescribeCommand.php b/src/Commands/EnvDescribeCommand.php index 69f0d5d1..40da89df 100644 --- a/src/Commands/EnvDescribeCommand.php +++ b/src/Commands/EnvDescribeCommand.php @@ -51,20 +51,20 @@ public function handle() $domain = count($domains) ? $domains[0] : null; $description = [ - 'project_id' => $environment['project_id'], - 'uuid' => $environment['uuid'], - 'id' => $environment['id'], - 'name' => $environment['name'], - 'vanity_domain' => $environment['vanity_domain'], - 'latest_deployment_id' => $environment['latest_deployment_id'], + 'project_id' => $environment['project_id'], + 'uuid' => $environment['uuid'], + 'id' => $environment['id'], + 'name' => $environment['name'], + 'vanity_domain' => $environment['vanity_domain'], + 'latest_deployment_id' => $environment['latest_deployment_id'], 'latest_deployment_status' => $environment['latest_deployment'] ? $environment['latest_deployment']['status'] : null, - 'latest_deployment_url' => 'https://vapor.laravel.com/app/projects/'.$environment['project_id'].'/environments/'.$environment['name'].'/deployments/'.$environment['latest_deployment_id'], - 'deployment_status' => $environment['deployment_status'], - 'domains' => $domains, - 'domain' => $domain, - 'management_url' => 'https://vapor.laravel.com/app/projects/'.$environment['project_id'].'/environments/'.$environment['name'], - 'vanity_url' => 'https://'.$environment['vanity_domain'], - 'custom_url' => $domain ? 'https://'.$domain : null, + 'latest_deployment_url' => 'https://vapor.laravel.com/app/projects/'.$environment['project_id'].'/environments/'.$environment['name'].'/deployments/'.$environment['latest_deployment_id'], + 'deployment_status' => $environment['deployment_status'], + 'domains' => $domains, + 'domain' => $domain, + 'management_url' => 'https://vapor.laravel.com/app/projects/'.$environment['project_id'].'/environments/'.$environment['name'], + 'vanity_url' => 'https://'.$environment['vanity_domain'], + 'custom_url' => $domain ? 'https://'.$domain : null, ]; if ($this->option('list')) { diff --git a/src/Commands/LocalCommand.php b/src/Commands/LocalCommand.php index 54b908e1..b8a0bac7 100644 --- a/src/Commands/LocalCommand.php +++ b/src/Commands/LocalCommand.php @@ -106,36 +106,36 @@ protected function dockerConfiguration() } return [ - 'version' => '3.7', + 'version' => '3.7', 'services' => [ 'redis' => [ - 'image' => 'redis:alpine', + 'image' => 'redis:alpine', 'volumes' => [ 'vapor_redis:/data', ], 'restart' => 'always', ], 'mysql' => [ - 'image' => 'mysql:8.0', + 'image' => 'mysql:8.0', 'volumes' => [ 0 => 'vapor_mysql:/var/lib/mysql', ], - 'restart' => 'always', + 'restart' => 'always', 'environment' => [ 'MYSQL_ROOT_PASSWORD' => 'secret', - 'MYSQL_DATABASE' => 'vapor', - 'MYSQL_USER' => 'vapor', - 'MYSQL_PASSWORD' => 'secret', + 'MYSQL_DATABASE' => 'vapor', + 'MYSQL_USER' => 'vapor', + 'MYSQL_PASSWORD' => 'secret', ], ], 'app' => [ - 'image' => static::$images[$this->option('php') ? $this->option('php') : '8.2'], + 'image' => static::$images[$this->option('php') ? $this->option('php') : '8.2'], 'depends_on' => [ 0 => 'mysql', 1 => 'redis', ], 'restart' => 'always', - 'init' => true, + 'init' => true, ], ], 'volumes' => [ diff --git a/src/Commands/ProjectDescribeCommand.php b/src/Commands/ProjectDescribeCommand.php index 5838a11b..0ed7f8ae 100644 --- a/src/Commands/ProjectDescribeCommand.php +++ b/src/Commands/ProjectDescribeCommand.php @@ -47,13 +47,13 @@ public function handle() $project = $this->vapor->project(Manifest::id()); $description = [ - 'id' => $project['id'], - 'name' => $project['name'], - 'team_id' => $project['team_id'], - 'team_name' => $project['team']['name'], - 'region' => $project['region'], + 'id' => $project['id'], + 'name' => $project['name'], + 'team_id' => $project['team_id'], + 'team_name' => $project['team']['name'], + 'region' => $project['region'], 'github_repository' => $project['github_repository'], - 'management_url' => 'https://vapor.laravel.com/app/projects/'.$project['id'], + 'management_url' => 'https://vapor.laravel.com/app/projects/'.$project['id'], ]; if ($this->option('list')) { diff --git a/src/Commands/RetrievesProviderCredentials.php b/src/Commands/RetrievesProviderCredentials.php index 084357ce..c61cb1ce 100644 --- a/src/Commands/RetrievesProviderCredentials.php +++ b/src/Commands/RetrievesProviderCredentials.php @@ -19,7 +19,7 @@ protected function getAWSCredentials() } return [ - 'key' => Helpers::ask('What is your AWS user key'), + 'key' => Helpers::ask('What is your AWS user key'), 'secret' => Helpers::secret('What is your AWS user secret'), ]; } @@ -36,7 +36,7 @@ protected function getCredentialsFromFile() ); return [ - 'key' => $credentials[$credential]['aws_access_key_id'], + 'key' => $credentials[$credential]['aws_access_key_id'], 'secret' => $credentials[$credential]['aws_secret_access_key'], ]; } diff --git a/src/ConsoleVaporClient.php b/src/ConsoleVaporClient.php index efcca0f0..dc093229 100644 --- a/src/ConsoleVaporClient.php +++ b/src/ConsoleVaporClient.php @@ -21,9 +21,9 @@ public function login($email, $password, $twoFactorAuthenticationToken = null) { try { return $this->request('post', '/api/login', [ - 'host' => gethostname(), - 'email' => $email, - 'password' => $password, + 'host' => gethostname(), + 'email' => $email, + 'password' => $password, 'two_factor_token' => $twoFactorAuthenticationToken, ])['access_token']; } catch (ClientException $e) { @@ -102,7 +102,7 @@ public function teamMembers() public function addTeamMember($email, array $permissions) { $this->requestWithErrorHandling('post', '/api/teams/'.Helpers::config('team').'/members', [ - 'email' => $email, + 'email' => $email, 'permissions' => $permissions, ]); } @@ -232,7 +232,7 @@ public function createZone($providerId, $zone) { return $this->requestWithErrorHandling('post', '/api/teams/'.Helpers::config('team').'/zones', [ 'cloud_provider_id' => $providerId, - 'zone' => $zone, + 'zone' => $zone, ]); } @@ -270,8 +270,8 @@ public function records($zoneId) public function createRecord($zoneId, $type, $name, $value) { return $this->requestWithErrorHandling('put', '/api/zones/'.$zoneId.'/records', [ - 'type' => $type, - 'name' => $name, + 'type' => $type, + 'name' => $name, 'value' => $value, ]); } @@ -323,9 +323,9 @@ public function network($networkId) public function createNetwork($providerId, $name, $region, $withInternetAccess) { $this->requestWithErrorHandling('post', '/api/teams/'.Helpers::config('team').'/networks', [ - 'cloud_provider_id' => $providerId, - 'name' => $name, - 'region' => $region, + 'cloud_provider_id' => $providerId, + 'name' => $name, + 'region' => $region, 'with_internet_access' => $withInternetAccess, ]); } @@ -399,12 +399,12 @@ public function database($databaseId) public function createDatabase($networkId, $name, $type, $instanceClass, $storage, $public, $pause = false) { return $this->requestWithErrorHandling('post', '/api/networks/'.$networkId.'/databases', [ - 'name' => $name, - 'type' => $type, + 'name' => $name, + 'type' => $type, 'instance_class' => $instanceClass, - 'storage' => $storage, - 'public' => $public, - 'pause' => $pause, + 'storage' => $storage, + 'public' => $public, + 'pause' => $pause, ]); } @@ -420,7 +420,7 @@ public function scaleDatabase($databaseId, $instanceClass, $storage) { $this->requestWithErrorHandling('put', '/api/databases/'.$databaseId.'/size', [ 'instance_class' => $instanceClass, - 'storage' => $storage, + 'storage' => $storage, ]); } @@ -507,7 +507,7 @@ public function rotateDatabasePassword($databaseId) public function restoreDatabase($databaseId, $name, $restoreTo) { return $this->requestWithErrorHandling('post', '/api/restored-databases?database_id='.$databaseId, [ - 'name' => $name, + 'name' => $name, 'restore_to' => $restoreTo, ]); } @@ -585,8 +585,8 @@ public function cache($cacheId) public function createCache($networkId, $name, $type, $instanceClass) { return $this->requestWithErrorHandling('post', '/api/networks/'.$networkId.'/caches', [ - 'name' => $name, - 'type' => $type, + 'name' => $name, + 'type' => $type, 'instance_class' => $instanceClass, ]); } @@ -734,9 +734,9 @@ public function requestCertificate($providerId, $domain, array $alternativeNames { $this->requestWithErrorHandling('post', '/api/teams/'.Helpers::config('team').'/certificates', [ 'cloud_provider_id' => $providerId, - 'domain' => $domain, + 'domain' => $domain, 'alternative_names' => $alternativeNames, - 'region' => $region, + 'region' => $region, 'validation_method' => $validationMethod, ]); } @@ -1024,12 +1024,12 @@ public function createArtifact( $coreVersion = null ) { $artifact = $this->requestWithErrorHandling('post', '/api/projects/'.$projectId.'/artifacts/'.$environment, [ - 'uuid' => $uuid, - 'commit' => $commit, + 'uuid' => $uuid, + 'commit' => $commit, 'commit_message' => $commitMessage, - 'vendor_hash' => $vendorHash, - 'cli_version' => $cliVersion, - 'core_version' => $coreVersion, + 'vendor_hash' => $vendorHash, + 'cli_version' => $cliVersion, + 'core_version' => $coreVersion, 'uses_container_image' => is_null($file), ]); @@ -1123,8 +1123,8 @@ public function deployment($deploymentId) public function validateManifest($projectId, $environment, array $manifest, $cliVersion = null, $coreVersion = null) { $this->requestWithErrorHandling('post', '/api/projects/'.$projectId.'/environments/'.$environment.'/linted-manifest', [ - 'manifest' => $manifest, - 'cli_version' => $cliVersion, + 'manifest' => $manifest, + 'cli_version' => $cliVersion, 'core_version' => $coreVersion, ]); } @@ -1450,10 +1450,10 @@ protected function request($method, $uri, array $json = [], $tries = 0) protected function requestWithoutErrorHandling($method, $uri, array $json = []) { return json_decode((string) $this->client()->request($method, ltrim($uri, '/'), [ - 'json' => $json, + 'json' => $json, 'headers' => [ - 'Accept' => 'application/json', - 'Content-Type' => 'application/json', + 'Accept' => 'application/json', + 'Content-Type' => 'application/json', 'Authorization' => 'Bearer '.Helpers::config('token', $_ENV['VAPOR_API_TOKEN'] ?? getenv('VAPOR_API_TOKEN') ?? null), ], ])->getBody(), true); diff --git a/src/DatabaseInstanceClasses.php b/src/DatabaseInstanceClasses.php index f448f292..a3fab4c9 100644 --- a/src/DatabaseInstanceClasses.php +++ b/src/DatabaseInstanceClasses.php @@ -19,10 +19,10 @@ public static function general() 'db.t2.xlarge' => 'db.t2.xlarge - (4 VCPU, 16Gib RAM) - ~$200 / month', 'db.t2.2xlarge' => 'db.t2.2xlarge - (8 VCPU, 32Gib RAM) - ~$400 / month', - 'db.t3.micro' => 'db.t3.micro - (2 VCPU, 1Gib RAM) - ~$15 / month', - 'db.t3.small' => 'db.t3.small - (2 VCPU, 2Gib RAM) - ~$25 / month', + 'db.t3.micro' => 'db.t3.micro - (2 VCPU, 1Gib RAM) - ~$15 / month', + 'db.t3.small' => 'db.t3.small - (2 VCPU, 2Gib RAM) - ~$25 / month', 'db.t3.medium' => 'db.t3.medium - (2 VCPU, 4Gib RAM) - ~$50 / month', - 'db.t3.large' => 'db.t3.large - (2 VCPU, 8Gib RAM) - ~$100 / month', + 'db.t3.large' => 'db.t3.large - (2 VCPU, 8Gib RAM) - ~$100 / month', 'db.t3.xlarge' => 'db.t3.xlarge - (4 VCPU, 16Gib RAM) - ~$200 / month', 'db.t3.2xlarge' => 'db.t3.2xlarge - (8 VCPU, 32Gib RAM) - ~$400 / month', @@ -33,11 +33,11 @@ public static function general() 'db.t4g.xlarge' => 'db.t4g.xlarge - (4 VCPU, 16Gib RAM) - ~$320 / month', 'db.t4g.2xlarge' => 'db.t4g.2xlarge - (8 VCPU, 32Gib RAM) - ~$640 / month', - 'db.m5.large' => 'db.m5.large - (2 VCPU, 8GB RAM) - ~$125 / month', - 'db.m5.xlarge' => 'db.m5.xlarge - (4 VCPU, 16Gib RAM) - ~$250 / month', - 'db.m5.2xlarge' => 'db.m5.2xlarge - (8 VCPU, 32Gib RAM) - ~$500 / month', - 'db.m5.4xlarge' => 'db.m5.4xlarge - (16 VCPU, 64Gib RAM) - ~$1000 / month', - 'db.m5.8xlarge' => 'db.m5.8xlarge - (32 VCPU, 128Gib RAM) - ~$2000 / month', + 'db.m5.large' => 'db.m5.large - (2 VCPU, 8GB RAM) - ~$125 / month', + 'db.m5.xlarge' => 'db.m5.xlarge - (4 VCPU, 16Gib RAM) - ~$250 / month', + 'db.m5.2xlarge' => 'db.m5.2xlarge - (8 VCPU, 32Gib RAM) - ~$500 / month', + 'db.m5.4xlarge' => 'db.m5.4xlarge - (16 VCPU, 64Gib RAM) - ~$1000 / month', + 'db.m5.8xlarge' => 'db.m5.8xlarge - (32 VCPU, 128Gib RAM) - ~$2000 / month', 'db.m5.12xlarge' => 'db.m5.12xlarge - (48 VCPU, 192GiB RAM) - ~$3000 / month', 'db.m5.16xlarge' => 'db.m5.16xlarge - (64 VCPU, 256Gib RAM) - ~$4000 / month', 'db.m5.24xlarge' => 'db.m5.24xlarge - (96 VCPU, 384GiB RAM) - ~$6000 / month', @@ -52,11 +52,11 @@ public static function general() public static function memory() { return [ - 'db.r5.large' => 'db.r5.large - (2 VCPU, 16Gib RAM) - ~$173 / month', - 'db.r5.xlarge' => 'db.r5.xlarge - (4 VCPU, 32Gib RAM) - ~$346 / month', - 'db.r5.2xlarge' => 'db.r5.2xlarge - (8 VCPU, 64Gib RAM) - ~$691 / month', - 'db.r5.4xlarge' => 'db.r5.4xlarge - (16 VCPU, 128Gib RAM) - ~$1382 / month', - 'db.r5.8xlarge' => 'db.r5.8xlarge - (32 VCPU, 256Gib RAM) - ~$2765 / month', + 'db.r5.large' => 'db.r5.large - (2 VCPU, 16Gib RAM) - ~$173 / month', + 'db.r5.xlarge' => 'db.r5.xlarge - (4 VCPU, 32Gib RAM) - ~$346 / month', + 'db.r5.2xlarge' => 'db.r5.2xlarge - (8 VCPU, 64Gib RAM) - ~$691 / month', + 'db.r5.4xlarge' => 'db.r5.4xlarge - (16 VCPU, 128Gib RAM) - ~$1382 / month', + 'db.r5.8xlarge' => 'db.r5.8xlarge - (32 VCPU, 256Gib RAM) - ~$2765 / month', 'db.r5.12xlarge' => 'db.r5.12xlarge - (48 VCPU, 384Gib RAM) - ~$4147 / month', 'db.r5.16xlarge' => 'db.r5.16xlarge - (64 VCPU, 512Gib RAM) - ~$5530 / month', 'db.r5.24xlarge' => 'db.r5.24xlarge - (96 VCPU, 768Gib RAM) - ~$8294 / month', diff --git a/src/Regions.php b/src/Regions.php index ccf42345..f6d1b2be 100644 --- a/src/Regions.php +++ b/src/Regions.php @@ -12,12 +12,12 @@ class Regions public static function available() { return [ - 'us-east-1' => 'US East (N. Virginia) (us-east-1)', - 'us-east-2' => 'US East (Ohio) (us-east-2)', - 'us-west-1' => 'US West (N. California) (us-west-1)', - 'us-west-2' => 'US West (Oregon) (us-west-2)', + 'us-east-1' => 'US East (N. Virginia) (us-east-1)', + 'us-east-2' => 'US East (Ohio) (us-east-2)', + 'us-west-1' => 'US West (N. California) (us-west-1)', + 'us-west-2' => 'US West (Oregon) (us-west-2)', 'af-south-1' => 'Africa (Capetown) (af-south-1)', - 'ap-east-1' => 'Asia Pacific (Hong Kong) (ap-east-1)', + 'ap-east-1' => 'Asia Pacific (Hong Kong) (ap-east-1)', 'ap-south-1' => 'Asia Pacific (Mumbai) (ap-south-1)', 'ap-northeast-3' => 'Asia Pacific (Osaka) (ap-northeast-3)', 'ap-northeast-2' => 'Asia Pacific (Seoul) (ap-northeast-2)', @@ -25,17 +25,17 @@ public static function available() 'ap-southeast-2' => 'Asia Pacific (Sydney) (ap-southeast-2)', 'ap-southeast-3' => 'Asia Pacific (Jakarta) (ap-southeast-3)', 'ap-northeast-1' => 'Asia Pacific (Tokyo) (ap-northeast-1)', - 'ca-central-1' => 'Canada (Central) (ca-central-1)', + 'ca-central-1' => 'Canada (Central) (ca-central-1)', // 'cn-north-1' => 'China (Beijing) (cn-north-1)', // 'cn-northwest-1' => 'China (Ningxia) (cn-northwest-1)', 'eu-central-1' => 'Europe (Frankfurt) (eu-central-1)', - 'eu-west-1' => 'Europe (Ireland) (eu-west-1)', - 'eu-west-2' => 'Europe (London) (eu-west-2)', - 'eu-west-3' => 'Europe (Paris) (eu-west-3)', - 'eu-north-1' => 'Europe (Stockholm) (eu-north-1)', - 'eu-south-1' => 'Europe (Milan) (eu-south-1)', - 'me-south-1' => 'Middle East (Bahrain) (me-south-1)', - 'sa-east-1' => 'South America (São Paulo) (sa-east-1)', + 'eu-west-1' => 'Europe (Ireland) (eu-west-1)', + 'eu-west-2' => 'Europe (London) (eu-west-2)', + 'eu-west-3' => 'Europe (Paris) (eu-west-3)', + 'eu-north-1' => 'Europe (Stockholm) (eu-north-1)', + 'eu-south-1' => 'Europe (Milan) (eu-south-1)', + 'me-south-1' => 'Middle East (Bahrain) (me-south-1)', + 'sa-east-1' => 'South America (São Paulo) (sa-east-1)', ]; } } diff --git a/tests/DockerTest.php b/tests/DockerTest.php index 34729048..18816ea4 100644 --- a/tests/DockerTest.php +++ b/tests/DockerTest.php @@ -98,11 +98,11 @@ public function test_build_command_cli_docker_options_and_cli_build_args() public function test_dockerfile_from_manifest() { file_put_contents(Container::getInstance()->offsetGet('manifest'), Yaml::dump([ - 'id' => 1, - 'name' => 'Test', + 'id' => 1, + 'name' => 'Test', 'environments' => [ 'production' => [ - 'runtime' => 'docker', + 'runtime' => 'docker', 'dockerfile' => 'docker/shared.Dockerfile', ], ],