Correcoes no client SQS;

andersoncontreira · andersoncontreira · commit 2ca7b5155927 · 2021-10-15T17:10:59.000-03:00
Ajustes nos scripts de interação com o Localstack;
diff --git a/examples/lambda_api/lambda_app/events/aws/sqs.py b/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
 
diff --git a/examples/lambda_api/scripts/localstack/sqs/receive-message.sh b/examples/lambda_api/scripts/localstack/sqs/receive-message.sh
@@ -1,7 +1,10 @@
 QUEUE=$1
 if [ -z "$QUEUE" ]
 then
-  QUEUE='http://localhost:4566/000000000000/test'
+  QUEUE='http://localhost:4566/000000000000/test-queue'
+else
+  QUEUE=$(basename -- $QUEUE)
+  QUEUE="http://localhost:4566/000000000000/${QUEUE}"
 fi
 
 echo "aws --endpoint-url=http://localhost:4566 sqs receive-message --queue-url $QUEUE"
diff --git a/examples/lambda_api/scripts/localstack/sqs/send-message.sh b/examples/lambda_api/scripts/localstack/sqs/send-message.sh
@@ -1,14 +1,17 @@
 QUEUE=$1
 if [ -z "$QUEUE" ]
 then
-  QUEUE='http://localhost:4566/000000000000/test'
+  QUEUE='http://localhost:4566/000000000000/test-queue'
+else
+  QUEUE=$(basename -- $QUEUE)
+  QUEUE="http://localhost:4566/000000000000/${QUEUE}"
 fi
 MESSAGE=$2
 if [ -z "$MESSAGE" ]
 then
-  #MESSAGE='test message'
-  MESSAGE=$(cat tests/datasources/events/sourcing-service-decision-processor/sample.json)
+  MESSAGE=$(cat samples/localstack/sqs/sample.json)
 fi
-
+#echo $QUEUE
+#exit
 echo "aws --endpoint-url=http://localhost:4566 sqs send-message --queue-url $QUEUE --message-body '$MESSAGE'"
 aws --endpoint-url=http://localhost:4566 sqs send-message --queue-url $QUEUE --message-body "'$MESSAGE'"
diff --git a/examples/lambda_sqs/README.md b/examples/lambda_sqs/README.md
@@ -9,7 +9,7 @@ Example of architecture with AWS SQS and AWS Lambda.
 There are no routes for this project.
 
 # Prerequisites
-- Python 3.6
+- Python 3.6 (Attention)
 - docker
 - docker-compose
 - python-dotenv
@@ -54,6 +54,11 @@ Execute the follow command:
 ```
 
 ### Running via docker
+Installing dependencies:
+```
+./scripts/venv.sh
+```
+
 To execute the build:
 ```
 ./scripts/runenv.sh --build
diff --git a/examples/lambda_sqs/docker-compose.yml b/examples/lambda_sqs/docker-compose.yml
@@ -1,21 +1,5 @@
 version: "3.2"
 services:
-#  template-serverless-lambda-python-lambda-sqs:
-#    container_name: lambda-sqs
-#    build:
-#      context: .
-#      dockerfile: ./docker/python/Dockerfile
-#    privileged: true
-#    environment:
-#      # Fake credentials for Localstack
-#      AWS_ACCESS_KEY_ID: AKIAIOSFODNN7EXAMPLE
-#      AWS_SECRET_ACCESS_KEY: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
-#    ports:
-#      - 5001:5000
-#    networks:
-#      - service-python
-#    volumes:
-#      - ./:/app
   redis:
     image: "redis:alpine"
     ports:
@@ -24,6 +8,7 @@ services:
       - 6379
     networks:
       - service-python
+    # hostname: redis
   mysql:
     image: mysql:5.7.22
     ports:
@@ -49,6 +34,7 @@ services:
       LAMBDA_EXECUTOR: local
       DEBUG: 1
       HOSTNAME_EXTERNAL: localstack
+    hostname: localstack
     networks:
       - service-python
     volumes:
diff --git a/examples/lambda_sqs/lambda_app/events/aws/sqs.py b/examples/lambda_sqs/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
 
