indicate all custom managed resources on sync:network

Author: stevethomas

src/Concerns/UsesEc2.php

@@ -144,7 +144,7 @@ public static function rdsSecurityGroup(): array
             return static::$rdsSecurityGroup;
         }
 
-        static::$rdsSecurityGroup = static::securityGroupByName(SecurityGroup::RDS_SECURITY_GROUP);
+        static::$rdsSecurityGroup = static::securityGroupByName(Manifest::get('aws.rds.security-group', SecurityGroup::RDS_SECURITY_GROUP));
 
         return static::$rdsSecurityGroup;
     }

src/Concerns/UsesRds.php

@@ -12,8 +12,8 @@ trait UsesRds
 {
     public static function dbSubnetGroup(): array
     {
-        $name = Manifest::has('aws.database-subnet')
-            ? Manifest::get('aws.database-subnet')
+        $name = Manifest::has('aws.rds.subnet')
+            ? Manifest::get('aws.rds.subnet')
             : Helpers::keyedResourceName(Rds::PUBLIC_SUBNET_GROUP);
 
         $dbSubnetGroups = Aws::rds()->describeDBSubnetGroups();

src/Enums/StepResult.php

@@ -9,11 +9,9 @@ enum StepResult
     case WOULD_CREATE;
 
     case SYNCED;
-    case IN_SYNC;
     case OUT_OF_SYNC;
     case WOULD_SYNC;
 
-    case CONDITIONAL;
     case CUSTOM_MANAGED;
     case TIMEOUT;
     case SKIPPED;

src/Steps/Network/SyncEc2SecurityGroupStep.php

@@ -26,7 +26,7 @@ public function __invoke(array $options): StepResult
         try {
             $securityGroup = AwsResources::ec2SecurityGroup();
 
-            if (Manifest::get('aws.ec2.security-group')) {
+            if (Manifest::has('aws.ec2.security-group')) {
                 return StepResult::CUSTOM_MANAGED;
             }
 

src/Steps/Network/SyncInternetGatewayStep.php

@@ -5,6 +5,7 @@
 use Codinglabs\Yolo\Aws;
 use Illuminate\Support\Arr;
 use Codinglabs\Yolo\Helpers;
+use Codinglabs\Yolo\Manifest;
 use Codinglabs\Yolo\AwsResources;
 use Codinglabs\Yolo\Contracts\Step;
 use Codinglabs\Yolo\Enums\StepResult;
@@ -17,6 +18,10 @@ public function __invoke(array $options): StepResult
         try {
             AwsResources::internetGateway();
 
+            if (Manifest::has('aws.internet-gateway')) {
+                return StepResult::CUSTOM_MANAGED;
+            }
+
             return StepResult::SYNCED;
         } catch (ResourceDoesNotExistException $e) {
             if (! Arr::get($options, 'dry-run')) {

src/Steps/Network/SyncPublicSubnetAStep.php

@@ -24,6 +24,10 @@ public function __invoke(array $options): StepResult
         try {
             AwsResources::subnetByName($publicSubnetName, relative: Manifest::doesntHave('aws.public-subnets'));
 
+            if (Manifest::has('aws.public-subnets')) {
+                return StepResult::CUSTOM_MANAGED;
+            }
+
             return StepResult::SYNCED;
         } catch (ResourceDoesNotExistException $e) {
             if (! Arr::get($options, 'dry-run')) {

src/Steps/Network/SyncPublicSubnetBStep.php

@@ -24,6 +24,10 @@ public function __invoke(array $options): StepResult
         try {
             AwsResources::subnetByName($publicSubnetName, relative: Manifest::doesntHave('aws.public-subnets'));
 
+            if (Manifest::has('aws.public-subnets')) {
+                return StepResult::CUSTOM_MANAGED;
+            }
+
             return StepResult::SYNCED;
         } catch (ResourceDoesNotExistException $e) {
             if (! Arr::get($options, 'dry-run')) {

src/Steps/Network/SyncPublicSubnetCStep.php

@@ -24,6 +24,10 @@ public function __invoke(array $options): StepResult
         try {
             AwsResources::subnetByName($publicSubnetName, relative: Manifest::doesntHave('aws.public-subnets'));
 
+            if (Manifest::has('aws.public-subnets')) {
+                return StepResult::CUSTOM_MANAGED;
+            }
+
             return StepResult::SYNCED;
         } catch (ResourceDoesNotExistException $e) {
             if (! Arr::get($options, 'dry-run')) {

src/Steps/Network/SyncRdsSecurityGroupStep.php

@@ -5,6 +5,7 @@
 use Codinglabs\Yolo\Aws;
 use Illuminate\Support\Arr;
 use Codinglabs\Yolo\Helpers;
+use Codinglabs\Yolo\Manifest;
 use Codinglabs\Yolo\AwsResources;
 use Codinglabs\Yolo\Contracts\Step;
 use Codinglabs\Yolo\Enums\StepResult;
@@ -18,6 +19,10 @@ public function __invoke(array $options): StepResult
         try {
             AwsResources::rdsSecurityGroup();
 
+            if (Manifest::has('aws.rds.security-group')) {
+                return StepResult::CUSTOM_MANAGED;
+            }
+
             return StepResult::SYNCED;
         } catch (ResourceDoesNotExistException) {
             if (! Arr::get($options, 'dry-run')) {

src/Steps/Network/SyncRdsSubnetStep.php

@@ -5,6 +5,7 @@
 use Codinglabs\Yolo\Aws;
 use Illuminate\Support\Arr;
 use Codinglabs\Yolo\Helpers;
+use Codinglabs\Yolo\Manifest;
 use Codinglabs\Yolo\Enums\Rds;
 use Codinglabs\Yolo\AwsResources;
 use Codinglabs\Yolo\Contracts\Step;
@@ -18,6 +19,10 @@ public function __invoke(array $options): StepResult
         try {
             AwsResources::dbSubnetGroup();
 
+            if (Manifest::has('aws.rds.subnet')) {
+                return StepResult::CUSTOM_MANAGED;
+            }
+
             return StepResult::SYNCED;
         } catch (ResourceDoesNotExistException $e) {
             if (! Arr::get($options, 'dry-run')) {