Skip to content

Configure DMC promotion apply for Homeboy #292

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

Closed
chubes4 wants to merge 1 commit into from
Closed

Configure DMC promotion apply for Homeboy #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 26 additions & 10 deletions lib/homeboy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ homeboy_dmc_wp_argv() {
argv=(${WP_CMD:-wp})
fi

printf '%s\n' "${argv[@]}"
if [ "${#argv[@]}" -gt 0 ]; then
printf '%s\n' "${argv[@]}"
fi
}

homeboy_dmc_wp_flags() {
Expand All @@ -86,17 +88,22 @@ homeboy_dmc_wp_flags() {
argv+=(--path="$SITE_PATH")
fi

# shellcheck disable=SC2206
local root_flags=(${WP_ROOT_FLAG:-})
argv+=("${root_flags[@]}")
if [ -n "${WP_ROOT_FLAG:-}" ]; then
# shellcheck disable=SC2206
local root_flags=(${WP_ROOT_FLAG})
argv+=("${root_flags[@]}")
fi

printf '%s\n' "${argv[@]}"
if [ "${#argv[@]}" -gt 0 ]; then
printf '%s\n' "${argv[@]}"
fi
}

homeboy_dmc_command_json() {
local action="$1"
local wp_argv=()
local wp_flags=()
local command=()
local value

while IFS= read -r value; do
Expand All @@ -109,23 +116,32 @@ homeboy_dmc_command_json() {

case "$action" in
resolve)
homeboy_json_array "${wp_argv[@]}" datamachine-code workspace worktree get '{handle}' --format=json "${wp_flags[@]}"
command=("${wp_argv[@]}" datamachine-code workspace worktree get '{handle}' --format=json)
;;
apply)
command=("${wp_argv[@]}" datamachine-code workspace promotion-apply '{handle}')
;;
list)
homeboy_json_array "${wp_argv[@]}" datamachine-code workspace worktree list --with-status --format=json "${wp_flags[@]}"
command=("${wp_argv[@]}" datamachine-code workspace worktree list --with-status --format=json)
;;
cleanup_preview)
homeboy_json_array "${wp_argv[@]}" datamachine-code workspace cleanup safe --dry-run --format=json "${wp_flags[@]}"
command=("${wp_argv[@]}" datamachine-code workspace cleanup safe --dry-run --format=json)
;;
cleanup_apply)
homeboy_json_array "${wp_argv[@]}" datamachine-code workspace cleanup safe --format=json "${wp_flags[@]}"
command=("${wp_argv[@]}" datamachine-code workspace cleanup safe --format=json)
;;
esac

if [ "${#wp_flags[@]}" -gt 0 ]; then
command+=("${wp_flags[@]}")
fi
homeboy_json_array "${command[@]}"
}

