Fixes bug caused by having no files in the env repo

netsells · Oct 29, 2021 · 78de9ce · 78de9ce
1 parent 7bd13b1
commit 78de9ce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/app/Commands/EditEnvironmentVariables.php b/app/Commands/EditEnvironmentVariables.php
@@ -31,7 +31,7 @@ class EditEnvironmentVariables extends BaseCommand
     protected $serviceName;
     protected $taskDefinitionName;
 
-    private array $envFiles;
+    private array $envFiles = [];
 
     private string $fileName;
 
@@ -88,15 +88,19 @@ private function processUpdate(string $bucket): void
 
     private function getMenuItem(string $bucket): ?int
     {
-        $this->envFiles = collect($this->helpers->aws()->s3()->listFiles($bucket))
-            ->pluck('Key')
-            ->map(function ($filename) {
-                return $filename;
-            })
-            ->reject(function ($filename) {
-                return !Str::endsWith($filename, '.env');
-            })
-            ->toArray();
+        $files = $this->helpers->aws()->s3()->listFiles($bucket);
+
+        if ($files) {
+            $this->envFiles = collect($files)
+                ->pluck('Key')
+                ->map(function ($filename) {
+                    return $filename;
+                })
+                ->reject(function ($filename) {
+                    return !Str::endsWith($filename, '.env');
+                })
+                ->toArray();
+        }
 
         $additionalMenuOptions = ['Create new file'];
         $callerArn = $this->helpers->aws()->iam()->getCallerArn();

diff --git a/app/Helpers/Aws/S3.php b/app/Helpers/Aws/S3.php
@@ -17,7 +17,7 @@ public function __construct(Aws $aws)
         $this->aws = $aws;
     }
 
-    public function listFiles(string $bucketName): array
+    public function listFiles(string $bucketName): ?array
     {
         $client = new S3Client($this->aws->standardSdkArguments());