Added a single assert

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+omit=venv/*

.drone.yml

@@ -25,10 +25,20 @@ steps:
         from_secret: DOCKER_PASSWORD
   commands:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-  - docker build -t="$DOCKER_USERNAME/consumer" .
-  - docker build -t="$DOCKER_USERNAME/consumer:$DRONE_BUILD_NUMBER" .
-  - docker push "$DOCKER_USERNAME/consumer"
-  - docker push "$DOCKER_USERNAME/consumer:$DRONE_BUILD_NUMBER"
+  - docker build -t="$DOCKER_USERNAME/consumer_api" .
+  - docker build -t="$DOCKER_USERNAME/consumer_api:$DRONE_BUILD_NUMBER" .
+  - docker push "$DOCKER_USERNAME/consumer_api"
+  - docker push "$DOCKER_USERNAME/consumer_api:$DRONE_BUILD_NUMBER"
+
+- name: slack
+  image: plugins/slack
+  settings:
+    webhook:
+      from_secret: slack_webhook
+    channel: alerts-ci
+    icon_url: https://cloudcdn.tormakristof.eu/static/drone.svg
+  when:
+    status: [ failure ]
 
 services:
 - name: docker

Dockerfile

@@ -1,9 +1,13 @@
-FROM python:3
+FROM python:3.8-slim
 
-WORKDIR /app
+ADD consumer_api requirements.txt /consumer_api/
+WORKDIR /consumer_api/
 
-RUN pip3 install --no-cache-dir -r requirements.txt
+ENV PIP_NO_CACHE_DIR=true
+ENV TZ Europe/Budapest
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY . ./
+RUN pip3 install -r requirements.txt
 
-CMD ["python3" "app.py"]
+EXPOSE 80
+CMD ["gunicorn", "-b", "0.0.0.0:80", "app:app"]

consumer_api/app.py

@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+import sentry_sdk
+from sentry_sdk.integrations.flask import FlaskIntegration
+from flask import Flask
+import os
+from db import redis_client
+from views import ConsumersView, LogView, SyncView
+
+"""
+Main Flask RESTful API
+"""
+
+__author__ = "@tormakris"
+__copyright__ = "Copyright 2020, GoldenPogácsa Team"
+__module_name__ = "app"
+__version__text__ = "1"
+
+# Setup sentry
+SENTRY_DSN = os.environ.get("SENTRY_DSN")
+if SENTRY_DSN:
+    sentry_sdk.init(
+        dsn = SENTRY_DSN,
+        integrations = [FlaskIntegration()],
+        send_default_pii = True,
+        release = os.environ.get('RELEASE_ID', 'test'),
+        environment = os.environ.get('RELEASEMODE', 'dev')
+    )
+
+app = Flask(__name__)
+app.config['REDIS_URL'] = os.environ['REDIS_URL']
+app.config['LOCAL_UUID'] = os.environ['LOCAL_UUID']
+app.config['CUSTOMER_TIMEOUT'] = int(os.environ.get('CUSTOMER_TIMEOUT', 30))
+app.config['PRODUCER_TIMEOUT'] = int(os.environ.get('PRODUCER_TIMEOUT', 60))
+
+redis_client.init_app(app)
+
+for view in [ConsumersView, LogView, SyncView]:
+    view.register(app, trailing_slash = False)
+
+if __name__ == "__main__":
+    app.run(debug = True)

consumer_api/db.py

@@ -0,0 +1,3 @@
+from flask_redis import FlaskRedis
+
+redis_client = FlaskRedis()

consumer_api/tests/__init__.py

@@ -0,0 +1,5 @@
+import os
+
+# Setup environment variables for testing
+os.environ["LOCAL_UUID"] = "d8b2e5e2-f675-4194-9324-af58e4b70c54"
+os.environ["REDIS_URL"] = "redis://192.168.111.121/0"

consumer_api/tests/consumers_view_test.py

@@ -0,0 +1,22 @@
+import db
+import pytest
+
+
+
+@pytest.fixture
+def client(mocker):
+    mocker.patch("db.redis_client")
+    db.redis_client.get.side_effect=lambda a: None
+
+    from app import app
+
+    app.config['TESTING'] = True
+
+    with app.test_client() as client:
+        yield client
+
+
+def test_response_length(client):
+    r = client.get('/consumers')
+
+    assert r.status_code == 200

consumer_api/tests/log_view_test.py

@@ -0,0 +1,30 @@
+import db
+import pytest
+
+@pytest.fixture
+def client(mocker):
+    mocker.patch("db.redis_client")
+    db.redis_client.get.side_effect=lambda a: None
+
+    from app import app
+
+    app.config['TESTING'] = True
+
+    with app.test_client() as client:
+        yield client
+
+
+def test_log_code_get(client):
+    r = client.get('/log')
+
+    assert r.status_code == 405
+
+
+def test_log_code_post(client):
+    data = {
+        "uuid": "asdasdasd",
+        "message": "Hello There!"
+    }
+    r = client.post('/log', json=data)
+
+    assert r.status_code == 204

consumer_api/tests/sync_view_test.py

@@ -0,0 +1,30 @@
+import db
+import pytest
+
+@pytest.fixture
+def client(mocker):
+    mocker.patch("db.redis_client")
+    db.redis_client.get.side_effect=lambda a: None
+
+    from app import app
+
+    app.config['TESTING'] = True
+
+    with app.test_client() as client:
+        yield client
+
+
+
+def test_log_code_get(client):
+    r = client.get('/sync')
+
+    assert r.status_code == 405
+
+
+def test_log_code_post(client):
+    data = {
+        "uuid": "tesuuid"
+    }
+    r = client.post('/sync', json=data)
+
+    assert r.status_code == 200

consumer_api/views/__init__.py

@@ -0,0 +1,3 @@
+from .consumers_view import ConsumersView
+from .log_view import LogView
+from .sync_view import SyncView

consumer_api/views/consumers_view.py

@@ -0,0 +1,19 @@
+import json
+
+from db import redis_client
+from flask import jsonify
+from flask_classful import FlaskView
+
+
+class ConsumersView(FlaskView):
+
+    def get(self):
+        keys = redis_client.keys('consumer_*')
+
+        list_of_customer_ips = []
+
+        for key in keys:
+            info = json.loads((redis_client.get(key) or b"{}").decode('utf-8'))
+            list_of_customer_ips.append(info['ip'])
+
+        return jsonify(list_of_customer_ips)

consumer_api/views/log_view.py

@@ -0,0 +1,32 @@
+from flask import request, current_app, Response
+from flask_classful import FlaskView
+from db import redis_client
+
+
+class LogView(FlaskView):
+
+    def post(self):
+        # Record the IP address of the producer
+        remote_uuid = request.json['uuid']
+        remote_ip = request.remote_addr
+
+        prod_key = f"producer_{remote_uuid}"
+
+        last_known_remote_ip = redis_client.get(prod_key)
+        if last_known_remote_ip:
+            last_known_remote_ip = last_known_remote_ip.decode('utf-8')
+
+        if not last_known_remote_ip:
+            current_app.logger.info(f"New producer {remote_uuid} at {remote_ip}")
+        elif last_known_remote_ip != remote_ip:
+            current_app.logger.info(
+                f"IP address of producer {remote_uuid} have changed: {last_known_remote_ip} -> {remote_ip}")
+
+        # update expirity
+        redis_client.set(prod_key, remote_ip.encode('utf-8'))
+        redis_client.expire(prod_key, current_app.config["PRODUCER_TIMEOUT"])
+
+        # print out message
+        current_app.logger.info(f"New message: {request.json['message']}")
+
+        return Response(status = 204)

consumer_api/views/sync_view.py

@@ -0,0 +1,38 @@
+import json
+import time
+from flask import request, current_app, jsonify
+from flask_classful import FlaskView
+from db import redis_client  # ez nagyon otvar
+
+
+class SyncView(FlaskView):
+
+    def post(self):
+        remote_uuid = request.json['uuid']
+        remote_ip = request.remote_addr
+
+        cust_key = f"consumer_{remote_uuid}"
+
+        last_known_info = json.loads((redis_client.get(cust_key) or b"{}").decode('utf-8'))
+
+        if not last_known_info:
+            current_app.logger.info(f"New consumer registered (unknown UUID): {remote_uuid} at {remote_ip}")
+
+        else:
+            if last_known_info['ip'] != remote_ip:
+                current_app.logger.info(f"Address of consumer {remote_uuid} changed to {remote_ip}")
+
+        info = {
+            "uuid": remote_uuid,
+            "ip": remote_ip,
+            "last_seen": time.time()
+        }
+
+        redis_client.set(cust_key, json.dumps(info).encode('utf-8'))
+        redis_client.expire(cust_key, current_app.config["CUSTOMER_TIMEOUT"])
+
+        response = {
+            "uuid": current_app.config['LOCAL_UUID']
+        }
+
+        return jsonify(response)

requirements.txt

@@ -1 +1,5 @@
 sentry_sdk
+flask
+flask-redis
+flask-classful
+gunicorn

requirements_dev.txt

@@ -0,0 +1,4 @@
+pytest
+pytest-mock
+mock
+coverage