api interop layer deploy

api-interop-layer/data/db.js

@@ -2,16 +2,34 @@ import mariadb from "mariadb";
 
 import { sleep } from "../util/sleep.js";
 
-export const openDatabase = async () => {
-  const connectionDetails = {
+const getDatabaseConnection = () => {
+  if (process.env.API_INTEROP_PRODUCTION) {
+    // we are in a cloud.gov environment and must retrieve credentials from
+    // the VCAP_SERVICES environment variable
+    const vcap = JSON.parse(process.env.VCAP_SERVICES);
+    const db = vcap["aws-rds"][0];
+    return {
+      user: db.credentials.username,
+      password: db.credentials.password,
+      database: db.credentials.name,
+      host: db.credentials.host,
+      port: db.credentials.port,
+    };
+  }
+
+  // we are in a local environment: offer defaults for ease of use
+  return {
     user: process.env.DB_USERNAME ?? "drupal",
     password: process.env.DB_PASSWORD ?? "drupal",
     database: process.env.DB_NAME ?? "weathergov",
     host: process.env.DB_HOST ?? "database",
     port: process.env.DB_PORT ?? 3306,
     ssl: { rejectUnauthorized: false },
   };
+}
 
+export const openDatabase = async () => {
+  const connectionDetails = getDatabaseConnection();
   return mariadb.createConnection(connectionDetails);
 };
 

api-interop-layer/newrelic.cjs

@@ -9,7 +9,7 @@ exports.config = {
   /**
    * Array of application names.
    */
-  app_name: [`api-interop-${process.env.APP_NAME || 'local'}`],
+  app_name: [`api-interop-${process.env.API_INTEROP_NAME || 'local'}`],
   /**
    * Your New Relic license key.
    */

api-interop-layer/package.json

@@ -24,5 +24,9 @@
     "chai-as-promised": "^8.0.0",
     "mocha": "^10.7.3",
     "sinon": "^18.0.0"
+  },
+  "engines": {
+    "node": "18.20.4",
+    "npm": "10.7.0"
   }
 }

api-interop-layer/util/fetch.js

@@ -39,7 +39,12 @@ export const fetchAPIJson = async (path, { wait = sleep } = {}) =>
     .catch(() => wait(204).then(() => internalFetch(path)))
     .catch(() => wait(337).then(() => internalFetch(path)))
     .catch((e) => {
-      logger.error(e.cause);
+      if (e instanceof SyntaxError) {
+          // this can happen if the API or proxy returns HTML
+          logger.error(`error retrieving ${path}: endpoint returned invalid JSON: ${e}`);
+      } else {
+          logger.error(`error retrieving ${path}: ${e.cause}`);
+      }
       return { ...e.cause, error: true };
     });
 

docker-compose.test.yml

@@ -11,7 +11,7 @@ services:
       - api-interop-layer-test
     environment: # we want to extend, not override
       API_URL: http://api-proxy-test:9081
-      INTEROP_URL: http://api-interop-layer-test:9082
+      API_INTEROP_URL: http://api-interop-layer-test:9082
       DRUPAL_DB_HOST: database-test
     profiles: !override ["test"]
 

docker-compose.yml

@@ -37,7 +37,7 @@ services:
       DB_HOST: database
       DB_PORT: 3306
       API_URL: http://api-proxy:8081
-      APP_NAME: ${APP_NAME:-local}
+      API_INTEROP_NAME: ${API_INTEROP_NAME:-local}
       NEWRELIC_LICENSE: $NEWRELIC_LICENSE
     networks:
       - weather.gov
@@ -68,7 +68,7 @@ services:
       - api-interop-layer
     environment:
       API_URL: http://api-proxy:8081
-      INTEROP_URL: http://api-interop-layer:8082
+      API_INTEROP_URL: http://api-interop-layer:8082
       DRUPAL_DB_NAME: weathergov
       DRUPAL_DB_USERNAME: drupal
       DRUPAL_DB_PASSWORD: drupal

manifests/manifest-james.yaml

@@ -9,6 +9,7 @@ default_config: &defaults
   env:
     PHP_INI_SCAN_DIR: /home/vcap/app/php/etc/:/home/vcap/app/php/etc/php.ini.d/
     NEWRELIC_LICENSE: ((newrelic-license))
+    API_INTEROP_URL: https://api-weathergov-james.app.cloud.gov
   services:
     - database
     - storage
@@ -34,3 +35,19 @@ applications:
       ALLOWED_IPS: ((allowed-ips))
       SPACE_NAME: james
     random-route: false
+
+  - name: api-weathergov-james
+    stack: cflinuxfs4
+    memory: 256M
+    instances: 1
+    buildpacks:
+      - nodejs_buildpack
+    env:
+      NEWRELIC_LICENSE: ((newrelic-license))
+      API_INTEROP_PRODUCTION: true
+      API_INTEROP_NAME: james
+    health-check-type: process
+    path: ../api-interop-layer
+    random-route: false
+    services:
+      - database

manifests/manifest.template.yaml

@@ -9,6 +9,7 @@ default_config: &defaults
   env:
     PHP_INI_SCAN_DIR: /home/vcap/app/php/etc/:/home/vcap/app/php/etc/php.ini.d/
     NEWRELIC_LICENSE: ((newrelic-license))
+    API_INTEROP_URL: https://api-weathergov-ENVIRONMENT.app.cloud.gov
   services:
     - database
     - storage
@@ -34,3 +35,26 @@ applications:
       ALLOWED_IPS: ((allowed-ips))
       SPACE_NAME: ENVIRONMENT
     random-route: false
+
+#  - name: cronish
+#    <<: *defaults
+#    no-route: true
+#    command: ./cronish.sh
+#    health-check-type: process
+#    memory: 128M
+
+  - name: api-weathergov-ENVIRONMENT
+    stack: cflinuxfs4
+    memory: 256M
+    instances: 1
+    buildpacks:
+      - nodejs_buildpack
+    env:
+      NEWRELIC_LICENSE: ((newrelic-license))
+      API_INTEROP_PRODUCTION: true
+      API_INTEROP_NAME: ENVIRONMENT
+    health-check-type: process
+    path: ../api-interop-layer
+    random-route: false
+    services:
+      - database

web/modules/weather_data/weather_data.module

@@ -12,13 +12,14 @@ function weather_data_template_preprocess_default_variables_alter(&$variables)
         $lon = $route->getParameter("lon");
         $weatherMetadata["point"] = ["lat" => $lat, "lon" => $lon];
 
-        $baseUrl = getEnv("INTEROP_URL");
+        // this is required since we no longer can interpret api.weather.gov lat/lon directly
+        // note: the url must have a scheme (https:// or http://) and no trailing slash
+        $baseUrl = getEnv("API_INTEROP_URL");
 
         $fetch = $container->get("http_client");
-
         try {
             $data = $fetch
-                ->get("http://api-interop-layer:8082/point/$lat/$lon")
+                ->get("$baseUrl/point/$lat/$lon")
                 ->getBody();
         } catch (Throwable $e) {
             $data = '{"error":true}';

web/sites/default/settings.cloudgov.php

@@ -102,6 +102,11 @@
             "https://weathergov-eric.app.cloud.gov";
         break;
 
+    case "james":
+        $config["samlauth.authentication"]["sp_entity_id"] =
+            "https://weathergov-james.app.cloud.gov";
+        break;
+
     case "staging":
         $config["samlauth.authentication"]["sp_entity_id"] =
             "https://weathergov-staging.app.cloud.gov";