Skip to content

feat: adding agents-backend to nginx config, keep BWC for moved endpoints #150

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
alagishev merged 1 commit into from
Sep 4, 2025
Merged

feat: adding agents-backend to nginx config, keep BWC for moved endpoints #150

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
3 changes: 2 additions & 1 deletion nginx/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ adjust_addr() {

adjust_addr APIHUB_NC_SERVICE_ADDRESS
adjust_addr API_LINTER_SERVICE_ADDRESS
adjust_addr APIHUB_AGENTS_BACKEND_ADDRESS

# No need to modify APIHUB_BACKEND_ADDRESS as its resolution is static

envsubst '${APIHUB_BACKEND_ADDRESS} ${APIHUB_NC_SERVICE_ADDRESS} ${API_LINTER_SERVICE_ADDRESS} ${DNS_RESOLVERS}' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
envsubst '${APIHUB_BACKEND_ADDRESS} ${APIHUB_NC_SERVICE_ADDRESS} ${API_LINTER_SERVICE_ADDRESS} ${APIHUB_AGENTS_BACKEND_ADDRESS} ${DNS_RESOLVERS}' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
nginx -g "daemon off;"
87 changes: 87 additions & 0 deletions nginx/nginx.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,79 @@ http {
return 400;
}

# ----- Temporarty section for backward compatiblity to handle the following endpoint move to agents-backend:
# - Moved from BE
# /api/v2/agents
# /api/v2/agents
# /api/v2/agents/{agentId}/namespaces
# /api/v2/agents/{agentId}/namespaces/{name}/serviceNames
# /api/v2/agents/{id}
# - Moved from NC service
# /apihub-nc/api/v1/agents/{agentId}/namespaces
# /apihub-nc/api/v2/agents/{agentId}/namespaces/{name}/workspaces/{workspaceId}/discover
# /apihub-nc/api/v2/agents/{agentId}/namespaces/{name}/workspaces/{workspaceId}/services
# /apihub-nc/api/v2/agents/{agentId}/namespaces/{name}/workspaces/{workspaceId}/snapshots
# /apihub-nc/api/v2/agents/{agentId}/namespaces/{name}/workspaces/{workspaceId}/snapshots
# /apihub-nc/api/v2/agents/{agentId}/namespaces/{name}/workspaces/{workspaceId}/snapshots/{version}
# /apihub-nc/api/v2/agents/{agentId}/namespaces/{name}/workspaces/{workspaceId}/services/{serviceId}/specs/{fileId}
# /apihub-nc/api/v2/security/authCheck
# /apihub-nc/api/v3/security/authCheck
# /apihub-nc/api/v2/security/authCheck/{processId}/status
# /apihub-nc/api/v2/security/authCheck/{processId}/report
# /apihub-nc/agents/{agentId}/namespaces/{namespace}/services/{serviceId}/proxy/
# ----- Can be removed after UI adaptation

location ^~ /api/v2/agents {
set $agents_backend_upstream http://${APIHUB_AGENTS_BACKEND_ADDRESS};
add_header Cache-Control "no-store" always;
proxy_pass $agents_backend_upstream;
proxy_connect_timeout 1s;
proxy_next_upstream off;
proxy_intercept_errors off;
}

location ^~ /apihub-nc/api/v1/agents {
set $agents_backend_upstream http://${APIHUB_AGENTS_BACKEND_ADDRESS};
add_header Cache-Control "no-store" always;
rewrite ^/apihub-nc/(.*)$ /$1 break;
proxy_pass $agents_backend_upstream;
proxy_connect_timeout 1s;
proxy_next_upstream off;
proxy_intercept_errors off;
}

location ^~ /apihub-nc/api/v2/agents {
set $agents_backend_upstream http://${APIHUB_AGENTS_BACKEND_ADDRESS};
add_header Cache-Control "no-store" always;
rewrite ^/apihub-nc/(.*)$ /$1 break;
proxy_pass $agents_backend_upstream;
proxy_connect_timeout 1s;
proxy_next_upstream off;
proxy_intercept_errors off;
}

location ^~ /apihub-nc/api/v2/security/authCheck {
set $agents_backend_upstream http://${APIHUB_AGENTS_BACKEND_ADDRESS};
add_header Cache-Control "no-store" always;
rewrite ^/apihub-nc/(.*)$ /$1 break;
proxy_pass $agents_backend_upstream;
proxy_connect_timeout 1s;
proxy_next_upstream off;
proxy_intercept_errors off;
}

location ^~ /apihub-nc/agents/ {
set $agents_backend_upstream http://${APIHUB_AGENTS_BACKEND_ADDRESS};
add_header Cache-Control "no-store" always;
rewrite ^/apihub-nc/(.*)$ /$1 break;
proxy_pass $agents_backend_upstream;
proxy_connect_timeout 1s;
proxy_next_upstream off;
proxy_intercept_errors off;
}
# ----- END of temporary section -----


# API endpoints proxifying to backend
location ~ ^/(?:api|ws|saml|login/gitlab|login/sso|debug|playground)(?:/.*)?$ {
add_header Cache-Control "no-store" always;
Expand Down Expand Up @@ -102,6 +175,20 @@ http {
proxy_intercept_errors off;
}

# Special section for agents-backend (rewrite required)
location ^~ /agents-backend {
set $agents_backend_upstream http://${APIHUB_AGENTS_BACKEND_ADDRESS};

add_header Cache-Control "no-store" always;
rewrite ^/agents-backend/(.*)$ /$1 break;

proxy_pass $agents_backend_upstream;

proxy_connect_timeout 1s;
proxy_next_upstream off;
proxy_intercept_errors off;
}

location ~ ^/(portal|agents)/version\.json$ {
root /usr/share/nginx/html;
add_header Cache-Control "no-store" always;
Expand Down
Loading