diff --git a/examples/lambda_sqs/lambda_app/services/v1/carrier_notifier_service.py b/examples/lambda_sqs/lambda_app/services/v1/carrier_notifier_service.py
@@ -35,6 +35,8 @@ def process(self, sqs_event):
             for record in records:
                 process_counter += 1
                 event = self._read_event(record)
+                if event is None:
+                    raise Exception('Event is None')
                 event_hash = event['hash'] if 'hash' in event else generate_hash(event)
 
                 self.logger.info('Event: {}'.format(event))
diff --git a/examples/lambda_sqs/samples/localstack/sqs/SQSTest.json b/examples/lambda_sqs/samples/localstack/sqs/SQSTest.json
diff --git a/examples/lambda_sqs/samples/localstack/sqs/sample.json b/examples/lambda_sqs/samples/localstack/sqs/sample.json
@@ -0,0 +1,6 @@
+{
+   "chavenfe": "32210206107255000134550010001712551245826554",
+   "ocor": "MOTIVO DO CANCELAMENTO",
+   "origem": "SAC/EAGLE",
+   "pedido": "Z1223321"
+}
diff --git a/examples/lambda_sqs/scripts/localstack/sqs/receive-message.sh b/examples/lambda_sqs/scripts/localstack/sqs/receive-message.sh
@@ -1,7 +1,10 @@
 QUEUE=$1
 if [ -z "$QUEUE" ]
 then
-  QUEUE='http://localhost:4566/000000000000/test'
+  QUEUE='http://localhost:4566/000000000000/test-queue'
+else
+  QUEUE=$(basename -- $QUEUE)
+  QUEUE="http://localhost:4566/000000000000/${QUEUE}"
 fi
 
 echo "aws --endpoint-url=http://localhost:4566 sqs receive-message --queue-url $QUEUE"
diff --git a/examples/lambda_sqs/scripts/localstack/sqs/send-message.sh b/examples/lambda_sqs/scripts/localstack/sqs/send-message.sh
@@ -1,14 +1,17 @@
 QUEUE=$1
 if [ -z "$QUEUE" ]
 then
-  QUEUE='http://localhost:4566/000000000000/test'
+  QUEUE='http://localhost:4566/000000000000/test-queue'
+else
+  QUEUE=$(basename -- $QUEUE)
+  QUEUE="http://localhost:4566/000000000000/${QUEUE}"
 fi
 MESSAGE=$2
 if [ -z "$MESSAGE" ]
 then
-  #MESSAGE='test message'
-  MESSAGE=$(cat tests/datasources/events/sourcing-service-decision-processor/sample.json)
+  MESSAGE=$(cat samples/localstack/sqs/sample.json)
 fi
-
+#echo $QUEUE
+#exit
 echo "aws --endpoint-url=http://localhost:4566 sqs send-message --queue-url $QUEUE --message-body '$MESSAGE'"
 aws --endpoint-url=http://localhost:4566 sqs send-message --queue-url $QUEUE --message-body "'$MESSAGE'"
diff --git a/examples/lambda_sqs/tests/component/test_app.py b/examples/lambda_sqs/tests/component/test_app.py
@@ -19,18 +19,22 @@ def get_queue_message():
     queue_url = os.getenv("APP_QUEUE")
     event = SQSHelper.get_message(queue_url)
 
-    return (event,)
+    return (event,),
 
 
 def get_queue_events_samples():
     event = get_cancelamento_event()
     # delivery_event = get_delivery_time_simulator_event_sample()
     sqs_event = create_chalice_sqs_event(event)
 
-    return (sqs_event,)
-
+    return (sqs_event,),
 
+# AttributeError: module 'typing' has no attribute '_classvar'
+# This error occours on Python 3.8
 class AppTestCase(BaseComponentTestCase):
+    """
+
+    """
     EXECUTE_FIXTURE = True
     CONFIG = None
 
@@ -66,8 +70,11 @@ def fixture_sqs(cls, logger, queue_url):
         message = event['Records'][0]
         if 'body' in message:
             message = message['body']
+        # print(message)
         SQSHelper.create_message(message, queue_url)
         logger.info('created message: {}'.format(message))
+        # message = SQSHelper.get_message(queue_url)
+        # print(message)
 
     @data_provider(get_queue_message)
     def test_index(self, event):
