bug(build): fix docker base image (#27)

* fix docker base image

* update compile settings

* fix build settings

* update build process for config

* replace config

* remove unneeded config dir

.env.example

@@ -0,0 +1,4 @@
+BOSSY_SLACK_OAUTH_TOKEN=default
+BOSSY_SLACK_SECRET=default
+BOSSY_SLACK_SIGNING_SECRET=default
+BOSSY_SPACELIFT_TO_SLACK_CHANNEL=default

.github/workflows/docker.yml

@@ -88,7 +88,7 @@ jobs:
 
       - name: Build Affected Projects
         shell: bash
-        run: npx nx run-many --target=build --all
+        run: npx nx run-many --target=build --prod --all
 
       ##################################################
       # Build and Push Bossy Docker Image

.gitignore

@@ -50,3 +50,5 @@ Thumbs.db
 *.tfstate.*
 .terraform
 .terraform.tfstate.lock.info
+
+.env

apps/bossy/Dockerfile

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/lambda/nodejs:14
+FROM public.ecr.aws/lambda/nodejs:16
 
 # add app
 COPY dist/apps/bossy/main.js ${LAMBDA_TASK_ROOT}
@@ -8,9 +8,6 @@ COPY dist/apps/bossy/package.json ${LAMBDA_TASK_ROOT}
 # install app dependencies
 RUN npm install --production
 
-# add config
-ADD config ${LAMBDA_TASK_ROOT}/config
-
 ENV NODE_ENV=production
 
 # start app

apps/bossy/project.json

@@ -11,10 +11,12 @@
         "main": "apps/bossy/src/main.ts",
         "tsConfig": "apps/bossy/tsconfig.app.json",
         "assets": ["apps/bossy/src/assets"],
-        "generatePackageJson": true
+        "generatePackageJson": true,
+        "externalDependencies": "none"
       },
       "configurations": {
         "production": {
+          "main": "apps/bossy/src/lambda.ts",
           "optimization": true,
           "extractLicenses": true,
           "inspect": false,

apps/bossy/src/app/app.ts

@@ -2,8 +2,6 @@ import { sendSpaceliftEventsToSlackRouter } from "@cloudposse/modules/spacelift"
 import express from "express";
 import helmet from "helmet";
 
-process.env["NODE_CONFIG_DIR"] = process.cwd() + "/config/";
-
 const app = express();
 
 app.use(helmet());

apps/bossy/src/lambda.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+require("dotenv").config();
+
 import { createLogger } from "@cloudposse/common";
 import serverlessExpress from "@vendia/serverless-express";
 

apps/bossy/src/main.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+require("dotenv").config();
+
 import { createLogger } from "@cloudposse/common";
 
 import { app } from "./app";

apps/bossy/tsconfig.app.json

@@ -3,7 +3,9 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["node", "express"]
+    "types": ["node", "express"],
+    "target": "es2017",
+    "lib": ["es2021"]
   },
   "exclude": ["**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]

libs/common/common/src/lib/config/config.ts

@@ -1,5 +1,3 @@
-import nodeConfig from "config";
-
 interface IConfig {
   env: string;
   slack: ISlackConfig;
@@ -22,17 +20,16 @@ class Config implements IConfig {
   spacelliftToSlackConfig: ISpacelliftToSlackConfig;
 
   private constructor() {
-    this.env = nodeConfig.get<string>("env");
+    this.env = process.env.NODE_ENV || "development";
 
     this.slack = {} as ISlackConfig;
-    this.slack.oAuthToken = nodeConfig.get<string>("slack.oauth_token");
-    this.slack.secret = nodeConfig.get<string>("slack.secret");
-    this.slack.signingSecret = nodeConfig.get<string>("slack.signing_secret");
+    this.slack.oAuthToken = process.env.BOSSY_SLACK_OAUTH_TOKEN;
+    this.slack.secret = process.env.BOSSY_SLACK_SECRET;
+    this.slack.signingSecret = process.env.BOSSY_SLACK_SIGNING_SECRET;
 
     this.spacelliftToSlackConfig = {} as ISpacelliftToSlackConfig;
-    this.spacelliftToSlackConfig.slackChannel = nodeConfig.get<string>(
-      "spaceliftToSlack.slack_channel"
-    );
+    this.spacelliftToSlackConfig.slackChannel =
+      process.env.BOSSY_SPACELIFT_TO_SLACK_CHANNEL;
   }
 
   public static getInstance(): Config {

nx.json

@@ -11,6 +11,11 @@
       "dependencies": "*",
       "devDependencies": "*"
     },
+    "bossy": {
+      "implicitDependencies": {
+        "js-yaml": "*"
+      }
+    },
     ".eslintrc.json": "*"
   },
   "tasksRunnerOptions": {

package.json

@@ -6,16 +6,16 @@
     "start": "nx serve",
     "build": "nx build",
     "build:bossy:lambda": "nx build bossy --main apps/bossy/src/lambda.ts",
-    "build:bossy:docker": "docker build -t $BOSSY_ECR_REPO/bossy -f apps/bossy/Dockerfile .",
+    "build:bossy:docker": "docker build -t bossy -f apps/bossy/Dockerfile .",
     "test": "nx test"
   },
   "private": true,
   "dependencies": {
     "@slack/bolt": "3.11.0",
     "@slack/web-api": "6.7.1",
     "@vendia/serverless-express": "4.8.0",
-    "config": "3.3.7",
     "crypto": "1.0.1",
+    "dotenv": "^16.0.1",
     "express": "4.18.1",
     "helmet": "5.0.2",
     "js-yaml": "4.1.0",
@@ -44,6 +44,7 @@
     "eslint-plugin-sort-destructure-keys": "1.4.0",
     "jest": "28.1.0",
     "moq.ts": "7.3.4",
+    "node-config-webpack": "^1.0.9",
     "prettier": "2.6.2",
     "ts-jest": "28.0.2",
     "typescript": "4.6.4"

tsconfig.base.json

@@ -7,7 +7,9 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
+    "strict": false,
     "experimentalDecorators": true,
+    "forceConsistentCasingInFileNames": true,
     "importHelpers": true,
     "target": "es2015",
     "module": "esnext",

yarn.lock

@@ -2538,7 +2538,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-[email protected]:
+[email protected], config@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/config/-/config-3.3.7.tgz#4310410dc2bf4e0effdca21a12a4035860a24ee4"
   integrity sha512-mX/n7GKDYZMqvvkY6e6oBY49W8wxdmQt+ho/5lhwFDXqQW9gI+Ahp8EKp8VAbISPnmf2+Bv5uZK7lKXZ6pf1aA==
@@ -2797,6 +2797,11 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
+dotenv@^16.0.1:
+  version "16.0.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
+  integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
+
 dotenv@~10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
@@ -5308,6 +5313,14 @@ node-addon-api@^3.2.1:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
+node-config-webpack@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/node-config-webpack/-/node-config-webpack-1.0.9.tgz#f7f8d22518577cfbfc9b8c2343bd24a420750528"
+  integrity sha512-8D9MIcRDUnav7r1Z0IPUrIyVFN9IVGrv25SUATZKq9eyIlKfrvelMxVVNbUaIUBT6smw3DchFFYaNRFZ/hkaoQ==
+  dependencies:
+    config "^3.3.6"
+    js-yaml "^4.1.0"
+
 node-gyp-build@^4.3.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4"