Skip to content

Commit bcc0e00

Browse files
patrickcrockerpatrickcrocker
committed
enable/disable-service-access learned to specify the broker
1 parent 5ac5b33 commit bcc0e00

5 files changed

Lines changed: 73 additions & 42 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## 2.21.0 - Unreleased
9+
10+
# Changed
11+
12+
- `enable-service-access` and `disable-service-access` commands now supports the `broker` option, thanks to a PR by [dominikmueller](https://github.com/dominikmueller)
13+
14+
### Packaged Dependencies
15+
16+
| Dependency | Version |
17+
| ---------- | :----------------------------------------------------------------: |
18+
| cf cli | [6.49.0](https://github.com/cloudfoundry/cli/releases/tag/v6.49.0) |
19+
| cf7 cli | [7.0.1](https://github.com/cloudfoundry/cli/releases/tag/v7.0.1) |
20+
| yq | [3.3.2](https://github.com/mikefarah/yq/releases/tag/3.3.2) |
21+
822
## 2.20.0 - 2020-07-09
923

1024
# Changed

‎itest/run-service-broker-tests‎

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,19 @@ it_can_disable_service_access() {
142142
local org=${1:?org null or not set}
143143
local space=${2:?space null or not set}
144144
local service=${3:?service null or not set}
145-
local plan=${4:-}
146-
local access_org=${5:-}
145+
local broker=${4:-}
146+
local plan=${5:-}
147+
local access_org=${6:-}
147148

148149
local params=$(jq -n \
149150
--arg service "$service" \
151+
--arg broker "$broker" \
150152
--arg plan "$plan" \
151153
--arg access_org "$access_org" \
152154
'{
153155
command: "disable-service-access",
154156
service: $service,
157+
broker: $broker,
155158
plan: $plan,
156159
access_org: $access_org
157160
}')
@@ -212,43 +215,72 @@ space=$(generate_test_name_with_spaces "Space")
212215

213216
setup_integration_tests "$org" "$space"
214217

215-
describe "it_can_push_and_create_a_service_broker_that_is_space_scoped"
218+
describe "it can create a space scoped service broker"
216219
{
217220
service_broker=$(generate_test_name_with_spaces "Space Scoped Broker")
218221
service_broker_url="https://$(app_to_hostname "$service_broker").$CCR_CF_APPS_DOMAIN"
219222

220223
run it_can_push_the_service_broker_app \"$org\" \"$space\" \"$service_broker\"
221-
222224
run it_can_create_a_service_broker_space_scoped \"$org\" \"$space\" \"$service_broker\" \"$service_broker_url\"
223225

224226
run it_can_delete_a_service_broker \"$org\" \"$space\" \"$service_broker\"
225227
run it_can_delete_an_app \"$org\" \"$space\" \"$service_broker\"
226228
}
227229

228-
describe "it_can_push_and_create_and_enable_and_disable_a_service_broker"
230+
describe "it can create a service broker and enable and disable service access"
229231
{
230232
service_broker=$(generate_test_name_with_spaces "Broker")
231233
service_broker_url="https://$(app_to_hostname "$service_broker").$CCR_CF_APPS_DOMAIN"
232-
service=overview-service
233234

234235
run it_can_push_the_service_broker_app \"$org\" \"$space\" \"$service_broker\"
235236
run it_can_create_a_service_broker \"$org\" \"$space\" \"$service_broker\" \"$service_broker_url\"
236237

237-
run it_can_enable_service_access_using_deprecated_service_broker_param \"$org\" \"$space\" \"$service\"
238-
run it_can_disable_service_access_using_deprecated_service_broker_param \"$org\" \"$space\" \"$service\"
239-
238+
service=overview-service
240239
broker=""
241240
plan=""
242-
run it_can_enable_service_access \"$org\" \"$space\" \"$service\" \"$broker\" \"$plan\" \"$org\"
243-
run it_can_disable_service_access \"$org\" \"$space\" \"$service\" \"$plan\" \"$org\"
241+
access_org=$org
242+
243+
run it_can_enable_service_access \"$org\" \"$space\" \"$service\" \"$broker\" \"$plan\" \"$access_org\"
244+
run it_can_disable_service_access \"$org\" \"$space\" \"$service\" \"$broker\" \"$plan\" \"$access_org\"
244245

245-
broker=""
246246
plan="small"
247-
run it_can_enable_service_access \"$org\" \"$space\" \"$service\" \"$broker\" \"$plan\" \"$org\"
248-
run it_can_disable_service_access \"$org\" \"$space\" \"$service\" \"$plan\" \"$org\"
247+
run it_can_enable_service_access \"$org\" \"$space\" \"$service\" \"$broker\" \"$plan\" \"$access_org\"
248+
run it_can_disable_service_access \"$org\" \"$space\" \"$service\" \"$broker\" \"$plan\" \"$access_org\"
249+
250+
run it_can_enable_service_access_using_deprecated_service_broker_param \"$org\" \"$space\" \"$service\"
251+
run it_can_disable_service_access_using_deprecated_service_broker_param \"$org\" \"$space\" \"$service\"
249252

250253
run it_can_delete_a_service_broker \"$org\" \"$space\" \"$service_broker\"
251254
run it_can_delete_an_app \"$org\" \"$space\" \"$service_broker\"
252255
}
253256

257+
describe "it can enable and disable service access from a particular service broker"
258+
{
259+
service_broker_1=$(generate_test_name_with_spaces "Broker 1")
260+
service_broker_1_url="https://$(app_to_hostname "$service_broker_1").$CCR_CF_APPS_DOMAIN"
261+
262+
run it_can_push_the_service_broker_app \"$org\" \"$space\" \"$service_broker_1\"
263+
run it_can_create_a_service_broker \"$org\" \"$space\" \"$service_broker_1\" \"$service_broker_1_url\"
264+
265+
service_broker_2=$(generate_test_name_with_spaces "Broker 2")
266+
service_broker_2_url="https://$(app_to_hostname "$service_broker_2").$CCR_CF_APPS_DOMAIN"
267+
268+
run it_can_push_the_service_broker_app \"$org\" \"$space\" \"$service_broker_2\"
269+
run it_can_create_a_service_broker \"$org\" \"$space\" \"$service_broker_2\" \"$service_broker_2_url\"
270+
271+
service=overview-service
272+
broker=$service_broker_1
273+
plan=""
274+
access_org=$org
275+
276+
run it_can_enable_service_access \"$org\" \"$space\" \"$service\" \"$broker\" \"$plan\" \"$access_org\"
277+
run it_can_disable_service_access \"$org\" \"$space\" \"$service\" \"$broker\" \"$plan\" \"$access_org\"
278+
279+
run it_can_delete_a_service_broker \"$org\" \"$space\" \"$service_broker_2\"
280+
run it_can_delete_an_app \"$org\" \"$space\" \"$service_broker_2\"
281+
282+
run it_can_delete_a_service_broker \"$org\" \"$space\" \"$service_broker_1\"
283+
run it_can_delete_an_app \"$org\" \"$space\" \"$service_broker_1\"
284+
}
285+
254286
teardown_integration_tests "$org" "$space"

‎resource/commands/disable-service-access.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
service_broker=$(get_option '.service_broker')
33
service=$(get_option '.service')
4+
broker=$(get_option '.broker')
45
plan=$(get_option '.plan')
56
access_org=$(get_option '.access_org')
67

@@ -9,4 +10,9 @@ logger::info "Executing $(logger::highlight "$command"): $service_broker"
910
# backwards compatibility for deprecated 'service_broker' param (https://github.com/nulldriver/cf-cli-resource/issues/21)
1011
service=${service:-$service_broker}
1112

12-
cf::disable_service_access "$service" "$plan" "$access_org"
13+
args=("$service")
14+
[ -n "$broker" ] && args+=(-b "$broker")
15+
[ -n "$plan" ] && args+=(-p "$plan")
16+
[ -n "$access_org" ] && args+=(-o "$access_org")
17+
18+
cf::cf disable-service-access "${args[@]}"

‎resource/commands/enable-service-access.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,9 @@ logger::info "Executing $(logger::highlight "$command"): $service"
1010
# backwards compatibility for deprecated 'service_broker' param (https://github.com/nulldriver/cf-cli-resource/issues/21)
1111
service=${service:-$service_broker}
1212

13-
cf::enable_service_access "$service" "$broker" "$plan" "$access_org"
13+
args=("$service")
14+
[ -n "$broker" ] && args+=(-b "$broker")
15+
[ -n "$plan" ] && args+=(-p "$plan")
16+
[ -n "$access_org" ] && args+=(-o "$access_org")
17+
18+
cf::cf enable-service-access "${args[@]}"

‎resource/lib/cf-functions.sh‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -615,32 +615,6 @@ function cf::create_service_broker() {
615615
fi
616616
}
617617

618-
function cf::enable_service_access() {
619-
local service=${1:?service null or not set}
620-
local broker=${2:-}
621-
local plan=${3:-}
622-
local access_org=${4:-}
623-
624-
local args=("$service")
625-
[ -n "$broker" ] && args+=(-b "$broker")
626-
[ -n "$plan" ] && args+=(-p "$plan")
627-
[ -n "$access_org" ] && args+=(-o "$access_org")
628-
629-
cf::cf enable-service-access "${args[@]}"
630-
}
631-
632-
function cf::disable_service_access() {
633-
local service=${1:?service null or not set}
634-
local plan=${2:-}
635-
local access_org=${3:-}
636-
637-
local args=("$service")
638-
[ -n "$plan" ] && args+=(-p "$plan")
639-
[ -n "$access_org" ] && args+=(-o "$access_org")
640-
641-
cf::cf disable-service-access "${args[@]}"
642-
}
643-
644618
function cf::delete_service_broker() {
645619
local service_broker=${1:?service_broker null or not set}
646620
cf::cf delete-service-broker "$service_broker" -f

0 commit comments

Comments
 (0)