Merge pull request #132 from microservices-suite/repo-engineering/universal-cli

Repo engineering/universal cli

Author: GAndanje

.suite-cli/cli/scripts/assets/dockerComposeContent.asset.js

@@ -1,4 +1,4 @@
-module.exports = ({ services }) => {
+module.exports = ({ services, webserver }) => {
   const servicesConfig = services.map(service => `
   ${service.name.toLowerCase().replace(/\s+/g, '-')}:
     build:
@@ -10,37 +10,21 @@ module.exports = ({ services }) => {
       - /app/node_modules
       - ../../../microservices/${service.name}:/app`).join('');
 
-  return `version: '3.8'
-services:${servicesConfig}`;
-};
+  // Collect all service names for the 'depends_on' section of the web server
+  const serviceNames = services.map(service => service.name.toLowerCase().replace(/\s+/g, '-'));
 
-
-// module.exports = ({ services }) => `
-// version: '3.8'
-// services:
-//   mongodb:
-//     image: mongo:latest
-//     container_name: mongodb
-//     ports:
-//       - '27017:27017'
-//   rabbitmq:
-//     image: rabbitmq:3.8
-//     container_name: rabbitmq
-//     ports:
-//       - '5672:5672'
-//       - '15672:15672'
-// ${services.map(({ service, ports, prerequisites }) => `
-//   ${service}:
-//     depends_on:
-// ${prerequisites.map((prerequisite) => `      - ${prerequisite}`).join('\n')}
-//     container_name: ${service}
-//     restart: always
-//     build:
-//       context: ../../../microservices/${service}
-//       dockerfile: DockerFile.dev
-//     ports:
-// ${ports.map((p) => `      - '${p}:${p}'`).join('\n')}
-//     volumes:
-//       - /app/node_modules
-//       - ../../../microservices/${service}:/app`).join('\n')}
-// `.trim();
+  return `
+version: '3.8'
+services:
+${servicesConfig}
+  ${webserver.toLowerCase().replace(/\s+/g, '-') || 'webserver'}:
+    depends_on:
+${serviceNames.map(service => `      - ${service}`).join('\n')}
+    restart: always
+    build:
+      context: ./${webserver}
+      dockerfile: Dockerfile.dev
+    ports:
+      - '4000:80'
+  `;
+};

.suite-cli/cli/scripts/assets/index.js

@@ -48,5 +48,6 @@ module.exports.suiteRC = require('./suiteRC.asset')
 module.exports.nginxContent = require('./nginxContent.asset') 
 module.exports.dockerComposeContent = require('./dockerComposeContent.asset') 
 module.exports.dockerfileContent = require('./dockerfileContent.asset') 
+module.exports.nginxDockerfileContent = require('./nginxDockerfileContent.asset') 
 
 

.suite-cli/cli/scripts/assets/nginxDockerfile.asset.js

@@ -0,0 +1,3 @@
+module.exports = () =>`
+FROM nginx
+COPY ./nginx.conf /etc/nginx/conf.d/nginx.conf`

.suite-cli/cli/scripts/assets/nginxDockerfileContent.asset.js

