remove all references to simulatenous building using current pattern

department-of-veterans-affairs · Feb 6, 2024 · 868f7d8 · 868f7d8
1 parent 29038f6
commit 868f7d8
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 37 deletions.
diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Environment/EnvironmentDiscovery.php b/docroot/modules/custom/va_gov_build_trigger/src/Environment/EnvironmentDiscovery.php
@@ -136,8 +136,8 @@ public function contentEditsShouldTriggerFrontendBuild() : bool {
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
    */
-  public function triggerFrontendBuild(array $payload) : void {
-    $this->getEnvironment()->triggerFrontendBuild($payload);
+  public function triggerFrontendBuild() : void {
+    $this->getEnvironment()->triggerFrontendBuild();
   }
 
   /**

diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Environment/EnvironmentInterface.php b/docroot/modules/custom/va_gov_build_trigger/src/Environment/EnvironmentInterface.php
@@ -20,7 +20,7 @@ public function getWebUrl() : string;
   /**
    * Trigger the frontend web build.
    */
-  public function triggerFrontendBuild(array $payload) : void;
+  public function triggerFrontendBuild() : void;
 
   /**
    * Should this environment trigger a frontend content deploy?

diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Environment/EnvironmentPluginBase.php b/docroot/modules/custom/va_gov_build_trigger/src/Environment/EnvironmentPluginBase.php
@@ -58,13 +58,10 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritDoc}
    */
-  public function triggerFrontendBuild(array $payload) : void {
-    // Write different files based on the frontend.
-    $destination = $payload['frontend'] === 'next_build' ? 'public://.next-buildrequest' : 'public://.buildrequest';
-
+  public function triggerFrontendBuild() : void {
     // The existence of this file triggers a content release.
     // See scripts/queue_runner/queue_runner.sh.
-    $this->filesystem->saveData('build plz', $destination, FileSystemInterface::EXISTS_REPLACE);
+    $this->filesystem->saveData('build plz', 'public://.buildrequest', FileSystemInterface::EXISTS_REPLACE);
     $this->messenger()->addStatus('A request to rebuild the front end has been submitted.');
   }
 

diff --git a/...t/modules/custom/va_gov_build_trigger/src/EventSubscriber/ContinuousReleaseSubscriber.php b/...t/modules/custom/va_gov_build_trigger/src/EventSubscriber/ContinuousReleaseSubscriber.php
@@ -72,7 +72,7 @@ public function releaseContinuously(ReleaseStateTransitionEvent $event) {
 
     if ($is_complete && $is_enabled) {
       $this->runDuringBusinessHours(function () {
-        $this->requestService->submitRequest('Continuous release', ['frontend' => 'content_build']);
+        $this->requestService->submitRequest('Continuous release');
       });
     }
   }

diff --git a/.../modules/custom/va_gov_build_trigger/src/Plugin/AdvancedQueue/JobType/ReleaseDispatch.php b/.../modules/custom/va_gov_build_trigger/src/Plugin/AdvancedQueue/JobType/ReleaseDispatch.php
@@ -100,8 +100,7 @@ public function process(Job $job) {
     switch ($this->releaseStateManager->canAdvanceStateTo(ReleaseStateManager::STATE_DISPATCHED)) {
       case ReleaseStateManager::STATE_TRANSITION_OK:
         try {
-          $payload = $job->getPayload();
-          $this->environmentDiscovery->triggerFrontendBuild($payload);
+          $this->environmentDiscovery->triggerFrontendBuild();
         }
         catch (\Exception $e) {
           return JobResult::failure('Release dispatch failed with error: ' . $e->getMessage());

diff --git a/...t/modules/custom/va_gov_build_trigger/src/Plugin/AdvancedQueue/JobType/ReleaseRequest.php b/...t/modules/custom/va_gov_build_trigger/src/Plugin/AdvancedQueue/JobType/ReleaseRequest.php
@@ -104,14 +104,7 @@ public function process(Job $job) {
     switch ($this->releaseStateManager->canAdvanceStateTo(ReleaseStateManager::STATE_REQUESTED)) {
       case ReleaseStateManager::STATE_TRANSITION_OK:
         $payload = $job->getPayload();
-
-        // Log the frontend being requested.
-        $this->logger->info('Frontend build requested for @frontend', ['@frontend' => $payload['frontend']]);
-
-        $dispatch_job = Job::create('va_gov_content_release_dispatch', [
-          'placeholder' => 'placeholder',
-          'frontend' => $payload['frontend'],
-        ]);
+        $dispatch_job = Job::create('va_gov_content_release_dispatch', ['placeholder' => 'placeholder']);
         $this->dispatchQueue->enqueueJob($dispatch_job);
         $this->releaseStateManager->advanceStateTo(ReleaseStateManager::STATE_REQUESTED);
         $message = 'Content release dispatch has been queued. Reason: @reason';

diff --git a/docroot/modules/custom/va_gov_build_trigger/src/Plugin/VAGov/Environment/BRD.php b/docroot/modules/custom/va_gov_build_trigger/src/Plugin/VAGov/Environment/BRD.php
@@ -77,7 +77,7 @@ public static function create(ContainerInterface $container, array $configuratio
   /**
    * {@inheritDoc}
    */
-  public function triggerFrontendBuild(array $payload) : void {
+  public function triggerFrontendBuild() : void {
     try {
       if ($this->pendingWorkflowRunExists()) {
         $vars = [

diff --git a/docroot/modules/custom/va_gov_content_release/src/Commands/RequestCommands.php b/docroot/modules/custom/va_gov_content_release/src/Commands/RequestCommands.php
@@ -40,7 +40,7 @@ public function __construct(
    *   va-gov-content-release-request-submit
    */
   public function submitRequest(string $reason = 'Build requested via Drush.') {
-    $this->requestService->submitRequest($reason, ['frontend' => 'content_build']);
+    $this->requestService->submitRequest($reason);
     $this->io()->success('Content Release requested; check the queue for status.');
   }
 

diff --git a/docroot/modules/custom/va_gov_content_release/src/EventSubscriber/EntityEventSubscriber.php b/docroot/modules/custom/va_gov_content_release/src/EventSubscriber/EntityEventSubscriber.php
@@ -104,7 +104,7 @@ public function handleNodeUpdate(VaNodeInterface $node) : void {
     $strategy = $this->strategyPluginManager->getStrategy($strategyId);
     if ($strategy->shouldTriggerContentRelease($node)) {
       $reason = $strategy->getReasonMessage($node);
-      $this->request->submitRequest($reason, ['frontend' => 'content_build']);
+      $this->request->submitRequest($reason);
     }
   }
 

diff --git a/docroot/modules/custom/va_gov_content_release/src/Form/BaseForm.php b/docroot/modules/custom/va_gov_content_release/src/Form/BaseForm.php
@@ -163,9 +163,7 @@ public function isUnderTest(FormStateInterface $form_state): bool {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->reporter->reportInfo($this->t('Content release requested successfully.'));
     if (!$this->isUnderTest($form_state)) {
-      // Determine which frontend submitted the request based on field presence.
-      $frontend = isset($form["build_request"]["next_build_selection"]) ? 'next_build' : 'content_build';
-      $this->request->submitRequest('Build requested via form.', ['frontend' => $frontend]);
+      $this->request->submitRequest('Build requested via form.');
     }
     else {
       $this->reporter->reportInfo($this->t('Build request skipped; form is under test.'));

diff --git a/docroot/modules/custom/va_gov_content_release/src/Request/Request.php b/docroot/modules/custom/va_gov_content_release/src/Request/Request.php
@@ -32,11 +32,10 @@ public function __construct(EntityTypeManagerInterface $entityTypeManager) {
   /**
    * {@inheritDoc}
    */
-  public function submitRequest(string $reason, array $options) : void {
+  public function submitRequest(string $reason) : void {
     try {
       $job = Job::create(static::JOB_TYPE, [
         'reason' => $reason,
-        'frontend' => $options['frontend'] ?? 'content_build',
       ]);
       $this->queue->enqueueJob($job);
     }

diff --git a/docroot/modules/custom/va_gov_content_release/src/Request/RequestInterface.php b/docroot/modules/custom/va_gov_content_release/src/Request/RequestInterface.php
@@ -18,14 +18,10 @@ interface RequestInterface {
    * @param string $reason
    *   The reason for the content release. This is logged, so it should be
    *   human-readable but can be fairly detailed.
-   * @param array $options
-   *   An array of options to pass to the job.
-   *   - 'frontend' (string): The frontend to release content for, either
-   *   'content_build' or 'next_build'.
    *
    * @throws \Drupal\va_gov_content_release\Exception\RequestException
    *   If the request could not be submitted.
    */
-  public function submitRequest(string $reason, array $options) : void;
+  public function submitRequest(string $reason) : void;
 
 }
diff --git a/scripts/build-frontend.sh b/scripts/build-frontend.sh
@@ -54,8 +54,6 @@ date >> ${logfile}
 echo "content-build version: ${content_build_version}" >> ${logfile}
 echo "vets-website version: ${vets_website_version}" >> ${logfile}
 
-exit 1
-
 # Tell the frontend (and the user) that we're starting.
 drush va-gov:content-release:advance-state starting
 echo "==> Starting a frontend build. This file will be updated as the build progresses." >> ${logfile}

diff --git a/scripts/queue_runner/queue_runner.sh b/scripts/queue_runner/queue_runner.sh
@@ -3,6 +3,5 @@
 cd "${TUGBOAT_ROOT}"
 ./bin/drush advancedqueue:queue:process command_runner 2>&1
 ./bin/drush advancedqueue:queue:process content_release 2>&1
-#[ -f "./docroot/sites/default/files/.buildrequest" ] && ( ./scripts/build-frontend.sh > /dev/null 2>&1 && rm ./docroot/sites/default/files/.buildrequest ) &
-#[ -f "./docroot/sites/default/files/.next-buildrequest" ] && ( ./scripts/next-build-frontend.sh && rm ./docroot/sites/default/files/.next-buildrequest ) &
-sleep 6s
+[ -f "./docroot/sites/default/files/.buildrequest" ] && ./scripts/build-frontend.sh && rm ./docroot/sites/default/files/.buildrequest
+sleep 60s