Rename application projects

Makefile

@@ -1,5 +1,5 @@
+include ./apps/authz/Makefile
 include ./apps/orchestration/Makefile
-include ./apps/authz-node/Makefile
 
 # For more terminal color codes, head over to https://opensource.com/article/19/9/linux-terminal-colors
 TERM_NO_COLOR := \033[0m
@@ -14,8 +14,8 @@ install/ci:
 setup:
 	make install
 	make docker/up
-	make orchestration/setup
 	make authz/setup
+	make orchestration/setup
 	@echo ""
 	@echo "${TERM_GREEN}Orchestration & AuthZ applications are ready 🐋${TERM_NO_COLOR}"
 	@echo "${TERM_GREEN}Run 'make orchestration/start/dev' or/and 'make authz/start/dev' to get them running.${TERM_NO_COLOR}"

README.md

@@ -25,7 +25,7 @@ At the end, you must have a working environment ready to run any application.
 
 ## Application
 
-- [AuthZ](./apps/authz-node/README.md)
+- [AuthZ](./apps/authz/README.md)
 - [Orchestration](./apps/orchestration/README.md)
 
 ## Docker

apps/authz-node/.env.test.default → apps/authz/.env.test.default

@@ -1,2 +1,2 @@
 # IMPORTANT: The variables defined here will override other variables.
-# See `./apps/authz-node/jest.setup.ts`.
+# See `./apps/authz/jest.setup.ts`.

apps/authz-node/Makefile → apps/authz/Makefile

@@ -1,5 +1,5 @@
-AUTHZ_PROJECT_NAME := apps/authz-node
-AUTHZ_PROJECT_DIR := ./apps/authz-node
+AUTHZ_PROJECT_NAME := authz
+AUTHZ_PROJECT_DIR := ./apps/authz
 
 authz/setup:
 	make authz/copy-default-env

apps/authz-node/README.md → apps/authz/README.md

@@ -6,7 +6,7 @@ TBD
 
 ```bash
 # Boot PostgreSQL and Redis
-make docker/up 
+make docker/up
 make authz/copy-default-env
 ```
 

apps/authz-node/jest.config.ts → apps/authz/jest.config.ts

@@ -1,14 +1,14 @@
 import type { Config } from 'jest'
 
 const config: Config = {
-  displayName: 'apps/authz-node',
+  displayName: 'authz',
   preset: '../../jest.preset.js',
   testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }]
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../coverage/apps/authz-node',
+  coverageDirectory: '../../coverage/apps/authz',
   moduleNameMapper: {
     '^@app/authz/(.*)$': '<rootDir>/src/$1'
   }

apps/authz-node/project.json → apps/authz/project.json

@@ -1,7 +1,7 @@
 {
-  "name": "apps/authz-node",
+  "name": "authz",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/authz-node/src",
+  "sourceRoot": "apps/authz/src",
   "projectType": "application",
   "targets": {
     "build": {
@@ -11,11 +11,11 @@
       "options": {
         "target": "node",
         "compiler": "tsc",
-        "outputPath": "dist/apps/authz-node",
-        "main": "apps/authz-node/src/main.ts",
-        "tsConfig": "apps/authz-node/tsconfig.app.json",
+        "outputPath": "dist/apps/authz",
+        "main": "apps/authz/src/main.ts",
+        "tsConfig": "apps/authz/tsconfig.app.json",
         "isolatedConfig": true,
-        "webpackConfig": "apps/authz-node/webpack.config.js"
+        "webpackConfig": "apps/authz/webpack.config.js"
       },
       "configurations": {
         "development": {},
@@ -26,25 +26,24 @@
       "executor": "@nx/js:node",
       "defaultConfiguration": "development",
       "options": {
-        "buildTarget": "apps/authz-node:build"
+        "buildTarget": "authz:build"
       },
       "configurations": {
         "development": {
-          "buildTarget": "apps/authz-node:build:development"
+          "buildTarget": "authz:build:development"
         },
         "production": {
-          "buildTarget": "apps/authz-node:build:production"
+          "buildTarget": "authz:build:production"
         }
       }
     },
     "lint": {
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": ["apps/authz-node/**/*.ts"]
+        "lintFilePatterns": ["apps/authz/**/*.ts"]
       }
     },
-
     "test:type": {
       "executor": "nx:run-commands",
       "options": {
@@ -55,15 +54,15 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/authz-node/jest.unit.ts",
+        "jestConfig": "apps/authz/jest.unit.ts",
         "verbose": true
       }
     },
     "test:integration": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/authz-node/jest.integration.ts",
+        "jestConfig": "apps/authz/jest.integration.ts",
         "verbose": true,
         "runInBand": true
       }
@@ -72,7 +71,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/authz-node/jest.e2e.ts",
+        "jestConfig": "apps/authz/jest.e2e.ts",
         "verbose": true,
         "runInBand": true
       }

apps/authz-node/src/main.ts → apps/authz/src/main.ts

@@ -15,7 +15,7 @@ async function bootstrap() {
 
   await app.listen(port)
 
-  logger.log(`dauthz-node is running on port ${port}`)
+  logger.log(`AuthZ is running on port ${port}`)
 }
 
 bootstrap()

apps/authz-node/tsconfig.spec.json → apps/authz/tsconfig.spec.json

@@ -5,10 +5,5 @@
     "module": "commonjs",
     "types": ["jest", "node"]
   },
-  "include": [
-    "jest.config.ts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
-  ]
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
 }

apps/authz-node/webpack.config.js → apps/authz/webpack.config.js

@@ -1,8 +1,8 @@
-const { composePlugins, withNx } = require('@nx/webpack');
+const { composePlugins, withNx } = require('@nx/webpack')
 
 // Nx plugins for webpack.
 module.exports = composePlugins(withNx(), (config) => {
   // Update the webpack config as needed here.
   // e.g. `config.plugins.push(new MyPlugin())`
-  return config;
-});
+  return config
+})

apps/orchestration/Makefile

@@ -1,4 +1,4 @@
-ORCHESTRATION_PROJECT_NAME := apps/orchestration
+ORCHESTRATION_PROJECT_NAME := orchestration
 ORCHESTRATION_PROJECT_DIR := ./apps/orchestration
 ORCHESTRATION_DATABASE_SCHEMA := ${ORCHESTRATION_PROJECT_DIR}/src/persistence/schema/schema.prisma
 

apps/orchestration/project.json

@@ -1,5 +1,5 @@
 {
-  "name": "apps/orchestration",
+  "name": "orchestration",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/orchestration/src",
   "projectType": "application",
@@ -26,14 +26,14 @@
       "executor": "@nx/js:node",
       "defaultConfiguration": "development",
       "options": {
-        "buildTarget": "apps/orchestration:build"
+        "buildTarget": "orchestration:build"
       },
       "configurations": {
         "development": {
-          "buildTarget": "apps/orchestration:build:development"
+          "buildTarget": "orchestration:build:development"
         },
         "production": {
-          "buildTarget": "apps/orchestration:build:production"
+          "buildTarget": "orchestration:build:production"
         }
       }
     },
@@ -47,7 +47,7 @@
     "test:type": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "npx tsc --noEmit --project apps/authz-node/tsconfig.app.json"
+        "command": "npx tsc --noEmit --project apps/authz/tsconfig.app.json"
       }
     },
     "test:unit": {