:gear: updating drone commands to automatically test | tweak chatservice key passing

.drone.yml

@@ -4,77 +4,97 @@
 ################
 
 # push_deploy_key: id_rsa from DRONE host machine
-
-################
-# Build & Test #
+---
+#################
+# Frontend Test #
 ################
 
 kind: pipeline
 name: frontend_run_tests
 
 steps:
-  # Test the vue frontend
-  - name: test-frontend
-    image: node
-    commands:
-      - pwd
-      - cd ./frontend
-      - npm install
-      - npm test
-    volumes:
-      # Link node_modules cache from host filesystem into container at the expected location
-      - name: frontend_node_cache
-        path: /drone/src/frontend/node_modules
+    # Test the vue frontend
+    - name: test-frontend
+      image: node
+      commands:
+          - pwd
+          - cd ./frontend
+          - npm install
+          - npm test
+      volumes:
+          # Link node_modules cache from host filesystem into container at the expected location
+          - name: frontend_node_cache
+            path: /drone/src/frontend/node_modules
 
-  - name: build-frontend
-    image: node
-    commands:
-      - cd ./frontend
-      - rm -Rf ./build/*
-      - npx browserslist@latest --update-db
-      - npm run build
-      - ls ./build
-    environment:
-      NODE_OPTIONS: --openssl-legacy-provider
-    volumes:
-      # Link node_modules cache from host filesystem into container at the expected location
-      - name: frontend_node_cache
-        path: /drone/src/frontend/node_modules
-      - name: frontend_build
-        path: /drone/src/frontend/build
+volumes:
+    - name: frontend_node_cache
+      host:
+          path: /tmp/cache/drone/frontend/node_modules
+    - name: frontend_build
+      host:
+          path: /tmp/cache/drone/frontend/build
+---
+##################
+# Frontend Build #
+##################
+
+kind: pipeline
+name: frontend_run_build
+
+steps:
+    - name: build-frontend
+      image: node
+      commands:
+          - cd ./frontend
+          - rm -Rf ./build/*
+          - npx browserslist@latest --update-db
+          - npm run build
+          - ls ./build
+      environment:
+          NODE_OPTIONS: --openssl-legacy-provider
+      volumes:
+          # Link node_modules cache from host filesystem into container at the expected location
+          - name: frontend_node_cache
+            path: /drone/src/frontend/node_modules
+          - name: frontend_build
+            path: /drone/src/frontend/build
 
 volumes:
-  - name: frontend_node_cache
-    host:
-      path: /tmp/cache/drone/frontend/node_modules
-  - name: frontend_build
-    host:
-      path: /tmp/cache/drone/frontend/build
+    - name: frontend_node_cache
+      host:
+          path: /tmp/cache/drone/frontend/node_modules
+    - name: frontend_build
+      host:
+          path: /tmp/cache/drone/frontend/build
 ---
+#################
+# Backend Tests #
+#################
+
 kind: pipeline
 name: backend_run_tests
 
 steps:
-  # Test the vue frontend
-  - name: test-backend
-    image: node
-    commands:
-      - pwd
-      - cd ./backend
-      - npm install
-      - npm test
-    volumes:
-      # Link node_modules cache from host filesystem into container at the expected location
-      - name: backend_node_cache
-        path: /drone/src/backend/node_modules
+    # Test the vue frontend
+    - name: test-backend
+      image: node
+      commands:
+          - pwd
+          - cd ./backend
+          - npm install
+          - npm test
+      volumes:
+          # Link node_modules cache from host filesystem into container at the expected location
+          - name: backend_node_cache
+            path: /drone/src/backend/node_modules
 
 volumes:
-  - name: backend_node_cache
-    host:
-      path: /tmp/cache/drone/backend/node_modules
-  - name: backend_build
-    host:
-      path: /tmp/cache/drone/backend/build
+    - name: backend_node_cache
+      host:
+          path: /tmp/cache/drone/backend/node_modules
+    - name: backend_build
+      host:
+          path: /tmp/cache/drone/backend/build
 ---
 ########################
 # Deploy to Production #
@@ -83,34 +103,35 @@ volumes:
 kind: pipeline
 name: deploy
 depends_on:
-  # Must run after the first pipeline
-  - frontend_run_tests
-  - backend_run_tests
+    # Must run after the first pipeline
+    - frontend_run_tests
+    - backend_run_tests
 trigger:
-  status:
-    # Only runs if the first pipeline was fully successful
-    - success
-
+    status:
+        # Only runs if the first pipeline was fully successful
+        - success
+    branch:
+        - master
 steps:
-  # post-receive hook
-  - name: push commit
-    image: appleboy/drone-git-push:0.2.0-linux-amd64
-    settings:
-      branch: master
-      remote: maeda@165.232.128.85:/opt/staging/siimee.git
-      remote_name: staging
-      force: true
-      ssh_key:
-        # !: id_rsa from DRONE machine
-        from_secret: push_deploy_key
+    # post-receive hook
+    - name: push commit
+      image: appleboy/drone-git-push:0.2.0-linux-amd64
+      settings:
+          branch: master
+          remote: maeda@165.232.128.85:/opt/staging/siimee.git
+          remote_name: staging
+          force: true
+          ssh_key:
+              # !: id_rsa from DRONE machine
+              from_secret: push_deploy_key
 
 volumes:
-  - name: frontend_node_cache
-    host:
-      path: /tmp/cache/drone/frontend/node_modules
-  - name: frontend_build
-    host:
-      path: /tmp/cache/drone/frontend/build
-  - name: backend_node_cache
-    host:
-      path: /tmp/cache/drone/backend/node_modules
+    - name: frontend_node_cache
+      host:
+          path: /tmp/cache/drone/frontend/node_modules
+    - name: frontend_build
+      host:
+          path: /tmp/cache/drone/frontend/build
+    - name: backend_node_cache
+      host:
+          path: /tmp/cache/drone/backend/node_modules

frontend/src/services/chat.service.js

@@ -21,12 +21,22 @@ const _providerMethods = {
 /**
  * Breaking out as much pubnub specific flavor
  */
