atualizacao de scripts de testes etc

andersoncontreira · andersoncontreira · commit 14b7898c2639 · 2022-01-07T10:05:30.000-03:00
diff --git a/examples/lambda_api/boot.py b/examples/lambda_api/boot.py
@@ -138,7 +138,7 @@ def load_env(env='dev', force=False):
 
     logger = get_internal_logger()
 
-    global _LOADED, _ENV_KEYS
+    global _LOADED, _ENV_KEYS, _DEFAULT_ENV_CONFIGS
     if not _LOADED or force:
 
         logger.info('Boot - Loading env: {}'.format(env))
@@ -166,10 +166,14 @@ def load_env(env='dev', force=False):
 
             if env in configs['stages']:
                 env_vars = configs['stages'][env]['environment_variables']
-                for k, v in env_vars.items():
-                    _ENV_KEYS.append(k)
-                    os.environ[k] = v
-                _LOADED = True
+                if isinstance(env_vars, dict):
+                    for k, v in env_vars.items():
+                        _ENV_KEYS.append(k)
+                        if k not in os.environ:
+                            os.environ[k] = v
+                    _LOADED = True
+                else:
+                    logger.error("Unable to load env_vars from chalice: {}".format(env_vars))
             else:
                 # solution for projects with development flag instead of dev
                 if env == 'dev':
diff --git a/examples/lambda_api/scripts/autopep8.sh b/examples/lambda_api/scripts/autopep8.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   autopep8 --in-place --recursive --aggressive
 else
diff --git a/examples/lambda_api/scripts/clean-env.sh b/examples/lambda_api/scripts/clean-env.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # -----------------------------------------------------------------------------
 # Current file variables
 # -----------------------------------------------------------------------------
diff --git a/examples/lambda_api/scripts/docker/create-network.sh b/examples/lambda_api/scripts/docker/create-network.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if test -f .projectrc; then
   source .projectrc
 elif test -f ./scripts/.projectrc; then
diff --git a/examples/lambda_api/scripts/docker/exec-sh.sh b/examples/lambda_api/scripts/docker/exec-sh.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if test -f .projectrc; then
   source .projectrc
 elif test -f ./scripts/.projectrc; then
diff --git a/examples/lambda_api/scripts/flask/run-local.sh b/examples/lambda_api/scripts/flask/run-local.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 python3 -m venv venv
 source ./venv/bin/activate
 
diff --git a/examples/lambda_api/scripts/install.sh b/examples/lambda_api/scripts/install.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if test -f "requirements.txt"; then
   python3 -m pip install -r requirements.txt
 fi
diff --git a/examples/lambda_api/scripts/localstack/lambda/create-event-source-mapping.sh b/examples/lambda_api/scripts/localstack/lambda/create-event-source-mapping.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   echo 'Function name must be informed'
   exit 1
diff --git a/examples/lambda_api/scripts/localstack/lambda/create-function-from-s3.sh b/examples/lambda_api/scripts/localstack/lambda/create-function-from-s3.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # -----------------------------------------------------------------------------
 # Current file variables
 # -----------------------------------------------------------------------------
diff --git a/examples/lambda_api/scripts/localstack/lambda/create-layer-from-vendor.sh b/examples/lambda_api/scripts/localstack/lambda/create-layer-from-vendor.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # https://aws.amazon.com/premiumsupport/knowledge-center/lambda-layer-simulated-docker/
 if [ -z "$1" ]; then
   echo 'Function path must be informed'
diff --git a/examples/lambda_api/scripts/localstack/lambda/create-layer.sh b/examples/lambda_api/scripts/localstack/lambda/create-layer.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # https://aws.amazon.com/premiumsupport/knowledge-center/lambda-layer-simulated-docker/
 if [ -z "$1" ]; then
   echo 'Function path must be informed'
diff --git a/examples/lambda_api/scripts/localstack/lambda/invoke-function.sh b/examples/lambda_api/scripts/localstack/lambda/invoke-function.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   echo 'Function name must be informed'
   exit 1
