42 Commits

Author SHA1 Message Date
858e18362f Added a single assert
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-14 13:55:20 +02:00
b226256187 fixed tests not running 2020-05-14 13:54:19 +02:00
32648d0f7a tests added
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-13 14:22:48 +02:00
7a565e0511 Fixed consumer test
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 21:25:18 +02:00
2c5444a245 post
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 21:08:37 +02:00
9fec4e81cc minor
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 21:04:13 +02:00
6ead97eee0 minor fix
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 21:03:40 +02:00
2227554977 backup 2020-05-08 21:02:49 +02:00
c58b6449aa tests definded
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 20:55:47 +02:00
f643b91a8b test_initial_commit
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 20:36:45 +02:00
d6b8c528de fixed sentry stuff
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 20:08:43 +02:00
2e8bc421c6 Merge pull request 'dev-consumer-timeout-fix' (#7) from dev-consumer-timeout-fix into dev
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 20:05:33 +02:00
7fbd62659d sync view fix
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2020-05-08 19:57:42 +02:00
d34756d9fc fixed getting customer instead of producer
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 19:56:09 +02:00
67d71fa43e Fixed customers endpoint
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 19:48:31 +02:00
eb03474392 Configure timeouts from envvar
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 19:44:42 +02:00
58d7de6073 updated redis structure
Some checks failed
continuous-integration/drone/push Build is failing
2020-05-08 19:34:29 +02:00
f39fa6f936 Merge pull request 'Add saving IP addresses of producers' (#5) from dev-prodip into dev
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is failing
2020-04-17 16:57:26 +02:00
2c6ab3d96d added saving producer ips to redis
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-04-17 16:21:42 +02:00
2376c1355d Merge branch 'dev' of https://git.kmlabz.com/GoldenPogacsa/consumer-api into dev
All checks were successful
continuous-integration/drone/push Build is passing
2020-04-01 01:51:52 +02:00
93beb10c49 dev
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-04-01 00:31:13 +02:00
269c08e5de port 80
All checks were successful
continuous-integration/drone/push Build is passing
2020-04-01 00:28:04 +02:00
19a74de675 port 80
All checks were successful
continuous-integration/drone/push Build is passing
2020-04-01 00:10:48 +02:00
5585574eac Merge pull request 'dev-fabian' (#2) from dev-fabian into dev
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 17:18:53 +02:00
f8feb40723 minor
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-03-30 17:00:59 +02:00
0c18cf9bf1 message
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:56:29 +02:00
68e2eaffcb message
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:52:15 +02:00
3c8229238c jsonify
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:37:12 +02:00
0c3161ef03 204
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:36:33 +02:00
244b779107 return 200
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:35:54 +02:00
b04d0d60d0 consumer and log views
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-30 16:32:33 +02:00
735aba20df Merge pull request 'Implemented sync view' (#1) from dev-sync into dev
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 18:14:13 +02:00
6f3ef28fb5 Implemented sync view
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2020-03-29 18:12:16 +02:00
c7c7971253 Updated drone config
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 17:15:02 +02:00
9c046b63d9 Created app skeleton
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 17:08:53 +02:00
f192459855 flask
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 16:08:14 +02:00
bb25397fe6 sorry
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 15:24:19 +02:00
97fa82d90e added messagesner class
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 15:06:41 +02:00
cef93181fd fix dockerfile
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 13:35:19 +02:00
0dbe372777 update sentry url
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 12:46:22 +02:00
1647fe4ddb add startup python file
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-29 12:45:16 +02:00
ee5b481ac0 Update '.drone.yml'
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-27 18:47:00 +01:00
15 changed files with 256 additions and 9 deletions

2
.coveragerc Normal file
View File

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

View File

@ -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

View File

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

41
consumer_api/app.py Normal file
View File

@ -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)

3
consumer_api/db.py Normal file
View File

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

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

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

4
requirements_dev.txt Normal file
View File

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