Skip to content

Resolve lifecycle specs from caller cwd #33

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

Merged
rogu3bear merged 1 commit into from
Jul 1, 2026
Merged

Resolve lifecycle specs from caller cwd #33

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
9 changes: 6 additions & 3 deletions scripts/cf_hostname_lifecycle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@ def default_spec_file() -> Path:
def resolve_spec_path(value: str | None) -> Path:
if value:
path = Path(value)
if not path.is_absolute():
path = ROOT / path
return path
if path.is_absolute():
return path
caller_path = Path.cwd() / path
if caller_path.exists():
return caller_path
return ROOT / path
return default_spec_file()


Expand Down
9 changes: 6 additions & 3 deletions scripts/cf_maildesk_cf_lifecycle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,12 @@ def default_spec_file() -> Path:
def resolve_spec_path(value: str | None) -> Path:
if value:
path = Path(value)
if not path.is_absolute():
path = ROOT / path
return path
if path.is_absolute():
return path
caller_path = Path.cwd() / path
if caller_path.exists():
return caller_path
return ROOT / path
return default_spec_file()


Expand Down
19 changes: 18 additions & 1 deletion scripts/verify_maildesk_cf_contract.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ require_source_line() {
fixture_file="$(mktemp "${TMPDIR:-/tmp}/maildesk-cf-fixture.XXXXXX")"
missing_fixture_file="$(mktemp "${TMPDIR:-/tmp}/maildesk-cf-missing-fixture.XXXXXX")"
unverified_sender_fixture_file="$(mktemp "${TMPDIR:-/tmp}/maildesk-cf-unverified-sender.XXXXXX")"
trap 'rm -f "${fixture_file}" "${missing_fixture_file}" "${unverified_sender_fixture_file}"' EXIT
caller_spec_dir="$(mktemp -d "${TMPDIR:-/tmp}/maildesk-cf-caller-spec.XXXXXX")"
trap 'rm -f "${fixture_file}" "${missing_fixture_file}" "${unverified_sender_fixture_file}"; rm -rf "${caller_spec_dir}"' EXIT

require_source_line "worker evidence lane" '"worker.script": run_cfctl(["list", "worker.script"], lane="global"),' "${ROOT_DIR}/scripts/cf_maildesk_cf_lifecycle.py"
require_source_line "d1 evidence lane" '"d1.database": run_cfctl(["list", "d1.database"], lane="global"),' "${ROOT_DIR}/scripts/cf_maildesk_cf_lifecycle.py"
Expand Down Expand Up @@ -211,6 +212,22 @@ jq -e '
and .summary.mail_ready == true
' <<< "${cfctl_output}" >/dev/null || die "cfctl provision --plan envelope did not match"

cp "${ROOT_DIR}/state/maildesk-cf/example.json" "${caller_spec_dir}/caller-relative.json"
caller_spec_physical_dir="$(cd -P "${caller_spec_dir}" && pwd)"
caller_relative_output="$(
cd "${caller_spec_dir}"
MAILDESK_CF_EVIDENCE_FILE="${fixture_file}" \
"${ROOT_DIR}/cfctl" maildesk-cf verify --file caller-relative.json
)"
jq -e \
--arg expected_spec "${caller_spec_physical_dir}/caller-relative.json" \
'
.ok == true
and .summary.spec_path == $expected_spec
and .summary.edge_ready == true
and .summary.mail_ready == true
' <<< "${caller_relative_output}" >/dev/null || die "caller-relative maildesk-cf spec path did not resolve"

standards_output="$("${ROOT_DIR}/cfctl" standards maildesk-cf)"
jq -e '
.ok == true
Expand Down
Loading