refactor: move extra routes to routes mod

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

crates/service/src/service/health.rs renamed to crates/service/src/routes/health.rs

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use axum::{
-    extract::Path,
+    extract::{Path, State},
     response::{IntoResponse, Response as AxumResponse},
-    Extension, Json,
+    Json,
 };
 use graphql_client::GraphQLQuery;
 use indexer_config::GraphNodeConfig;
@@ -43,7 +43,7 @@ impl IntoResponse for CheckHealthError {
 
 pub async fn health(
     Path(deployment_id): Path<String>,
-    Extension(graph_node): Extension<GraphNodeConfig>,
+    State(graph_node): State<GraphNodeConfig>,
 ) -> Result<impl IntoResponse, CheckHealthError> {
     let req_body = HealthQuery::build_query(health_query::Variables {
         ids: vec![deployment_id],

crates/service/src/routes/mod.rs

@@ -3,6 +3,12 @@
 
 pub mod cost;
 pub mod dips;
+mod health;
+mod request_handler;
+mod static_subgraph;
 mod status;
 
+pub use health::health;
+pub use request_handler::request_handler;
+pub use static_subgraph::static_subgraph_request_handler;
 pub use status::status;

crates/service/src/service/request_handler.rs renamed to crates/service/src/routes/request_handler.rs

@@ -18,10 +18,9 @@ use tap_core::receipt::Context;
 use thegraph_core::DeploymentId;
 use tracing::trace;
 
-use super::{
-    indexer_service::{AttestationOutput, IndexerServiceError, IndexerServiceState},
-    tap_receipt_header::TapReceipt,
-    IndexerServiceImpl, IndexerServiceResponse,
+use crate::service::{
+    AttestationOutput, IndexerServiceError, IndexerServiceImpl, IndexerServiceResponse,
+    IndexerServiceState, TapReceipt,
 };
 
 lazy_static! {

crates/service/src/routes/static_subgraph.rs

@@ -0,0 +1,73 @@
+// Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
+// SPDX-License-Identifier: Apache-2.0
+
+use axum::{body::Bytes, http::HeaderMap, response::IntoResponse, Extension, Json};
+use reqwest::StatusCode;
+use serde_json::json;
+use tracing::warn;
+
+use indexer_common::SubgraphClient;
+
+#[autometrics::autometrics]
+pub async fn static_subgraph_request_handler(
+    Extension(subgraph_client): Extension<&'static SubgraphClient>,
+    Extension(required_auth_token): Extension<Option<String>>,
+    headers: HeaderMap,
+    body: Bytes,
+) -> Result<impl IntoResponse, StaticSubgraphError> {
+    if let Some(required_auth_token) = required_auth_token {
+        let authorization = headers
+            .get("authorization")
+            .map(|value| value.to_str())
+            .transpose()
+            .map_err(|_| StaticSubgraphError::Unauthorized)?
+            .ok_or_else(|| StaticSubgraphError::Unauthorized)?
+            .trim_start_matches("Bearer ");
+
+        if authorization != required_auth_token {
+            return Err(StaticSubgraphError::Unauthorized);
+        }
+    }
+
+    let response = subgraph_client.query_raw(body).await?;
+
+    Ok((
+        response.status(),
+        response.headers().to_owned(),
+        response.text().await.inspect_err(|e| {
+            warn!("Failed to read response body: {}", e);
+        })?,
+    ))
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum StaticSubgraphError {
+    #[error("No valid receipt or free query auth token provided")]
+    Unauthorized,
+
+    #[error("Failed to query subgraph: {0}")]
+    FailedToQuery(#[from] anyhow::Error),
+
+    #[error("Failed to parse subgraph response: {0}")]
+    FailedToParse(#[from] reqwest::Error),
+}
+
+impl IntoResponse for StaticSubgraphError {
+    fn into_response(self) -> axum::response::Response {
+        let status = match self {
+            StaticSubgraphError::Unauthorized => StatusCode::UNAUTHORIZED,
+            StaticSubgraphError::FailedToQuery(_) | StaticSubgraphError::FailedToParse(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            }
+        };
+
+        tracing::error!(%self, "An IndexerServiceError occoured.");
+        (
+            status,
+            Json(json! {{
+                "message": self.to_string(),
+            }}),
+        )
+            .into_response()
+    }
+}

crates/service/src/service.rs

@@ -28,20 +28,20 @@ use crate::{
         dips::{AgreementStore, InMemoryAgreementStore},
     },
     routes::dips::Price,
-    service::indexer_service::{
-        AttestationOutput, IndexerService, IndexerServiceImpl, IndexerServiceOptions,
-        IndexerServiceRelease, IndexerServiceResponse,
-    },
+    service::indexer_service::{IndexerService, IndexerServiceOptions, IndexerServiceRelease},
 };
 use clap::Parser;
 use tracing::error;
 
-mod health;
 mod indexer_service;
-mod request_handler;
-mod static_subgraph;
 mod tap_receipt_header;
 
+pub use indexer_service::{
+    AttestationOutput, IndexerServiceError, IndexerServiceImpl, IndexerServiceResponse,
+    IndexerServiceState,
+};
+pub use tap_receipt_header::TapReceipt;
+
 #[derive(Debug)]
 struct SubgraphServiceResponse {
     inner: String,

crates/service/src/service/indexer_service.rs

@@ -39,8 +39,9 @@ use tower_governor::{governor::GovernorConfigBuilder, GovernorLayer};
 use tower_http::{cors, cors::CorsLayer, normalize_path::NormalizePath, trace::TraceLayer};
 use tracing::{error, info, info_span};
 
-use super::request_handler::request_handler;
-use super::{health::health, static_subgraph::static_subgraph_request_handler};
+use crate::routes::health;
+use crate::routes::request_handler;
+use crate::routes::static_subgraph_request_handler;
 use crate::tap::IndexerTapContext;
 use indexer_config::Config;
 
@@ -90,8 +91,6 @@ where
     InvalidFreeQueryAuthToken,
     #[error("Failed to sign attestation")]
     FailedToSignAttestation,
-    #[error("Failed to query subgraph: {0}")]
-    FailedToQueryStaticSubgraph(anyhow::Error),
 
     #[error("Could not decode signer: {0}")]
     CouldNotDecodeSigner(tap_core::Error),
@@ -123,8 +122,6 @@ where
             | CouldNotDecodeSigner(_)
             | EscrowAccount(_)
             | ProcessingError(_) => StatusCode::BAD_REQUEST,
-
-            FailedToQueryStaticSubgraph(_) => StatusCode::INTERNAL_SERVER_ERROR,
         };
         tracing::error!(%self, "An IndexerServiceError occoured.");
         (
@@ -399,16 +396,18 @@ impl IndexerService {
 
         // Check subgraph Health
         misc_routes = misc_routes
-            .route("/subgraph/health/:deployment_id", get(health))
-            .route_layer(Extension(options.config.graph_node.clone()))
+            .route(
+                "/subgraph/health/:deployment_id",
+                get(health).with_state(options.config.graph_node.clone()),
+            )
             .layer(misc_rate_limiter);
 
         if options.config.service.serve_network_subgraph {
             info!("Serving network subgraph at /network");
 
             misc_routes = misc_routes.route(
                 "/network",
-                post(static_subgraph_request_handler::<I>)
+                post(static_subgraph_request_handler)
                     .route_layer(Extension(network_subgraph))
                     .route_layer(Extension(options.config.service.serve_auth_token.clone()))
                     .route_layer(static_subgraph_rate_limiter.clone()),
@@ -419,7 +418,7 @@ impl IndexerService {
             info!("Serving escrow subgraph at /escrow");
 
             misc_routes = misc_routes
-                .route("/escrow", post(static_subgraph_request_handler::<I>))
+                .route("/escrow", post(static_subgraph_request_handler))
                 .route_layer(Extension(escrow_subgraph))
                 .route_layer(Extension(options.config.service.serve_auth_token.clone()))
                 .route_layer(static_subgraph_rate_limiter);