Skip to content

AB#459 New proxy endpoint for frends api #284

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
hjvuor merged 3 commits into from
Mar 9, 2026
Merged

AB#459 New proxy endpoint for frends api #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a86785
new proxy endpoint for frends api
hjvuor Mar 9, 2026
868be14
fix tests
hjvuor Mar 9, 2026
7a26c5d
remove escaped quotes
hjvuor Mar 9, 2026
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
13 changes: 13 additions & 0 deletions external.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,19 @@ location /out/raumaadmin.mattersoft.fi/ {
proxy_set_header Authorization RAUMA_STATIC_BASIC_AUTH;
}

#frendsapp test gtfs (zip + gtfs-rt)
location /out/waltti-cloudtest-agent.frendsapp.com/ {
proxy_pass https://waltti-cloudtest-agent.frendsapp.com/;
include allowed-ips.conf;
proxy_cache ext_cache;
proxy_cache_valid 200 30s;
proxy_cache_lock on;
add_header X-Proxy-Cache $upstream_cache_status;
proxy_ignore_headers X-Accel-Expires Expires Cache-Control Set-Cookie;
proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;
proxy_set_header X-Api-Key FRENDS_API_KEY;
}

#donkey citybike api (for example https://stables.donkey.bike/api/public/gbfs/2/donkey_lappeenranta/gbfs.json)
location /out/stables.donkey.bike/ {
proxy_pass https://stables.donkey.bike/;
Expand Down
1 change: 1 addition & 0 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ sed -i "s/NYSSE_BASIC_AUTH/${NYSSE_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s/WALTTI_TEST_STATIC_BASIC_AUTH/${WALTTI_TEST_STATIC_BASIC_AUTH}/" /etc/nginx/external.conf
sed -i "s#CDN_BASE_URL#${CDN_BASE_URL}#" /etc/nginx/common.conf
sed -i "s/MOBILITY_API_KEY/${MOBILITY_API_KEY}/" /etc/nginx/external.conf
sed -i "s/FRENDS_API_KEY/${FRENDS_API_KEY}/" /etc/nginx/external.conf

#set basic auth
htpasswd -c -B -b .htpasswd $DEBUG_UI_CREDENTIALS_USER $DEBUG_UI_CREDENTIALS_PASS &>/dev/null
Expand Down
2 changes: 1 addition & 1 deletion test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CONTAINER_ID=$(docker run -d -p 9000:8080 $ADDHOSTS -e VILKKU_BASIC_AUTH="\"test
-e PORI_RT_BASIC_AUTH="\"test\"" -e MH_BASIC_AUTH="\"test\"" -e RAASEPORI_RT_BASIC_AUTH="\"test\"" \
-e WALTTI_TEST_CREDENTIALS_USER="walttitest" -e WALTTI_TEST_CREDENTIALS_PASS="walttitest" -e WALTTI_TEST_STATIC_BASIC_AUTH="\"test\"" \
-e DEBUG_UI_CREDENTIALS_USER="test" -e DEBUG_UI_CREDENTIALS_PASS="test" \
-e MOBILITY_API_KEY="\"test\"" -e CDN_BASE_URL="test" \
-e MOBILITY_API_KEY="\"test\"" -e CDN_BASE_URL="test" -e FRENDS_API_KEY="test" \
hsldevcom/digitransit-proxy:integrationtest)

curl -v http://127.0.0.1:9000
Expand Down