Add canary steps to presenter

Author: Samze

app/presenters/v3/deployment_presenter.rb

@@ -10,14 +10,7 @@ def to_hash
         guid: deployment.guid,
         created_at: deployment.created_at,
         updated_at: deployment.updated_at,
-        status: {
-          value: deployment.status_value,
-          reason: deployment.status_reason,
-          details: {
-            last_successful_healthcheck: deployment.last_healthy_at,
-            last_status_change: deployment.status_updated_at
-          }
-        },
+        status: build_status(deployment),
         strategy: deployment.strategy,
         options: {
           max_in_flight: deployment.max_in_flight
@@ -64,6 +57,29 @@ def new_processes
       end
     end
 
+    def build_status(deployment)
+      status = {
+        value: deployment.status_value,
+        reason: deployment.status_reason,
+        details: {
+          last_successful_healthcheck: deployment.last_healthy_at,
+          last_status_change: deployment.status_updated_at
+        }
+      }
+
+      if deployment.strategy == VCAP::CloudController::DeploymentModel::CANARY_STRATEGY
+        status[:canary] = {
+          steps: {
+            # TODO: delegate to model ?
+            current: deployment.canary_current_step,
+            total: deployment.canary_steps&.length || 1
+          }
+        }
+      end
+
+      status
+    end
+
     def build_links
       {
         self: {

spec/unit/presenters/v3/deployment_presenter_spec.rb

@@ -128,6 +128,53 @@ module VCAP::CloudController::Presenters::V3
           end
         end
       end
+
+      describe 'status' do
+        context 'when the strategy is rolling' do
+          before do
+            deployment.strategy = VCAP::CloudController::DeploymentModel::ROLLING_STRATEGY
+          end
+
+          it 'shows no canary status' do
+            result = DeploymentPresenter.new(deployment).to_hash
+            expect(result[:status][:canary]).to be_nil
+          end
+        end
+
+        context 'when the strategy is canary' do
+          before do
+            deployment.strategy = VCAP::CloudController::DeploymentModel::CANARY_STRATEGY
+            deployment.canary_current_step = 1
+          end
+
+          context 'when there are no explicit steps' do
+            it 'presents the canary status' do
+              result = DeploymentPresenter.new(deployment).to_hash
+              expect(result[:status][:canary][:steps][:current]).to eq(1)
+              expect(result[:status][:canary][:steps][:total]).to eq(1)
+            end
+          end
+
+          context 'when there are explicit steps' do
+            before do
+              deployment.strategy = VCAP::CloudController::DeploymentModel::CANARY_STRATEGY
+              deployment.canary_current_step = 2
+              deployment.canary_steps = [
+                { instance_weight: 1 },
+                { instance_weight: 2 },
+                { instance_weight: 3 },
+                { instance_weight: 4 }
+              ]
+            end
+
+            it 'presents the canary status' do
+              result = DeploymentPresenter.new(deployment).to_hash
+              expect(result[:status][:canary][:steps][:current]).to eq(2)
+              expect(result[:status][:canary][:steps][:total]).to eq(4)
+            end
+          end
+        end
+      end
     end
   end
 end