Skip to content
This repository was archived by the owner on Jun 2, 2021. It is now read-only.

Commit a917640

Browse files
GergGerg
committed
Revert "Revert "Remove deployment state from API""
This reverts commit ddf6065.
1 parent dccd661 commit a917640

5 files changed

Lines changed: 1 addition & 29 deletions

File tree

‎app/presenters/v3/deployment_presenter.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ def to_hash
1010
guid: deployment.guid,
1111
created_at: deployment.created_at,
1212
updated_at: deployment.updated_at,
13-
state: deployment.state,
1413
status: {
1514
value: deployment.status_value,
1615
reason: deployment.status_reason,

‎docs/v3/source/includes/api_resources/_deployments.erb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
{
44
"guid": "59c3d133-2b83-46f3-960e-7765a129aea4",
5-
"state": "DEPLOYING",
65
"status": {
76
"value": "ACTIVE",
87
"reason": "DEPLOYING",
@@ -72,7 +71,6 @@
7271
"resources": [
7372
{
7473
"guid": "59c3d133-2b83-46f3-960e-7765a129aea4",
75-
"state": "DEPLOYED",
7674
"status": {
7775
"value": "FINALIZED",
7876
"reason": "DEPLOYED"

‎docs/v3/source/includes/resources/deployments/_object.md.erb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Name | Type | Description
1212
**guid** | _uuid_ | Unique identifier for the deployment
1313
**created_at** | _[timestamp](#timestamps)_ | The time with zone when the object was created
1414
**updated_at** | _[timestamp](#timestamps)_ | The time with zone when the object was last updated
15-
**state** | _string_ | **(deprecated)** This field will be removed in the future; use the `status` fields to determine deployment state instead
1615
**status.value** | _string_ | The current status of the deployment; valid values are `ACTIVE` (meaning in progress) and `FINALIZED` (meaning finished, either successfully or not)
1716
**status.reason** | _string_ | The reason for the status of the deployment;<br>following list represents valid values:<br>1. If **status.value** is `ACTIVE`<br>- `DEPLOYING`<br>- `CANCELING`<br>2. If **status.value** is `FINALIZED`<br>- `DEPLOYED`<br>- `CANCELED`<br>- `SUPERSEDED` (another deployment created for app before completion)<br>- `DEGENERATE` (the deployment was created incorrectly by the system)
1817
**status.details** | _object_ | The details for the status of the deployment shows a timestamp of the last successful healthcheck

‎spec/request/deployments_spec.rb‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242
expect(parsed_response).to be_a_response_like({
4343
'guid' => deployment.guid,
44-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
4544
'status' => {
4645
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
4746
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -116,7 +115,6 @@
116115

117116
expect(parsed_response).to be_a_response_like({
118117
'guid' => deployment.guid,
119-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
120118
'status' => {
121119
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
122120
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -198,7 +196,6 @@
198196

199197
expect(parsed_response).to be_a_response_like({
200198
'guid' => deployment.guid,
201-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
202199
'status' => {
203200
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
204201
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -316,7 +313,6 @@
316313

317314
expect(parsed_response).to be_a_response_like({
318315
'guid' => deployment.guid,
319-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
320316
'status' => {
321317
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
322318
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -393,7 +389,6 @@
393389
parsed_response = MultiJson.load(last_response.body)
394390
expect(parsed_response).to be_a_response_like({
395391
'guid' => deployment.guid,
396-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
397392
'status' => {
398393
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
399394
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -473,7 +468,6 @@
473468

474469
expect(parsed_response).to be_a_response_like({
475470
'guid' => deployment.guid,
476-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYED_STATE,
477471
'status' => {
478472
'value' => VCAP::CloudController::DeploymentModel::FINALIZED_STATUS_VALUE,
479473
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYED_STATUS_REASON,
@@ -638,7 +632,6 @@
638632

639633
expect(parsed_response).to be_a_response_like({
640634
'guid' => deployment.guid,
641-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
642635
'status' => {
643636
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
644637
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -698,7 +691,6 @@
698691

699692
expect(parsed_response).to be_a_response_like({
700693
'guid' => deployment.guid,
701-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
702694
'status' => {
703695
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
704696
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -815,7 +807,6 @@
815807
parsed_response = MultiJson.load(last_response.body)
816808
expect(parsed_response).to be_a_response_like({
817809
'guid' => deployment.guid,
818-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
819810
'status' => {
820811
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
821812
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -877,7 +868,6 @@
877868
parsed_response = MultiJson.load(last_response.body)
878869
expect(parsed_response).to be_a_response_like({
879870
'guid' => deployment.guid,
880-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
881871
'status' => {
882872
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
883873
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -986,10 +976,9 @@
986976
status_reason: VCAP::CloudController::DeploymentModel::SUPERSEDED_STATUS_REASON)
987977
}
988978

989-
def json_for_deployment(deployment, app_model, droplet, state, status_value, status_reason, cancel_link=true)
979+
def json_for_deployment(deployment, app_model, droplet, status_value, status_reason, cancel_link=true)
990980
{
991981
guid: deployment.guid,
992-
state: state,
993982
status: {
994983
value: status_value,
995984
reason: status_reason,
@@ -1063,11 +1052,9 @@ def json_for_deployment(deployment, app_model, droplet, state, status_value, sta
10631052
},
10641053
resources: [
10651054
json_for_deployment(deployment, app_model, droplet,
1066-
VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
10671055
VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
10681056
VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON),
10691057
json_for_deployment(deployment2, app2, droplet2,
1070-
VCAP::CloudController::DeploymentModel::CANCELING_STATE,
10711058
VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
10721059
VCAP::CloudController::DeploymentModel::CANCELING_STATUS_REASON),
10731060
]
@@ -1086,19 +1073,16 @@ def json_for_deployment(deployment, app_model, droplet, state, status_value, sta
10861073
code: 200,
10871074
response_objects: [
10881075
json_for_deployment(deployment3, app3, droplet3,
1089-
VCAP::CloudController::DeploymentModel::DEPLOYED_STATE,
10901076
VCAP::CloudController::DeploymentModel::FINALIZED_STATUS_VALUE,
10911077
VCAP::CloudController::DeploymentModel::DEPLOYED_STATUS_REASON,
10921078
false
10931079
),
10941080
json_for_deployment(deployment4, app4, droplet4,
1095-
VCAP::CloudController::DeploymentModel::CANCELED_STATE,
10961081
VCAP::CloudController::DeploymentModel::FINALIZED_STATUS_VALUE,
10971082
VCAP::CloudController::DeploymentModel::CANCELED_STATUS_REASON,
10981083
false
10991084
),
11001085
json_for_deployment(deployment5, app5, droplet5,
1101-
VCAP::CloudController::DeploymentModel::DEPLOYED_STATE,
11021086
VCAP::CloudController::DeploymentModel::FINALIZED_STATUS_VALUE,
11031087
VCAP::CloudController::DeploymentModel::SUPERSEDED_STATUS_REASON,
11041088
false
@@ -1143,13 +1127,11 @@ def json_for_deployment(deployment, app_model, droplet, state, status_value, sta
11431127
code: 200,
11441128
response_objects: [
11451129
json_for_deployment(deployment3, app3, droplet3,
1146-
VCAP::CloudController::DeploymentModel::DEPLOYED_STATE,
11471130
VCAP::CloudController::DeploymentModel::FINALIZED_STATUS_VALUE,
11481131
VCAP::CloudController::DeploymentModel::DEPLOYED_STATUS_REASON,
11491132
false
11501133
),
11511134
json_for_deployment(deployment5, app5, droplet5,
1152-
VCAP::CloudController::DeploymentModel::DEPLOYED_STATE,
11531135
VCAP::CloudController::DeploymentModel::FINALIZED_STATUS_VALUE,
11541136
VCAP::CloudController::DeploymentModel::SUPERSEDED_STATUS_REASON,
11551137
false
@@ -1194,7 +1176,6 @@ def json_for_deployment(deployment, app_model, droplet, state, status_value, sta
11941176
code: 200,
11951177
response_objects: [
11961178
json_for_deployment(deployment, app_model, droplet,
1197-
VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
11981179
VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
11991180
VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON),
12001181
]
@@ -1300,7 +1281,6 @@ def json_for_deployment(deployment, app_model, droplet, state, status_value, sta
13001281
'resources' => [
13011282
{
13021283
'guid' => deployment.guid,
1303-
'state' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATE,
13041284
'status' => {
13051285
'value' => VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE,
13061286
'reason' => VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON,
@@ -1373,7 +1353,6 @@ def json_for_deployment(deployment, app_model, droplet, state, status_value, sta
13731353

13741354
expect(last_response.body).to be_empty
13751355
deployment.reload
1376-
expect(deployment.state).to eq(VCAP::CloudController::DeploymentModel::CANCELING_STATE)
13771356
expect(deployment.status_value).to eq(VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE)
13781357
expect(deployment.status_reason).to eq(VCAP::CloudController::DeploymentModel::CANCELING_STATUS_REASON)
13791358

@@ -1382,7 +1361,6 @@ def json_for_deployment(deployment, app_model, droplet, state, status_value, sta
13821361
require 'cloud_controller/deployment_updater/scheduler'
13831362
VCAP::CloudController::DeploymentUpdater::Updater.new(deployment, Steno.logger('blah')).cancel
13841363
deployment.reload
1385-
expect(deployment.state).to eq(VCAP::CloudController::DeploymentModel::CANCELED_STATE)
13861364
expect(deployment.status_value).to eq(VCAP::CloudController::DeploymentModel::FINALIZED_STATUS_VALUE)
13871365
expect(deployment.status_reason).to eq(VCAP::CloudController::DeploymentModel::CANCELED_STATUS_REASON)
13881366
end

‎spec/unit/presenters/v3/deployment_presenter_spec.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ module VCAP::CloudController::Presenters::V3
2626
result = DeploymentPresenter.new(deployment).to_hash
2727
expect(result[:guid]).to eq(deployment.guid)
2828

29-
expect(result[:state]).to eq(VCAP::CloudController::DeploymentModel::DEPLOYING_STATE)
3029
expect(result[:status][:value]).to eq(VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE)
3130
expect(result[:status][:reason]).to eq(VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON)
3231
expect(result[:status][:details][:last_successful_healthcheck]).to eq('2019-07-12 19:01:54')
@@ -71,7 +70,6 @@ module VCAP::CloudController::Presenters::V3
7170
result = DeploymentPresenter.new(deployment).to_hash
7271
expect(result[:guid]).to eq(deployment.guid)
7372

74-
expect(result[:state]).to eq(VCAP::CloudController::DeploymentModel::DEPLOYING_STATE)
7573
expect(result[:status][:value]).to eq(VCAP::CloudController::DeploymentModel::ACTIVE_STATUS_VALUE)
7674
expect(result[:status][:reason]).to eq(VCAP::CloudController::DeploymentModel::DEPLOYING_STATUS_REASON)
7775

0 commit comments

Comments
 (0)