-const _setupPubnub = async (uuid, publishKey, subscribeKey) => {
+const _setPubnubKeys = testing => {
+    let keys = {}
+    if (testing) {
+        keys = testing
+    } else {
+        ;(keys.publishKey = import.meta.env.VITE_PUBNUB_PUBLISH_KEY),
+            (keys.subscribeKey = import.meta.env.VITE_PUBNUB_SUBSCRIBE_KEY)
+    }
+    return keys
+}
+const _setupPubnub = async (uuid, testing) => {
     if (!uuid) return console.error('no pubnub uuid set')
-
+    const keys = _setPubnubKeys(testing)
     const pubnubClient = await new PubNub({
-        publishKey: publishKey,
-        subscribeKey: subscribeKey,
+        publishKey: keys.publishKey,
+        subscribeKey: keys.subscribeKey,
         logVerbosity: false,
         uuid,
     })
@@ -82,17 +92,7 @@ class Chatter {
 
         // Pass api keys in ugle fasion for testing purposes
         // TODO: refactor this with a mock
-        this.provider = testing
-            ? await _setupPubnub(
-                  this.uuid,
-                  testing.publishKey,
-                  testing.subscribeKey,
-              )
-            : await _setupPubnub(
-                  this.uuid,
-                  import.meta.env.VITE_PUBNUB_PUBLISH_KEY,
-                  import.meta.env.VITE_PUBNUB_SUBSCRIBE_KEY,
-              )
+        this.provider = await _setupPubnub(this.uuid, testing)
 
         //  step_1: build the this.groupings object from the backend
         //  await for the groupings to be fetched before subscribing to channels