Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions .env.development.vault
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
$ANSIBLE_VAULT;1.1;AES256
35363534306332666665623730313830306363623264393936353362353433616531393732376566
3630303131643061643566646239653266393461633465300a366534346631313638643830653665
62326430616261656139376166356364313839386331393562366235343763323162636637363565
6537623639323937370a323464626263313161316535363562653237353164386336316663343037
39366432376465646532666234373563333736316364613462383766643438653366363433666566
37313538323733626135353635646638363735643638316235623534616634346238656338363939
62313931663930316366343935306263626461633663616139653837373332356131323238366532
39646365663234623937646338373435373833346436623732323736643738306462623436653131
39656463353436343431643835653064613235643365326563663933343234643731646132366665
39363861316639326530353063343464623236346161326462353132303234666162333039303337
65613434613562646638353962376638373264633165313331326536643564646235663632326362
65626266303536643137366238643738633530663132653162663062356234326537656361646131
33666231643165666663636361353435373036623730306132613231626462626335356135626435
32623661663334643338373466663030323635666431383861663135366433656464333066616162
34663830386238653361303839636335616637376333653565356239366365636635653931353564
64353233366361663232663435663639636363386636656231383239393136313230336562636639
62663430643064323061326336366330323964333131393562643966623539366635316537313065
34393534386436656534666331626464313935666539623333396135393831393935323061643734
35396437646332366335356639386338303466393661613135303966303561366361663536393065
62616336623935343261396131363731366131383832353466313361323637313166343333326564
32383532316462386431313932356562333139336430386236306238353533636465
38656463313161643863396466386333343439366630343135636663613832393933336530656435
3133343039356233383833613661363764366365653638620a306666396631393761646531663135
61626230373131386266656263353433633433323835353864323834353161363061313432313761
6563633638323030340a383638356334393162343739386366616666346230303862636233636133
63363063366539373931623835343435306234646162313565306430373736343733336333363032
32363537633063326164616565363433313665613834316162303564363666643466303034343164
35393031306161326437616135616636303766613330613236626630376466333161353230333365
34626561336163646534316136626333333032373865653136366235636162393330366535653337
61316463313034613231346566373037346634633961333736653566386436643032616533626235
39643562613733363166313161313030613034636362653338663066396531326466363937616266
32383238323961323637386465623034323862303330653866343237376463613132396237613961
63623832323137656261363336663535363137336239646432643737356235663235623062633266
36363363383933363437393966626366353064356264643630353862666132396133663262616532
65306435323164326238376139666235613039326363376238383466303938383631643261393436
65656637383430373036373532616537336162356464373762363739623339313435663439396265
31623331633739656561
37 changes: 16 additions & 21 deletions .env.production.vault
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
$ANSIBLE_VAULT;1.1;AES256
38343734613438643366663763336535633065643362356461663162646434356330306435623362
3865376432376461313730376564346664646165386339370a643864343364623536396334613333
32393735373535386435306230353865303132376463343565663737343334333737303532656364
3233393461393831620a343639346265393861633634616338323930313265343730363433366632
64656335373435336535326165323466333361643835383635643066316635386235663137303437
66366664643336303733343262303235346539633738363739303032383762643532396434653338
33646361363133653738626330646563333061343764666262613736376562656435643132623134
36656336666232383137373263346166383764663862333961633233316334643261646238323365
30363034313835363866376630306639313438346665653035623463653362663638616262336131
34316266616336373539306335323434623963303665376231393431323838356533656465303836
33633035303664343430323865383262326431353462623239666537643961663133306565626563
34663232323532373434313033656631363733353034316135656138646365663766653633613364
61613039306537653833623832663366653030666131363032623237353563326638643661656632
33303333343531336338396137396130366436336661346264646661623139353530366330343137
37633137663035656236643666373237333432313836633239393638633539373262613532306635
66353837363638373266633738663530303330303632343966633732616630313138383938653065
34636136363964626633623663346638383464333262356563333430613764626261663766373431
63323361396364343766353031666136626532366466663937643765656234333633363230373961
64303338363838626530316661303739393234653736373961356135323562316664653632333633
35323631306566356665336233386430376334626665393966313663616130386537323738643430
33633966336362656166663331643333366364653761313061313963636663633662
35393333323237313064346533376233343836373736663239366666326137333636616534653030
3266623434363163346165313864666662666261393734390a343464666534306161356330346638
39323761336336373330323962643131303663646139373463346363626665396630373132336461
6334666166643865650a373439326136336134343734663961373761396336646338616435373063
36393532383937343138306464346331666363623930666264373536306133643036366435653737
34663736306432613064643632653339663361633534623965326538663436373762343365653738
65663736306637313734633035636239303531363165333239393833383361356266616235653932
34396430336630613736623936313466303761353632373935643631306363306334613763363736
66666366623635626563633335613130333838353530316136376232353439386164326461303139
66646638383632613234623534306134613733663332643964333763653031643939376164626664
61366563336330346537316262623930343564346636336339613961356464333061636130336661
32643162336633336163303036663036633036666230306637346537376164336365393037653231
61353431663632356161376432613339376333333164333337333032353632373430653664346365
65666532313832643436623431356436326263323433336633396334383462386361393131393237
64306461333739313232636466343136393830393636656663353837613134646633316434336435
39656130303431656133
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"@hapi/vision": "^7.0.1",
"@notionhq/client": "^2.2.3",
"@types/jest": "^29.4.0",
"@sentry/node": "7.11.1",
"pino": "8.10.0",
"pino-pretty": "9.2.0",
"axios": "^1.3.2",
Expand Down
1 change: 0 additions & 1 deletion src/config/initEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ interface Config {
FALCO_GEO_DB: string;
FALCO_GEO_DB_PORT: number;
FALCO_GEO_API_ENV: string;
FALCO_GEO_SENTRY_DSN: string;
FALCO_WEBMAP: string;
}

