Added grouping in pulled file and better access handling

Author: nandi95

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "nandi95/laravel-env-in-aws-ssm",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "description": "Manage your environment variables in AWS' SSM Parameter store",
     "type": "library",
     "license": "MIT",

composer.lock

@@ -4,6 +4,8 @@
 
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use Nandi95\LaravelEnvInAwsSsm\Traits\InteractsWithSSM;
 
 class EnvPull extends Command
@@ -35,14 +37,16 @@ public function handle(): int
     {
         $this->stage = $this->argument('stage');
 
-        // todo group by the first part before `_` and add extra line in between in the output
-        $resolvedEnv = $this->getEnvironmentVarsFromRemote()
+        $resolvedEnv = '';
+
+        $this->getEnvironmentVarsFromRemote()
             ->sortKeys()
-            ->reduce(function (string $resolvedGroup, string $val, string $key) {
-                    return $resolvedGroup . $key . '=' . $val . "\n";
-                    },
-                ''
-            );
+            ->mapToGroups(function ($value, $key) {
+                return [Str::before($key, '_') => $key . '=' . $value];
+            })
+            ->each(static function (Collection $envs) use (&$resolvedEnv) {
+                $resolvedEnv .= $envs->join("\n") . "\n\n";
+            });
 
         if (file_exists('.env.' . $this->stage)) {
             $this->backupEnvFile();

src/Console/EnvPull.php

@@ -48,7 +48,13 @@ public function handle(): int
         $remoteKeysNotInLocal = $remoteEnvs->diffKeys($localEnvs);
 
         // user deleted some keys, remove from remote too
-        if ($remoteKeysNotInLocal->count()) {
+        if ($remoteKeysNotInLocal->isNotEmpty()) {
+            $this->info($remoteKeysNotInLocal->count() . ' variables found not present in .env.' . $this->stage . '. Deleting removed keys.');
+            if ($localEnvs->isEmpty()) {
+                $this->warn('There are no environment variables set locally.');
+                $this->confirm('This will remove all variables in SSM, are you sure you want to proceed?');
+            }
+
             $qualifiedKeys = $remoteKeysNotInLocal
                 ->keys()
                 ->map(fn (string $key) => $this->qualifyKey($key))

src/Console/EnvPush.php

@@ -7,48 +7,47 @@
 use Exception;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use InvalidArgumentException;
 use Symfony\Component\Dotenv\Dotenv;
 
 trait InteractsWithSSM
 {
     /**
      * The stage/environment of the app.
      *
-     * @var string|null
+     * @var string
      */
-    protected string|null $stage;
+    protected string $stage;
 
     /**
      * The name of the app.
      *
-     * @var string|null
+     * @var string
      */
-    private string|null $appName;
+    private string $appName;
 
     /**
      * The region we're operating in.
      *
-     * @var string|null
+     * @var string
      */
-    private string|null $region;
+    private string $region;
 
     /**
      * The Dotenv instance.
      *
-     * @var Dotenv|null
+     * @var Dotenv
      */
-    private Dotenv|null $dotEnv;
+    private Dotenv $dotEnv;
 
     /**
-     * @var Credentials|null
+     * @var Credentials
      */
-    private Credentials|null $credentials;
+    private Credentials $credentials;
 
     /**
-     * @var SsmClient|null
+     * @var SsmClient
      */
-    private SsmClient|null $client;
+    private SsmClient $client;
 
     /**
      * Get the parameter name as a qualified path
@@ -133,12 +132,12 @@ public function getRegion(): string
         if (file_exists('.env.' . $this->stage)) {
             $env = $this->getDotenv()->parse(file_get_contents('.env.' . $this->stage));
 
-            if ($env['AWS_DEFAULT_REGION']) {
+            if (isset($env['AWS_DEFAULT_REGION'])) {
                 $this->region = $env['AWS_DEFAULT_REGION'];
             }
         }
 
-        if (!$this->region) {
+        if (!isset($this->region)) {
             $this->region = $this->ask('AWS Region');
         }
 
@@ -180,7 +179,7 @@ public function getAppName(): string
             $appName = $this->getEnvironmentVarsFromFile()->get('APP_NAME');
         }
 
-        $this->appName = $appName ?? $this->ask('app name');
+        $this->appName = $appName ?? $this->ask('App name');
 
         return $this->appName;
     }