From b044b8640207d5c58d9fbb7bd4008d367a603e7d Mon Sep 17 00:00:00 2001
From: Alan Storm <astorm@newrelic.com>
Date: Mon, 2 Oct 2017 16:24:28 -0700
Subject: [PATCH] Skipping stock deploy, adding new command.

---
 .../Command/DeployMarker.php                  | 54 +++++++++++++++++++
 .../Model/Cron/ReportNewRelicCron.php         |  1 -
 .../Model/ServiceShellUser.php                | 21 ++++++++
 app/code/Magento/NewRelicReporting/etc/di.xml |  7 +++
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/NewRelicReporting/Command/DeployMarker.php
 create mode 100644 app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php

diff --git a/app/code/Magento/NewRelicReporting/Command/DeployMarker.php b/app/code/Magento/NewRelicReporting/Command/DeployMarker.php
new file mode 100644
index 0000000000000..d7c039ca1b75c
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Command/DeployMarker.php
@@ -0,0 +1,54 @@
+<?php
+namespace Magento\NewRelicReporting\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+use Magento\NewRelicReporting\Model\Apm\DeploymentsFactory;
+use Magento\NewRelicReporting\Model\ServiceShellUser;
+
+class DeployMarker extends Command
+{    
+    protected $deploymentsFactory;
+    protected $serviceShellUser;
+    public function __construct(
+        DeploymentsFactory $deploymentsFactory,
+        ServiceShellUser $serviceShellUser,        
+        $name = null
+    )
+    {
+        $this->deploymentsFactory = $deploymentsFactory;
+        $this->serviceShellUser = $serviceShellUser;
+        parent::__construct($name);
+    }
+        
+    protected function configure()
+    {
+        $this->setName("newrelic:create:deploy-marker");
+        $this->setDescription("Check the deploy queue for entries and create an appropriate deploy marker.")
+              ->addArgument(
+                'message',
+                InputArgument::REQUIRED,
+                'Deploy Message?')
+              ->addArgument(
+                'changelog',
+                InputArgument::REQUIRED,
+                'Change Log?')
+              ->addArgument(
+                'user',
+                InputArgument::OPTIONAL,
+                'Deployment User');
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->deploymentsFactory->create()->setDeployment(
+            $input->getArgument('message'),
+            $input->getArgument('changelog'),
+            $this->serviceShellUser->get($input->getArgument('user'))
+        );    
+    }
+} 
\ No newline at end of file
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
index a4a7d30b44f5b..6b2bd50dc456b 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
@@ -175,7 +175,6 @@ protected function reportCounts()
     public function report()
     {
         if ($this->config->isNewRelicEnabled()) {
-            $this->reportModules();
             $this->reportCounts();
         }
 
diff --git a/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php b/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php
new file mode 100644
index 0000000000000..87d5f796df9d8
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Model/ServiceShellUser.php
@@ -0,0 +1,21 @@
+<?php
+namespace Magento\NewRelicReporting\Model;
+class ServiceShellUser
+{
+    const DEFAULT_USER='cron';
+    public function get($userFromArgument=false)
+    {
+        if($userFromArgument)
+        {
+            return $userFromArgument;
+        }
+        
+        $user = `echo \$USER`;
+        if($user)
+        {
+            return $user;
+        }
+        
+        return self::DEFAULT_USER;
+    }
+}
diff --git a/app/code/Magento/NewRelicReporting/etc/di.xml b/app/code/Magento/NewRelicReporting/etc/di.xml
index a0d06105dd3fe..8a57c8aa49100 100644
--- a/app/code/Magento/NewRelicReporting/etc/di.xml
+++ b/app/code/Magento/NewRelicReporting/etc/di.xml
@@ -27,4 +27,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Console\CommandList">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="magento_new_relic_reporting_command_deploy_marker" xsi:type="object">Magento\NewRelicReporting\Command\DeployMarker</item>
+            </argument>
+        </arguments>
+    </type>    
 </config>