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

Commit 7ef926a

Browse files
pivotal-marcela-campopivotal-marcela-campo
committed
Remove available flag from broker response
[#169572884](https://www.pivotaltracker.com/story/show/169572884)
1 parent e7ee7a1 commit 7ef926a

7 files changed

Lines changed: 7 additions & 32 deletions

File tree

‎app/decorators/field_service_offering_service_broker_decorator.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ def self.allowed
55
end
66

77
def self.match?(fields)
8-
fields.is_a?(Hash) && fields[:'service_broker']&.to_set&.intersect?(self.allowed)
8+
fields.is_a?(Hash) && fields[:service_broker]&.to_set&.intersect?(self.allowed)
99
end
1010

1111
def initialize(fields)
12-
@fields = fields[:'service_broker'].to_set.intersection(self.class.allowed)
12+
@fields = fields[:service_broker].to_set.intersection(self.class.allowed)
1313
end
1414

1515
def decorate(hash, service_offerings)

‎app/presenters/v3/service_broker_presenter.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def to_hash
2323
guid: broker.guid,
2424
name: broker.name,
2525
url: broker.broker_url,
26-
available: status == 'available',
2726
status: status,
2827
created_at: broker.created_at,
2928
updated_at: broker.updated_at,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"guid": "dde5ad2a-d8f4-44dc-a56f-0452d744f1c3",
44
"name": "my_service_broker",
55
"url": "https://example.service-broker.com",
6-
"available": true,
76
"status": "available",
87
"created_at": "2015-11-13T17:02:56Z",
98
"updated_at": "2016-06-08T16:41:26Z",
@@ -55,7 +54,6 @@
5554
"guid": "dde5ad2a-d8f4-44dc-a56f-0452d744f1c3",
5655
"name": "my_service_broker",
5756
"url": "https://example.service-broker.com",
58-
"available": true,
5957
"status": "available",
6058
"created_at": "2015-11-13T17:02:56Z",
6159
"updated_at": "2016-06-08T16:41:26Z",
@@ -77,7 +75,6 @@
7775
"guid": "7aa37bad-6ccb-4ef9-ba48-9ce3a91b2b62",
7876
"name": "another_service_broker",
7977
"url": "https://another-example.service-broker.com",
80-
"available": true,
8178
"status": "available",
8279
"created_at": "2015-11-13T17:02:56Z",
8380
"updated_at": "2016-06-08T16:41:26Z",

‎docs/v3/source/includes/experimental_resources/service_brokers/_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 service broker.
1313
**name** | _string_ | Name of the service broker.
1414
**url** | _string_ | URL of the service broker.
15-
**available** | _boolean_ | Whether or not the service broker is available.
1615
**status** | _string_ | Availability status of the service broker.
1716
**created_at** | _datetime_ | The time with zone when the object was created.
1817
**updated_at** | _datetime_ | The time with zone when the object was last updated.

‎spec/request/lifecycle/service_brokers_spec.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@
256256
expect(parsed_response).to include({
257257
'name' => 'new-name',
258258
'url' => 'http://example.org/new-broker-url',
259-
'available' => true,
260259
'status' => 'available',
261260
})
262261
end
@@ -298,7 +297,6 @@
298297
expect(parsed_response).to include({
299298
'name' => 'old-name',
300299
'url' => 'http://example.org/old-broker-url',
301-
'available' => true,
302300
'status' => 'available',
303301
'metadata' => {
304302
'annotations' => {

‎spec/request/service_brokers_spec.rb‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
created_at: iso8601,
154154
updated_at: iso8601,
155155
status: 'available',
156-
available: true,
157156
relationships: {},
158157
links: {
159158
self: {
@@ -174,7 +173,6 @@
174173
created_at: iso8601,
175174
updated_at: iso8601,
176175
status: 'available',
177-
available: true,
178176
relationships: {},
179177
links: {
180178
self: {
@@ -214,7 +212,6 @@
214212
created_at: iso8601,
215213
updated_at: iso8601,
216214
status: 'available',
217-
available: true,
218215
metadata: { labels: {}, annotations: {} },
219216
relationships: {
220217
space: { data: { guid: space.guid } }
@@ -358,7 +355,6 @@ def expect_empty_list(user_headers)
358355
created_at: iso8601,
359356
updated_at: iso8601,
360357
status: 'available',
361-
available: true,
362358
metadata: { labels: {}, annotations: {} },
363359
relationships: {},
364360
links: {
@@ -406,7 +402,6 @@ def expect_empty_list(user_headers)
406402
created_at: iso8601,
407403
updated_at: iso8601,
408404
status: 'available',
409-
available: true,
410405
metadata: { labels: {}, annotations: {} },
411406
relationships: {
412407
space: { data: { guid: space.guid } }
@@ -716,7 +711,6 @@ def expect_empty_list(user_headers)
716711
created_at: iso8601,
717712
updated_at: iso8601,
718713
status: 'synchronization in progress',
719-
available: false,
720714
metadata: { labels: { potato: 'yam' }, annotations: { style: 'mashed' } },
721715
relationships: {},
722716
links: {
@@ -855,7 +849,6 @@ def expect_empty_list(user_headers)
855849
created_at: iso8601,
856850
updated_at: iso8601,
857851
status: 'synchronization in progress',
858-
available: false,
859852
metadata: { labels: {}, annotations: {} },
860853
relationships: {
861854
space: { data: { guid: space.guid } }
@@ -1023,7 +1016,6 @@ def expect_empty_list(user_headers)
10231016

10241017
it 'leaves broker in a non-available failed state' do
10251018
expect_broker_status(
1026-
available: false,
10271019
status: 'synchronization failed',
10281020
with: admin_headers
10291021
)
@@ -1184,14 +1176,13 @@ def expect_created_broker(expected_broker)
11841176
expect(service_broker.auth_password).to eq(expected_broker[:authentication][:credentials][:password])
11851177
end
11861178

1187-
def expect_broker_status(available:, status:, with:)
1179+
def expect_broker_status(status:, with:)
11881180
expect(VCAP::CloudController::ServiceBroker.count).to eq(@count_before_creation + 1)
11891181
service_broker = VCAP::CloudController::ServiceBroker.last
11901182

11911183
get("/v3/service_brokers/#{service_broker.guid}", {}, with)
11921184
expect(last_response.status).to eq(200)
11931185
expect(parsed_response).to include(
1194-
'available' => available,
11951186
'status' => status
11961187
)
11971188
end
@@ -1217,7 +1208,6 @@ def assert_broker_state(broker_json)
12171208

12181209
updated_service_broker_json = broker_json.tap do |broker|
12191210
broker[:status] = 'available'
1220-
broker[:available] = true
12211211
end
12221212

12231213
expect(parsed_response).to match_json_response(updated_service_broker_json)
@@ -1311,7 +1301,6 @@ def assert_broker_state(broker_json)
13111301
it 'marks the broker as deleting' do
13121302
get "/v3/service_brokers/#{global_broker.guid}", {}, admin_headers
13131303
expect(parsed_response).to include({
1314-
'available' => false,
13151304
'status' => 'delete in progress'
13161305
})
13171306
end
@@ -1403,7 +1392,6 @@ def assert_broker_state(broker_json)
14031392
it 'updates the broker state' do
14041393
get "/v3/service_brokers/#{global_broker.guid}", {}, admin_headers
14051394
expect(parsed_response).to include({
1406-
'available' => false,
14071395
'status' => 'delete failed'
14081396
})
14091397
end

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ module Presenters::V3
101101
describe 'broker status' do
102102
context 'when there is no state (e.g. legacy V2 created broker)' do
103103
it 'is available' do
104-
expect(result[:available]).to be(true)
105104
expect(result[:status]).to eq('available')
106105
end
107106
end
@@ -110,43 +109,38 @@ module Presenters::V3
110109
let(:service_broker_state) { ServiceBrokerStateEnum::AVAILABLE }
111110

112111
it 'is available' do
113-
expect(result[:available]).to be(true)
114112
expect(result[:status]).to eq('available')
115113
end
116114
end
117115

118116
context 'when state is synchronizing' do
119117
let(:service_broker_state) { ServiceBrokerStateEnum::SYNCHRONIZING }
120118

121-
it 'is not available and has synchronization in progress' do
122-
expect(result[:available]).to be(false)
119+
it 'has synchronization in progress' do
123120
expect(result[:status]).to eq('synchronization in progress')
124121
end
125122
end
126123

127124
context 'when state is synchronization failed' do
128125
let(:service_broker_state) { ServiceBrokerStateEnum::SYNCHRONIZATION_FAILED }
129126

130-
it 'is not available and has synchronization failed' do
131-
expect(result[:available]).to be(false)
127+
it 'has synchronization failed' do
132128
expect(result[:status]).to eq('synchronization failed')
133129
end
134130
end
135131

136132
context 'when state is delete in progress' do
137133
let(:service_broker_state) { ServiceBrokerStateEnum::DELETE_IN_PROGRESS }
138134

139-
it 'is not available and has delete in progress' do
140-
expect(result[:available]).to be(false)
135+
it 'has delete in progress' do
141136
expect(result[:status]).to eq('delete in progress')
142137
end
143138
end
144139

145140
context 'when state is delete failed' do
146141
let(:service_broker_state) { ServiceBrokerStateEnum::DELETE_FAILED }
147142

148-
it 'is not available and has delete failed' do
149-
expect(result[:available]).to be(false)
143+
it 'has delete failed' do
150144
expect(result[:status]).to eq('delete failed')
151145
end
152146
end

0 commit comments

Comments
 (0)