diff --git a/examples/lambda_api/scripts/localstack/lambda/invoke-sqs-function.sh b/examples/lambda_api/scripts/localstack/lambda/invoke-sqs-function.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   echo 'Function name must be informed'
   exit 1
diff --git a/examples/lambda_api/scripts/localstack/lambda/list-function.sh b/examples/lambda_api/scripts/localstack/lambda/list-function.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ $RUNNING_IN_CONTAINER ]; then
   HOST=localstack
 else
diff --git a/examples/lambda_api/scripts/localstack/sqs/create-queue.sh b/examples/lambda_api/scripts/localstack/sqs/create-queue.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   echo 'Queue name must be informed'
   exit 1
diff --git a/examples/lambda_api/scripts/localstack/sqs/delete-queue.sh b/examples/lambda_api/scripts/localstack/sqs/delete-queue.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   echo 'Queue name must be informed'
   exit 1
diff --git a/examples/lambda_api/scripts/localstack/sqs/list-queues.sh b/examples/lambda_api/scripts/localstack/sqs/list-queues.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ $RUNNING_IN_CONTAINER ]; then
   HOST=localstack
 else
diff --git a/examples/lambda_api/scripts/localstack/sqs/receive-message.sh b/examples/lambda_api/scripts/localstack/sqs/receive-message.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ $RUNNING_IN_CONTAINER ]; then
   HOST=localstack
 else
diff --git a/examples/lambda_api/scripts/localstack/sqs/send-message.sh b/examples/lambda_api/scripts/localstack/sqs/send-message.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # -----------------------------------------------------------------------------
 # Current file variables
 # -----------------------------------------------------------------------------
diff --git a/examples/lambda_api/scripts/runenv.sh b/examples/lambda_api/scripts/runenv.sh
@@ -1,2 +1,3 @@
+#!/bin/bash
 export TEST_ENV=0
 docker-compose up $1 $2 $3
diff --git a/examples/lambda_api/scripts/testenv.sh b/examples/lambda_api/scripts/testenv.sh
@@ -1,2 +1,3 @@
+#!/bin/bash
 export TEST_ENV=1
 docker-compose up $1 $2 $3
diff --git a/examples/lambda_api/scripts/tests/component-coverage.sh b/examples/lambda_api/scripts/tests/component-coverage.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   coverage run -m unittest discover -s ./tests/component -t ./
 else
diff --git a/examples/lambda_api/scripts/tests/component-tests.sh b/examples/lambda_api/scripts/tests/component-tests.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   python3 -m unittest discover -s ./tests/component -t ./
 else
diff --git a/examples/lambda_api/scripts/tests/install-tests.sh b/examples/lambda_api/scripts/tests/install-tests.sh
@@ -1 +1,2 @@
+#!/bin/bash
 python3 -m pip install -r requirements-tests.txt
diff --git a/examples/lambda_api/scripts/tests/integration-coverage.sh b/examples/lambda_api/scripts/tests/integration-coverage.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   coverage run -m unittest discover -s ./tests/integration -t ./
 else
diff --git a/examples/lambda_api/scripts/tests/integration-tests.sh b/examples/lambda_api/scripts/tests/integration-tests.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   python3 -m unittest discover -s ./tests/integration -t ./
 else
diff --git a/examples/lambda_api/scripts/tests/tests.sh b/examples/lambda_api/scripts/tests/tests.sh
@@ -1 +1,2 @@
+#!/bin/bash
 python3 -m unittest discover -s ./tests -t ./tests
diff --git a/examples/lambda_api/scripts/tests/unit-coverage-no-report-html.sh b/examples/lambda_api/scripts/tests/unit-coverage-no-report-html.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   python3 -m coverage run -m unittest discover -s ./tests/unit -t ./
 else
diff --git a/examples/lambda_api/scripts/tests/unit-coverage.sh b/examples/lambda_api/scripts/tests/unit-coverage.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   coverage run -m unittest discover -s ./tests/unit -t ./
 else
diff --git a/examples/lambda_api/scripts/tests/unit-tests.sh b/examples/lambda_api/scripts/tests/unit-tests.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ -z "$1" ]; then
   python3 -m unittest discover -s ./tests/unit -t ./
 else
