github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #4046 from rvanlaar/lint-fixes

Browse Source 
Make `make test` pass on linting
This commit is contained in:
Jose Diaz-Gonzalez
2020-07-03 18:45:51 -04:00
committed by GitHub
parent 6e9f21b1d5 5f312d7347
commit dbd86ad7a2
8 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/nginx-vhosts/command-functions
View File

@@ -95,7 +95,6 @@ cmd-nginx-show-config() {
cat "$DOKKU_ROOT/$APP/nginx.conf" cat "$DOKKU_ROOT/$APP/nginx.conf"
} }
cmd-nginx-validate-config() { cmd-nginx-validate-config() {
declare desc="validates and optionally cleans up invalid nginx configurations" declare desc="validates and optionally cleans up invalid nginx configurations"
declare cmd="nginx:validate-config" declare cmd="nginx:validate-config"

2
plugins/nginx-vhosts/functions
View File

@@ -453,7 +453,7 @@ nginx_build_config() {
LISTENERS="$(plugn trigger network-get-listeners "$APP" "$PROC_TYPE" | xargs)" LISTENERS="$(plugn trigger network-get-listeners "$APP" "$PROC_TYPE" | xargs)"
UPP_PROC_TYPE="${PROC_TYPE^^}" UPP_PROC_TYPE="${PROC_TYPE^^}"
UPP_PROC_TYPE="${UPP_PROC_TYPE//-/_}" UPP_PROC_TYPE="${UPP_PROC_TYPE//-/_}"
SIGIL_PARAMS+=( "DOKKU_APP_${UPP_PROC_TYPE}_LISTENERS=$LISTENERS" ) SIGIL_PARAMS+=("DOKKU_APP_${UPP_PROC_TYPE}_LISTENERS=$LISTENERS")
done <"$DOKKU_SCALE_FILE" done <"$DOKKU_SCALE_FILE"
if grep DOKKU_APP_LISTENERS "$NGINX_TEMPLATE"; then if grep DOKKU_APP_LISTENERS "$NGINX_TEMPLATE"; then

6
plugins/ps/functions
View File

@@ -196,12 +196,12 @@ ps_scale() {
# shellcheck disable=SC2015 # shellcheck disable=SC2015
[[ ! -e $DOKKU_PROCFILE ]] && extract_procfile "$APP" "$IMAGE_TAG" >/dev/null 2>&1 || true [[ ! -e $DOKKU_PROCFILE ]] && extract_procfile "$APP" "$IMAGE_TAG" >/dev/null 2>&1 || true
if [[ ! -e $DOKKU_SCALE_FILE ]] ; then if [[ ! -e $DOKKU_SCALE_FILE ]]; then
generate_scale_file "$APP" "$IMAGE_TAG" >/dev/null 2>&1 generate_scale_file "$APP" "$IMAGE_TAG" >/dev/null 2>&1
elif [[ -e $DOKKU_PROCFILE ]] ; then elif [[ -e $DOKKU_PROCFILE ]]; then
for PROC_NAME in $(procfile-util list --procfile "$DOKKU_PROCFILE"); do for PROC_NAME in $(procfile-util list --procfile "$DOKKU_PROCFILE"); do
if ! grep -qE "^${PROC_NAME}=" "$DOKKU_SCALE_FILE"; then if ! grep -qE "^${PROC_NAME}=" "$DOKKU_SCALE_FILE"; then
echo "$PROC_NAME=0" >> "$DOKKU_SCALE_FILE" echo "$PROC_NAME=0" >>"$DOKKU_SCALE_FILE"
fi fi
done done
fi fi

6
tests/unit/test_helper.bash
View File

@@ -217,7 +217,7 @@ assert_nonssl_domain() {
assert_app_domain() { assert_app_domain() {
local domain=$1 local domain=$1
run /bin/bash -c "dokku domains:report $TEST_APP --domains-app-vhosts | tr \" \" \"\n\" | grep -xF ${domain}" run /bin/bash -c "dokku domains:report $TEST_APP --domains-app-vhosts | tr \" \" \"\n\" | grep -xF ${domain}"
echo "app domains: $(dokku domains:report $TEST_APP --domains-app-vhosts | tr \" \" \"\n\" )" echo "app domains: $(dokku domains:report $TEST_APP --domains-app-vhosts | tr \" \" \"\n\")"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_output "${domain}" assert_output "${domain}"
@@ -262,8 +262,8 @@ assert_urls() {
run /bin/bash -c "dokku urls $TEST_APP" run /bin/bash -c "dokku urls $TEST_APP"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
echo "urls:" "$(tr ' ' '\n' <<< "${urls}" | sort)" echo "urls:" "$(tr ' ' '\n' <<<"${urls}" | sort)"
assert_output < <(tr ' ' '\n' <<< "${urls}" | sort) assert_output < <(tr ' ' '\n' <<<"${urls}" | sort)
} }
deploy_app() { deploy_app() {