Add a comment

.gitignore

@@ -4,4 +4,10 @@
 # Ignore coverage reports
 /coverage
 
-.idea
+.idea
+
+.DS_Store
+
+newrelic_agent.log
+
+agentlog.log

Dockerfile

@@ -1,7 +1,8 @@
-FROM node:10-alpine
+FROM node:12-alpine
 ENV NODE_ENV "production"
 ENV PORT 8079
 EXPOSE 8079
+ENV NEW_RELIC_NO_CONFIG_FILE=true
 RUN addgroup mygroup && adduser -D -G mygroup myuser && mkdir -p /usr/src/app && chown -R myuser /usr/src/app
 
 # Prepare app directory

NewReadme.md

@@ -0,0 +1 @@
+test

README.md

@@ -5,7 +5,7 @@
 
 Front-end app
 ---
-Front-end application written in [Node.js](https://nodejs.org/en/) that puts together all of the microservices under [microservices-demo](https://github.com/microservices-demo/microservices-demo).
+Front-end application written in [Node.js](https://nodejs.org/en/) that puts together all of the microservices under [microservices-demo](https://github.com/microservices-demo/microservices-demo)
 
 # Build
 
@@ -36,8 +36,6 @@ Front-end application written in [Node.js](https://nodejs.org/en/) that puts tog
 
 ## Node
 
-`npm install`
-
 ## Docker
 
 `make test-image`
@@ -56,6 +54,8 @@ Front-end application written in [Node.js](https://nodejs.org/en/) that puts tog
 make test
 ```
 
+`npm install`
+
 ## End-to-End tests:
 
 To make sure that the test suite is running against the latest (local) version with your changes, you need to manually build
@@ -96,3 +96,7 @@ make e2e
 # Push
 
 `GROUP=weaveworksdemos COMMIT=test ./scripts/push.sh`
+
+this is new changes
+
+some changes

api/cart/index.js

@@ -109,15 +109,21 @@
 // Update cart item
   app.post("/cart/update", function (req, res, next) {
     console.log("Attempting to update cart item: " + JSON.stringify(req.body));
-    
+
     if (req.body.id == null) {
       next(new Error("Must pass id of item to update"), 400);
       return;
     }
+
     if (req.body.quantity == null) {
       next(new Error("Must pass quantity to update"), 400);
       return;
     }
+
+    if (parseInt(req.body.quantity) > 20) {
+      throw new Error("Cannot have quantity more than 20");
+    }
+
     var custId = helpers.getCustomerId(req, app.get("env"));
 
     async.waterfall([

helpers/helper.js

@@ -0,0 +1,19 @@
+const { pipe, map, path, filter, head, mergeDeepLeft } = require("ramda");
+
+const getAuthor = (id) => pipe(
+  path(["result", "authors"]),
+  filter(item => item.id === id),
+  head
+);
+
+const getJoin = (data) =>
+  pipe(
+    path(["result", "books"]),
+    map(item =>
+      mergeDeepLeft(item, getAuthor(item.author)(data))
+    )
+  )(data);
+
+module.exports = {
+  getJoin
+}

helpers/index.js

@@ -1,9 +1,27 @@
-(function (){
+(function () {
   'use strict';
 
   var request = require("request");
+  var newrelic = require("newrelic");
   var helpers = {};
 
+  const winston = require('winston');
+  const newrelicFormatter = require('@newrelic/winston-enricher');
+  helpers.logger = winston.createLogger({
+    level: 'info',
+    format: winston.format.combine(
+      winston.format.json(),
+      // combine with newrelic enricher
+      newrelicFormatter()
+    ),
+    defaultMeta: { service: 'front-end' },
+    transports: [
+      // just push to console this will be picked up by Newrlic k8s infra agent
+      new winston.transports.Console()
+    ],
+  });
+
+
   /* Public: errorHandler is a middleware that handles your errors
    *
    * Example:
@@ -12,24 +30,25 @@
    * app.use(helpers.errorHandler);
    * */
 
-  helpers.errorHandler = function(err, req, res, next) {
+  helpers.errorHandler = function (err, req, res, next) {
     var ret = {
       message: err.message,
-      error:   err
+      error: err
     };
+    newrelic.noticeError(err);
     res.
       status(err.status || 500).
       send(ret);
   };
 
-  helpers.sessionMiddleware = function(err, req, res, next) {
-    if(!req.cookies.logged_in) {
+  helpers.sessionMiddleware = function (err, req, res, next) {
+    if (!req.cookies.logged_in) {
       res.session.customerId = null;
     }
   };
 
   /* Responds with the given body and status 200 OK  */
-  helpers.respondSuccessBody = function(res, body) {
+  helpers.respondSuccessBody = function (res, body) {
     helpers.respondStatusBody(res, 200, body);
   }
 
@@ -39,24 +58,24 @@
    * statusCode - the HTTP status code to set to the response
    * body       - (string) the body to yield to the response
    */
-  helpers.respondStatusBody = function(res, statusCode, body) {
+  helpers.respondStatusBody = function (res, statusCode, body) {
     res.writeHeader(statusCode);
     res.write(body);
     res.end();
   }
 
   /* Responds with the given statusCode */
-  helpers.respondStatus = function(res, statusCode) {
+  helpers.respondStatus = function (res, statusCode) {
     res.writeHeader(statusCode);
     res.end();
   }
 
   /* Rewrites and redirects any url that doesn't end with a slash. */
-  helpers.rewriteSlash = function(req, res, next) {
-   if(req.url.substr(-1) == '/' && req.url.length > 1)
-       res.redirect(301, req.url.slice(0, -1));
-   else
-       next();
+  helpers.rewriteSlash = function (req, res, next) {
+    if (req.url.substr(-1) == '/' && req.url.length > 1)
+      res.redirect(301, req.url.slice(0, -1));
+    else
+      next();
   }
 
   /* Public: performs an HTTP GET request to the given URL
@@ -75,15 +94,15 @@
    *   });
    * });
    */
-  helpers.simpleHttpRequest = function(url, res, next) {
-    request.get(url, function(error, response, body) {
+  helpers.simpleHttpRequest = function (url, res, next) {
+    request.get(url, function (error, response, body) {
       if (error) return next(error);
       helpers.respondSuccessBody(res, body);
-    }.bind({res: res}));
+    }.bind({ res: res }));
   }
 
   /* TODO: Add documentation */
-  helpers.getCustomerId = function(req, env) {
+  helpers.getCustomerId = function (req, env) {
     // Check if logged in. Get customer Id
     var logged_in = req.cookies.logged_in;
 

newrelic.js

@@ -0,0 +1,52 @@
+'use strict';
+/**
+* New Relic agent configuration.
+*
+* See lib/config/default.js in the agent distribution for a more complete
+* description of configuration variables and their potential values.
+*/
+exports.config = {
+  /**
+  * Array of application names.
+  */
+  app_name: ['sock-shop-frontend'],
+  /**
+  * Your New Relic license key.
+  */
+  logging: {
+    /**
+    * Level at which to log. 'trace' is most useful to New Relic when diagnosing
+    * issues with the agent, 'info' and higher will impose the least overhead on
+    * production applications.
+    */
+    level: 'info'
+  },
+  /**
+  * When true, all request headers except for those listed in attributes.exclude
+  * will be captured for all traces, unless otherwise specified in a destination's
+  * attributes include/exclude lists.
+  */
+  allow_all_headers: true,
+  attributes: {
+    /**
+    * Prefix of attributes to exclude from all destinations. Allows * as wildcard
+    * at end.
+    *
+    * NOTE: If excluding headers, they must be in camelCase form to be filtered.
+    *
+    * @env NEW_RELIC_ATTRIBUTES_EXCLUDE
+    */
+    exclude: [
+      'request.headers.cookie',
+      'request.headers.authorization',
+      'request.headers.proxyAuthorization',
+      'request.headers.setCookie*',
+      'request.headers.x*',
+      'response.headers.cookie',
+      'response.headers.authorization',
+      'response.headers.proxyAuthorization',
+      'response.headers.setCookie*',
+      'response.headers.x*'
+    ]
+  }
+}