Update review

mekomsolutions · Jan 19, 2024 · 31c548e · 31c548e
1 parent 7e36d26
commit 31c548e
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 287 deletions.
diff --git a/node-scripts/spec/pipeline3/impl/dockerComposeGenericRegacy.spec.js b/node-scripts/spec/pipeline3/impl/dockerComposeGenericRegacy.spec.js
diff --git a/...peline3/impl/dockerComposeGeneric.spec.js → ...ine3/impl/dockerComposeProjectDir.spec.js b/...peline3/impl/dockerComposeGeneric.spec.js → ...ine3/impl/dockerComposeProjectDir.spec.js
@@ -6,7 +6,7 @@ describe("Docker Compose Generic Deployment implementation", function() {
   const config = require(path.resolve("src/utils/config"));
   const cst = require(path.resolve("src/const"));
   const dockerCompose = require(path.resolve(
-    "src/pipeline3/impl/dockerComposeGeneric"
+    "src/pipeline3/impl/dockerComposeProjectDir"
   ));
 
   const scripts = require(path.resolve(
@@ -20,12 +20,12 @@ describe("Docker Compose Generic Deployment implementation", function() {
     group: "tlc",
     deployment: {
       hostDir: "/var/docker-volumes/",
-      workDir: "/var/docker-volumes/artifacts/run/docker",
-      type: "dockerComposeGeneric",
+      type: "dockerComposeProjectDir",
       composePlugin: true,
       dockerComposeFiles: ["docker-compose.yml", "docker-compose-2.yml"],
       envFiles: ["env-file-1", "env-file-2"],
       value: {
+        projectPath: "/var/docker-volumes/artifacts/run/docker",
         services: ["proxy", "openmrs", "mysql"]
       },
       timezone: "Europe/Amsterdam",
@@ -82,26 +82,16 @@ describe("Docker Compose Generic Deployment implementation", function() {
 
   it("should generate Host Preparation deployment script", () => {
     var expected = "";
-    // expected += scripts.rsync(
-    //   { ...instanceDef.deployment.host.value, ...{ remoteDst: true } },
-    //   config.getCDDockerDirPath(instanceDef.uuid),
-    //   path.resolve(
-    //     instanceDef.deployment.hostDir,
-    //     instanceDef.name,
-    //     "docker_compose"
-    //   ),
-    //   true,
-    //   null,
-    //   "-avzz --delete"
-    // );
 
     expected +=
       scripts.remote(
         instanceDef.deployment.host.value,
         scripts.writeProperty(
           "TIMEZONE",
           instanceDef.deployment.timezone,
-          path.resolve(instanceDef.deployment.workDir, ".env").toString()
+          path
+            .resolve(instanceDef.deployment.value.projectPath, ".env")
+            .toString()
         )
       ) + "\n";
 
@@ -114,7 +104,7 @@ describe("Docker Compose Generic Deployment implementation", function() {
       scripts.remote(
         instanceDef.deployment.host.value,
         "cd " +
-          path.resolve(instanceDef.deployment.workDir).toString() +
+          path.resolve(instanceDef.deployment.value.projectPath).toString() +
           " && docker compose -p " +
           instanceDef.name +
           " -f docker-compose.yml -f docker-compose-2.yml " +
@@ -125,7 +115,7 @@ describe("Docker Compose Generic Deployment implementation", function() {
       scripts.remote(
         instanceDef.deployment.host.value,
         "cd " +
-          path.resolve(instanceDef.deployment.workDir).toString() +
+          path.resolve(instanceDef.deployment.value.projectPath).toString() +
           " && docker compose -p " +
           instanceDef.name +
           " -f docker-compose.yml -f docker-compose-2.yml " +

diff --git a/node-scripts/src/instance-event/validator.js b/node-scripts/src/instance-event/validator.js
@@ -112,7 +112,6 @@ module.exports = {
       } else if (deployment.hostDir === "") {
         throw new Error("The 'host dir' is not specified.");
       }
-      console.log(JSON.stringify(deployment));
       // validating the actual config based on its type
       module.exports
         .getConfigValidatorsMap()
@@ -248,15 +247,15 @@ module.exports = {
       );
     }
   },
-  validateDockerComposeGenericDeploymentConfigValue: function(value) {
+  validateDockerComposeProjectDirDeploymentConfigValue: function(value) {
     if (
       JSON.stringify(Object.keys(value).sort()) >=
       JSON.stringify(
         Object.keys(new model.DockerComposeGenericDeployment()).sort()
       )
     ) {
       throw new Error(
-        "The Docker compose deployment value should be provided as an instance of 'DockerComposeGenericDeployment'."
+        "The Docker compose deployment value should be provided as an instance of 'DockerComposeProjectDirDeployment'."
       );
     }
   },
@@ -383,8 +382,8 @@ module.exports = {
         module.exports.validateDockerComposeMavenDeploymentConfigValue,
       dockerComposeGenericMaven:
         module.exports.validateDockerComposeGenericMavenDeploymentConfigValue,
-      dockerComposeGeneric:
-        module.exports.validateDockerComposeGenericDeploymentConfigValue
+      dockerComposeProjectDir:
+        module.exports.validateDockerComposeProjectDirDeploymentConfigValue
     };
   }
 };