Expand Down
2 changes: 0 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ import * as dotenv from 'dotenv';
import { pgisConfig, plugins } from './config';
import { usecases } from './domain';
import logger from './libs/logger';
import { initSentry } from './libs/sentry';
import { routes } from './routes';

dotenv.config();

const server = Hapi.server(pgisConfig);

const init = async () => {
initSentry();

server.bind(usecases);

Expand Down
15 changes: 4 additions & 11 deletions src/libs/logger.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import pino from 'pino';

import { sendToSentry } from './sentry';
import { Optional } from './types';

const PinoInstance = pino({
Expand Down Expand Up @@ -37,8 +36,8 @@ interface Logger {
debug: (message: string, originalError?: unknown) => void;
info: (message: string, originalError?: unknown) => void;
warn: (message: string, originalError?: unknown) => void;
error: (message: string, originalError: unknown, allowCopyToSentry?: boolean) => void;
fatal: (message: string, originalError: unknown, allowCopyToSentry?: boolean) => void;
error: (message: string, originalError: unknown) => void;
fatal: (message: string, originalError: unknown) => void;
}

const logger: Logger = {
Expand All @@ -54,17 +53,11 @@ const logger: Logger = {
warn: (message: string, originalError?: unknown): void => {
log(message, originalError as Error, PinoInstance.warn.bind(PinoInstance));
},
error: (message: string, originalError: unknown, allowCopyToSentry: boolean = true): void => {
error: (message: string, originalError: unknown): void => {
log(message, originalError as Error, PinoInstance.error.bind(PinoInstance));
if (allowCopyToSentry) {
sendToSentry(message, originalError as Error);
}
},
fatal: (message: string, originalError: unknown, allowCopyToSentry: boolean = true): void => {
fatal: (message: string, originalError: unknown): void => {
log(message, originalError as Error, PinoInstance.fatal.bind(PinoInstance));
if (allowCopyToSentry) {
sendToSentry(message, originalError as Error);
}
},
};

Expand Down
33 changes: 0 additions & 33 deletions src/libs/sentry.ts

This file was deleted.

87 changes: 8 additions & 79 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1069,52 +1069,6 @@
pluralize "^8.0.0"
yaml-ast-parser "0.0.43"

"@sentry/core@7.11.1":
version "7.11.1"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.11.1.tgz#d68e796f3b6428aefd6086a1db00118df7a9a9e4"
integrity sha512-kaDSZ6VNuO4ZZdqUOOX6XM6x+kjo2bMnDQ3IJG51FPvVjr8lXYhXj1Ccxcot3pBYAIWPPby2+vNDOXllmXqoBA==
dependencies:
"@sentry/hub" "7.11.1"
"@sentry/types" "7.11.1"
"@sentry/utils" "7.11.1"
tslib "^1.9.3"

"@sentry/hub@7.11.1":
version "7.11.1"
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.11.1.tgz#1749b2b102ea1892ff388d65d66d3b402b393958"
integrity sha512-M6ClgdXdptS0lUBKB5KpXXe2qMQhsoiEN2pEGRI6+auqhfHCUQB1ZXsfjiOYexKC9fwx7TyFyZ9Jcaf2DTxEhw==
dependencies:
"@sentry/types" "7.11.1"
"@sentry/utils" "7.11.1"
tslib "^1.9.3"

"@sentry/node@7.11.1":
version "7.11.1"
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.11.1.tgz#97fd26de26e8203a3c34e26b38f3c2a5ba46828b"
integrity sha512-EAAHou/eHSzwRK0Z5qnQiwXNbkpnjWjloaG979gftA+MS/kM0AxQHdOrSJQbOEaqRf3F7/eC4Hj+1tfglAuaLQ==
dependencies:
"@sentry/core" "7.11.1"
"@sentry/hub" "7.11.1"
"@sentry/types" "7.11.1"
"@sentry/utils" "7.11.1"
cookie "^0.4.1"
https-proxy-agent "^5.0.0"
lru_map "^0.3.3"
tslib "^1.9.3"

"@sentry/types@7.11.1":
version "7.11.1"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.11.1.tgz#06e2827f6ba37159c33644208a0453b86d25e232"
integrity sha512-gIEhOPxC2cjrxQ0+K2SFJ1P6e/an5osSxVc9OOtekN28eHtVsXFCLB8XVWeNQnS7N2VkrVrkqORMBz1kvIcvVQ==

"@sentry/utils@7.11.1":
version "7.11.1"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.11.1.tgz#1635c5b223369d9428bc83c9b8908c9c3287ee10"
integrity sha512-tRVXNT5O9ilkV31pyHeTqA1PcPQfMV/2OR6yUYM4ah+QVISovC0f0ybhByuH5nYg6x/Gsnx1o7pc8L1GE3+O7A==
dependencies:
"@sentry/types" "7.11.1"
tslib "^1.9.3"

"@sideway/address@^4.1.3":
version "4.1.4"
resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
Expand Down Expand Up @@ -1453,13 +1407,6 @@ acorn@^7.4.0:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==

agent-base@6:
version "6.0.2"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
dependencies:
debug "4"

aggregate-error@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e"
Expand Down Expand Up @@ -1955,11 +1902,6 @@ convert-source-map@^2.0.0:
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==

cookie@^0.4.1:
version "0.4.2"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==

cross-spawn@^7.0.2, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
Expand All @@ -1974,20 +1916,20 @@ dateformat@^4.6.3:
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==

debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"

debug@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
dependencies:
ms "^2.1.1"

debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"

decko@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decko/-/decko-1.2.0.tgz#fd43c735e967b8013306884a56fbe665996b6817"
Expand Down Expand Up @@ -2891,14 +2833,6 @@ http2-wrapper@^1.0.0-beta.5.2:
quick-lru "^5.1.1"
resolve-alpn "^1.0.0"

https-proxy-agent@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
dependencies:
agent-base "6"
debug "4"

human-signals@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
Expand Down Expand Up @@ -3723,11 +3657,6 @@ lru-cache@^7.10.2:
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea"
integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==

lru_map@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
integrity sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==

lunr@^2.3.9:
version "2.3.9"
resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
Expand Down Expand Up @@ -5076,7 +5005,7 @@ tsconfig-paths@^3.14.1:
minimist "^1.2.6"
strip-bom "^3.0.0"

tslib@^1.8.1, tslib@^1.9.3:
tslib@^1.8.1:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
Expand Down