-
Notifications
You must be signed in to change notification settings - Fork 10
feat: add edge urls #15
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.
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
Open
aisha331
wants to merge
5
commits into
main
Choose a base branch
from
aisha/add-edge-endpoints
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| #!/usr/bin/env bash | ||
| # resolve-url: Resolve the regional edge URL for a dataset | ||
| # | ||
| # Usage: resolve-url <deployment> <dataset> | ||
| # | ||
| # Two-step resolution: | ||
| # 1. GET /v1/datasets → find dataset's region (e.g. cloud.us-east-1.aws) | ||
| # 2. GET /api/internal/regions/axiom → map region to edge domain | ||
| # | ||
| # Both steps are cached to avoid repeated API calls. | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" | ||
|
|
||
| DEPLOYMENT="${1:-}" | ||
| DATASET="${2:-}" | ||
|
|
||
| if [[ -z "$DEPLOYMENT" || -z "$DATASET" ]]; then | ||
| echo "Usage: resolve-url <deployment> <dataset>" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| CACHE_DIR="${TMPDIR:-/tmp}/axiom-edge-cache" | ||
|
|
||
| # Check dataset edge URL cache (valid for 1 hour) | ||
| DATASET_CACHE="$CACHE_DIR/edge__${DEPLOYMENT}__${DATASET}" | ||
| if [[ -f "$DATASET_CACHE" ]]; then | ||
| if [[ "$(uname)" == "Darwin" ]]; then | ||
| AGE=$(( $(date +%s) - $(stat -f %m "$DATASET_CACHE") )) | ||
| else | ||
| AGE=$(( $(date +%s) - $(stat -c %Y "$DATASET_CACHE") )) | ||
| fi | ||
| if [[ $AGE -lt 3600 ]]; then | ||
| cat "$DATASET_CACHE" | ||
| exit 0 | ||
| fi | ||
| fi | ||
|
|
||
| eval "$("$SCRIPT_DIR/config" axiom "$DEPLOYMENT")" | ||
|
|
||
| # Step 1: get dataset region | ||
| REGION=$("$SCRIPT_DIR/curl-auth" axiom "$DEPLOYMENT" -X GET "${AXIOM_URL}/v1/datasets" \ | ||
| | jq -r --arg name "$DATASET" '.[] | select(.name == $name) | .edgeDeployment // .region // empty' 2>/dev/null) | ||
|
|
||
| if [[ -z "$REGION" || "$REGION" == "null" ]]; then | ||
| mkdir -p "$CACHE_DIR" | ||
| echo "$AXIOM_URL" > "$DATASET_CACHE" | ||
| echo "$AXIOM_URL" | ||
| exit 0 | ||
| fi | ||
|
aisha331 marked this conversation as resolved.
|
||
|
|
||
| # Step 2: look up edge domain from regions API (cached 24h per deployment) | ||
| REGIONS_CACHE="$CACHE_DIR/regions__${DEPLOYMENT}" | ||
| REGIONS_JSON="" | ||
| if [[ -f "$REGIONS_CACHE" ]]; then | ||
| if [[ "$(uname)" == "Darwin" ]]; then | ||
| AGE=$(( $(date +%s) - $(stat -f %m "$REGIONS_CACHE") )) | ||
| else | ||
| AGE=$(( $(date +%s) - $(stat -c %Y "$REGIONS_CACHE") )) | ||
| fi | ||
| if [[ $AGE -lt 86400 ]]; then | ||
| REGIONS_JSON=$(cat "$REGIONS_CACHE") | ||
| fi | ||
| fi | ||
|
|
||
| if [[ -z "$REGIONS_JSON" ]]; then | ||
| if [[ "$AXIOM_URL" == *"cloud.axiom.co"* ]]; then | ||
| APP_URL="https://app.axiom.co" | ||
| else | ||
| APP_URL="${AXIOM_URL/api./app.}" | ||
| fi | ||
|
aisha331 marked this conversation as resolved.
|
||
| REGIONS_JSON=$("$SCRIPT_DIR/curl-auth" axiom "$DEPLOYMENT" -X GET "${APP_URL}/api/internal/regions/axiom" 2>/dev/null) || true | ||
| if [[ -n "$REGIONS_JSON" ]]; then | ||
| mkdir -p "$CACHE_DIR" | ||
| echo "$REGIONS_JSON" > "$REGIONS_CACHE" | ||
| fi | ||
|
aisha331 marked this conversation as resolved.
|
||
| fi | ||
|
|
||
| EDGE_DOMAIN="" | ||
| if [[ -n "$REGIONS_JSON" ]]; then | ||
| EDGE_DOMAIN=$(echo "$REGIONS_JSON" | jq -r --arg region "$REGION" '.axiom[] | select(.id == $region) | .domain // empty' 2>/dev/null) | ||
| fi | ||
|
|
||
| if [[ -z "$EDGE_DOMAIN" ]]; then | ||
| mkdir -p "$CACHE_DIR" | ||
| echo "$AXIOM_URL" > "$DATASET_CACHE" | ||
| echo "$AXIOM_URL" | ||
| exit 0 | ||
| fi | ||
|
|
||
| # Cache the resolved edge URL | ||
| mkdir -p "$CACHE_DIR" | ||
| if [[ "$EDGE_DOMAIN" != https://* ]]; then | ||
| EDGE_DOMAIN="https://${EDGE_DOMAIN}" | ||
| fi | ||
| echo "$EDGE_DOMAIN" > "$DATASET_CACHE" | ||
|
|
||
| echo "$EDGE_DOMAIN" | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you explain what's going on here? Why do we need to auto-resolve anything? Why don't we use the configured axiom url directly?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because core APIs for ingest and query will be deprecated as part of multiregion, we're moving to route those directly to the edge endpoint. This also correctly handles multi region ds, since queries go to the right regional edge