Refactored code

.circleci/config.yml

@@ -1,157 +1,157 @@
-# CircleCI v2.1 Config
-version: 2.1
-
-##
-# orbs
-#
-# Orbs used in this pipeline
-###
-orbs:
-  docker: circleci/[email protected]
-  slack: circleci/[email protected]
-
-##
-# Executors
-#
-# CircleCI Executors
-##
-executors:
-  default-docker:
-    working_directory: /home/circleci/project/git
-    docker:
-      - image: node:16.14.2-alpine3.14
-
-  default-machine:
-    machine:
-      image: ubuntu-2004:202201-02
-
-##
-# Jobs
-#
-# A map of CircleCI jobs
-##
-jobs:
-  setup:
-    executor: default-docker
-    steps:
-      - checkout
-      - run:
-          name: Update NPM install (using `yarn install`)
-          command: yarn install
-      - save_cache:
-          key: dependency-cache-v2-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules
-  lint:
-    executor: default-docker
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - dependency-cache-v2-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules
-      - run:
-          name: Run lint
-          command: yarn lint
-      - run:
-          name: Run unit tests
-          command: yarn test
-#      - slack/status:
-#          success_message: Linting passed in branch $CIRCLE_BRANCH
-#          failure_message: Linting failed in branch $CIRCLE_BRANCH
-#          webhook: $SLACK_WEBHOOK
-
-  test-unit:
-    executor: default-docker
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - dependency-cache-v2-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules
-      - run:
-          name: Run unit tests
-          command: yarn test
-#      - slack/status:
-#          success_message: Unit tests passed in branch $CIRCLE_BRANCH
-#          failure_message: Unit tests failed in branch $CIRCLE_BRANCH
-#          webhook: $SLACK_WEBHOOK
-
-#  slack-notify-docker:
-#    docker:
-#      - image: circleci/node:latest
-#    steps:
-#      - slack/notify:
-#          color: '#42e2f4'
-#          message: Docker Image built and published, tag $CIRCLE_BRANCH
-#          webhook: $SLACK_WEBHOOK
-
-##
-# Workflows
-#
-# CircleCI Workflow config
-##
-workflows:
-  test:
-    jobs:
-      - setup:
-          context: pm4ml-ci
-          filters:
-            branches:
-              ignore:
-                - /feature*/
-                - /bugfix*/
-                - /hotfix*/
-      - lint:
-          requires:
-            - setup
-          context: pm4ml-ci
-          filters:
-            branches:
-              ignore:
-                - /feature*/
-                - /bugfix*/
-                - /hotfix*/
-      - test-unit:
-          requires:
-            - setup
-          context: pm4ml-ci
-          filters:
-            branches:
-              ignore:
-                - /feature*/
-                - /bugfix*/
-                - /hotfix*/
-  deploy:
-    jobs:
-      - docker/publish:
-          executor: default-machine
-          context: pm4ml-ci
-          filters:
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*(\-snapshot(\.[0-9]+))?(\-hotfix(\.[0-9]+))?/
-            branches:
-              ignore:
-                - /.*/
-          before_build:
-            - run:
-                name: Set image tag
-                command: |
-                  if [[ -v CIRCLE_TAG ]]; then
-                    echo 'export IMAGE_TAG=$(echo $CIRCLE_TAG | tr -d v)' >> $BASH_ENV
-                  else
-                    echo 'export IMAGE_TAG=v`grep version package.json | sed 1q | awk -F \" '\''{print $4}'\''`' >> $BASH_ENV
-                  fi
-          lint-dockerfile: false
-          image: $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
-          tag: $IMAGE_TAG
-          registry: $DOCKER_REGISTRY
-          docker-username: DOCKER_USER
-          docker-password: DOCKER_PASSWORD
-#          after_build:
-#            - slack/status:
-#                success_message: Building Docker Image $CIRCLE_PROJECT_REPONAME:$IMAGE_TAG passed in branch $CIRCLE_BRANCH
-#                failure_message: Building Docker Image $CIRCLE_PROJECT_REPONAME:$IMAGE_TAG failed in branch $CIRCLE_BRANCH
-#                webhook: $SLACK_WEBHOOK
+# CircleCI v2.1 Config
+version: 2.1
+
+##
+# orbs
+#
+# Orbs used in this pipeline
+###
+orbs:
+  docker: circleci/[email protected]
+  slack: circleci/[email protected]
+
+##
+# Executors
+#
+# CircleCI Executors
+##
+executors:
+  default-docker:
+    working_directory: /home/circleci/project/git
+    docker:
+      - image: node:16.14.2-alpine3.14
+
+  default-machine:
+    machine:
+      image: ubuntu-2004:202201-02
+
+##
+# Jobs
+#
+# A map of CircleCI jobs
+##
+jobs:
+  setup:
+    executor: default-docker
+    steps:
+      - checkout
+      - run:
+          name: Update NPM install (using `yarn install`)
+          command: yarn install
+      - save_cache:
+          key: dependency-cache-v2-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules
+  lint:
+    executor: default-docker
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - dependency-cache-v2-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules
+      - run:
+          name: Run lint
+          command: yarn lint
+      - run:
+          name: Run unit tests
+          command: yarn test
+#      - slack/status:
+#          success_message: Linting passed in branch $CIRCLE_BRANCH
+#          failure_message: Linting failed in branch $CIRCLE_BRANCH
+#          webhook: $SLACK_WEBHOOK
+
+  test-unit:
+    executor: default-docker
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - dependency-cache-v2-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules
+      - run:
+          name: Run unit tests
+          command: yarn test
+#      - slack/status:
+#          success_message: Unit tests passed in branch $CIRCLE_BRANCH
+#          failure_message: Unit tests failed in branch $CIRCLE_BRANCH
+#          webhook: $SLACK_WEBHOOK
+
+#  slack-notify-docker:
+#    docker:
+#      - image: circleci/node:latest
+#    steps:
+#      - slack/notify:
+#          color: '#42e2f4'
+#          message: Docker Image built and published, tag $CIRCLE_BRANCH
+#          webhook: $SLACK_WEBHOOK
+
+##
+# Workflows
+#
+# CircleCI Workflow config
+##
+workflows:
+  test:
+    jobs:
+      - setup:
+          context: pm4ml-ci
+          filters:
+            branches:
+              ignore:
+                - /feature*/
+                - /bugfix*/
+                - /hotfix*/
+      - lint:
+          requires:
+            - setup
+          context: pm4ml-ci
+          filters:
+            branches:
+              ignore:
+                - /feature*/
+                - /bugfix*/
+                - /hotfix*/
+      - test-unit:
+          requires:
+            - setup
+          context: pm4ml-ci
+          filters:
+            branches:
+              ignore:
+                - /feature*/
+                - /bugfix*/
+                - /hotfix*/
+  deploy:
+    jobs:
+      - docker/publish:
+          executor: default-machine
+          context: pm4ml-ci
+          filters:
+            tags:
+              only: /v[0-9]+(\.[0-9]+)*(\-snapshot(\.[0-9]+))?(\-hotfix(\.[0-9]+))?/
+            branches:
+              ignore:
+                - /.*/
+          before_build:
+            - run:
+                name: Set image tag
+                command: |
+                  if [[ -v CIRCLE_TAG ]]; then
+                    echo 'export IMAGE_TAG=$(echo $CIRCLE_TAG | tr -d v)' >> $BASH_ENV
+                  else
+                    echo 'export IMAGE_TAG=v`grep version package.json | sed 1q | awk -F \" '\''{print $4}'\''`' >> $BASH_ENV
+                  fi
+          lint-dockerfile: false
+          image: $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
+          tag: $IMAGE_TAG
+          registry: $DOCKER_REGISTRY
+          docker-username: DOCKER_USER
+          docker-password: DOCKER_PASSWORD
+#          after_build:
+#            - slack/status:
+#                success_message: Building Docker Image $CIRCLE_PROJECT_REPONAME:$IMAGE_TAG passed in branch $CIRCLE_BRANCH
+#                failure_message: Building Docker Image $CIRCLE_PROJECT_REPONAME:$IMAGE_TAG failed in branch $CIRCLE_BRANCH
+#                webhook: $SLACK_WEBHOOK

.env

@@ -1,5 +1,5 @@
-SKIP_PREFLIGHT_CHECK=true
-PROXY_TARGET=http://senderfsp-pm4ml.qa.prod-dev.mbox-dev.io:20000
-PROXY_PORT=10000
-PROXY_API_PATH=/experience-api
-PORT=8081
+SKIP_PREFLIGHT_CHECK=true
+PROXY_TARGET=http://senderfsp-pm4ml.qa.prod-dev.mbox-dev.io:20000
+PROXY_PORT=10000
+PROXY_API_PATH=/experience-api
+PORT=8081