Update RW API integration lib to 5.1.1

resource-watch · Aug 8, 2023 · 8123990 · 8123990
1 parent 146af4a
commit 8123990
Show file tree

Hide file tree

Showing 8 changed files with 937 additions and 150 deletions.
diff --git a/app/src/app.js b/app/src/app.js
@@ -58,6 +58,7 @@ app.use(RWAPIMicroservice.bootstrap({
     requireAPIKey: process.env.REQUIRE_API_KEY || true,
     awsRegion: process.env.AWS_REGION,
     awsCloudWatchLogStreamName: config.get('service.name'),
+    awsCloudWatchLoggingEnabled: process.env.AWS_CLOUD_WATCH_LOGGING_ENABLED || true,
 }));
 
 loader.loadRoutes(app);

diff --git a/docker-compose-develop.yml b/docker-compose-develop.yml
@@ -12,6 +12,9 @@ services:
       GOOGLE_APPLICATION_CREDENTIALS: /opt/query/storage.json
       BUCKET_FREEZE: query-freeze
       FASTLY_ENABLED: "false"
+      AWS_REGION: "us-east-1"
+      AWS_ACCESS_KEY_ID: "test"
+      AWS_SECRET_ACCESS_KEY: "test"
 
     command: develop
     volumes:

diff --git a/k8s/dev/deployment.yaml b/k8s/dev/deployment.yaml
@@ -82,11 +82,11 @@ spec:
             secretKeyRef:
               key: AWS_REGION
               name: mssecrets
-        - name: AWS_API_KEY_USAGE_PLAN_ID
+        - name: REQUIRE_API_KEY
           valueFrom:
             secretKeyRef:
-              key: AWS_API_KEY_USAGE_PLAN_ID
-              name: mssecrets
+              key: REQUIRE_API_KEY
+              name: authorization
         image: vizzuality/query
         imagePullPolicy: Always
         livenessProbe:

diff --git a/k8s/production/deployment.yaml b/k8s/production/deployment.yaml
@@ -83,11 +83,11 @@ spec:
                 secretKeyRef:
                   key: AWS_REGION
                   name: mssecrets
-            - name: AWS_API_KEY_USAGE_PLAN_ID
+            - name: REQUIRE_API_KEY
               valueFrom:
                 secretKeyRef:
-                  key: AWS_API_KEY_USAGE_PLAN_ID
-                  name: mssecrets
+                  key: REQUIRE_API_KEY
+                  name: authorization
           image: vizzuality/query
           imagePullPolicy: Always
           livenessProbe:

diff --git a/k8s/staging/deployment.yaml b/k8s/staging/deployment.yaml
@@ -82,11 +82,11 @@ spec:
                 secretKeyRef:
                   key: AWS_REGION
                   name: mssecrets
-            - name: AWS_API_KEY_USAGE_PLAN_ID
+            - name: REQUIRE_API_KEY
               valueFrom:
                 secretKeyRef:
-                  key: AWS_API_KEY_USAGE_PLAN_ID
-                  name: mssecrets
+                  key: REQUIRE_API_KEY
+                  name: authorization
           image: vizzuality/query
           imagePullPolicy: Always
           livenessProbe:

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   "author": {
     "name": "Vizzuality",
     "email": "[email protected]",
-    "url": "http://vizzuality.com/"
+    "url": "https://vizzuality.com/"
   },
   "engines": {
     "node": "~20.4"
@@ -62,7 +62,7 @@
     "koa-simple-healthcheck": "^0.0.1",
     "request": "2.88.0",
     "request-promise": "4.2.2",
-    "rw-api-microservice-node": "5.0.0-rc.6",
+    "rw-api-microservice-node": "^5.1.1",
     "sql2json": "2.0.6"
   },
   "lint-staged": {

diff --git a/query.sh b/query.sh
@@ -1,12 +1,6 @@
 #!/bin/bash
 
 case "$1" in
-    test-e2e)
-        yarn run test-e2e
-        ;;
-    test-unit)
-        yarn run test-unit
-        ;;
     start)
         yarn start
         ;;