VACMS-2347 Do not tar files on cms export during deploy (#2568)

* PHPCS fix * Fix issue with export update * Use correct method to find directory
department-of-veterans-affairs · Aug 6, 2020 · 8916b8e · 8916b8e · va-cms-bot · Aug 6, 2020
1 parent 112273d
commit 8916b8e
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 4 deletions.
diff --git a/docroot/modules/custom/va_gov_content_export/src/Archive/ArchiveDirectory.php b/docroot/modules/custom/va_gov_content_export/src/Archive/ArchiveDirectory.php
@@ -61,7 +61,7 @@ public function __construct(Zippy $zippy, FileSystemInterface $fileSystem, Conta
    */
   public function archive(ArchiveArgs $archiveArgs) : ArchiveInterface {
     // @TODO Add locking/queueing/waiting so only one archive is occurring at a time.
-    $output_dir = dirname($archiveArgs->getOutputPath());
+    $output_dir = $this->fileSystem->dirname($archiveArgs->getOutputPath());
     $this->fileSystem->prepareDirectory($output_dir, FileSystemInterface::CREATE_DIRECTORY);
 
     $input_path = $this->fileSystem->realpath($archiveArgs->getCurrentWorkingDirectory());

diff --git a/docroot/modules/custom/va_gov_content_export/src/Controller/ContentExport.php b/docroot/modules/custom/va_gov_content_export/src/Controller/ContentExport.php
@@ -8,6 +8,7 @@
 use Drupal\va_gov_content_export\Archive\ArchiveArgs;
 use Drupal\va_gov_content_export\Archive\ArchiveArgsFactory;
 use Drupal\va_gov_content_export\Archive\ArchiveDirectory;
+use Drupal\va_gov_content_export\SiteStatus\SiteStatusInterface;
 use Exception;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -47,6 +48,13 @@ class ContentExport extends ControllerBase {
    */
   public const ALLOWED_EXPORT_TYPES = ['content', 'asset'];
 
+  /**
+   * Site Status.
+   *
+   * @var \Drupal\va_gov_content_export\SiteStatus\SiteStatusInterface
+   */
+  private $siteStatus;
+
   /**
    * ContentExport constructor.
    *
@@ -56,11 +64,14 @@ class ContentExport extends ControllerBase {
    *   Kill switch.
    * @param \Drupal\va_gov_content_export\Archive\ArchiveArgsFactory $archiveArgsFactory
    *   The Archive Args factory.
+   * @param \Drupal\va_gov_content_export\SiteStatus\SiteStatusInterface $siteStatus
+   *   The Site Status Service.
    */
-  public function __construct(ArchiveDirectory $archiver, KillSwitch $killSwitch, ArchiveArgsFactory $archiveArgsFactory) {
+  public function __construct(ArchiveDirectory $archiver, KillSwitch $killSwitch, ArchiveArgsFactory $archiveArgsFactory, SiteStatusInterface $siteStatus) {
     $this->archiver = $archiver;
     $this->killSwitch = $killSwitch;
     $this->archiveArgsFactory = $archiveArgsFactory;
+    $this->siteStatus = $siteStatus;
   }
 
   /**
@@ -70,7 +81,8 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('va_gov.content_export.archive_directory'),
       $container->get('page_cache_kill_switch'),
-      $container->get('va_gov.content_export.archive_args_factory')
+      $container->get('va_gov.content_export.archive_args_factory'),
+      $container->get('va_gov.site_status')
     );
   }
 
@@ -97,7 +109,9 @@ public function redirectToFile(string $export_type) : Response {
     $this->killSwitch->trigger();
     try {
       $archive_args = $this->getArchiveArgs($export_type);
-      $this->archiver->archive($archive_args);
+      if (!$this->siteStatus->inDeployMode()) {
+        $this->archiver->archive($archive_args);
+      }
       $file_name = $archive_args->getOutputPath();
 
       if (!file_exists($file_name)) {

diff --git a/docroot/modules/custom/va_gov_content_export/src/SiteStatus/SiteStatus.php b/docroot/modules/custom/va_gov_content_export/src/SiteStatus/SiteStatus.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\va_gov_content_export\SiteStatus;
+
+use Drupal\Core\Site\Settings;
+
+/**
+ * SiteStatus Service.
+ */
+class SiteStatus implements SiteStatusInterface {
+
+  /**
+   * {@inheritDoc}
+   */
+  public function inDeployMode(): bool {
+    return Settings::get('va_site_deploy_mode', FALSE);
+  }
+
+}
diff --git a/docroot/modules/custom/va_gov_content_export/src/SiteStatus/SiteStatusInterface.php b/docroot/modules/custom/va_gov_content_export/src/SiteStatus/SiteStatusInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Drupal\va_gov_content_export\SiteStatus;
+
+/**
+ * Interface SiteStatusInterface.
+ */
+interface SiteStatusInterface {
+
+  /**
+   * Is the site currently in Deploy Mode.
+   *
+   * @return bool
+   *   In Deploy Mode.
+   */
+  public function inDeployMode() : bool;
+
+}
diff --git a/docroot/modules/custom/va_gov_content_export/va_gov_content_export.services.yml b/docroot/modules/custom/va_gov_content_export/va_gov_content_export.services.yml
@@ -34,3 +34,5 @@ services:
     arguments: ['@tome_sync.exporter', '@event_dispatcher', '@va_gov.content_export.executable_finder']
   va_gov.content_export.executable_finder:
     class: Drupal\va_gov_content_export\ExportCommand\ExecutableFinder
+  va_gov.site_status:
+    class: Drupal\va_gov_content_export\SiteStatus\SiteStatus