Merge branch 'production' into fix_scripts

Author: andersoncontreira

examples/lambda_api/README.md

@@ -32,6 +32,10 @@ Service routes map.
 * Redis
 * Swagger
 
+## Kong configuration
+Configure Kong API Gateway to work compatible with API Gateway.
+
+
 ## Installation
 
 ### Running Locally

examples/lambda_api/app.py

@@ -3,6 +3,11 @@
 from lambda_app.boot import load_dot_env,register_vendor
 register_vendor()
 
+from lambda_app import helper
+
+env = helper.get_environment()
+load_dot_env(env)
+
 # load env
 from lambda_app.config import get_config
 from lambda_app.enums.events import EventType
@@ -13,10 +18,6 @@
 from lambda_app.http_resources.response import ApiResponse
 from lambda_app.services.v1.ocoren_event_service import OcorenEventService
 from lambda_app.vos.events import EventVO
-
-env = os.environ['ENVIRONMENT_NAME'] if 'ENVIRONMENT_NAME' in os.environ else None
-load_dot_env(env)
-
 from lambda_app.logging import get_logger
 from lambda_app import APP_NAME, APP_VERSION, http_helper, helper
 from lambda_app.helper import open_vendor_file, print_routes
@@ -198,9 +199,108 @@ def event_create(event_type):
     return response.get_response(status_code)
 
 
+@app.route('/v1/event/<event_type>', methods=['GET'])
+def event_list(event_type):
+    """
+    :param event_type:
+    :return:
+    ---
+    get:
+        summary: List event
+        parameters:
+            - in: path
+              name: event_type
+              description: "Event type"
+              required: true
+              schema:
+                type: string
+                example: ocoren-event
+        responses:
+            200:
+                content:
+                    application/json:
+                        schema: EventListResponseSchema
+            4xx:
+                content:
+                    application/json:
+                        schema: EventListErrorResponseSchema
+        """
+    request = ApiRequest().parse_request(app)
+    logger.info('event_type: {}'.format(event_type))
+    logger.info('request: {}'.format(request))
+
+    # event_tracker = EventTracker(logger)
+    #
+    status_code = 200
+    response = ApiResponse(request)
+    response.set_hateos(False)
+    # try:
+    #     # event_type validation
+    #     if EventType.from_value(event_type) not in EventType.get_public_events():
+    #         exception = ApiException(MessagesEnum.EVENT_TYPE_UNKNOWN_ERROR)
+    #         exception.set_message_params([event_type])
+    #         raise exception
+    #
+    #     event_vo = EventVO(event_type=event_type, data=request.where)
+    #     # if EventType.from_value(event_type) == EventType.OCOREN_EVENT:
+    #     #     event_service = OcorenEventService()
+    #     # else:
+    #     #     event_service = ProductEventService()
+    #     event_service = OcorenEventService()
+    #     service = EventManager(logger=logger, event_service=event_service)
+    #     result = service.process(event_vo)
+    #     event_hash = event_vo.hash
+    #
+    #     event_tracker.track(event_hash, event_vo.to_dict())
+    #
+    #     if result:
+    #         code = MessagesEnum.EVENT_REGISTERED_WITH_SUCCESS.code
+    #         label = MessagesEnum.EVENT_REGISTERED_WITH_SUCCESS.label
+    #         message = MessagesEnum.EVENT_REGISTERED_WITH_SUCCESS.message
+    #         params = None
+    #     else:
+    #         if isinstance(service.exception, ApiException):
+    #             raise service.exception
+    #         else:
+    #             raise ApiException(MessagesEnum.INTERNAL_SERVER_ERROR)
+    # except Exception as err:
+    #     logger.error(err)
+    #     result = False
+    #     event_hash = None
+    #     if isinstance(err, ApiException):
+    #         api_ex = err
+    #         status_code = 400
+    #     else:
+    #         api_ex = ApiException(MessagesEnum.CREATE_ERROR)
+    #         status_code = 500
+    #
+    #     code = api_ex.code
+    #     label = api_ex.label
+    #     message = api_ex.message
+    #     params = api_ex.params
+    #
+    # data = {
+    #     "result": result,
+    #     "event_hash": event_hash,
+    #     "code": code,
+    #     "label": label,
+    #     "message": message,
+    #     "params": params
+    # }
+
+
+    data = {}
+
+    response.set_data(data)
+    response.set_total()
+
+    # event_tracker.track(event_hash, data)
+    return response.get_response(status_code)
+
+
 # doc
 spec.path(view=alive, path="/alive", operations=get_doc(alive))
-# spec.path(view=event_list, path="/v1/event/{event_type}", operations=get_doc(event_list))
+spec.path(view=event_list, path="/v1/event/{event_type}", operations=get_doc(event_list))
 spec.path(view=event_create, path="/v1/event/{event_type}", operations=get_doc(event_create))
 
 print_routes(app, logger)

examples/lambda_api/lambda_app/database/mysql.py

@@ -56,7 +56,10 @@ def get_connection(config=None, connect=True, retry=False):
                     _RETRY_COUNT += 1
                     # Fix para tratar diff entre docker/local
                     if config.DB_HOST == 'mysql':
