feat: deployment change for adding logging framework

package.json

@@ -39,10 +39,10 @@
     "aws-sdk": "^2.785.0",
     "axios": "^0.21.1",
     "fhir-works-on-aws-authz-rbac": "4.1.1",
-    "fhir-works-on-aws-interface": "8.1.1",
-    "fhir-works-on-aws-persistence-ddb": "3.3.3",
-    "fhir-works-on-aws-routing": "5.2.0",
-    "fhir-works-on-aws-search-es": "2.5.1",
+    "fhir-works-on-aws-interface": "9.0.0",
+    "fhir-works-on-aws-persistence-ddb": "3.3.4",
+    "fhir-works-on-aws-routing": "5.3.0",
+    "fhir-works-on-aws-search-es": "2.6.0",
     "serverless-http": "^2.3.1",
     "yargs": "^16.2.0"
   },
@@ -65,6 +65,7 @@
     "jest-mock-extended": "^1.0.8",
     "lodash": "^4.17.20",
     "prettier": "^1.19.1",
+    "qs": "^6.10.1",
     "serverless": "2.29.0",
     "serverless-bundle": "4.0.1",
     "serverless-offline": "^5.12.1",
@@ -73,8 +74,7 @@
     "tmp-promise": "^3.0.2",
     "ts-jest": "^26.4.4",
     "typescript": "^4.1.3",
