Obsrv 1.3.0 Release (#12)

* #48 feat: set query service to app state * Fix: Bug Fix * Feat: added validations on ingestion spec * Feat: updated test cases * #62 feat: add query wrapper APIs * #0 feat: upgrade package.json versions * #0 fix; fix test case * Feat: API to submit ingestion spec to druid * #0 fix: change functions to new service * #0 fix: remove unused import * Feat: API to submit ingestion spec to druid- Test Cases * Fix: fixing test cases * Feat: modified datasource APIs to submit ingestion spec on datasource entry * Fix: Bug Fix in getting default values * Fix: Url fix * Feat: modified submit ingestion method using wrapper service * Fix: Url fix * Fix: Bug fix while getting default values * Issue feat: prom metrics for data in and out apis * fix: attached endpoint label for the metrics * fix: feedback fixes * removed unnecessary logs * Feat: helper method for submitting ingestion spec * Feat: modified swagger doc with latest changes * Feat: modified swagger doc with latest changes * Feat: modified swagger doc with latest changes * Feat: removed unused args and logs * Feat: added more validations on ingestion spec * Feat: removed nested if else conditions * Feat: updated error logs * Feat: modified swagger doc according to latest changes * #Issue133 Feat: command-service to restart flink jobs * #Issue133 Feat: changed folder structure * #Issue133 Feat: added pycache to gitignore * Bug Fixes in Data IN API and fixing vulnerabilities in node version (#40) * Fix: fixing vulnerabilities in node version * Fix: Bug fixes in data in API * Feat: fetching options from appconfig * #Issue133 Feat: changed folder structure * #Issue133 Feat: changed folder structure * #0 fix: Remove unused packages * Issue 133 Fix: upgrading versions * #Issue 142 Feat: modified implementation of source config save (#41) * Fix: Resolving conflicts with main * SB-01:fix:updated the api-service and command-service Dockerfiles * SB-02:fix:updated command-service Dockerfile * SB-03:fix:updated docker/build-push-action@v4 in github/workflows/build_and_deploy.yaml * SB-04:fix:updated docker/build-push-action@v1 in github/workflows/build_and_deploy.yaml * SB-05:fix:updated aws and azure configuration in github/workflows/build_and_deploy.yaml * SB-05:fix:updated aws and azure configuration in github/workflows/build_and_deploy.yaml * SB-06:fix:updated aws and azure configuration in github/workflows/build_and_deploy.yaml * Release 1.3.0 into Main (conflict fix) (#54) * issue#223: feat: Updated API endpoints with verbs * issue#223: fix: Test case modification * issue #84 : fix: API swagger doc update * #99 fix: upgrade packages to fix vulnerabilities --------- Co-authored-by: Jerald <[email protected]> Co-authored-by: harishkumar gangula <[email protected]> Co-authored-by: Praveen <[email protected]> * Release 1.3.0 into Main (#53) * issue#223: feat: Updated API endpoints with verbs * issue#223: fix: Test case modification * issue #84 : fix: API swagger doc update * #99 fix: upgrade packages to fix vulnerabilities --------- Co-authored-by: Jerald <[email protected]> Co-authored-by: harishkumar gangula <[email protected]> Co-authored-by: Praveen <[email protected]> * command-service vulnerabilities fixes (#55) --------- Co-authored-by: Praveen <[email protected]> Co-authored-by: GayathriSrividya <[email protected]> Co-authored-by: Praveen <[email protected]> Co-authored-by: Manjunath Davanam <[email protected]> Co-authored-by: Jerald <[email protected]> Co-authored-by: Ravinder Kumar <[email protected]> Co-authored-by: GayathriSrividya <[email protected]> Co-authored-by: Harish Kumar Gangula <[email protected]> Co-authored-by: divyagovindaiah <[email protected]> Co-authored-by: Manoj Krishna <[email protected]>
Sunbird-Obsrv · Nov 17, 2023 · 4a3a8e2 · 4a3a8e2
1 parent 0f920d6
commit 4a3a8e2
Show file tree

Hide file tree

Showing 108 changed files with 16,167 additions and 871 deletions.
diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml
@@ -15,7 +15,7 @@ jobs:
         id: tag-checker
         run: |
           (echo -n TRIGGER_ALLOWED= && echo 'print("${{ github.ref_name }}".split("_")[0] in "${{ vars.CURRENT_RELEASE }}")' | python3) >> "$GITHUB_OUTPUT"
-  docker-build:
+  docker-build-api-service:
     needs: check-tag
     if: needs.check-tag.outputs.ALLOWED_TAG ==  'True'
     runs-on: ubuntu-latest
@@ -29,11 +29,29 @@ jobs:
       - name: Build docker image and push
         uses: docker/build-push-action@v4
         with:
+          file: ./api-service/Dockerfile  
           push: true
           tags: ${{ vars.DOCKERHUB_USERNAME }}/obsrv-api-service:${{ github.ref_name }}
 
+  docker-build-command-service:
+    needs: check-tag
+    if: needs.check-tag.outputs.ALLOWED_TAG ==  'True'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to docker hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build docker image and push
+        uses: docker/build-push-action@v2
+        with:
+          file: ./command-service/Dockerfile  
+          push: true
+          tags: ${{ vars.DOCKERHUB_USERNAME }}/flink-command-service:${{ github.ref_name }}
+
   aws-deploy:
-    needs: [check-tag, docker-build]
+    needs: [check-tag, docker-build-api-service, docker-build-command-service]
     if: needs.check-tag.outputs.ALLOWED_TAG ==  'True'
     runs-on: ubuntu-latest
     environment: aws-dev
@@ -79,7 +97,7 @@ jobs:
           -var dataset_api_image_tag=${{ github.ref_name }}
 
   azure-deploy:
-    needs: [check-tag, docker-build]
+    needs: [check-tag, docker-build-api-service, docker-build-command-service]
     if: needs.check-tag.outputs.ALLOWED_TAG ==  'True' && vars.CLOUD_PROVIDER == 'azure'
     runs-on: ubuntu-latest
     steps:
@@ -101,4 +119,4 @@ jobs:
           terragrunt init
           terragrunt apply -auto-approve --target=module.dataset_api \
           -var dataset_api_container_registry=${{ secrets.DOCKERHUB_USERNAME }} \
-          -var dataset_api_image_tag=${{ github.ref_name }}
+          -var dataset_api_image_tag=${{ github.ref_name }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,10 @@
-FROM node:18-alpine
+FROM --platform=linux/amd64 node:20-alpine
+RUN apk add libcrypto3=3.1.4-r1 libssl3=3.1.4-r1
+RUN apk upgrade
 RUN mkdir -p /opt/obsrv-api-service
 WORKDIR /opt/obsrv-api-service/
 COPY package*.json ./
 RUN npm install
 COPY . .
 EXPOSE 3000
-CMD ["npm", "run", "start"]
+CMD ["npm", "run", "start"]
diff --git a/.dockerignore → api-service/.dockerignore b/.dockerignore → api-service/.dockerignore
diff --git a/.gitignore → api-service/.gitignore b/.gitignore → api-service/.gitignore
@@ -2,5 +2,5 @@ coverage
 node_modules
 .nyc_output
 dist
-package-lock.json
 .vscode
+__pycache__/
diff --git a/@types/express/index.d.ts → api-service/@types/express/index.d.ts b/@types/express/index.d.ts → api-service/@types/express/index.d.ts
diff --git a/api-service/Dockerfile b/api-service/Dockerfile
@@ -0,0 +1,8 @@
+FROM --platform=linux/amd64 node:20-alpine
+RUN mkdir -p /opt/api-service
+COPY ./api-service  ./opt/api-service
+WORKDIR /opt/api-service
+RUN npm install
+COPY . .
+EXPOSE 3000
+CMD ["npm", "run", "start"]