#175 Rename image by dockerImage

TheHive-Project · Apr 3, 2019 · 0e73665 · 0e73665
1 parent 73768db
commit 0e73665
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/org/thp/cortex/models/Migration.scala b/app/org/thp/cortex/models/Migration.scala
@@ -79,7 +79,7 @@ class Migration @Inject() (
               ("url" -> JsString(definition.url)) +
               ("license" -> JsString(definition.license)) +
               ("command" -> definition.command.fold[JsValue](JsNull)(c ⇒ JsString(c.toString))) +
-              ("dockerImage" -> definition.image.fold[JsValue](JsNull)(JsString.apply)) +
+              ("dockerImage" -> definition.dockerImage.fold[JsValue](JsNull)(JsString.apply)) +
               ("baseConfig" -> definition.baseConfiguration.fold[JsValue](JsNull)(JsString.apply))
           }
       })

diff --git a/app/org/thp/cortex/models/WorkerDefinition.scala b/app/org/thp/cortex/models/WorkerDefinition.scala
@@ -78,7 +78,7 @@ case class WorkerDefinition(
     author: String,
     url: String,
     license: String,
-    image: Option[String],
+    dockerImage: Option[String],
     command: Option[Path],
     baseConfiguration: Option[String],
     configurationItems: Seq[ConfigurationDefinitionItem],
@@ -100,7 +100,7 @@ object WorkerDefinition {
     (JsPath \ "author").read[String] and
     (JsPath \ "url").read[String] and
     (JsPath \ "license").read[String] and
-    (JsPath \ "image").readNullable[String] and
+    (JsPath \ "dockerImage").readNullable[String] and
     (JsPath \ "command").readNullable[String].map(_.map(Paths.get(_))) and
     (JsPath \ "baseConfig").readNullable[String] and
     (JsPath \ "configurationItems").read[Seq[ConfigurationDefinitionItem]].orElse(Reads.pure(Nil)) and
@@ -124,7 +124,7 @@ object WorkerDefinition {
       "license" → workerDefinition.license,
       "baseConfig" → workerDefinition.baseConfiguration,
       "configurationItems" → workerDefinition.configurationItems,
-      "image" → workerDefinition.image,
+      "dockerImage" → workerDefinition.dockerImage,
       "command" → workerDefinition.command.map(_.getFileName.toString))
   }
 }
diff --git a/app/org/thp/cortex/services/WorkerSrv.scala b/app/org/thp/cortex/services/WorkerSrv.scala
@@ -145,11 +145,11 @@ class WorkerSrv @Inject() (
         } yield w.copy(command = command)
       source.close()
       workerDefinitions.filter {
-        case w if w.command.isDefined && jobRunnerSrv.processRunnerIsEnable ⇒ true
-        case w if w.image.isDefined && jobRunnerSrv.dockerRunnerIsEnable    ⇒ true
+        case w if w.command.isDefined && jobRunnerSrv.processRunnerIsEnable    ⇒ true
+        case w if w.dockerImage.isDefined && jobRunnerSrv.dockerRunnerIsEnable ⇒ true
         case w ⇒
           val reason = if (w.command.isDefined) "process runner is disabled"
-          else if (w.image.isDefined) "Docker runner is disabled"
+          else if (w.dockerImage.isDefined) "Docker runner is disabled"
           else "it doesn't have image nor command"
 
           logger.warn(s"$workerType ${w.name} is disabled because $reason")
@@ -208,7 +208,7 @@ class WorkerSrv @Inject() (
           .set("description", workerDefinition.description)
           .set("author", workerDefinition.author)
           .set("version", workerDefinition.version)
-          .set("dockerImage", workerDefinition.image.map(JsString))
+          .set("dockerImage", workerDefinition.dockerImage.map(JsString))
           .set("command", workerDefinition.command.map(p ⇒ JsString(p.toString)))
           .set("url", workerDefinition.url)
           .set("license", workerDefinition.license)