Move Audit API from testing to production server (05998bf2) · Commits · OCF / capif

services/TS29222_CAPIF_Auditing_API/Dockerfile

+2 −2

Original line number	Diff line number	Diff line
		@@ -12,6 +12,6 @@ COPY . /usr/src/app

		EXPOSE 8080

		ENTRYPOINT ["python3"]
		ENTRYPOINT ["gunicorn"]

		CMD ["-m", "logs"]
		No newline at end of file
		CMD ["--bind", "0.0.0.0:8080", "--chdir", "/usr/src/app/logs", "wsgi:app"]
		No newline at end of file

+4 −4

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@
		import connexion
		import logging
		from logging.handlers import RotatingFileHandler
		from logs import encoder
		from .config import Config
		import encoder
		from config import Config
		import os
		from fluent import sender
		from opentelemetry.instrumentation.flask import FlaskInstrumentor
		@@ -112,5 +112,5 @@ config = Config()
		if eval(os.environ.get("MONITORING").lower().capitalize()):
		configure_monitoring(app.app, config.get_config())

		if __name__ == '__main__':
		app.run(port=8080)
		# if __name__ == '__main__':
		# app.run(port=8080)

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ import os
		class Config:
		def __init__(self):
		self.cached = 0
		self.file="./config.yaml"
		self.file="../config.yaml"
		self.my_config = {}

		stamp = os.stat(self.file).st_mtime

+4 −17

Original line number	Diff line number	Diff line
		import connexion
		import six
		import sys

		from logs.models.interface_description import InterfaceDescription # noqa: E501
		from logs.models.invocation_log import InvocationLog # noqa: E501
		from logs.models.operation import Operation # noqa: E501
		from logs.models.problem_details import ProblemDetails # noqa: E501
		from logs.models.protocol import Protocol # noqa: E501
		from logs import util

		from ..util import deserialize_datetime
		from ..core.auditoperations import AuditOperations
		import json
		from flask import Response, request, current_app
		from ..encoder import JSONEncoder
		from cryptography import x509
		from cryptography.hazmat.backends import default_backend
		import pymongo

		from ..core.responses import bad_request_error

		audit_operations = AuditOperations()
		@@ -65,8 +52,8 @@ def api_invocation_logs_get(aef_id=None, api_invoker_id=None, time_range_start=N
		cause="Mandatory parameters missing", invalid_params=[
		{"param": "aef_id or api_invoker_id", "reason": "missing"}])

		time_range_start = util.deserialize_datetime(time_range_start)
		time_range_end = util.deserialize_datetime(time_range_end)
		time_range_start = deserialize_datetime(time_range_start)
		time_range_end = deserialize_datetime(time_range_end)

		query_params = {"aef_id": aef_id,
		"api_invoker_id": api_invoker_id,

+5 −9

Original line number	Diff line number	Diff line
		import sys

		from flask import current_app, Flask, Response
		import json
		import sys
		from datetime import datetime

		from .resources import Resource
		from bson import json_util

		from ..util import dict_to_camel_case, clean_empty
		from .responses import bad_request_error, not_found_error, forbidden_error, internal_server_error, make_response
		from ..models.invocation_log import InvocationLog
		@@ -57,11 +55,9 @@ class AuditOperations (Resource):
		if not result['logs']:
		return not_found_error(detail="Parameters do not match any log entry", cause="No logs found")


		result = dict_to_camel_case(clean_empty(result))
		invocation_log = InvocationLog(result['aefId'], result['apiInvokerId'], result['logs'],
		result['supportedFeatures'])
		res = make_response(object=invocation_log, status=200)
		invocation_log = InvocationLog(result['aef_id'], result['api_invoker_id'], result['logs'],
		result['supported_features'])
		res = make_response(object=dict_to_camel_case(clean_empty(invocation_log.to_dict())), status=200)
		current_app.logger.debug("Found invocation logs")
		return res