From f232b409c3775b97a3fc0fa232602dab71621fd6 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 12:29:47 +0530 Subject: [PATCH 01/14] [MOSIP-29854] Updating directory --- Dockerfile => DataBreachDetector/Dockerfile | 0 README.md => DataBreachDetector/README.md | 0 mosipvaluefinder.py => DataBreachDetector/mosipvaluefinder.py | 0 requirements.txt => DataBreachDetector/requirements.txt | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => DataBreachDetector/Dockerfile (100%) rename README.md => DataBreachDetector/README.md (100%) rename mosipvaluefinder.py => DataBreachDetector/mosipvaluefinder.py (100%) rename requirements.txt => DataBreachDetector/requirements.txt (100%) diff --git a/Dockerfile b/DataBreachDetector/Dockerfile similarity index 100% rename from Dockerfile rename to DataBreachDetector/Dockerfile diff --git a/README.md b/DataBreachDetector/README.md similarity index 100% rename from README.md rename to DataBreachDetector/README.md diff --git a/mosipvaluefinder.py b/DataBreachDetector/mosipvaluefinder.py similarity index 100% rename from mosipvaluefinder.py rename to DataBreachDetector/mosipvaluefinder.py diff --git a/requirements.txt b/DataBreachDetector/requirements.txt similarity index 100% rename from requirements.txt rename to DataBreachDetector/requirements.txt From 8dabb96c883b0ef7fac5d23bc81e339207583427 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 12:33:29 +0530 Subject: [PATCH 02/14] [MOSIP-29854] Updating filenames --- .../{mosipvaluefinder.py => DataBreachDetector.py} | 0 DataBreachDetector/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename DataBreachDetector/{mosipvaluefinder.py => DataBreachDetector.py} (100%) diff --git a/DataBreachDetector/mosipvaluefinder.py b/DataBreachDetector/DataBreachDetector.py similarity index 100% rename from DataBreachDetector/mosipvaluefinder.py rename to DataBreachDetector/DataBreachDetector.py diff --git a/DataBreachDetector/Dockerfile b/DataBreachDetector/Dockerfile index bb24300..09f46ee 100644 --- a/DataBreachDetector/Dockerfile +++ b/DataBreachDetector/Dockerfile @@ -36,5 +36,5 @@ ENV s3-bucket-name= COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt -COPY mosipvaluefinder.py . +COPY DataBreachDetector.py . CMD ["python", "mosipvaluefinder.py"] \ No newline at end of file From 1aa1c78bf8595db4aea7dc2c03b5d54a248e8ed7 Mon Sep 17 00:00:00 2001 From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com> Date: Thu, 11 Jan 2024 12:51:32 +0530 Subject: [PATCH 03/14] [MOSIP-29854]Created push_trigger.yml Signed-off-by: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com> --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..eac633f --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From 8130bd12adb2c57409b8252cc5f36e9755d49413 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 12:54:43 +0530 Subject: [PATCH 04/14] [MOSIP-29854] Updating filenames --- .github/workflows/{docker-image.yml => push_trigger.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docker-image.yml => push_trigger.yml} (100%) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/push_trigger.yml similarity index 100% rename from .github/workflows/docker-image.yml rename to .github/workflows/push_trigger.yml From bcc87bb96b0ebad5db5cc704d3bcb8081344fa77 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 13:10:00 +0530 Subject: [PATCH 05/14] [MOSIP-29854] Updated push_trigger.yml --- .github/workflows/push_trigger.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml index eac633f..a3fb3e4 100644 --- a/.github/workflows/push_trigger.yml +++ b/.github/workflows/push_trigger.yml @@ -2,9 +2,13 @@ name: Docker Image CI on: push: - branches: [ "master" ] + branches: + - master + - develop pull_request: - branches: [ "master" ] + branches: + - master + - develop jobs: @@ -15,4 +19,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) + run: docker build . --file Dockerfile --tag Databreachdetector:$(date +%s) From 2a4fd2beec5d0d9eb94993f8184e50ea560ce7a6 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 13:16:30 +0530 Subject: [PATCH 06/14] [MOSIP-29854] Updated push_trigger.yml --- .github/workflows/push_trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml index a3fb3e4..c46a3f1 100644 --- a/.github/workflows/push_trigger.yml +++ b/.github/workflows/push_trigger.yml @@ -19,4 +19,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag Databreachdetector:$(date +%s) + run: docker build . --file Dockerfile --tag databreachdetector:$(date +%s) From 288f32bf8fd4105ac5191004600934d963f84994 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 13:18:10 +0530 Subject: [PATCH 07/14] [MOSIP-29854] Updated push_trigger.yml --- .../.github}/workflows/push_trigger.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.github => DataBreachDetector/.github}/workflows/push_trigger.yml (100%) diff --git a/.github/workflows/push_trigger.yml b/DataBreachDetector/.github/workflows/push_trigger.yml similarity index 100% rename from .github/workflows/push_trigger.yml rename to DataBreachDetector/.github/workflows/push_trigger.yml From 9c17fca9d42c30a8ec02c9811f9962a850df17a3 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 13:20:21 +0530 Subject: [PATCH 08/14] [MOSIP-29854] Updated push_trigger.yml --- DataBreachDetector/.github/workflows/push_trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataBreachDetector/.github/workflows/push_trigger.yml b/DataBreachDetector/.github/workflows/push_trigger.yml index c46a3f1..bd0cb68 100644 --- a/DataBreachDetector/.github/workflows/push_trigger.yml +++ b/DataBreachDetector/.github/workflows/push_trigger.yml @@ -1,4 +1,4 @@ -name: Docker Image CI +name: Build Docker Image on: push: From bab1c4a70b9fbecdca2732dfd44723de28e6143c Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 13:29:30 +0530 Subject: [PATCH 09/14] [MOSIP-29854] Updated push_trigger.yml --- .../.github => .github}/workflows/push_trigger.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {DataBreachDetector/.github => .github}/workflows/push_trigger.yml (100%) diff --git a/DataBreachDetector/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml similarity index 100% rename from DataBreachDetector/.github/workflows/push_trigger.yml rename to .github/workflows/push_trigger.yml From 717ddb09c9fc0c2e7a448c30ea8feed3b54c0ad7 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 13:31:00 +0530 Subject: [PATCH 10/14] [MOSIP-29854] Updated push_trigger.yml --- .github/workflows/push_trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml index bd0cb68..88222a3 100644 --- a/.github/workflows/push_trigger.yml +++ b/.github/workflows/push_trigger.yml @@ -19,4 +19,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag databreachdetector:$(date +%s) + run: docker build . --file DataBreachdetector/Dockerfile --tag databreachdetector:$(date +%s) From 27de7eb77c3b7a753032cb57793c04dc97dbf93c Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 13:31:53 +0530 Subject: [PATCH 11/14] [MOSIP-29854] Updated push_trigger.yml --- .github/workflows/push_trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml index 88222a3..263ef48 100644 --- a/.github/workflows/push_trigger.yml +++ b/.github/workflows/push_trigger.yml @@ -19,4 +19,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file DataBreachdetector/Dockerfile --tag databreachdetector:$(date +%s) + run: docker build . --file DataBreachDetector/Dockerfile --tag databreachdetector:$(date +%s) From 006f175abe6d3d567741b613143f5980c92f0ce1 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 13:33:23 +0530 Subject: [PATCH 12/14] [MOSIP-29854] Updated push_trigger.yml --- DataBreachDetector/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataBreachDetector/Dockerfile b/DataBreachDetector/Dockerfile index 09f46ee..1c8db9c 100644 --- a/DataBreachDetector/Dockerfile +++ b/DataBreachDetector/Dockerfile @@ -37,4 +37,4 @@ ENV s3-bucket-name= COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt COPY DataBreachDetector.py . -CMD ["python", "mosipvaluefinder.py"] \ No newline at end of file +CMD ["python", "DataBreachDetector.py"] \ No newline at end of file From 6608b0c23a150b96bb310dfc2a1377199320f5e6 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 14:06:52 +0530 Subject: [PATCH 13/14] [MOSIP-29854] Updated push_trigger.yml --- DataBreachDetector/Dockerfile | 6 +++--- .../{DataBreachDetector.py => databreachdetector.py} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename DataBreachDetector/{DataBreachDetector.py => databreachdetector.py} (100%) diff --git a/DataBreachDetector/Dockerfile b/DataBreachDetector/Dockerfile index 1c8db9c..ff6059b 100644 --- a/DataBreachDetector/Dockerfile +++ b/DataBreachDetector/Dockerfile @@ -34,7 +34,7 @@ ENV s3-user-key= ENV s3-user-secret= ENV s3-bucket-name= -COPY requirements.txt . +COPY DataBreachDetector/requirements.txt . RUN pip install --no-cache-dir -r requirements.txt -COPY DataBreachDetector.py . -CMD ["python", "DataBreachDetector.py"] \ No newline at end of file +COPY DataBreachDetector/databreachdetector.py . +CMD ["python", "databreachdetector.py"] \ No newline at end of file diff --git a/DataBreachDetector/DataBreachDetector.py b/DataBreachDetector/databreachdetector.py similarity index 100% rename from DataBreachDetector/DataBreachDetector.py rename to DataBreachDetector/databreachdetector.py From 3cbe423bb03e1830fbfc334b6257d5c5047498e8 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Thu, 11 Jan 2024 14:20:47 +0530 Subject: [PATCH 14/14] [MOSIP-29854] Updated port number --- DataBreachDetector/databreachdetector.py | 1 + 1 file changed, 1 insertion(+) diff --git a/DataBreachDetector/databreachdetector.py b/DataBreachDetector/databreachdetector.py index 2b3f88a..8d19369 100644 --- a/DataBreachDetector/databreachdetector.py +++ b/DataBreachDetector/databreachdetector.py @@ -91,6 +91,7 @@ def deduce_sensitive_data_in_databases(): connection = psycopg2.connect( host='postgres.dev.mosip.net', + port=5432, user='postgres', password='mQi298ZW7p', database=databases[0]['name']