Updated scripts logic from main.

Author: AlexSkrypnyk

.vortex/tooling/src/notify-newrelic

@@ -13,6 +13,13 @@ namespace DrevOps\VortexTooling;
 require_once __DIR__ . '/helpers.php';
 execute_override(basename(__FILE__));
 
+// -----------------------------------------------------------------------------
+
+// Flag to enable New Relic notifications.
+//
+// Set to "true" (not "1") in environments where New Relic is configured.
+$newrelic_enabled = getenv('VORTEX_NOTIFY_NEWRELIC_ENABLED') ?: getenv('NEWRELIC_ENABLED');
+
 // New Relic notification project name.
 $notify_project = getenv_required('VORTEX_NOTIFY_NEWRELIC_PROJECT', 'VORTEX_NOTIFY_PROJECT');
 
@@ -77,6 +84,11 @@ $newrelic_endpoint = getenv_default('VORTEX_NOTIFY_NEWRELIC_ENDPOINT', 'https://
 
 // ------------------------------------------------------------------------------
 
+if (empty($newrelic_enabled)) {
+  info('New Relic is not enabled. Set NEWRELIC_ENABLED or VORTEX_NOTIFY_NEWRELIC_ENABLED in your environment.');
+  quit();
+}
+
 info('Started New Relic notification.');
 
 // Skip if this is a pre-deployment event (New Relic only for post-deployment).

.vortex/tooling/src/notify-slack

@@ -84,6 +84,21 @@ if ($notify_event === 'pre_deployment') {
 // Build the message title.
 $title = sprintf('%s: %s', $event_label, $notify_project);
 
+// Build fields array - conditionally include Environment and Login for post_deployment only.
+$fields = [
+  ['title' => 'Deployment', 'value' => $notify_label, 'short' => TRUE],
+  ['title' => 'Time', 'value' => $timestamp, 'short' => TRUE],
+];
+
+// Only include Environment and Login links for post-deployment notifications.
+// Pre-deployment notifications should not show these as the site is not yet available.
+if ($notify_event !== 'pre_deployment') {
+  array_splice($fields, 1, 0, [
+    ['title' => 'Environment', 'value' => sprintf('<%s|View Site>', $notify_env_url), 'short' => TRUE],
+    ['title' => 'Login', 'value' => sprintf('<%s|Login Here>', $notify_login_url), 'short' => TRUE],
+  ]);
+}
+
 // Build payload.
 $data = [
   'username' => $slack_username,
@@ -93,12 +108,7 @@ $data = [
       'color' => $color,
       'fallback' => $slack_fallback_message,
       'title' => $title,
-      'fields' => [
-        ['title' => 'Deployment', 'value' => $notify_label, 'short' => TRUE],
-        ['title' => 'Environment', 'value' => sprintf('<%s|View Site>', $notify_env_url), 'short' => TRUE],
-        ['title' => 'Login', 'value' => sprintf('<%s|Login Here>', $notify_login_url), 'short' => TRUE],
-        ['title' => 'Time', 'value' => $timestamp, 'short' => TRUE],
-      ],
+      'fields' => $fields,
       'ts' => time(),
     ],
   ],

.vortex/tooling/tests/Unit/NotifyNewrelicTest.php

@@ -21,6 +21,7 @@ protected function setUp(): void {
     parent::setUp();
 
     $this->envSetMultiple([
+      'VORTEX_NOTIFY_NEWRELIC_ENABLED' => 'true',
       'VORTEX_NOTIFY_NEWRELIC_PROJECT' => 'test-project',
       'VORTEX_NOTIFY_NEWRELIC_USER_KEY' => 'NRAK-TEST123456',
       'VORTEX_NOTIFY_NEWRELIC_LABEL' => 'main',
@@ -33,6 +34,31 @@ protected function setUp(): void {
     ]);
   }
 
+  public function testNotificationSkippedWhenNotEnabled(): void {
+    $this->envUnset('VORTEX_NOTIFY_NEWRELIC_ENABLED');
+
+    $this->runScriptEarlyPass('src/notify-newrelic', 'New Relic is not enabled');
+  }
+
+  public function testNotificationEnabledWithFallbackVariable(): void {
+    $this->envUnset('VORTEX_NOTIFY_NEWRELIC_ENABLED');
+    $this->envSet('NEWRELIC_ENABLED', 'true');
+    $this->envSet('VORTEX_NOTIFY_NEWRELIC_REVISION', 'v1.0.0');
+
+    $this->mockRequestPost(
+      'https://api.newrelic.com/v2/applications/12345678/deployments.json',
+      $this->callback(fn(): true => TRUE),
+      ['Api-Key: NRAK-TEST123456', 'Content-Type: application/json'],
+      10,
+      ['status' => 201]
+    );
+
+    $output = $this->runScript('src/notify-newrelic');
+
+    $this->assertStringContainsString('Started New Relic notification', $output);
+    $this->assertStringContainsString('Finished New Relic notification', $output);
+  }
+
   public function testSuccessfulNotificationWithProvidedAppId(): void {
     $this->envSet('VORTEX_NOTIFY_NEWRELIC_REVISION', 'v1.2.3');
 

.vortex/tooling/tests/Unit/NotifySlackTest.php

@@ -41,6 +41,13 @@ public function testSuccessfulNotificationPostDeployment(): void {
         $this->assertEquals(':rocket:', $payload['icon_emoji']);
         $this->assertEquals('good', $payload['attachments'][0]['color']);
         $this->assertStringContainsString('Deployment Complete', $payload['attachments'][0]['title']);
+        // Verify fields - post-deployment should have all 4 fields.
+        $fields = $payload['attachments'][0]['fields'];
+        $this->assertCount(4, $fields, 'Post-deployment should have 4 fields');
+        $this->assertEquals('Deployment', $fields[0]['title']);
+        $this->assertEquals('Environment', $fields[1]['title']);
+        $this->assertEquals('Login', $fields[2]['title']);
+        $this->assertEquals('Time', $fields[3]['title']);
         $this->assertEquals('test-project', $this->getFieldValue($payload, 'Deployment'));
         return TRUE;
       }),
@@ -68,6 +75,11 @@ public function testSuccessfulNotificationPreDeployment(): void {
         // Verify pre-deployment styling.
         $this->assertEquals('#808080', $payload['attachments'][0]['color']);
         $this->assertStringContainsString('Deployment Starting', $payload['attachments'][0]['title']);
+        // Verify fields - should only have Deployment and Time, not Environment or Login.
+        $fields = $payload['attachments'][0]['fields'];
+        $this->assertCount(2, $fields, 'Pre-deployment should only have 2 fields');
+        $this->assertEquals('Deployment', $fields[0]['title']);
+        $this->assertEquals('Time', $fields[1]['title']);
         return TRUE;
       }),
       ['Content-Type: application/json'],