+                        old_value = config.DB_HOST
                         config.DB_HOST = 'localhost'
+                        logger.info(
+                            'Changing the endpoint from {} to {}'.format(old_value, config.DB_HOST))
                     return get_connection(config, True)
     else:
         connection = _CONNECTION

examples/lambda_api/lambda_app/events/aws/sqs.py

@@ -25,9 +25,12 @@ def connect(self, retry=False):
         try:
             endpoint_url = self.config.SQS_ENDPOINT
             profile = os.environ['AWS_PROFILE'] if 'AWS_PROFILE' in os.environ else None
+            queue_name = os.path.basename(os.environ['APP_QUEUE']) if 'APP_QUEUE' in os.environ else None
             self.logger.info('SQSEvents - profile: {}'.format(profile))
             self.logger.info('SQSEvents - endpoint_url: {}'.format(endpoint_url))
+            self.logger.info('SQSEvents - queue_name: {}'.format(queue_name))
             self.logger.info('SQSEvents - self.config.REGION_NAME: {}'.format(self.config.REGION_NAME))
+
             if profile:
                 session = boto3.session.Session(profile_name=profile)
                 connection = session.resource(
@@ -43,10 +46,11 @@ def connect(self, retry=False):
                 )
 
             try:
-                connection.get_queue_by_name(QueueName='test')
+                connection.get_queue_by_name(QueueName=queue_name)
             except Exception as err:
                 if helper.has_attr(err, "response") and err.response['Error']:
                     self.logger.info('SQSEvents - Connected')
+                    self.logger.error(err)
                 else:
                     raise err
 
@@ -66,7 +70,9 @@ def connect(self, retry=False):
                     _RETRY_COUNT += 1
                     # Fix para tratar diff entre docker/local
                     if self.config.SQS_ENDPOINT == 'http://0.0.0.0:4566' or self.config.SQS_ENDPOINT == 'http://localstack:4566':
-                        self.config.DB_HOST = 'http://localhost:4566'
+                        old_value = self.config.SQS_ENDPOINT
+                        self.config.SQS_ENDPOINT = 'http://localhost:4566'
+                        self.logger.info('Changing the endpoint from {} to {}'.format(old_value, self.config.SQS_ENDPOINT))
                     connection = self.connect(retry=True)
         return connection
 

examples/lambda_api/lambda_app/helper.py

@@ -164,3 +164,14 @@ def print_routes(app, logger):
         methods = list(dict_route.keys())
         for method in methods:
             logger.info('Route: %s - %s', method, path)
+
+
+def get_environment():
+    environment = 'development'
+    if 'ENVIRONMENT' in os.environ:
+        environment = os.environ['ENVIRONMENT']
+    elif 'ENVIRONMENT_NAME' in os.environ:
+        environment = os.environ['ENVIRONMENT_NAME']
+    elif 'APP_ENV' in os.environ:
+        environment = os.environ['APP_ENV']
+    return environment

examples/lambda_api/public/swagger/openapi.yml

@@ -6,6 +6,20 @@ components:
           example: I'm alive!
           type: string
       type: object
+    Event:
+      properties:
+        data:
+          type: object
+        date:
+          example: '2021-05-03T19:41:36.315842-03:00'
+          format: date-time
+          type: string
+        hash:
+          example: 406cce9743906f7b8d7dd5d5c5d8c95d820eeefd72a3a554a4a726d022d8fa19
+          type: string
+        type:
+          type: string
+      type: object
     EventCreateErrorResponse:
       properties:
         code:
@@ -65,6 +79,61 @@ components:
           example: true
           type: boolean
       type: object
+    EventListResponse:
+      properties:
+        control:
+          $ref: '#/components/schemas/RequestControl'
+        data:
+          items:
+            $ref: '#/components/schemas/Event'
+          type: array
+        links:
+          items:
+            $ref: '#/components/schemas/Link'
+          type: array
+        meta:
+          $ref: '#/components/schemas/Meta'
+      type: object
+    Link:
+      properties:
+        href:
+          type: string
+        method:
+          type: string
+        rel:
+          type: string
+      type: object
+    Meta:
+      properties:
+        first:
+          format: url
+          type: string
+        href:
+          format: url
+          type: string
+        last:
+          format: url
+          type: string
+        next:
+          format: url
+          type: string
+        previous:
+          format: url
+          type: string
+      type: object
+    RequestControl:
+      properties:
+        count:
+          type: integer
+        limit:
+          type: integer
+        offset:
+          type: integer
+        total:
+          type: integer
+      required:
+      - limit
+      type: object
 info:
   title: template-serverless-lambda-python-lambda-api
   version: 1.0.0
@@ -81,6 +150,27 @@ paths:
           description: Success response
       summary: Service Health Method
   /v1/event/{event_type}:
+    get:
+      parameters:
+      - description: Event type
+        in: path
+        name: event_type
+        required: true
+        schema:
+          example: ocoren-event
+          type: string
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EventListResponse'
+        4xx:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EventListErrorResponseSchema'
+      summary: List event
     post:
       parameters:
       - description: Event type

examples/lambda_api/requirements.txt

@@ -8,5 +8,3 @@ Flask
 pyyaml
 apispec
 marshmallow
-greenlet
-gevent