Skip to content

Commit 7f3e056

Browse files
author
Nathan Jones
committed
Merge branch 'entity-pipeline' into action-generators-config
* entity-pipeline: (30 commits) Tidy up get request action method. Small fixes Fixed user apce roles data source Merge changes Fix a few low hanging fruit, added some TODOs for me Added backward compatility to old action types Added fixme Fix e2e test Fix cf init script given changes in broker service (#3746) Update protractor to fix travis e2e tests (#3747) Two tweaks - Move entityCatalogue clear into testEntityCatalogue, optionally return test if in test env - Move EffectsFeatureTestModule & TEST_CATALOGUE_ENTITIES into own test file Removed some comments Fix cf-autoscaler unit tests Entity validation fixes Same Tweaks at space level - Show edit quota on space level quota details page - Ensure we return from edit stepper from org's space quota list, org level quota page and space level quota page - Apply permissions to edit quota Tweaks - Show edit quota on org level quota details page - Ensure we return from edit stepper from cf quota list, cf level quota page and org level quota page - Apply permissions to edit quota - Change org --> space in space level quota page - Fix validation for sub 0 values Small tweaks WIP Fix entity relations from parents test Build ...
2 parents 3304fb8 + 05e76f8 commit 7f3e056

File tree

197 files changed

+7714
-4736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+7714
-4736
lines changed

deploy/tools/populate-cf/create-services.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ CF_API_ENDPOINT=https://api.local.pcfdev.io
1313
# Skip login - run against whatever target the cf CLI is configured for
1414
SKIP_LOGIN=false
1515

16+
BROKER_CRED=broker
17+
1618
while getopts ":o:s:u:p:a:n" opt ; do
1719
case $opt in
1820
o)
@@ -46,6 +48,8 @@ function pushBrokerApp {
4648
cf set-env $APPNAME SERVICE_NAME $SERVICE
4749
cf set-env $APPNAME SERVICE_PLAN_NAME shared
4850
cf set-env $APPNAME TAGS simple,shared
51+
cf set-env $APPNAME AUTH_USER $BROKER_CRED
52+
cf set-env $APPNAME AUTH_PASSWORD $BROKER_CRED
4953
cf env $APPNAME
5054
cf start $APPNAME
5155
popd
@@ -62,7 +66,7 @@ function createService {
6266
cf target -o $ORG -s $SPACE
6367
SPACE_ARGS="--space-scoped"
6468
fi
65-
cf create-service-broker $SERVICE $USER_NAME $USER_PASS https://$SERVICE_URL $SPACE_ARGS
69+
cf create-service-broker $SERVICE $BROKER_CRED $BROKER_CRED https://$SERVICE_URL $SPACE_ARGS
6670
}
6771

6872
function makeServicePublic {

0 commit comments

Comments
 (0)