Merge pull request #20 from KPMP/develop

Atlas 2024 Q3 Release

.dockerignore

@@ -0,0 +1 @@
+.*

.github/workflows/build-project.yml

@@ -0,0 +1,39 @@
+name: Build atlas-file-service docker image
+
+on: 
+  push:
+
+jobs:
+  build-project:
+    env:
+      IMAGE_TAG: 3.4
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get branch names
+        id: branch-names
+        uses: tj-actions/branch-names@v8
+
+      - name: Get current branch name
+        if: steps.branch-names.outputs.is_default == 'false'
+        run: |
+          echo "Running on branch: ${{ steps.branch-names.outputs.current_branch }}"
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        with:
+          username: ${{ secrets.ENV_DOCKER_USER }}
+          password: ${{ secrets.ENV_DOCKER_PASS }}
+
+      - name: Build and push to Docker Hub if branch is develop
+        if: steps.branch-names.outputs.current_branch == 'develop'
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: kingstonduo/atlas-file-service:${{ env.IMAGE_TAG }}
+
+      - name: Build and push to Docker Hub if branch is not develop
+        if: steps.branch-names.outputs.current_branch != 'develop'
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: kingstonduo/atlas-file-service:${{ steps.branch-names.outputs.current_branch }}

Dockerfile

@@ -1,9 +1,10 @@
 FROM python:3.7.12-alpine3.14
 WORKDIR /code
-ENV FLASK_APP app.py
-ENV FLASK_RUN_HOST 0.0.0.0
+ENV FLASK_APP=app.py
+ENV FLASK_RUN_HOST=0.0.0.0
 RUN apk add --no-cache gcc musl-dev linux-headers tzdata libffi-dev libc-dev
+COPY app.py app.py
 COPY requirements.txt requirements.txt
 RUN pip3 install -r requirements.txt
 RUN pip3 install -U flask-cors
-CMD ["flask", "run"]
+CMD ["gunicorn", "-b", ":5000", "app:app"]

app.py

@@ -7,6 +7,8 @@
 from flask_cors import CORS
 import mysql.connector
 import logging
+import requests
+import json
 
 app = Flask(__name__)
 CORS(app)
@@ -15,6 +17,9 @@
 minioSecretKey = os.environ.get('MINIO_SECRET_KEY')
 s3Bucket = os.environ.get('BUCKET_NAME')
 minioUrl = os.environ.get('MINIO_URL')
+apiSecret = os.environ.get("API_SECRET")
+ga4Id = os.environ.get("GA4_ID")
+url = "https://www.google-analytics.com/mp/collect?measurement_id=" + ga4Id + "&api_secret=" + apiSecret
 minioClient = Minio(minioUrl, access_key=minioAccessKey, secret_key=minioSecretKey, secure=False)
 s3_client = boto3.client(
     's3',
@@ -29,7 +34,7 @@
 
 class MYSQLConnection:
     def __init__(self):
-        logger.debug(
+        logger.info(
             "Start: MYSQLConnection().__init__(), trying to load environment variables in docker"
         )
         self.host = None
@@ -103,14 +108,26 @@ def get_file_info_by_file_name(file_name):
         (file_name,),
     )
 
-
-@app.route('/v1/file/download/<packageId>/<objectName>', methods=['GET'])
+@app.route('/v1/file/download/<packageId>/<objectName>', methods=['POST', 'GET'])
 def downloadFile(packageId, objectName):
     result = get_file_info_by_file_name(objectName)
     if result[0]["access"] == "open":
         try:
             objectNameFull = packageId + '/' + objectName
             object = minioClient.get_object(s3Bucket, objectNameFull, request_headers=None)
+            payload = {
+                "client_id": "XXXXXXXXXX.YYYYYYYYYY",
+                "events": [
+                 {
+                    "name": "AtlasRepositoryDownload",
+                    "params": {
+                        "event_category": "Repository",
+                        "event_action": "Download",
+                        "label": objectName
+                    }
+                 }]
+            }
+            requests.post(url, json=payload, headers={"Content-Type": "application/json"})
             return send_file(object, as_attachment=True, download_name=objectName)
         except S3Error as err:
             logger.error(err)
@@ -127,6 +144,6 @@ def downloadDerivedFileS3PS(packageId, objectName):
                                                 Params={'Bucket': s3Bucket, 'Key': objectNameFull},
                                                 ExpiresIn=3600)
     except botocore.exceptions.ClientError as error:
-        logger.error(err)
+        logger.error(error)
     except botocore.exceptions.ParamValidationError as error:
-        logger.error(err)
+        logger.error(error)

changelog.md

@@ -0,0 +1,14 @@
+# Changelog
+
+## Release 1.4 [unreleased]
+Brief summary of what's in this release:
+
+
+### Breaking changes
+
+Breaking changes include any database updates needed, if we need to edit any files on system (like .env or certs, etc). Things that are outside of the code itself that need changed for the system to work.
+
+
+### Non-breaking changes
+
+Just a place to keep track of things that have changed in the code that we may want to pay special attention to when smoke testing, etc.

requirements.txt

@@ -4,3 +4,5 @@ minio
 boto3
 flask-cors
 mysql-connector-python
+requests
+gunicorn