Various tweaks to support proper operation (#4)

* Various tweaks to support proper operation

- Fix CircleCI build pipeline
- Update Dockerfile to use a multistage build and set the correct CMD
- Add morgan as logging middleware
- Use proper domain (placeholder now...) when signing download URLs
- Don't set DB secrets for k8s
- DO set AWS_REGION and S3_BUCKET env vars for k8s

Author: GrooveStomp

templates/.circleci/config.yml

@@ -1,6 +1,7 @@
 ---
 version: 2.1
 orbs:
+  node: circleci/node@3.0.1
   aws-ecr: circleci/aws-ecr@6.5.0
   aws-eks: circleci/aws-eks@0.2.3
   aws-s3: circleci/aws-s3@1.0.11
@@ -12,7 +13,7 @@ orbs:
 variables:
   - &workspace /home/circleci/project
 
-  - &build-image cimg/go:1.13
+  - &build-image cimg/node:14.10
 
 
 aliases:
@@ -111,30 +112,30 @@ jobs:
     steps: # steps that comprise the `build` job
       - attach_workspace:
           at: *workspace
-      - restore_cache: # restores saved cache if no changes are detected since last run
-          keys:
-            - v1-pkg-cache-{{ checksum "go.sum" }}
-            - v1-pkg-cache-
+      - node/install-packages:
+          cache-path: "./node_modules"
+          app-dir: .
       - run:
-          name: Run unit tests
-          command: |
-            go get -u github.com/jstemmer/go-junit-report
-            mkdir -p test-reports
-            go test -v ./... | go-junit-report > test-reports/junit.xml
-
-      - save_cache: # Store cache in the /go/pkg directory
-          key: v1-pkg-cache-{{ checksum "go.sum" }}
-          paths:
-            - "/go/pkg"
-
+          name: Generating env file
+          command: cp .env.example .env
       - store_test_results:
           path: test-reports
-
       - store_artifacts:
           path: test-reports
 
       # Requires the SLACK_WEBHOOK env var to be set
       #- slack/notify-on-failure
+  lint:
+    docker:
+      - image: *build-image
+    working_directory: *workspace
+    steps:
+      - attach_workspace:
+          at: *workspace
+      - node/install-packages:
+          cache-path: "./node_modules"
+          app-dir: .
+      - run: npm run lint
 
   build_and_push:
     machine:
@@ -243,10 +244,14 @@ workflows:
       jobs:
         - checkout_code
 
-        - unit_test:
+        - lint:
             requires:
               - checkout_code
 
+        - unit_test:
+            requires:
+              - lint
+
         - build_and_push:
             account-id: "<% index .Params `accountId` %>"
             repo: "<% .Name %>"

templates/.eslintrc.js

@@ -0,0 +1,41 @@
+module.exports = {
+  env: {
+    es6: true,
+    node: true,
+    jest: true,
+    jasmine: true,
+  },
+  extends: [
+    "eslint:recommended",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+    "plugin:node/recommended",
+    "plugin:promise/recommended",
+    "plugin:prettier/recommended",
+  ],
+  parserOptions: {
+    ecmaVersion: 2020,
+    sourceType: "module",
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  plugins: ["import", "node", "prettier", "promise"],
+  rules: {
+    "import/order": [
+      2,
+      {
+        groups: [
+          ["builtin", "external"],
+          ["internal", "parent", "sibling", "index"],
+        ],
+        "newlines-between": "always",
+      },
+    ],
+    "import/newline-after-import": [2],
+    "linebreak-style": ["error", "unix"],
+    "no-console": "off",
+    quotes: ["error", "double", { avoidEscape: true }],
+    semi: ["error", "always"],
+  },
+};

templates/.gitignore

@@ -99,3 +99,4 @@ $RECYCLE.BIN/
 
 # application environment config
 .env
+node_modules

templates/Dockerfile

@@ -1,6 +1,12 @@
-FROM node:14.9-alpine
+FROM node:14-alpine as base
 WORKDIR /app
 COPY . .
-RUN npm i
 
-ENTRYPOINT ["/app/<% .Name %>"]
+RUN touch .env
+RUN npm i --no-optional --production
+
+FROM node:14-alpine
+WORKDIR /app
+COPY --from=base /app /app
+
+CMD ["node", "src/app.js"]

templates/app.js

@@ -47,16 +47,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.name
-          - name: DATABASE_USERNAME
-            valueFrom:
-                secretKeyRef:
-                  name: <% .Name %>
-                  key: DATABASE_USERNAME
-          - name: DATABASE_PASSWORD
-            valueFrom:
-                secretKeyRef:
-                  name: <% .Name %>
-                  key: DATABASE_PASSWORD
           - name: CF_KEYPAIR_ID
             valueFrom:
                 secretKeyRef:

templates/kubernetes/base/deployment.yml

@@ -14,6 +14,7 @@ configMapGenerator:
     - DATABASE_PORT=<%if eq (index .Params `database`) "postgres" %>5432<% else if eq (index .Params `database`) "mysql" %>3306<% end %>
     - DATABASE_NAME=<% index .Params `databaseName` %>
     - SERVICE_PORT=80
+    - AWS_REGION=<% index .Params `region` %>
 
 commonLabels:
   app: <% .Name %>

templates/kubernetes/base/kustomization.yml

@@ -14,3 +14,5 @@ configMapGenerator:
   behavior: merge
   literals:
     - ENVIRONMENT=production
+    - DOMAIN=<% index .Params `productionHostRoot` %>
+    - S3_BUCKET=files.<% index .Params `productionHostRoot` %>

templates/kubernetes/overlays/production/kustomization.yml

@@ -13,3 +13,5 @@ configMapGenerator:
   behavior: merge
   literals:
     - ENVIRONMENT=staging
+    - DOMAIN=<% index .Params `stagingHostRoot` %>
+    - S3_BUCKET=files.<% index .Params `stagingHostRoot` %>