-    "wait-for-expect": "^3.0.2",
-    "qs": "^6.10.1"
+    "wait-for-expect": "^3.0.2"
   },
   "resolutions": {
     "dot-prop": "^5.1.1",

serverless.yaml

@@ -15,6 +15,7 @@ custom:
   oauthRedirect: ${opt:oauthRedirect, 'http://localhost'}
   config: ${file(serverless_config.json)}
   useHapiValidator: ${opt:useHapiValidator, 'false'}
+  logLevel: ${opt.logLevel, 'error'}
   bundle:
     externals:
       - fhir-works-on-aws-routing
@@ -53,6 +54,7 @@ provider:
         - isUsingHapiValidator
         - Fn::ImportValue: "fhir-service-validator-lambda-${self:custom.stage}"
         - !Ref AWS::NoValue
+    LOG_LEVEL: '${self:custom.logLevel}'
   apiKeys:
     - name: 'developer-key-${self:custom.stage}' # Full name must be known at package-time
       description: Key for developer to access the FHIR Api
@@ -201,6 +203,14 @@ resources:
           - 'true'
           - 'false'
         Description: whether or not to use an already deployed HAPI Validator
+      logLevel:
+        Type: String
+        Default: ${self:custom.logLevel}
+        AllowedValues:
+          - 'debug'
+          - 'info'
+          - 'warn'
+          - 'error'
   - Conditions:
       isDev: !Equals [!Ref Stage, 'dev']
       isNotDev: !Not [Condition: isDev]

src/config.ts

@@ -89,10 +89,6 @@ export const fhirConfig: FhirConfig = {
                 ? 'https://API_URL.com'
                 : process.env.API_URL,
     },
-    logging: {
-        // Unused at this point
-        level: 'error',
-    },
     validators,
     profile: {
         systemOperations: ['transaction'],

yarn.lock

@@ -1059,6 +1059,15 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@dabh/diagnostics@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31"
+  integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==
+  dependencies:
+    colorspace "1.1.x"
+    enabled "2.0.x"
+    kuler "^2.0.0"
+
 "@elastic/elasticsearch@7", "@elastic/elasticsearch@^7.4":
   version "7.10.0"
   resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-7.10.0.tgz#da105a9c1f14146f9f2cab4e7026cb7949121b8d"
@@ -2924,7 +2933,7 @@ async@^2.6.1, async@^2.6.2:
   dependencies:
     lodash "^4.17.14"
 
-async@^3.2.0:
+async@^3.1.0, async@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
   integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
@@ -4918,6 +4927,11 @@ [email protected]:
   dependencies:
     env-variable "0.0.x"
 
+[email protected]:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
+  integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -5743,42 +5757,40 @@ [email protected]:
     jsonwebtoken "^8.5.1"
     lodash "^4.17.20"
 
-[email protected], fhir-works-on-aws-interface@^8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-interface/-/fhir-works-on-aws-interface-8.1.1.tgz#b4fdaebee54c8c07a508c54828ab61f77d85c3e1"
-  integrity sha512-cKDnhtumC5Eh0oI0gcQfZ5kVrESX4iBRLw3CB7j/zW2EfVkei2r5qZgNGursJAQ75+EW8XL0yHZo71EvGpbTJw==
+[email protected], fhir-works-on-aws-interface@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-interface/-/fhir-works-on-aws-interface-9.0.0.tgz#2e784f7a5c2e476b436558d0954bf3beb2f150de"
+  integrity sha512-qYuWefK54g6RLrXqiyw2wZVEqwR5nesxcD5CmPv9ZWEd6bvAxgzQHV5YIOuHtOI2R0cXRaGqldtJqpT8PX9ISQ==
+  dependencies:
+    winston "^3.3.3"
+    winston-transport "^4.4.0"
 
-fhir-works-on-aws-interface@^7.0.1, fhir-works-on-aws-interface@^7.1.0:
+fhir-works-on-aws-interface@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/fhir-works-on-aws-interface/-/fhir-works-on-aws-interface-7.1.0.tgz#74ec69861b9909b9d14925085a901162def8ad6c"
   integrity sha512-0Tz0ZXycp3vnKSyjnPO94rKJ7Qtz4JWLy83HpB1+qdGaAxzGaMVyW7w3vC3fkPmqOIPKxVl96pU/tXS7/Q9J8g==
 
-fhir-works-on-aws-interface@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-interface/-/fhir-works-on-aws-interface-8.1.0.tgz#6ccc9dbad8ed41bad86f31daa0c237d8bb36b499"
-  integrity sha512-Q8u1y68ac8bVqU6NKW2cHrEkz7JVh7oP6JrSVGYW/wzNi0s++w9rbq3IQdQRv9PfDMJfNl6j0CtXZv855Vt5QQ==
-
-[email protected]:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-persistence-ddb/-/fhir-works-on-aws-persistence-ddb-3.3.3.tgz#e43a600fde27f51d6fa8c2c3c4a70d6d997233cf"
-  integrity sha512-JAPWSieEy/oBs1WstFX38ItruJusrWLLYZo1DQe6Kokou2jS8snULeNYPzoSgfLLY4/VjD3HrY9dG7qWM/Bs8g==
+[email protected]:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-persistence-ddb/-/fhir-works-on-aws-persistence-ddb-3.3.4.tgz#c253c689be81a3ed11ef205cc1a43e578e7557c5"
+  integrity sha512-psDFHhmynCTe2msAr0meVHxflqwo1Gyqsb4oCitxfjiTZ7UOJXJ8TOZtnEdncB3MiEgZ7MVHOuKezr4MYaiJAg==
   dependencies:
     "@elastic/elasticsearch" "^7.4"
     "@types/aws-lambda" "^8.10.63"
     aws-elasticsearch-connector "^8.2.0"
     aws-sdk "^2.610.0"
     aws-xray-sdk "^3.1.0"
-    fhir-works-on-aws-interface "^8.1.1"
+    fhir-works-on-aws-interface "^9.0.0"
     flat "^5.0.2"
     lodash "^4.17.20"
     mime-types "^2.1.26"
     promise.allsettled "^1.0.2"
     uuid "^3.4.0"
 
-fhir-works-on-aws-routing@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-routing/-/fhir-works-on-aws-routing-5.2.0.tgz#dd135a3c97f27e1d9d3b7efab26c1a4cbf85154e"
-  integrity sha512-cseNpRifjSUY66+nTqDQT0l5s/qPjQdI7s5/4jQqNL0Jx+PpL67ix3xqqFZtw1kt/yAMlOknwr+lwr4dgXxrSQ==
+fhir-works-on-aws-routing@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-routing/-/fhir-works-on-aws-routing-5.3.0.tgz#01e17b6b45e58099007a780929684235a60329d5"
+  integrity sha512-QNpOERsc8HnOf3FBNXZqzoP75fLOsesh7mM63IV7gDUx2EHI70zrhtyOKKQiXuLCPQysQ758/lHUeEpA+9knew==
   dependencies:
     "@types/cors" "^2.8.7"
     "@types/express-serve-static-core" "^4.17.2"
@@ -5788,24 +5800,24 @@ [email protected]:
     cors "^2.8.5"
     errorhandler "^1.5.1"
     express "^4.17.1"
-    fhir-works-on-aws-interface "^8.1.0"
+    fhir-works-on-aws-interface "^9.0.0"
     flat "^5.0.0"
     http-errors "^1.8.0"
     lodash "^4.17.15"
     mime-types "^2.1.26"
     serverless-http "^2.3.1"
     uuid "^3.4.0"
 
-fhir-works-on-aws-search-es@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-search-es/-/fhir-works-on-aws-search-es-2.5.1.tgz#1b8b842b74d1957d2945f4fc1f2a2170788112cd"
-  integrity sha512-S2IyO4EdPblryxJ7pzFwnRA4KC8i5q+HMd9EOs8nbuETj9vp21T0h+SxJsvsHkgqxnQxI4C32d+7K3nyJU2oGA==
+fhir-works-on-aws-search-es@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/fhir-works-on-aws-search-es/-/fhir-works-on-aws-search-es-2.6.0.tgz#6c0305d9977a189e63a7142e11459013a367e0b5"
+  integrity sha512-XvNA3goJ1QR/Qq2HCt1q3yvJvztRXL8BAE+Q+L2ZJ0e9tZZOjtsPjGJXRDHY6sm/0OMi0VwMZhqA0FBtfx6wWQ==
   dependencies:
     "@elastic/elasticsearch" "7"
     aws-elasticsearch-connector "^8.2.0"
     aws-sdk "^2.610.0"
     date-fns "^2.19.0"
-    fhir-works-on-aws-interface "^7.1.0"
+    fhir-works-on-aws-interface "^9.0.0"
     lodash "^4.17.20"
     nearley "^2.20.0"
 
@@ -6017,6 +6029,11 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
+[email protected]:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
+  integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
+
 follow-redirects@^1.10.0:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147"
@@ -8132,6 +8149,11 @@ [email protected]:
   dependencies:
     colornames "^1.1.1"
 
+kuler@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
+  integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
+
 latest-version@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
@@ -8343,7 +8365,7 @@ log@^6.0.0:
     sprintf-kit "^2.0.0"
     type "^1.0.1"
 
-logform@^2.1.1:
+logform@^2.1.1, logform@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2"
   integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==
@@ -9218,6 +9240,13 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
   integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
 
+one-time@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45"
+  integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==
+  dependencies:
+    fn.name "1.x.x"
+
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -12621,7 +12650,7 @@ widest-line@^3.1.0:
   dependencies:
     string-width "^4.0.0"
 
-winston-transport@^4.3.0:
+winston-transport@^4.3.0, winston-transport@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59"
   integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==
@@ -12644,6 +12673,21 @@ [email protected]:
     triple-beam "^1.3.0"
     winston-transport "^4.3.0"
 
+winston@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170"
+  integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==
+  dependencies:
+    "@dabh/diagnostics" "^2.0.2"
+    async "^3.1.0"
+    is-stream "^2.0.0"
+    logform "^2.2.0"
+    one-time "^1.0.0"
+    readable-stream "^3.4.0"
+    stack-trace "0.0.x"
+    triple-beam "^1.3.0"
+    winston-transport "^4.4.0"
+
 word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"