feat: Improve publish command (#392)

* feat: Improve publish command

Ask for DSN

* feat: Remove use of setDsn

Author: HazAT

src/Sentry/Laravel/PublishConfigCommand.php

@@ -3,6 +3,7 @@
 namespace Sentry\Laravel;
 
 use Illuminate\Console\Command;
+use Sentry\Dsn;
 
 class PublishConfigCommand extends Command
 {
@@ -18,7 +19,7 @@ class PublishConfigCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'sentry:publish';
+    protected $signature = 'sentry:publish {--dsn=}';
 
     /**
      * The console command description.
@@ -39,23 +40,53 @@ public function handle()
             '--provider' => 'Sentry\Laravel\ServiceProvider'
         ]);
 
+        $args = [];
+
+        $dsn = $this->option('dsn');
+
+        if (!$this->isKeySet('SENTRY_LARAVEL_DSN')) {
+            while (empty($dsn)) {
+                $this->info('');
+                $this->question('[Sentry] Please paste the DSN here');
+                $dsn = $this->ask('DSN');
+                // In case someone copies it with SENTRY_LARAVEL_DSN=
+                $dsn = str_replace('SENTRY_LARAVEL_DSN=', '', $dsn);
+                try {
+                    $dsnObj = Dsn::createFromString($dsn);
+                } catch (\Exception $e) {
+                    // Not a valid DSN do it again
+                    $this->error('[Sentry] The DSN is not valid, please make sure to paste a valid DSN');
+                    $dsn = '';
+                    continue;
+                }
+            };
+
+            $this->setEnvironmentValue(['SENTRY_LARAVEL_DSN' => $dsn]);
+            $args = array_merge($args, ['--dsn' => $dsn]);
+        }
+
         if ($this->confirm('Enable Performance Monitoring?', true)) {
             $this->setEnvironmentValue(['SENTRY_TRACES_SAMPLE_RATE' => 1.0]);
 
             $this->info('[Sentry] Added `SENTRY_TRACES_SAMPLE_RATE=1` to your .env file.');
 
             $testCommandPrompt = 'Want to send a test Event & Transaction?';
-            $args = ['--transaction' => true];
+            $args = array_merge($args, ['--transaction' => true]);
         } else {
             $testCommandPrompt = 'Want to send a test Event?';
-            $args = [];
         }
 
         if ($this->confirm($testCommandPrompt, true)) {
             $this->call('sentry:test', $args);
         }
     }
 
+    public function isKeySet(string $key)
+    {
+        $envFile = app()->environmentFilePath();
+        return strpos(file_get_contents($envFile), $key) !== false;
+    }
+
     public function setEnvironmentValue(array $values)
     {
         $envFile = app()->environmentFilePath();

src/Sentry/Laravel/TestCommand.php

@@ -4,6 +4,8 @@
 
 use Exception;
 use Illuminate\Console\Command;
+use Sentry\ClientBuilder;
+use Sentry\State\Hub;
 use Sentry\Tracing\SpanContext;
 use Sentry\Tracing\TransactionContext;
 
@@ -21,7 +23,7 @@ class TestCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'sentry:test {--transaction}';
+    protected $signature = 'sentry:test {--transaction} {--dsn=}';
 
     /**
      * The console command description.
@@ -44,6 +46,10 @@ public function handle()
             /** @var \Sentry\State\Hub $hub */
             $hub = app('sentry');
 
+            if ($this->option('dsn')) {
+                $hub = new Hub(ClientBuilder::create(['dsn' => $this->option('dsn')])->getClient());
+            }
+
             if ($hub->getClient()->getOptions()->getDsn()) {
                 $this->info('[Sentry] DSN discovered!');
             } else {
@@ -70,23 +76,22 @@ public function handle()
 
             $ex = $this->generateTestException('command name', ['foo' => 'bar']);
 
-            $hub->captureException($ex);
+            $eventId = $hub->captureException($ex);
 
             $this->info('[Sentry] Sending test Event');
 
             $span1->finish();
             $result = $transaction->finish();
             if ($result) {
-                $this->info('[Sentry] Sending test Transaction');
+                $this->info("[Sentry] Transaction sent: {$result}");
             }
 
-            $lastEventId = $hub->getLastEventId();
 
-            if (!$lastEventId) {
+            if (!$eventId) {
                 $this->error('[Sentry] There was an error sending the test event.');
                 $this->error('[Sentry] Please check if you DSN is set properly in your config or `.env` as `SENTRY_LARAVEL_DSN`.');
             } else {
-                $this->info("[Sentry] Event sent with ID: {$lastEventId}");
+                $this->info("[Sentry] Event sent with ID: {$eventId}");
             }
         } catch (Exception $e) {
             $this->error("[Sentry] {$e->getMessage()}");