homeboy_dmc_worktree_provider_json() {
printf '{"enabled":true,"kind":"command","apply_enabled":true,"commands":{"resolve":%s,"list":%s,"cleanup_preview":%s,"cleanup_apply":%s},"list_result_mapping":{"items":"$","handle":"$.handle","path":"$.path","branch":"$.branch","dirty":"$.safety.dirty","unpushed":"$.safety.unpushed","primary":"$.safety.primary"}}' \
printf '{"enabled":true,"kind":"command","apply_enabled":true,"commands":{"resolve":%s,"apply":%s,"list":%s,"cleanup_preview":%s,"cleanup_apply":%s},"list_result_mapping":{"items":"$","handle":"$.handle","path":"$.path","branch":"$.branch","dirty":"$.safety.dirty","unpushed":"$.safety.unpushed","primary":"$.safety.primary"}}' \
"$(homeboy_dmc_command_json resolve)" \
"$(homeboy_dmc_command_json apply)" \
"$(homeboy_dmc_command_json list)" \
"$(homeboy_dmc_command_json cleanup_preview)" \
"$(homeboy_dmc_command_json cleanup_apply)"
Expand Down
27 changes: 23 additions & 4 deletions tests/homeboy-dmc-provider.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ assert_not_contains() {
fi
}

assert_provider_mapping() {
python3 - "$1" <<'PY'
assert_provider_contract() {
python3 - "$1" "$SITE_PATH" <<'PY'
import json
import sys

Expand All @@ -54,6 +54,19 @@ try:
provider = json.loads(payload)
except json.JSONDecodeError as error:
raise SystemExit(f"FAIL: provider config is not valid JSON: {error}: {payload!r}")
site_path = sys.argv[2]
prefix = ["studio", "wp", "datamachine-code", "workspace"]
expected_commands = {
"resolve": prefix + ["worktree", "get", "{handle}", "--format=json", f"--path={site_path}"],
"apply": prefix + ["promotion-apply", "{handle}", f"--path={site_path}"],
"list": prefix + ["worktree", "list", "--with-status", "--format=json", f"--path={site_path}"],
"cleanup_preview": prefix + ["cleanup", "safe", "--dry-run", "--format=json", f"--path={site_path}"],
"cleanup_apply": prefix + ["cleanup", "safe", "--format=json", f"--path={site_path}"],
}
if provider.get("enabled") is not True or provider.get("kind") != "command" or provider.get("apply_enabled") is not True:
raise SystemExit("FAIL: provider enablement fields changed")
if provider.get("commands") != expected_commands:
raise SystemExit(f"FAIL: provider commands changed: {provider.get('commands')!r}")
expected = {
"items": "$",
"handle": "$.handle",
Expand Down Expand Up @@ -101,11 +114,18 @@ export HOMEBOY_CONFIG_LOG STUDIO_LOG
# when the test runs under newer Bash so this path stays portable.
enable -n mapfile 2>/dev/null || true

NO_FLAG_COMMAND="$(SITE_PATH= WP_ROOT_FLAG= homeboy_dmc_command_json apply)"
if [ "$NO_FLAG_COMMAND" != '["studio","wp","datamachine-code","workspace","promotion-apply","{handle}"]' ]; then
echo "FAIL: empty optional WP flags changed the apply argv: $NO_FLAG_COMMAND"
exit 1
fi

DRY_RUN=true
configure_homeboy_dmc_worktree_provider > "$TMP/dry-run.log"

assert_contains "homeboy config set /worktree_providers/dmc '{\"enabled\":true,\"kind\":\"command\",\"apply_enabled\":true" "$TMP/dry-run.log"
assert_contains "\"resolve\":[\"studio\",\"wp\",\"datamachine-code\",\"workspace\",\"worktree\",\"get\",\"{handle}\",\"--format=json\",\"--path=$SITE_PATH\"]" "$TMP/dry-run.log"
assert_contains "\"apply\":[\"studio\",\"wp\",\"datamachine-code\",\"workspace\",\"promotion-apply\",\"{handle}\",\"--path=$SITE_PATH\"]" "$TMP/dry-run.log"
assert_contains "\"list\":[\"studio\",\"wp\",\"datamachine-code\",\"workspace\",\"worktree\",\"list\",\"--with-status\",\"--format=json\",\"--path=$SITE_PATH\"]" "$TMP/dry-run.log"
assert_contains "\"cleanup_preview\":[\"studio\",\"wp\",\"datamachine-code\",\"workspace\",\"cleanup\",\"safe\",\"--dry-run\",\"--format=json\",\"--path=$SITE_PATH\"]" "$TMP/dry-run.log"
assert_contains "\"cleanup_apply\":[\"studio\",\"wp\",\"datamachine-code\",\"workspace\",\"cleanup\",\"safe\",\"--format=json\",\"--path=$SITE_PATH\"]" "$TMP/dry-run.log"
Expand All @@ -120,8 +140,7 @@ configure_homeboy_dmc_worktree_provider > "$TMP/apply.log"

assert_contains "wp datamachine-code workspace worktree list --format=json --path=$SITE_PATH" "$STUDIO_LOG"
assert_contains "/worktree_providers/dmc|{\"enabled\":true,\"kind\":\"command\",\"apply_enabled\":true" "$HOMEBOY_CONFIG_LOG"
assert_provider_mapping "$HOMEBOY_CONFIG_LOG"
assert_contains "\"cleanup_apply\":[\"studio\",\"wp\",\"datamachine-code\",\"workspace\",\"cleanup\",\"safe\",\"--format=json\",\"--path=$SITE_PATH\"]" "$HOMEBOY_CONFIG_LOG"
assert_provider_contract "$HOMEBOY_CONFIG_LOG"

HOMEBOY_MODE="disabled"
HOMEBOY_CONFIG_LOG="$TMP/disabled-homeboy-config.log"
Expand Down
Loading