@@ -578,7 +578,7 @@ const getComponentDirecotories = async ({ components, component_type }) => {
 
     const { workspace_name } = retrieveWorkSpaceName({ package_json_path })
 
-    const component_root_dir = join(project_root, `${component_type === 'app' ? `gateway/apps` : 'microservices'}`)
+    const component_root_dir = join(project_root, `${component_type === 'app' ? `gateways/apps` : 'microservices'}`)
 
     // Simulate delay before checking if the component directory exists
     await delay(1);
@@ -1363,17 +1363,18 @@ const test = async ({ package }) => {
 
 const scaffoldApp = ({ answers }) => {
 
-    const project_root = generatRootPath({ currentDir: cwd() })
-    const app_directory = join(project_root, 'gateway/apps', answers.app_name)
     const { webserver } = readFileContent({ currentDir: cwd() })
+    const project_root = generatRootPath({ currentDir: cwd() })
+    const app_directory = join(project_root, 'gateways/apps', answers.app_name)
+    const webserver_dir = join(app_directory, webserver)
 
-    mkdirSync(app_directory, { recursive: true })
-    writeFileSync(join(app_directory, 'docker-compose.dev.yml'), assets.dockerComposeContent({ services: answers.services, app_name: answers.app_name }));
-    writeFileSync(join(app_directory, 'docker-compose.yml'), assets.dockerComposeContent({ services: answers.services, app_name: answers.app_name }));
+    mkdirSync(webserver_dir, { recursive: true })
+    writeFileSync(join(app_directory, 'docker-compose.dev.yml'), assets.dockerComposeContent({ services: answers.services, app_name: answers.app_name, webserver }));
+    writeFileSync(join(app_directory, 'docker-compose.yml'), assets.dockerComposeContent({ services: answers.services, app_name: answers.app_name, webserver }));
     ora().succeed(`Generated docker-compose configs at: ${app_directory}`)
     switch (webserver) {
         case 'nginx':
-            generateNginxConfiguration({ services: answers.services, app_directory });
+            generateNginxConfiguration({ services: answers.services, webserver_dir });
             break
         default:
 
@@ -1388,9 +1389,11 @@ const readFileContent = ({ currentDir }) => {
     return project_config
 }
 
-const generateNginxConfiguration = ({ services, app_directory }) => {
-    writeFileSync(join(app_directory, 'nginx.conf'), assets.nginxContent({ services }));
-    ora().succeed(`Generated nginx.conf at: ${app_directory}`)
+const generateNginxConfiguration = ({ services, webserver_dir }) => {
+    writeFileSync(join(webserver_dir, 'nginx.conf'), assets.nginxContent({ services }));
+    writeFile(join(webserver_dir, 'Dockerfile'), assets.nginxDockerfileContent());
+    writeFile(join(webserver_dir, 'Dockerfile.dev'), assets.nginxDockerfileContent());
+    ora().succeed(`Generated webserver configs at: ${webserver_dir}`)
 }
 const installDependencies = async ({ project_base, workspace, spinner, deps, flags }) => {
 

.suite-cli/cli/scripts/scripts.module.js

@@ -1,6 +1,10 @@
 # Changelog
 
 
+## v1.6.6
+
+[compare changes](https://github.com/microservices-suite/node-microservices-suite/compare/v2.0.10...v1.6.6)
+
 ## v1.6.5
 
 [compare changes](https://github.com/microservices-suite/node-microservices-suite/compare/v1.6.4...v1.6.5)

CHANGELOG.md

@@ -14,11 +14,16 @@ To easily work with a `@microservices-suite monorepo` you need to install [Suite
 |  │  │  ├─ cli.js
 |  │  │  ├─ package.json
 |  │  │  ├─ README.md
-│  ├─ api-gateways/
-|  │  ├─ app-1/
-|  │  │  ├─ nginx
-|  │  │  ├─ apache
-|  │  │  ├─ README.md
+│  ├─ gateways/
+|  │  ├─ apps/
+|  │  |   ├─app-1/
+|  │  │   | ├─ webserver/
+|  │  │   | |  ├─Dockerfile
+|  │  │   | |  ├─Dockerfile.dev
+|  │  │   | |  ├─webserver.conf
+|  │  │   | ├─ docker-compose.yml
+|  │  │   | ├─ docker-compose.dev.yml
+|  │  │   | ├─ README.md
 │  ├─ graphql/
 |  │  ├─ app-1/
 |  │  │  ├─ apollo-server

README.md

@@ -1,6 +1,6 @@
 {
   "name": "@microservices-suite/microservices",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "This is the central orchestration point for our microservices-based platform, encompassing user management, email communications, file upload handling, and role-based access control services. It serves as the backbone of our application's backend, facilitating seamless interaction, development, and scaling of individual microservices. The workspace is designed to streamline the development process, ensuring dependency consistency, and simplifying the build and deployment workflows across all services.\nThis root workspace enables our development teams to:\n- Manage dependencies for all services in a unified manner, reducing conflicts and easing updates.\n- Utilize shared configurations, such as ESLint rules, TypeScript configurations, and shared utility libraries, to maintain coding standards and reduce redundancy across services.\n- Implement global scripts for tasks like testing, linting, and deployment that can run across all services, ensuring consistency and efficiency in our development pipeline.\n- Leverage the workspace's structure for local development, allowing for easy testing of interactions between services without the need for deploying or configuring external environments.",
   "keywords": [],
   "author": "Gilbert Andanje",