Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use cf create|update-service-broker to register the service #972

Merged
merged 2 commits into from
Jun 24, 2024
Merged

Use cf create|update-service-broker to register the service #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58a8243
Use cf create|update-service-broker to register the service
davewalter Jun 12, 2024
f87361a
Remove support for CF CLI v6 and v7 packages
davewalter Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions jobs/nfsbroker-bbr-lock/templates/post-restore-unlock.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
set -euo pipefail
set -x

PATH="/var/vcap/packages/cf-cli-6-linux/bin:${PATH}"
PATH="/var/vcap/packages/cf-cli-7-linux/bin:${PATH}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davewalter It looks cf-cli-7 is still supported. Our CI is failing because that's what it was using. Can we only remove cf-cli-6 and keep the other two for now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've restored the cf-cli-7-linux package addition to the PATH so it should be able to run now.

PATH="/var/vcap/packages/cf-cli-8-linux/bin:${PATH}"

API_ENDPOINT=https://api.<%= link('nfsbrokerpush').p('nfsbrokerpush.domain') %>
Expand Down
27 changes: 7 additions & 20 deletions jobs/nfsbrokerpush/templates/deploy.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
#!/bin/bash -eu

export PATH="/var/vcap/packages/cf-cli-8-linux/bin:${PATH}"
export PATH="/var/vcap/packages/cf-cli-7-linux/bin:${PATH}"
export PATH="/var/vcap/packages/cf-cli-6-linux/bin:${PATH}"

export CF_HOME=/var/vcap/data/nfsbrokerpush_$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 6 | head -n 1)/
export CF_DIAL_TIMEOUT=<%= p('nfsbrokerpush.cf.dial_timeout') %>

export CF_BROKER_USERNAME="<%= p('nfsbrokerpush.username') %>"
export CF_BROKER_PASSWORD="<%= p('nfsbrokerpush.password') %>"

API_ENDPOINT=https://api.<%= p('nfsbrokerpush.domain') %>
APP_NAME=<%= p('nfsbrokerpush.app_name') %>
APP_URL=https://<%= p('nfsbrokerpush.app_name') %>.<%= p('nfsbrokerpush.domain') %>
CREDHUB_CA_CERT="<%= link('credhub').p('credhub.ca_certificate') %>"
CREDHUB_SERVER="<%= link('credhub').p('credhub.internal_url')+":"+link('credhub').p('credhub.port').to_s %>"
MANIFEST=/var/vcap/jobs/nfsbrokerpush/manifest.yml
ORG=<%= p('nfsbrokerpush.organization') %>
PASSWORD="<%= p('nfsbrokerpush.password') %>"
PROCFILE=/var/vcap/jobs/nfsbrokerpush/Procfile
SERVICES_CONFIG=/var/vcap/jobs/nfsbrokerpush/config/services.json
SERVICE_BROKER_NAME=<%= p('nfsbrokerpush.broker_name') %>
SPACE=<%= p('nfsbrokerpush.space') %>
STARTUP_SCRIPT=/var/vcap/jobs/nfsbrokerpush/start.sh
STORE_ID="<%= p('nfsbrokerpush.store_id') %>"
SYSLOG_URL="<%= p('nfsbrokerpush.syslog_url') %>"
USERNAME="<%= p('nfsbrokerpush.username') %>"

if [[ -n "${CREDHUB_CA_CERT}" ]]; then
if ! [[ "${CREDHUB_SERVER}" =~ ^https?:// ]]; then
Expand Down Expand Up @@ -131,23 +131,10 @@ function push_app() {
fi
popd > /dev/null
}

function register_service() {
# We want to avoid providing creds as commandline params to binaries to avoid leaking creds via autitd logs. The below `cf curl` replaces the (create|update)-service-broker commands.
# cf create-service-broker $SERVICE_BROKER_NAME $USERNAME $PASSWORD $APP_URL || cf update-service-broker $SERVICE_BROKER_NAME $USERNAME $PASSWORD $APP_URL
if ! cf curl "/v2/service_brokers?q=name:$SERVICE_BROKER_NAME" | grep $SERVICE_BROKER_NAME; then
echo "Creating service broker - name:${SERVICE_BROKER_NAME} host:${APP_URL}"
echo "{\"auth_username\":\"${USERNAME}\",\"auth_password\":\"${PASSWORD}\",\"broker_url\":\"${APP_URL}\", \"name\": \"${SERVICE_BROKER_NAME}\"}" > ./data
cf curl --fail \
-X POST "/v2/service_brokers" \
-d @./data
rm data
else
echo "Updating service broker - name:${SERVICE_BROKER_NAME} host:${APP_URL}"
broker_guid="$(cf curl /v2/service_brokers?q=name:$SERVICE_BROKER_NAME | grep \"guid\" | cut -f4 -d\")"
cf curl --fail \
-X PUT "/v2/service_brokers/${broker_guid}" \
-d @<(echo "{\"auth_username\":\"${USERNAME}\",\"auth_password\":\"${PASSWORD}\",\"broker_url\":\"${APP_URL}\"}") > /dev/null
fi
# We want to avoid providing creds as commandline params to binaries to avoid leaking creds via auditd logs. Set the CF_BROKER_PASSWORD instead.
cf create-service-broker $SERVICE_BROKER_NAME $CF_BROKER_USERNAME $APP_URL || cf update-service-broker $SERVICE_BROKER_NAME $CF_BROKER_USERNAME $APP_URL
}

function clean_up() {
Expand Down