Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

Commit c832520

Browse files
andersoncontreiraandersoncontreira
committed
Correção de pastas que são lidas no testes com cobertura.
Correção para executar o boot para a API, criar fila, porém temporariamente sem criar a lambda no Localstack Correção de path para database_mocks
1 parent d7cc678 commit c832520

File tree

21 files changed

+5833
-98
lines changed

21 files changed

+5833
-98
lines changed

‎examples/lambda_api/.coveragerc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ omit =
1616
*~/.local/lib/*
1717
/usr/local/lib*
1818
/home/*/.local/*
19+
vendor/*
20+
tests/*
1921

2022

2123
[report]
@@ -26,6 +28,8 @@ omit =
2628
*~/.local/lib/*
2729
/usr/local/lib*
2830
/home/*/.local/*
31+
vendor/*
32+
tests/*
2933

3034
[html]
3135
directory = ./target/unit/coverage_html/

‎examples/lambda_api/.projectrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ APP_REGION=us-east-1
55
APP_QUEUE=test-queue
66
APP_LAMBDA_NAME=lambda_api
77
APP_LAMBDA_EVENT_SOURCE=false
8+
APP_LAMBDA_RUNTIME=python3.8
89
# APP_LAMBDA_HANDLER=app.APP
910
APP_LAMBDA_HANDLER=localstack.handler
1011
APP_PORT=5000

‎examples/lambda_api/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,3 +328,9 @@ Or:
328328
```bash
329329
./scripts/autopep8.sh ./app.py
330330
```
331+
332+
## TODO
333+
334+
* [x] Revisar porque os testes de coverage via script estão consumindo dados da vendor por um exclude dir
335+
* [ ] Replicar para os demais exemplos
336+
* [ ] Melhorar erro de importação de libs que faltam nos log handlers (ELK, Newrelic)

‎examples/lambda_api/docker-compose.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,12 @@ services:
5252
DOCKER_HOST: unix:///var/run/docker.sock
5353
PORT_WEB_UI: 9070
5454
#LAMBDA_EXECUTOR: docker # está dando erro via docker
55-
LAMBDA_EXECUTOR: local
55+
LAMBDA_EXECUTOR: docker
56+
LAMBDA_REMOTE_DOCKER: 1
57+
LAMBDA_DOCKER_NETWORK: service-python-v1
5658
DEBUG: 1
5759
HOSTNAME_EXTERNAL: localstack
60+
LEGACY_DIRECTORIES: 1
5861
networks:
5962
- service-python-v1
6063
volumes:

‎examples/lambda_api/docker/python/entrypoint.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ else
1212
export RUNNING_IN_CONTAINER=0
1313
fi
1414

15-
#echo $RUNNING_IN_CONTAINER
16-
1715
# execute the boot.sh
18-
#bash ./scripts/boot.sh
19-
# bash ./scripts/boot-queues.sh
16+
bash ./scripts/boot.sh
17+
2018

2119
# execute the flask
2220
#flask run --host 0.0.0.0
23-
python3 server.py
21+
python3 server.py

‎examples/lambda_api/public/swagger/openapi.yml

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,17 @@ components:
8585
Entry:
8686
type: object
8787
properties:
88+
status:
89+
type: string
90+
example: healthy
91+
duration:
92+
type: string
93+
example: '0:00:00.013737'
8894
tags:
8995
type: array
9096
items:
9197
type: string
9298
example: db
93-
duration:
94-
type: string
95-
example: '0:00:00.013737'
96-
status:
97-
type: string
98-
example: healthy
9999
EntryData:
100100
type: object
101101
properties:
@@ -104,43 +104,30 @@ components:
104104
HealthCheck:
105105
type: object
106106
properties:
107+
status:
108+
type: string
109+
example: healthy
107110
total_duration:
108111
type: string
109112
example: '0:00:00.013737'
110113
entries:
111114
$ref: '#/components/schemas/EntryData'
112-
status:
113-
type: string
114-
example: healthy
115-
RequestControl:
116-
type: object
117-
properties:
118-
count:
119-
type: integer
120-
total:
121-
type: integer
122-
limit:
123-
type: integer
124-
offset:
125-
type: integer
126-
required:
127-
- limit
128115
Meta:
129116
type: object
130117
properties:
131-
next:
118+
last:
132119
type: string
133120
format: url
134-
previous:
121+
href:
135122
type: string
136123
format: url
137124
first:
138125
type: string
139126
format: url
140-
href:
127+
previous:
141128
type: string
142129
format: url
143-
last:
130+
next:
144131
type: string
145132
format: url
146133
Link:
@@ -152,61 +139,72 @@ components:
152139
type: string
153140
rel:
154141
type: string
142+
RequestControl:
143+
type: object
144+
properties:
145+
limit:
146+
type: integer
147+
offset:
148+
type: integer
149+
count:
150+
type: integer
151+
total:
152+
type: integer
153+
required:
154+
- limit
155155
Event:
156156
type: object
157157
properties:
158-
type:
158+
hash:
159159
type: string
160+
example: 406cce9743906f7b8d7dd5d5c5d8c95d820eeefd72a3a554a4a726d022d8fa19
160161
date:
161162
type: string
162163
format: date-time
163164
example: '2021-05-03T19:41:36.315842-03:00'
164-
hash:
165-
type: string
166-
example: 406cce9743906f7b8d7dd5d5c5d8c95d820eeefd72a3a554a4a726d022d8fa19
167165
data:
168166
type: object
167+
type:
168+
type: string
169169
EventListResponse:
170170
type: object
171171
properties:
172-
code:
173-
type: integer
174-
example: 1
172+
message:
173+
type: string
174+
example: Success
175175
success:
176176
type: boolean
177177
example: true
178+
meta:
179+
$ref: '#/components/schemas/Meta'
178180
label:
179181
type: string
180182
example: common.success
181183
params:
182184
type: array
183185
items:
184186
type: string
185-
control:
186-
$ref: '#/components/schemas/RequestControl'
187-
meta:
188-
$ref: '#/components/schemas/Meta'
189-
message:
190-
type: string
191-
example: Success
192187
links:
193188
type: array
194189
items:
195190
$ref: '#/components/schemas/Link'
191+
control:
192+
$ref: '#/components/schemas/RequestControl'
196193
data:
197194
type: array
198195
items:
199196
$ref: '#/components/schemas/Event'
197+
code:
198+
type: integer
199+
example: 1
200200
required:
201201
- code
202202
EventListErrorResponse:
203203
type: object
204204
properties:
205-
code:
206-
type: integer
207-
example: 7
208-
trace:
205+
message:
209206
type: string
207+
example: Internal Server Error
210208
success:
211209
type: boolean
212210
example: false
@@ -217,34 +215,36 @@ components:
217215
type: array
218216
items:
219217
type: string
220-
details:
218+
code:
219+
type: integer
220+
example: 7
221+
trace:
221222
type: string
222-
message:
223+
details:
223224
type: string
224-
example: Internal Server Error
225225
required:
226226
- code
227227
EventCreateRequest:
228228
type: object
229229
properties:
230-
origem:
231-
type: string
232-
example: SAC/EAGLE
233230
pedido:
234231
type: string
235232
example: Z1223321
236-
chavenfe:
233+
origem:
237234
type: string
238-
example: '32210206107255000134550010001712551245826554'
235+
example: SAC/EAGLE
239236
ocor:
240237
type: string
241238
example: MOTIVO DO CANCELAMENTO
239+
chavenfe:
240+
type: string
241+
example: '32210206107255000134550010001712551245826554'
242242
EventCreateResponse:
243243
type: object
244244
properties:
245-
code:
246-
type: integer
247-
example: 102
245+
message:
246+
type: string
247+
example: Event registered with success
248248
label:
249249
type: string
250250
example: common.event_registered_with_success
@@ -255,18 +255,18 @@ components:
255255
event_hash:
256256
type: string
257257
example: c82bf3ee20dd2f4ae7109e52d313a3190f1a85ba3362c54d3eb6257bd0c4d69d
258+
code:
259+
type: integer
260+
example: 102
258261
result:
259262
type: boolean
260263
example: true
261-
message:
262-
type: string
263-
example: Event registered with success
264264
EventCreateErrorResponse:
265265
type: object
266266
properties:
267-
code:
268-
type: integer
269-
example: 105
267+
message:
268+
type: string
269+
example: 'Event type unknown: (%s)'
270270
label:
271271
type: string
272272
example: common.error.event_type_unknown_error
@@ -277,9 +277,9 @@ components:
277277
event_hash:
278278
type: string
279279
example: null
280+
code:
281+
type: integer
282+
example: 105
280283
result:
281284
type: boolean
282285
example: false
283-
message:
284-
type: string
285-
example: 'Event type unknown: (%s)'

‎examples/lambda_api/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ apispec
1111
marshmallow
1212
pylint
1313
autopep8
14-
gevent
14+
gevent
15+
python-json-logger

‎examples/lambda_api/scripts/boot.sh

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,22 @@ fi
8484

8585
read -p "Press enter to continue..."
8686

87-
echo '----------------------------------------'
88-
echo "$0 - Lambda boot"
89-
echo '----------------------------------------'
90-
if [ "$DEV_MODE" = "0" ]; then
91-
if test -f ${current_file_path}boot-lambda.sh; then
92-
${current_file_path}boot-lambda.sh
93-
else
94-
echo 'There is no lambda to be booted'
95-
fi
96-
else
97-
echo 'Ignoring lambda boot'
98-
fi
99-
100-
read -p "Press enter to continue..."
87+
# TODO revisar para criar uma lambda api e permitir o invoke ou api gateway via localstack
88+
# TODO ou melhor usar um container Kong + Lambda
89+
#echo '----------------------------------------'
90+
#echo "$0 - Lambda boot"
91+
#echo '----------------------------------------'
92+
#if [ "$DEV_MODE" = "0" ]; then
93+
# if test -f ${current_file_path}boot-lambda.sh; then
94+
# ${current_file_path}boot-lambda.sh
95+
# else
96+
# echo 'There is no lambda to be booted'
97+
# fi
98+
#else
99+
# echo 'Ignoring lambda boot'
100+
#fi
101+
#
102+
#read -p "Press enter to continue..."
101103

102104
echo '----------------------------------------'
103105
echo "$0 - Database boot"

‎examples/lambda_api/scripts/localstack/sqs/receive-message.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,18 @@ else
1717
QUEUE=$(basename -- $QUEUE)
1818
QUEUE="http://$HOST:4566/000000000000/${QUEUE}"
1919
fi
20-
echo "aws --endpoint-url=http://$HOST:4566 sqs receive-message --queue-url $QUEUE"
21-
aws --endpoint-url=http://$HOST:4566 sqs receive-message --queue-url $QUEUE
20+
21+
if [ -z "$2" ]; then
22+
REGION=us-east-1
23+
else
24+
REGION=$2
25+
fi
26+
27+
echo "aws --endpoint-url=http://$HOST:4566 sqs receive-message --queue-url $QUEUE --region $REGION"
28+
aws --endpoint-url=http://$HOST:4566 sqs receive-message --queue-url $QUEUE --region $REGION
2229

2330
if [ ! $? -eq 0 ]; then
2431
QUEUE="http://$HOST:4566/000000000000/$QUEUE"
25-
echo "aws --endpoint-url=http://$HOST:4566 sqs receive-message --queue-url $QUEUE"
26-
aws --endpoint-url=http://$HOST:4566 sqs receive-message --queue-url $QUEUE
27-
fi
32+
echo "aws --endpoint-url=http://$HOST:4566 sqs receive-message --queue-url $QUEUE --region $REGION"
33+
aws --endpoint-url=http://$HOST:4566 sqs receive-message --queue-url $QUEUE --region $REGION
34+
fi

‎examples/lambda_api/target/component/clover.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<coverage generated="14-03-23" clover="7.2.1"><project timestamp="14-03-23"><metrics packages="1" elements="3119" coveredelements="1638" statements="2447" coveredstatements="1426" conditionals="672" coveredconditionals="212" files="32" loc="3369" ncloc="2447" classes="32" /><package name=""><metrics elements="3119" coveredelements="1638" statements="2447" coveredstatements="1426" conditionals="672" coveredconditionals="212" files="32" classes="32" loc="3369" ncloc="2447" /><class name="__init__.py" filename="flambda_app/vos/__init__.py"><metrics elements="25" coveredelements="15" statements="23" coveredstatements="15" conditionals="2" coveredconditionals="0" files="1" loc="32" ncloc="23" /></class><class name="api_schemas.py" filename="flambda_app/openapi/api_schemas.py"><metrics elements="58" coveredelements="58" statements="58" coveredstatements="58" conditionals="0" coveredconditionals="0" files="1" loc="65" ncloc="58" /></class><class name="app.py" filename="app.py"><metrics elements="155" coveredelements="61" statements="141" coveredstatements="60" conditionals="14" coveredconditionals="1" files="1" loc="288" ncloc="141" /></class><class name="boot.py" filename="boot.py"><metrics elements="271" coveredelements="132" statements="179" coveredstatements="98" conditionals="92" coveredconditionals="34" files="1" loc="240" ncloc="179" /></class><class name="config.py" filename="flambda_app/config.py"><metrics elements="62" coveredelements="48" statements="46" coveredstatements="39" conditionals="16" coveredconditionals="9" files="1" loc="63" ncloc="46" /></class><class name="constants.py" filename="flambda_app/constants.py"><metrics elements="3" coveredelements="3" statements="3" coveredstatements="3" conditionals="0" coveredconditionals="0" files="1" loc="7" ncloc="3" /></class><class name="event_manager.py" filename="flambda_app/services/event_manager.py"><metrics elements="84" coveredelements="17" statements="70" coveredstatements="17" conditionals="14" coveredconditionals="0" files="1" loc="91" ncloc="70" /></class><class name="events.py" filename="flambda_app/vos/events.py"><metrics elements="9" coveredelements="5" statements="9" coveredstatements="5" conditionals="0" coveredconditionals="0" files="1" loc="13" ncloc="9" /></class><class name="exceptions.py" filename="flambda_app/exceptions.py"><metrics elements="87" coveredelements="35" statements="77" coveredstatements="35" conditionals="10" coveredconditionals="0" files="1" loc="115" ncloc="77" /></class><class name="filter_helper.py" filename="flambda_app/filter_helper.py"><metrics elements="47" coveredelements="5" statements="31" coveredstatements="5" conditionals="16" coveredconditionals="0" files="1" loc="35" ncloc="31" /></class><class name="flambda.py" filename="flambda_app/flambda.py"><metrics elements="8" coveredelements="5" statements="8" coveredstatements="5" conditionals="0" coveredconditionals="0" files="1" loc="13" ncloc="8" /></class><class name="flask_request_parser.py" filename="flambda_app/http_resources/parsers/flask_request_parser.py"><metrics elements="170" coveredelements="11" statements="106" coveredstatements="11" conditionals="64" coveredconditionals="0" files="1" loc="147" ncloc="106" /></class><class name="hateos.py" filename="flambda_app/http_resources/hateos.py"><metrics elements="21" coveredelements="21" statements="21" coveredstatements="21" conditionals="0" coveredconditionals="0" files="1" loc="27" ncloc="21" /></class><class name="healthcheck_manager.py" filename="flambda_app/services/healthcheck_manager.py"><metrics elements="23" coveredelements="21" statements="21" coveredstatements="19" conditionals="2" coveredconditionals="2" files="1" loc="34" ncloc="21" /></class><class name="healthcheck_service.py" filename="flambda_app/services/v1/healthcheck_service.py"><metrics elements="68" coveredelements="62" statements="54" coveredstatements="50" conditionals="14" coveredconditionals="12" files="1" loc="75" ncloc="54" /></class><class name="helper.py" filename="flambda_app/helper.py"><metrics elements="241" coveredelements="99" statements="167" coveredstatements="77" conditionals="74" coveredconditionals="22" files="1" loc="201" ncloc="167" /></class><class name="http_helper.py" filename="flambda_app/http_helper.py"><metrics elements="68" coveredelements="17" statements="52" coveredstatements="14" conditionals="16" coveredconditionals="3" files="1" loc="65" ncloc="52" /></class><class name="logging.py" filename="flambda_app/logging.py"><metrics elements="208" coveredelements="110" statements="148" coveredstatements="82" conditionals="60" coveredconditionals="28" files="1" loc="187" ncloc="148" /></class><class name="messages.py" filename="flambda_app/enums/messages.py"><metrics elements="38" coveredelements="38" statements="38" coveredstatements="38" conditionals="0" coveredconditionals="0" files="1" loc="48" ncloc="38" /></class><class name="mysql.py" filename="flambda_app/database/mysql.py"><metrics elements="53" coveredelements="47" statements="43" coveredstatements="40" conditionals="10" coveredconditionals="7" files="1" loc="66" ncloc="43" /></class><class name="ocoren_event_service.py" filename="flambda_app/services/v1/ocoren_event_service.py"><metrics elements="26" coveredelements="7" statements="24" coveredstatements="7" conditionals="2" coveredconditionals="0" files="1" loc="39" ncloc="24" /></class><class name="product.py" filename="flambda_app/vos/product.py"><metrics elements="14" coveredelements="14" statements="14" coveredstatements="14" conditionals="0" coveredconditionals="0" files="1" loc="14" ncloc="14" /></class><class name="product_repository.py" filename="flambda_app/repositories/v1/redis/product_repository.py"><metrics elements="90" coveredelements="66" statements="68" coveredstatements="53" conditionals="22" coveredconditionals="13" files="1" loc="80" ncloc="68" /></class><class name="redis.py" filename="flambda_app/database/redis.py"><metrics elements="61" coveredelements="60" statements="51" coveredstatements="51" conditionals="10" coveredconditionals="9" files="1" loc="71" ncloc="51" /></class><class name="request.py" filename="flambda_app/http_resources/request.py"><metrics elements="80" coveredelements="19" statements="78" coveredstatements="19" conditionals="2" coveredconditionals="0" files="1" loc="96" ncloc="78" /></class><class name="request_control.py" filename="flambda_app/request_control.py"><metrics elements="42" coveredelements="20" statements="30" coveredstatements="18" conditionals="12" coveredconditionals="2" files="1" loc="43" ncloc="30" /></class><class name="resources.py" filename="flambda_app/services/v1/healthcheck/resources.py"><metrics elements="127" coveredelements="87" statements="105" coveredstatements="76" conditionals="22" coveredconditionals="11" files="1" loc="127" ncloc="105" /></class><class name="response.py" filename="flambda_app/http_resources/response.py"><metrics elements="140" coveredelements="51" statements="110" coveredstatements="49" conditionals="30" coveredconditionals="2" files="1" loc="172" ncloc="110" /></class><class name="schemas.py" filename="flambda_app/openapi/schemas.py"><metrics elements="47" coveredelements="47" statements="47" coveredstatements="47" conditionals="0" coveredconditionals="0" files="1" loc="51" ncloc="47" /></class><class name="sqs.py" filename="flambda_app/aws/sqs.py"><metrics elements="156" coveredelements="101" statements="124" coveredstatements="84" conditionals="32" coveredconditionals="17" files="1" loc="161" ncloc="124" /></class><class name="tracker.py" filename="flambda_app/events/tracker.py"><metrics elements="9" coveredelements="5" statements="9" coveredstatements="5" conditionals="0" coveredconditionals="0" files="1" loc="19" ncloc="9" /></class><class name="wrappers.py" filename="flambda_app/decorators/wrappers.py"><metrics elements="34" coveredelements="11" statements="28" coveredstatements="11" conditionals="6" coveredconditionals="0" files="1" loc="43" ncloc="28" /></class></package></project></coverage>

0 commit comments

Comments
 (0)