diff --git a/examples/lambda_api/scripts/tools/package.sh b/examples/lambda_api/scripts/tools/package.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Program variables
 program="Package"
 program_flag="${program}:"
diff --git a/examples/lambda_api/scripts/zip.sh b/examples/lambda_api/scripts/zip.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 if test -f .projectrc; then
   source .projectrc
 elif test -f ./scripts/.projectrc; then
diff --git a/examples/lambda_api_restful/boot.py b/examples/lambda_api_restful/boot.py
@@ -0,0 +1,217 @@
+import json
+import os
+import sys
+
+from lambda_app import APP_NAME
+
+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__))
+
+if not current_path[-1] == '/':
+    current_path += '/'
+
+ROOT_DIR = current_path
+_LOADED = False
+_ENV_KEYS = []
+
+try:
+    import chalicelib
+
+    APP_TYPE = 'Chalice'
+except Exception as err:
+    APP_TYPE = 'Flask'
+
+_DEFAULT_ENV_CONFIGS = {
+    "APP_ENV": "development",
+    "DEBUG": "true",
+    "LOG_LEVEL": "info",
+    "APP_TYPE": APP_TYPE
+}
+
+
+def set_root_dir(root_dir):
+    global ROOT_DIR
+    ROOT_DIR = root_dir
+
+
+def is_loaded():
+    global _LOADED
+    return _LOADED
+
+
+def reset():
+    global _LOADED, _ENV_KEYS
+    _LOADED = False
+    _ENV_KEYS = []
+
+
+def get_env_keys():
+    global _ENV_KEYS
+    return _ENV_KEYS
+
+
+def get_internal_logger():
+    try:
+        from lambda_app.logging import get_logger
+        logger = get_logger()
+    except Exception as err:
+        print('load_env: Unable to load logger: {}'.format(err))
+        import logging
+        log_name = APP_NAME
+        logger = logging.getLogger(log_name)
+    return logger
+
+
+def load_dot_env(env='development', force=False):
+    from dotenv import dotenv_values
+    # env default value
+    if env is None:
+        env = 'development'
+
+    logger = get_internal_logger()
+
+    global _LOADED, _ENV_KEYS
+    if not _LOADED or force:
+        logger.info('Boot - Loading env: {}'.format(env))
+
+        # Default
+        for k, v in _DEFAULT_ENV_CONFIGS.items():
+            _ENV_KEYS.append(k)
+            if k == 'APP_ENV':
+                v = env
+            os.environ[k] = v
+
+        config_path = '{}env/{}.env'.format(current_path, env)
+        if os.path.isfile(config_path):
+            env_vars = dotenv_values(config_path)
+
+            for k, v in env_vars.items():
+                _ENV_KEYS.append(k)
+                os.environ[k] = v
+            _LOADED = True
+        else:
+            # try with development
+            if env == 'dev':
+                load_dot_env('development')
+            else:
+                # Try to load via secrets manager
+                result = load_secrets(env=env)
+                if result:
+                    _LOADED = True
+                else:
+                    logger.error('Unable to load config')
+
+    else:
+        pass
+
+
+def load_secrets(env='staging'):
+    global _ENV_KEYS
+    from lambda_app.aws.secrets import Secrets
+    logger = get_internal_logger()
+    result = False
+
+    logger.info('Boot - Loading env by secret manager: {}'.format(env))
+    app_name = os.environ["APP_NAME"] if "APP_NAME" in os.environ else APP_NAME
+    secret_name = app_name + "-" + env
+    try:
+        logger.info('secret name: {}'.format(secret_name))
+        secrets_dict = Secrets().get_secrets(secret_name=secret_name)
+    except Exception as err:
+        secrets_dict = None
+        logger.error(err)
+
+    if secrets_dict is not None:
+        for k, v in secrets_dict.items():
+            os.environ[k] = v
+        result = True
+
+    return result
+
+
+def load_env(env='dev', force=False):
+    # env default value
+    if env is None:
+        env = 'dev'
+
+    logger = get_internal_logger()
+
+    global _LOADED, _ENV_KEYS, _DEFAULT_ENV_CONFIGS
+    if not _LOADED or force:
+
+        logger.info('Boot - Loading env: {}'.format(env))
+
+        # Default
+        for k, v in _DEFAULT_ENV_CONFIGS.items():
+            _ENV_KEYS.append(k)
+            if k == 'APP_ENV':
+                v = env
+            os.environ[k] = v
+
+        chalice_config_path = '{}.chalice/config.json'.format(current_path)
+
+        if os.path.isfile(chalice_config_path):
+            file = open(chalice_config_path, 'r')
+            data = file.read()
+            configs = json.loads(data)
+
+            # solution for projects with integration tests
+            if env not in configs['stages'] and env == 'integration':
+                env = 'staging'
+            # solution for projects with dev flag instead of development
+            if env not in configs['stages'] and env == 'development':
+                env = 'dev'
+
+            if env in configs['stages']:
+                env_vars = configs['stages'][env]['environment_variables']
+                if isinstance(env_vars, dict):
+                    for k, v in env_vars.items():
+                        _ENV_KEYS.append(k)
+                        if k not in os.environ:
+                            os.environ[k] = v
+                    _LOADED = True
+                else:
+                    logger.error("Unable to load env_vars from chalice: {}".format(env_vars))
+            else:
+                # solution for projects with development flag instead of dev
+                if env == 'dev':
+                    load_env('development')
+                else:
+                    logger.error('Unable to load config')
+                    _LOADED = False
+            # close the file
+            file.close()
+        else:
+            logger.error('Unable to load config')
+            _LOADED = False
+    else:
+        pass
+
+
+def register_vendor():
+    vendor_path = current_path + "vendor"
+    # print(vendor_path)
+    if not os.path.isdir(vendor_path):
+        vendor_path = current_path + "/vendor"
+        # print(vendor_path)
+
+    sys.path.insert(0, vendor_path)
+
+
+def register_path(path):
+    if os.path.isdir(path):
+        sys.path.insert(0, path)
+
+
+def print_env(app, logger):
+    logger.info('Environment: %s' % os.getenv('APP_ENV'))
+    # logger.info('Host: %s' % os.getenv('APP_HOST'))
+    # logger.info('Port: %s' % os.getenv('APP_PORT'))
+    # logger.info('Database: %s' % os.getenv('DB_HOST'))
+    logger.info('Log Level: %s' % os.getenv('LOG_LEVEL'))
+    logger.info('Debug: %s' % os.getenv('DEBUG'))
+
+
+register_vendor()
diff --git a/examples/lambda_sqs/boot.py b/examples/lambda_sqs/boot.py
diff --git a/examples/lambda_sqs/lambda_app/repositories/redis/product_repository.py b/examples/lambda_sqs/lambda_app/repositories/redis/product_repository.py
diff --git a/examples/lambda_sqs_light/boot.py b/examples/lambda_sqs_light/boot.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/bin/bash`
`1`	`2`	`if [ -z "$1" ]; then`
`2`	`3`	`autopep8 --in-place --recursive --aggressive`
`3`	`4`	`else`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/bin/bash`
`1`	`2`	`# -----------------------------------------------------------------------------`
`2`	`3`	`# Current file variables`
`3`	`4`	`# -----------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/bin/bash`
`1`	`2`	`if test -f .projectrc; then`
`2`	`3`	`source .projectrc`
`3`	`4`	`elif test -f ./scripts/.projectrc; then`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/bin/bash`
`1`	`2`	`python3 -m venv venv`
`2`	`3`	`source ./venv/bin/activate`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/bin/bash`
`1`	`2`	`if test -f "requirements.txt"; then`
`2`	`3`	`python3 -m pip install -r requirements.txt`
`3`	`4`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/bin/bash`
`1`	`2`	`# https://aws.amazon.com/premiumsupport/knowledge-center/lambda-layer-simulated-docker/`
`2`	`3`	`if [ -z "$1" ]; then`
`3`	`4`	`echo 'Function path must be informed'`