Skip to content

Preserve explicit cfctl token lane #9

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
May 12, 2026
Merged

Preserve explicit cfctl token lane #9

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
10 changes: 10 additions & 0 deletions scripts/lib/cloudflare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,12 @@ cf_load_cloudflare_env() {
cf_load_cloudflare_env_files() {
local shared_env_file="${CF_SHARED_ENV_FILE:-${CF_SHARED_ENV_FILE_DEFAULT}}"
local repo_env_file="${CF_REPO_ENV_FILE:-${CF_REPO_ENV_FILE_DEFAULT}}"
local explicit_token_lane_is_set=0
local explicit_token_lane="${CF_TOKEN_LANE:-}"

if [[ "${CF_TOKEN_LANE+x}" == "x" ]]; then
explicit_token_lane_is_set=1
fi

if [[ -f "${shared_env_file}" ]]; then
set -a
Expand All @@ -870,6 +876,10 @@ cf_load_cloudflare_env_files() {
source "${repo_env_file}"
set +a
fi

if [[ "${explicit_token_lane_is_set}" == "1" ]]; then
export CF_TOKEN_LANE="${explicit_token_lane}"
fi
}

cf_require_var() {
Expand Down
27 changes: 27 additions & 0 deletions scripts/verify_static_contract.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,33 @@ jq -e '
and .result.resource.resource.cloudflare_surface == "dns.record"
and .result.resource.authority.control_plane == "cfctl"
' <<< "${ownership_get_json}" >/dev/null || die "ownership get envelope assertion failed"

lane_precedence_dir="$(mktemp -d "${TMPDIR:-/tmp}/cfctl-lane-precedence.XXXXXX")"
trap 'rm -rf "${lane_precedence_dir}"' EXIT
lane_precedence_shared_env="${lane_precedence_dir}/shared.env"
lane_precedence_repo_env="${lane_precedence_dir}/repo.env"
printf '%s\n' \
'CF_DEV_TOKEN=dev-token' \
'CF_GLOBAL_TOKEN=global-token' \
'CLOUDFLARE_EMAIL=operator@example.com' \
'CF_TOKEN_LANE=dev' \
> "${lane_precedence_shared_env}"
printf '%s\n' \
'CLOUDFLARE_ACCOUNT_ID=account-id' \
> "${lane_precedence_repo_env}"
lane_precedence_json="$(
env \
CF_TOKEN_LANE=global \
CF_SHARED_ENV_FILE="${lane_precedence_shared_env}" \
CF_REPO_ENV_FILE="${lane_precedence_repo_env}" \
bash -c 'source "$1"; cf_load_cloudflare_env; cf_current_auth_state_json' bash "${ROOT_DIR}/scripts/lib/cloudflare.sh"
)"
jq -e '
.CF_TOKEN_LANE == "global"
and .CF_ACTIVE_TOKEN_ENV == "CF_GLOBAL_TOKEN"
and .CF_ACTIVE_AUTH_SCHEME == "global_api_key"
' <<< "${lane_precedence_json}" >/dev/null || die "explicit CF_TOKEN_LANE was not preserved over env files"

assert_cross_catalog_empty "surface docs topics resolve to docs bank" '
(
["foundation", "watch"]
Expand Down
Loading