Merge pull request #1 from vitalii-codefresh/develop

Develop

Author: vitalii-codefresh

.github/workflows/blank.yml

@@ -28,5 +28,7 @@ jobs:
       # Runs a set of commands using the runners shell
       - name: Run a multi-line script
         run: |
-          yarn test,
+          cd app1
+          yarn install
+          yarn test
           echo test, and deploy your project.

.gitignore

@@ -0,0 +1,11 @@
+node_modules
+build
+npm-debug.log
+.nyc
+.env
+.DS_Store
+.idea
+configmap
+app3
+
+/gitops/single-service/other/

app1/.dockerignore

@@ -0,0 +1,4 @@
+.env
+node_modules
+build
+data/*

app1/Dockerfile

@@ -0,0 +1,10 @@
+ARG BUILD_VAR="buildVar"
+FROM node:20.18.0-alpine3.20
+LABEL authors="vitalii-codefresh"
+WORKDIR app/
+COPY . .
+EXPOSE 8002
+VOLUME /myvol
+RUN yarn install && npm -g uninstall npm
+
+ENTRYPOINT ["node", "index.js"]

app1/index.js

@@ -0,0 +1,76 @@
+const { log } = require('console');
+const express = require('express');
+const crypto = require(`crypto`);
+const { appendFile, readFile } = require("fs/promises");
+const { readdirSync } = require("fs");
+const { resolve } = require("path");
+require('dotenv').config();
+
+const router = express.Router();
+const port = process.env.PORT || 8000;
+const serviceId = crypto.randomBytes(5).toString("hex");
+const resultFile = "./data/results.csv";
+
+const app = express(); // Експортуємо цей екземпляр
+
+
+router.get('/', (req, res) => {
+    res.statusCode = 200;
+    res.header("Content-Type", "application/json");
+    res.json({ result: "hello", serviceId });
+});
+
+router.get('/add', express.json(), async (req, res) => {
+    const body = req.body;
+    if (!body || typeof body.firstValue === 'undefined' || typeof body.secondValue === 'undefined') {
+        res.statusCode = 400;
+        res.send("body is required");
+        return;
+    }
+    const firstValue = body.firstValue;
+    const secondValue = body.secondValue;
+    const result = firstValue + secondValue;
+    await writeResult(result, serviceId);
+    res.send({ result, serviceId });
+});
+
+router.get('/getResults', async (req, res) => {
+    try {
+        const results = await readResults();
+        res.json({ results, serviceId });
+    } catch (e) {
+        res.statusCode = 500;
+        res.send("internal error");
+    }
+});
+
+router.get('/getDir', async (req, res) => {
+    try {
+        const myPath = resolve();
+        const files = readdirSync("./");
+        const dataContent = readdirSync("./data");
+        res.json({ files, dataContent, myPath, serviceId });
+    } catch (e) {
+        res.statusCode = 500;
+        res.send("internal error");
+    }
+});
+
+app.use("/app1", router);
+
+module.exports = { app };
+
+if (require.main === module) {
+    app.listen(port, () => {
+        log(`server starts at port ${port}`, `id is - ${serviceId}`);
+    });
+}
+
+
+async function writeResult(result, serviceId) {
+    await appendFile(resultFile, `${result};SERVICE_ID-${serviceId};` + "\n");
+}
+
+async function readResults() {
+    return readFile(resultFile, { encoding: "utf-8" });
+}

app1/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "simple-server",
+  "version": "1.0.0",
+  "description": "To make it easy for you to get started with GitLab, here's a list of recommended next steps.",
+  "main": "app1/index.js",
+  "scripts": {
+    "test": "npx jest "
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "dotenv": "^16.4.1",
+    "express": "^4.18.2",
+    "jest": "27.5.1",
+    "ip":  "2.0.1"
+  },
+  "devDependencies": {
+    "supertest": "^7.1.4"
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}

app1/test/app1.test.js

@@ -0,0 +1,85 @@
+const request = require('supertest');
+const { app } = require('../index');
+
+jest.mock('fs/promises', () => ({
+    appendFile: jest.fn(() => Promise.resolve()),
+    readFile: jest.fn(() => Promise.resolve('10;SERVICE_ID-abcde;\n20;SERVICE_ID-fghij;\n')),
+}));
+
+jest.mock('fs', () => ({
+    readdirSync: jest.fn((path) => {
+        if (path === './') return ['app.js', 'package.json', 'data'];
+        if (path === './data') return ['results.csv'];
+        return [];
+    }),
+}));
+
+describe('Express App Tests', () => {
+    let server;
+
+    beforeAll((done) => {
+        server = app.listen(0, done);
+    });
+    afterAll((done) =>{
+        server.close(done);
+    });
+
+    test('GET /app1/ should return hello and serviceId', async () => {
+        const res = await request(server).get('/app1/');
+        expect(res.statusCode).toEqual(200);
+        expect(res.headers['content-type']).toMatch(/application\/json/);
+        expect(res.body.result).toEqual('hello');
+        expect(res.body).toHaveProperty('serviceId');
+    });
+
+    test('GET /app1/add with valid body should return sum and serviceId', async () => {
+        const res = await request(server)
+            .get('/app1/add')
+            .send({ firstValue: 5, secondValue: 3 })
+            .set('Content-Type', 'application/json');
+
+        expect(res.statusCode).toEqual(200);
+        expect(res.body.result).toEqual(8);
+        expect(res.body).toHaveProperty('serviceId');
+        expect(require('fs/promises').appendFile).toHaveBeenCalledWith(
+            './data/results.csv',
+            expect.stringContaining('8;SERVICE_ID-'),
+        );
+    });
+
+    test('GET /app1/add without body should return 400', async () => {
+        const res = await request(server).get('/app1/add'); // Без .send()
+        expect(res.statusCode).toEqual(400);
+        expect(res.text).toEqual('body is required');
+    });
+
+    test('GET /app1/add with missing firstValue should return 400', async () => {
+        const res = await request(server)
+            .get('/app1/add')
+            .send({ secondValue: 3 })
+            .set('Content-Type', 'application/json');
+        expect(res.statusCode).toEqual(400);
+        expect(res.text).toEqual('body is required');
+    });
+
+    test('GET /app1/getResults should return results from file', async () => {
+        const res = await request(server).get('/app1/getResults');
+        expect(res.statusCode).toEqual(200);
+        expect(res.body.results).toEqual('10;SERVICE_ID-abcde;\n20;SERVICE_ID-fghij;\n');
+        expect(res.body).toHaveProperty('serviceId');
+        // Перевіряємо, що readFile був викликаний
+        expect(require('fs/promises').readFile).toHaveBeenCalledWith(
+            './data/results.csv',
+            { encoding: 'utf-8' }
+        );
+    });
+
+    test('GET /app1/getDir should return directory contents and path', async () => {
+        const res = await request(server).get('/app1/getDir');
+        expect(res.statusCode).toEqual(200);
+        expect(res.body.files).toEqual(['app.js', 'package.json', 'data']);
+        expect(res.body.dataContent).toEqual(['results.csv']);
+        expect(res.body).toHaveProperty('myPath');
+        expect(res.body).toHaveProperty('serviceId');
+    });
+});

app2/.dockerignore

@@ -0,0 +1,3 @@
+.env
+node_modules
+build

app2/Dockerfile

@@ -0,0 +1,10 @@
+ARG BUILD_VAR="buildVar"
+FROM node:20.11-alpine3.18
+LABEL authors="vitalii-codefresh"
+WORKDIR app/
+COPY . .
+EXPOSE 8010
+VOLUME /myvol
+RUN ["npm", "i"]
+
+ENTRYPOINT ["node", "index2.js"]

app2/index2.js

@@ -0,0 +1,38 @@
+const {log} = require('console');
+const express = require('express')
+const crypto = require(`crypto`);
+require('dotenv').config();
+const app1Host = process.env.APP1_HOST;
+const router = express.Router();
+const port = 8010;
+const serviceId = crypto.randomBytes(5).toString("hex");
+const app = express();
+
+router.get('/', (req, res) => {
+    res.statusCode = 200;
+    res.header("Content-Type", "application/json");
+    res.json({result: "hello", serviceId});
+})
+
+router.get('/getRes', express.json(), async (req, res) => {
+    if (!app1Host) {
+        res.statusCode = 500;
+        res.send("APP1_HOST - variable was not set");
+        return;
+    }
+    try {
+        const results = await (await fetch(`${app1Host}/getResults`)).json();
+        res.send({results, serviceId});
+    } catch (e) {
+        console.error(e)
+        res.statusCode = 500;
+        res.send("Internal error");
+    }
+});
+
+app.use("/app2", router);
+
+app.listen(port, () => {
+    log(`server starts at port ${port}`, `id is - ${serviceId}`);
+    console.log("app1Host is :"+ app1Host);
+})