fix: use project region when cache and database project initialization steps

Author: carlalexander

src/Project/Initialization/CacheInitializationStep.php

@@ -56,7 +56,7 @@ private function selectCacheCluster(ExecutionContext $context, string $region):
         if (!$cacheClusters->isEmpty() && $output->confirm('Would you like to use an existing cache cluster for this project?')) {
             $cacheCluster = $cacheClusters->firstWhereIdOrName($output->choiceWithResourceDetails('Which cache cluster would you like to use?', $cacheClusters));
         } elseif ($output->confirm($provisionPrompt)) {
-            $cacheCluster = $context->provision(CacheCluster::class);
+            $cacheCluster = $context->provision(CacheCluster::class, ['region' => $region]);
         }
 
         return $cacheCluster instanceof CacheCluster ? $cacheCluster : null;

src/Project/Initialization/DatabaseInitializationStep.php

@@ -84,7 +84,7 @@ private function selectDatabaseServer(ExecutionContext $context, string $region)
             (!$databaseServers->isEmpty() && $output->confirm('Would you like to create a new one for this project instead?'))
             || ($databaseServers->isEmpty() && $output->confirm(sprintf('Your team doesn\'t have any configured database servers in the "<comment>%s</comment>" region. Would you like to create one for this team first?', $region)))
         ) {
-            $databaseServer = $context->provision(DatabaseServer::class);
+            $databaseServer = $context->provision(DatabaseServer::class, ['region' => $region]);
         }
 
         return $databaseServer instanceof DatabaseServer ? $databaseServer : null;

src/Resource/Requirement/ResolveOrProvisionResourceRequirement.php

@@ -55,7 +55,7 @@ public function fulfill(ExecutionContext $context, array $fulfilledRequirements
         try {
             return parent::fulfill($context, $fulfilledRequirements);
         } catch (NoResourcesFoundException $exception) {
-            return $context->getProvisioner()->provision($this->resource, $context, $this->preFulfilledRequirements);
+            return $context->getProvisioner()->provision($this->resource, $context, array_merge($fulfilledRequirements, $this->preFulfilledRequirements));
         }
     }
 }

tests/Unit/Project/Initialization/CacheInitializationStepTest.php

@@ -83,7 +83,7 @@ public function testPerformProvisionsNewCacheClusterIfRequestedWhenNoneExist():
         $this->apiClient->shouldReceive('getCaches')->once()->andReturn(new ResourceCollection([]));
         $this->output->shouldReceive('confirm')->with('Would you like to use a cache cluster for this project?', false)->once()->andReturn(true);
         $this->output->shouldReceive('confirm')->with(\Mockery::pattern('/Your team doesn\'t have any configured cache clusters/'))->once()->andReturn(true);
-        $this->context->shouldReceive('provision')->with(CacheCluster::class)->once()->andReturn($cacheCluster);
+        $this->context->shouldReceive('provision')->with(CacheCluster::class, ['region' => 'us-east-1'])->once()->andReturn($cacheCluster);
 
         $step = new CacheInitializationStep();
 
@@ -101,7 +101,7 @@ public function testPerformProvisionsNewCacheClusterIfRequestedWhenSomeExist():
         $this->output->shouldReceive('confirm')->with('Would you like to use a cache cluster for this project?', false)->once()->andReturn(true);
         $this->output->shouldReceive('confirm')->with('Would you like to use an existing cache cluster for this project?')->once()->andReturn(false);
         $this->output->shouldReceive('confirm')->with('Would you like to create a new one for this project instead?')->once()->andReturn(true);
-        $this->context->shouldReceive('provision')->with(CacheCluster::class)->once()->andReturn($cacheCluster);
+        $this->context->shouldReceive('provision')->with(CacheCluster::class, ['region' => 'us-east-1'])->once()->andReturn($cacheCluster);
 
         $step = new CacheInitializationStep();
 

tests/Unit/Project/Initialization/DatabaseInitializationStepTest.php

@@ -67,7 +67,7 @@ public function testPerformProvisionsNewServerIfRequested(): void
 
         $this->apiClient->shouldReceive('getDatabaseServers')->once()->andReturn(new ResourceCollection([]));
         $this->output->shouldReceive('confirm')->with(\Mockery::pattern('/Your team doesn\'t have any configured database servers/'))->once()->andReturn(true);
-        $this->context->shouldReceive('provision')->with(DatabaseServer::class)->once()->andReturn($databaseServer);
+        $this->context->shouldReceive('provision')->with(DatabaseServer::class, ['region' => 'us-east-1'])->once()->andReturn($databaseServer);
         $this->output->shouldReceive('askSlug')->once()->andReturn('prefix_');
         $this->output->shouldReceive('warning')->once();
 

tests/Unit/Resource/Requirement/ResolveOrProvisionResourceRequirementTest.php

@@ -55,6 +55,26 @@ public function testFulfillProvisionsResourceIfNoneFound(): void
         $this->assertSame($resource, $requirement->fulfill($context));
     }
 
+    public function testFulfillProvisionsResourceWithMergedRequirements(): void
+    {
+        $context = \Mockery::mock(ExecutionContext::class);
+        $definition = \Mockery::mock(ProvisionableResourceDefinitionInterface::class, ResolvableResourceDefinitionInterface::class);
+        $provisioner = \Mockery::mock(ResourceProvisioner::class);
+        $resource = \Mockery::mock(ResourceModelInterface::class);
+
+        $context->shouldReceive('getProvisioner')->andReturn($provisioner);
+
+        $definition->shouldReceive('resolve')->once()->andThrow(new NoResourcesFoundException('No resources found'));
+
+        $provisioner->shouldReceive('provision')->once()
+                    ->with($definition, $context, ['fulfilled' => 'requirement', 'pre' => 'filled'])
+                    ->andReturn($resource);
+
+        $requirement = new ResolveOrProvisionResourceRequirement($definition, 'Question?', ['pre' => 'filled']);
+
+        $this->assertSame($resource, $requirement->fulfill($context, ['fulfilled' => 'requirement']));
+    }
+
     public function testFulfillReturnsResolvedResource(): void
     {
         $context = \Mockery::mock(ExecutionContext::class);