fixing router health check endpoint (#233)

Author: dariuszkuc

docker-compose.yaml

@@ -6,6 +6,7 @@ services:
       - ./supergraph.graphql:/dist/config/supergraph.graphql
     ports:
       - 4000:4000
+      - 8088:8088
     command: -c config/router.yaml -s config/supergraph.graphql
   inventory:
     image: apollo-federation-implementations/inventory

router.yaml

@@ -1,5 +1,17 @@
+cors:
+  # allow_credentials: true
+  allow_any_origin: true
+
+health-check:
+  listen: 0.0.0.0:8088
+  enabled: true
+
+homepage:
+  enabled: false
+
+sandbox:
+  enabled: true
+
 supergraph:
   listen: 0.0.0.0:4000
-
-cors:
-  allow_credentials: true
+  introspection: true

src/utils/client.ts

@@ -3,9 +3,8 @@ import fetch from "make-fetch-happen";
 export const ROUTER_URL = "http://localhost:4000/";
 const PING_QUERY = "query { __typename }";
 
-const routerHealthCheck =
-  "http://localhost:4000/.well-known/apollo/server-health";
-const productsUrl = "http://localhost:4001/";
+const ROUTER_HEALTH_URL = "http://localhost:8088/health";
+const PRODUCTS_URL = "http://localhost:4001/";
 
 export async function graphqlRequest(
   url: string,
@@ -40,7 +39,7 @@ export function productsRequest(
   },
   headers?: { [key: string]: any }
 ) {
-  return graphqlRequest(productsUrl, req, headers);
+  return graphqlRequest(PRODUCTS_URL, req, headers);
 }
 
 export function routerRequest(
@@ -55,7 +54,8 @@ export function routerRequest(
 }
 
 export async function ping(): Promise<boolean> {
-  const routerPing = await fetch(routerHealthCheck, { retry: 10 });
+  console.log("router health check", ROUTER_HEALTH_URL)
+  const routerPing = await fetch(ROUTER_HEALTH_URL, { retry: { retries: 10, maxTimeout: 1000 } });
 
   if (!routerPing.ok) {
     console.log("router failed to start");
@@ -65,8 +65,9 @@ export async function ping(): Promise<boolean> {
   let attempts = 100;
   let lastError = null;
   while (attempts--) {
+    console.log("products health check", ROUTER_HEALTH_URL)
     try {
-      const implementationPing = await graphqlRequest(productsUrl, {
+      const implementationPing = await graphqlRequest(PRODUCTS_URL, {
         query: PING_QUERY,
       });
 

supergraph.graphql

@@ -80,7 +80,7 @@ type Product
   package: String @join__field(graph: PRODUCTS)
   variation: ProductVariation @join__field(graph: PRODUCTS)
   createdBy: User @join__field(graph: PRODUCTS, provides: "totalProductsCreated")
-  notes: String @tag(name: "internal") @join__field(graph: PRODUCTS)
+  notes: String @join__field(graph: PRODUCTS) @tag(name: "internal")
   research: [ProductResearch!]! @join__field(graph: PRODUCTS)
 }
 
@@ -112,7 +112,7 @@ type Query
   @join__type(graph: USERS)
 {
   product(id: ID!): Product @join__field(graph: PRODUCTS)
-  deprecatedProduct(sku: String!, package: String!): DeprecatedProduct @deprecated(reason: "Use product query instead") @join__field(graph: PRODUCTS)
+  deprecatedProduct(sku: String!, package: String!): DeprecatedProduct @join__field(graph: PRODUCTS) @deprecated(reason: "Use product query instead")
 }
 
 type User