troca de variável do projeto do projectrc para ficar compativel com os demais pontos da aplicacao;

Correção de Dockerfile (remoção de variável não usada nos exemplos);

Author: andersoncontreira

.projectrc

@@ -1,3 +1,3 @@
 # project
-PROJECT_NAME=template-serverless-lambda-python
+APP_NAME=template-serverless-lambda-python
 NETWORK_NAME=service-python

docker/python/Dockerfile

@@ -1,15 +1,14 @@
 FROM python:3.8.11-alpine3.13
 MAINTAINER Anderson Contreira <anderson.contreira@gmail.com>
 
-ARG PROJECT_NAME=template-serverless-lambda-python
 ARG FLASK_PORT=5000
 ARG ENVIRONMENT_NAME=development
 ENV FLASK_ENV=$ENVIRONMENT_NAME \
     FLASK_APP=app.py
 
 EXPOSE ${FLASK_PORT}
 
-WORKDIR /${PROJECT_NAME}
+WORKDIR /app
 
 # SQLite support
 RUN apk update \

examples/lambda_api/.projectrc

@@ -1,4 +1,4 @@
-PROJECT_NAME=template-serverless-lambda-python-lambda-api
+APP_NAME=template-serverless-lambda-python-lambda-api
 NETWORK_NAME=service-python
 APP_QUEUE=test-queue
 APP_LAMBDA_NAME=lambda_api

examples/lambda_api/docker/python/Dockerfile

@@ -1,7 +1,6 @@
 FROM python:3.8.11-alpine3.13
 MAINTAINER Anderson Contreira <anderson.contreira@gmail.com>
 
-ARG PROJECT_NAME=template-serverless-lambda-python
 ARG FLASK_PORT=5000
 ARG ENVIRONMENT_NAME=development
 ENV FLASK_ENV=$ENVIRONMENT_NAME \

examples/lambda_api/lambda_app/__init__.py

@@ -1,3 +1,22 @@
-APP_NAME = 'template-serverless-lambda-python-lambda-api'
-APP_VERSION = '1.0.0'
-APP_ARCH_VERSION = 'v1'
+import os
+from dotenv import dotenv_values
+
+if __package__:
+    current_path = os.path.abspath(os.path.dirname(__file__)).replace('/' + str(__package__), '', 1)
+else:
+    current_path = os.path.abspath(os.path.dirname(__file__))
+
+env_vars = {}
+projectrc_file = current_path + '.projectrc'
+
+PROJECT_NAME = os.path.basename(current_path).replace('_', '-')
+
+if not current_path[-1] == '/':
+    current_path += '/'
+
+if os.path.exists(projectrc_file):
+    env_vars = dotenv_values(projectrc_file)
+
+APP_NAME = env_vars['APP_NAME'] if 'APP_NAME' in env_vars else PROJECT_NAME
+APP_VERSION = env_vars['APP_VERSION'] if 'APP_VERSION' in env_vars else '1.0.0'
+APP_ARCH_VERSION = env_vars['APP_ARCH_VERSION'] if 'APP_ARCH_VERSION' in env_vars else 'v1'

examples/lambda_api/scripts/docker/exec-sh.sh

@@ -5,9 +5,9 @@ elif test -f ./scripts/.projectrc; then
   source ./scripts/.projectrc
 fi
 
-if [ -z "$PROJECT_NAME" ]; then
-  echo 'PROJECT_NAME not defined'
+if [ -z "$APP_NAME" ]; then
+  echo 'APP_NAME not defined'
   exit 1
 else
-  docker-compose exec $PROJECT_NAME /bin/sh
+  docker-compose exec $APP_NAME /bin/sh
 fi

examples/lambda_api/scripts/zip.sh

@@ -5,9 +5,9 @@ elif test -f ./scripts/.projectrc; then
   source ./scripts/.projectrc
 fi
 
-if [ -z "$PROJECT_NAME" ]; then
-  echo 'PROJECT_NAME not defined'
+if [ -z "$APP_NAME" ]; then
+  echo 'APP_NAME not defined'
   exit 1
 else
-  zip -r $PROJECT_NAME.zip ./ -x '*.git*' -x './zip.sh*' -x './venv/*' -x './.idea/*'  -x './node_modules/*'
+  zip -r $APP_NAME.zip ./ -x '*.git*' -x './zip.sh*' -x './venv/*' -x './.idea/*'  -x './node_modules/*'
 fi

examples/lambda_api/tests/component/helpers/events/__init__.py renamed to examples/lambda_api/tests/component/helpers/aws/__init__.py

@@ -12,7 +12,7 @@
 from lambda_app.logging import get_logger
 
 from tests.component.helpers.database.mysql_helper import MySQLHelper
-from tests.component.helpers.events.aws.sqs_helper import SQSHelper
+from tests.component.helpers.aws.sqs_helper import SQSHelper
 from tests.unit.helpers.aws.sqs_helper import get_sqs_event_sample
 from tests.unit.mocks.aws_mocks.aws_lambda_mock import FakeLambdaContext
 from tests.unit.mocks.lambda_event_mocks.request_event import create_aws_api_gateway_proxy_request_event