TASK: add current release identifier as argument to release pipeline

Author: batabana

Classes/ContentReleaseManager.php

@@ -4,6 +4,7 @@
 
 namespace Flowpack\DecoupledContentStore;
 
+use Flowpack\DecoupledContentStore\Core\Infrastructure\RedisClientManager;
 use Neos\Flow\Annotations as Flow;
 use Flowpack\Prunner\PrunnerApiService;
 use Flowpack\Prunner\ValueObject\PipelineName;
@@ -26,16 +27,29 @@ class ContentReleaseManager
      */
     protected $prunnerApiService;
 
+    /**
+     * @Flow\Inject
+     * @var RedisClientManager
+     */
+    protected $redisClientManager;
+
+    const REDIS_CURRENT_RELEASE_KEY = 'contentStore:current';
+    const NO_PREVIOUS_RELEASE = 'NO_PREVIOUS_RELEASE';
 
     public function startIncrementalContentRelease()
     {
-        $this->prunnerApiService->schedulePipeline(PipelineName::create('do_content_release'), ['contentReleaseId' => (string)time()]);
+        $redis = $this->redisClientManager->getPrimaryRedis();
+        $currentContentReleaseId = $redis->get(self::REDIS_CURRENT_RELEASE_KEY);
+
+        // the currentContentReleaseId is not used in any pipeline step in this package, but is a common need in other
+        // use cases in extensions, e.g. calculating the differences between current and new release
+        $this->prunnerApiService->schedulePipeline(PipelineName::create('do_content_release'), ['contentReleaseId' => (string)time(), 'currentContentReleaseId' => $currentContentReleaseId ?: self::NO_PREVIOUS_RELEASE]);
     }
 
     public function startFullContentRelease()
     {
         $this->contentCache->flush();
-        $this->prunnerApiService->schedulePipeline(PipelineName::create('do_content_release'), ['contentReleaseId' => (string)time()]);
+        $this->prunnerApiService->schedulePipeline(PipelineName::create('do_content_release'), ['contentReleaseId' => (string)time(), 'currentContentReleaseId' => self::NO_PREVIOUS_RELEASE]);
     }
 
     public function cancelAllRunningContentReleases()
@@ -46,4 +60,4 @@ public function cancelAllRunningContentReleases()
             $this->prunnerApiService->cancelJob($job);
         }
     }
-}
+}

Classes/Controller/BackendController.php

@@ -159,8 +159,11 @@ public function switchAction(string $contentReleaseIdentifier, string $redisInst
 
     public function switchContentReleaseOnOtherInstanceAction(string $targetRedisInstanceIdentifier, string $contentReleaseIdentifier)
     {
+        $redis = $this->redisClientManager->getPrimaryRedis();
+        $currentContentReleaseId = $redis->get('contentStore:current');
+
         $this->prunnerApiService->schedulePipeline(PipelineName::create('manually_transfer_content_release'),
-            ['contentReleaseId' => $contentReleaseIdentifier, 'redisInstanceId' => $targetRedisInstanceIdentifier]);
+            ['contentReleaseId' => $contentReleaseIdentifier, 'currentContentReleaseId' => $currentContentReleaseId ?: ContentReleaseManager::NO_PREVIOUS_RELEASE, 'redisInstanceId' => $targetRedisInstanceIdentifier]);
 
         $this->redirect('index', null, null, ['contentStore' => $targetRedisInstanceIdentifier]);
     }

Resources/Private/BackendFusion/Integration/Backend.Details.fusion

@@ -393,7 +393,7 @@ prototype(Flowpack.DecoupledContentStore:DetailsFooter) < prototype(Neos.Fusion:
 
             renderer = afx`
                 <button form="postHelper" formaction={props._switchUri} type="submit" class="neos-button neos-button-warning neos-pull-right" @if.isNotPrimary={item != "primary"}>
-                    Transfer to {item}
+                    Transfer and switch on {item}
                 </button>
             `
         }

pipelines_template.yml

@@ -9,7 +9,9 @@
 # The contents of this file is read by [prunner](https://github.com/Flowpack/prunner).
 #
 pipelines:
-  # ARG: contentReleaseId
+  # ARG: contentReleaseId, currentContentReleaseId
+  # the currentContentReleaseId is not used in any pipeline step here in the template, but is a common need in other
+  # use cases in extensions, e.g. calculating the differences between current and new release
   do_content_release:
 
     # crucial settings for incremental rendering to work
@@ -200,7 +202,7 @@ pipelines:
 
   # this subset of the pipeline above is running when a release is manually transfered and switched live
   # from the primary content store to any other content store
-  # ARG: contentReleaseId, redisInstanceId
+  # ARG: contentReleaseId, currentContentReleaseId, redisInstanceId
   manually_transfer_content_release:
     # just to be safe, we want to run manual transfers one-by-one (without concurrency)
     concurrency: 1