From 7118af3c151c7893d11ddcf4b338a67c08d9cd28 Mon Sep 17 00:00:00 2001 From: marcsello Date: Wed, 25 Mar 2020 01:57:54 +0100 Subject: [PATCH] Added Minio stuff --- requirements.txt | 1 + storage_service/app.py | 18 +++++++++++------- storage_service/utils/__init__.py | 1 + storage_service/utils/storage.py | 3 +++ storage_service/views/object_view.py | 1 + 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 storage_service/utils/storage.py diff --git a/requirements.txt b/requirements.txt index 14bd26e..21fa9bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +werkzeug requests blinker Flask diff --git a/storage_service/app.py b/storage_service/app.py index abc1d28..244c861 100644 --- a/storage_service/app.py +++ b/storage_service/app.py @@ -4,7 +4,7 @@ from flask import Flask from werkzeug.middleware.proxy_fix import ProxyFix # import stuff -from utils import register_all_error_handlers +from utils import register_all_error_handlers, storage # import views from views import ObjectView @@ -13,19 +13,23 @@ from views import ObjectView app = Flask(__name__) app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1) +# init stuff +storage.init_app(app) + # important stuff app.secret_key = os.environ.get('SECRET_KEY', os.urandom(12)) +app.config['MINIO_ENDPOINT'] = os.environ['MINIO_ENDPOINT'] +app.config['MINIO_ACCESS_KEY'] = os.environ['MINIO_ACCESS_KEY'] +app.config['MINIO_SECRET_KEY'] = os.environ['MINIO_SECRET_KEY'] + # register error handlers register_all_error_handlers(app) # register views for view in [ObjectView]: - view.register(app, trailing_slash=False) + view.register(app, trailing_slash=False) - - - -# start debuggig if needed +# start debugging if needed if __name__ == "__main__": - app.run(debug=True) + app.run(debug=True) diff --git a/storage_service/utils/__init__.py b/storage_service/utils/__init__.py index 6c6531e..cd90b13 100644 --- a/storage_service/utils/__init__.py +++ b/storage_service/utils/__init__.py @@ -1,3 +1,4 @@ #!/usr/bin/env python3 from .require_decorators import json_required from .error_handlers import register_all_error_handlers +from .storage import storage diff --git a/storage_service/utils/storage.py b/storage_service/utils/storage.py new file mode 100644 index 0000000..0259793 --- /dev/null +++ b/storage_service/utils/storage.py @@ -0,0 +1,3 @@ +from flask_minio import Minio + +storage = Minio() \ No newline at end of file diff --git a/storage_service/views/object_view.py b/storage_service/views/object_view.py index 61611f4..16d0880 100644 --- a/storage_service/views/object_view.py +++ b/storage_service/views/object_view.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from flask import jsonify from flask_classful import FlaskView +from utils import storage class ObjectView(FlaskView):