improvements to besom-cfg

Justfile

@@ -1,7 +1,6 @@
 # Big idea behind using a Justfile is so that we can have modules like in sbt.
 
 besom-version := `cat version.txt`
-besom-cfg-version := `cat besom-cfg/version.txt`
 is-snapshot := if "{{besom-version}}" =~ '.*-SNAPSHOT' { "true" } else { "false" }
 no-bloop := if env_var_or_default('BESOM_BUILD_NO_BLOOP', "") == "true" { "--server=false" } else { "" }
 
@@ -44,20 +43,20 @@ build-packages-for-templates-and-examples:
   grep -hr "0.3-SNAPSHOT" examples/**/*.scala templates/**/*.scala | sed -n 's/.*besom-\([^:]*:[^"]*\).*-core.0.3-SNAPSHOT.*/\1/p' | sort -u | tr '\n' ' ' | xargs -I {} just cli packages local {}
 
 # Cleans everything
-clean-all: clean-json clean-rpc clean-sdk clean-auto clean-out clean-compiler-plugin clean-codegen clean-scripts clean-test-integration clean-cfg clean-test-templates clean-test-examples clean-test-markdown
+clean-all: clean-json clean-model clean-rpc clean-sdk clean-auto clean-out clean-compiler-plugin clean-codegen clean-scripts clean-test-integration clean-cfg clean-test-templates clean-test-examples clean-test-markdown
 
 # Compiles everything
-compile-all: compile-json compile-rpc compile-sdk compile-auto compile-codegen compile-scripts compile-compiler-plugin build-language-plugin
+compile-all: compile-json compile-model compile-rpc compile-sdk compile-auto compile-codegen compile-scripts compile-compiler-plugin build-language-plugin
 
 # Tests everything
-test-all: test-json test-sdk test-auto test-codegen test-scripts test-integration build-packages-for-templates-and-examples test-templates test-examples test-markdown
+test-all: test-json test-model test-sdk test-auto test-codegen test-scripts test-integration build-packages-for-templates-and-examples test-templates test-examples test-markdown
 
 # Publishes everything locally
-publish-local-all: publish-local-json publish-local-rpc publish-local-sdk publish-local-auto publish-local-codegen publish-local-scripts install-language-plugin
+publish-local-all: publish-local-json publish-local-model publish-local-rpc publish-local-sdk publish-local-auto publish-local-codegen publish-local-scripts install-language-plugin
 
 # Publishes everything to Maven
 # TODO add publish-maven-auto once stable
-publish-maven-all: publish-maven-json publish-maven-rpc publish-maven-sdk publish-maven-codegen publish-maven-scripts
+publish-maven-all: publish-maven-json publish-maven-model publish-maven-rpc publish-maven-sdk publish-maven-codegen publish-maven-scripts
 
 # Runs all necessary checks before committing
 before-commit: compile-all test-all
@@ -215,7 +214,7 @@ publish-maven-json:
 ####################
 
 # Compiles auto module
-compile-auto: publish-local-core
+compile-auto: publish-local-core publish-local-model
     scala-cli --power compile auto --suppress-experimental-feature-warning
 
 # Runs tests for auto module
@@ -314,65 +313,106 @@ publish-language-plugins-all: package-language-plugins-all
 compile-cfg-lib: publish-local-json publish-local-core
 	scala-cli --power compile besom-cfg/lib --suppress-experimental-feature-warning
 
+compile-cfg-containers: publish-local-cfg-lib publish-local-model
+	scala-cli --power compile besom-cfg/containers --suppress-experimental-feature-warning
+
 # Compiles besom-cfg k8s module
-compile-cfg-k8s: publish-local-cfg-lib
+compile-cfg-k8s: publish-local-cfg-lib publish-local-cfg-containers
 	just cli packages local kubernetes:4.17.1
 	scala-cli --power compile besom-cfg/k8s --suppress-experimental-feature-warning
 
-# Compiles all besom-cfg modules
-compile-cfg: compile-cfg-lib compile-cfg-k8s
-
 # Publishes locally besom-cfg lib module
 publish-local-cfg-lib:
-	scala-cli --power publish local besom-cfg/lib --project-version {{besom-cfg-version}} --suppress-experimental-feature-warning
+	scala-cli --power publish local besom-cfg/lib --project-version {{besom-version}} --suppress-experimental-feature-warning
+
+publish-local-cfg-containers: compile-cfg-containers
+	scala-cli --power publish local besom-cfg/containers --project-version {{besom-version}} --suppress-experimental-feature-warning
 
 # Publishes locally besom-cfg k8s module
 publish-local-cfg-k8s: compile-cfg-k8s
-	scala-cli --power publish local besom-cfg/k8s --project-version {{besom-cfg-version}} --suppress-experimental-feature-warning
+	scala-cli --power publish local besom-cfg/k8s --project-version {{besom-version}} --suppress-experimental-feature-warning
 
 # Publishes locally all besom-cfg modules
-publish-local-cfg: publish-local-cfg-lib publish-local-cfg-k8s
+publish-local-cfg: publish-local-cfg-lib publish-local-cfg-containers publish-local-cfg-k8s
 
 # Publishes besom-cfg lib module to Maven
 publish-maven-cfg-lib:
-	scala-cli --power publish besom-cfg/lib --project-version {{besom-cfg-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning
+	scala-cli --power publish besom-cfg/lib --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning
+
+publish-maven-cfg-containers:
+	scala-cli --power publish besom-cfg/containers --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning
 
 # Publishes besom-cfg k8s module to Maven
 publish-maven-cfg-k8s:
-	scala-cli --power publish besom-cfg/k8s --project-version {{besom-cfg-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning
+	scala-cli --power publish besom-cfg/k8s --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning
 
 # Tests besom-cfg lib module
 test-cfg-lib: compile-cfg-lib
 	scala-cli --power test besom-cfg/lib --suppress-experimental-feature-warning
 
+# Tests besom-cfg containers module
+test-cfg-containers: compile-cfg-containers
+	scala-cli --power test besom-cfg/containers --suppress-experimental-feature-warning
+
 # Tests besom-cfg k8s module
-test-cfg-k8s: publish-local-cfg-lib compile-cfg-k8s
+test-cfg-k8s: compile-cfg-k8s
 	scala-cli --power test besom-cfg/k8s --suppress-experimental-feature-warning
 
+# Compiles all besom-cfg modules
+compile-cfg: compile-cfg-lib compile-cfg-containers compile-cfg-k8s
+
 # Runs all tests of besom-cfg
-test-cfg: test-cfg-lib test-cfg-k8s
+test-cfg: test-cfg-lib test-cfg-containers test-cfg-k8s
 
 # Cleans besom-cfg-lib build
 clean-cfg-lib:
 	scala-cli clean besom-cfg/lib
 
+# Cleans besom-cfg-containers build
+clean-cfg-containers:
+	scala-cli clean besom-cfg/containers
+
 # Cleans besom-cfg-k8s build
 clean-cfg-k8s:
 	scala-cli clean besom-cfg/k8s
 
 # Cleans all besom-cfg builds
-clean-cfg: clean-cfg-lib clean-cfg-k8s
+clean-cfg: clean-cfg-lib clean-cfg-containers clean-cfg-k8s
+
+####################
+# Model
+####################
+
+# Compiles model module
+compile-model:
+	scala-cli --power compile {{no-bloop}} model --suppress-experimental-feature-warning
+
+# Runs tests for model module
+test-model:
+	scala-cli --power test {{no-bloop}} model --suppress-experimental-feature-warning
+
+# Cleans model module
+clean-model:
+	scala-cli --power clean model
+
+# Publishes locally model module
+publish-local-model: test-model
+	scala-cli --power publish local {{no-bloop}} model --project-version {{besom-version}} --suppress-experimental-feature-warning
+
+# Publishes model module
+publish-maven-model: test-model
+	scala-cli --power publish {{no-bloop}} model --project-version {{besom-version}} {{publish-maven-auth-options}} --suppress-experimental-feature-warning
 
 ####################
 # Codegen
 ####################
 
 # Compiles Besom codegen module
-compile-codegen:
+compile-codegen: publish-local-model
 	scala-cli --power compile {{no-bloop}} codegen --suppress-experimental-feature-warning
 
 # Runs tests for Besom codegen
-test-codegen:
+test-codegen: compile-codegen
 	scala-cli --power test {{no-bloop}} codegen --suppress-experimental-feature-warning
 
 # Cleans codegen build

auto/project.scala

@@ -4,6 +4,7 @@
 
 //> using dep org.virtuslab::besom-json:0.4.0-SNAPSHOT
 //> using dep org.virtuslab::besom-core:0.4.0-SNAPSHOT
+//> using dep org.virtuslab::besom-model:0.4.0-SNAPSHOT
 //> using dep org.virtuslab::scala-yaml:0.0.8
 //> using dep com.lihaoyi::os-lib:0.10.0
 //> using dep com.lihaoyi::os-lib-watch:0.10.0

besom-cfg/containers/.scalafmt.conf

@@ -0,0 +1,11 @@
+version = 3.5.2
+runner.dialect = scala3
+project.git = true
+align = most
+align.openParenCallSite = false
+align.openParenDefnSite = false
+align.tokens = [{code = "=>", owner = "Case"}, "<-", "%", "%%", "="]
+indent.defnSite = 2
+maxColumn = 140
+
+rewrite.scala3.insertEndMarkerMinLines = 40

besom-cfg/containers/project.scala

@@ -0,0 +1,19 @@
+//> using scala 3.3.3
+
+//> using dep com.lihaoyi::os-lib::0.9.3
+//> using dep org.virtuslab::besom-cfg:0.4.0-SNAPSHOT
+//> using dep org.virtuslab::besom-model:0.4.0-SNAPSHOT
+
+//> using test.dep org.scalameta::munit:1.0.0
+
+//> using publish.name "besom-cfg-containers"
+//> using publish.organization "org.virtuslab"
+//> using publish.url "https://github.com/VirtusLab/besom"
+//> using publish.vcs "github:VirtusLab/besom"
+//> using publish.license "Apache-2.0"
+//> using publish.repository "central"
+//> using publish.developer "lbialy|Łukasz Biały|https://github.com/lbialy"
+//> using publish.developer "prolativ|Michał Pałka|https://github.com/prolativ"
+//> using publish.developer "KacperFKorban|Kacper Korban|https://github.com/KacperFKorban"
+//> using publish.developer "pawelprazak|Paweł Prażak|https://github.com/pawelprazak"
+//> using repository sonatype:snapshots

besom-cfg/k8s/src/main/scala/containers.scala → besom-cfg/containers/src/main/scala/containers.scala

@@ -1,8 +1,8 @@
 package besom.cfg.containers
 
-// this should be a separate package, base for all container integrations
-
 import besom.cfg.internal.Schema
+import besom.cfg.Configured
+import besom.model.SemanticVersion
 import besom.json.*
 import scala.util.Try
 
@@ -26,38 +26,45 @@ def saveToCache(image: String, content: String): Unit =
     os.makeDir.all(os.Path(s"$cacheDir/besom-cfg"))
     os.write.over(os.Path(s"$cacheDir/besom-cfg/$sanitized"), content)
 
-def resolveMetadataFromImage(image: String): String =
+def resolveMetadataFromImage(image: String, overrideClasspathPath: Option[String] = None): String =
   lazy val sbtNativePackagerFormatCall =
+    val classpathPath = overrideClasspathPath.getOrElse("/opt/docker/lib/*")
     os
-      .proc("docker", "run", "--rm", "--entrypoint", "java", image, "-cp", "/opt/docker/lib/*", "besom.cfg.SummonConfiguration")
+      .proc("docker", "run", "--rm", "--entrypoint", "java", image, "-cp", classpathPath, "besom.cfg.SummonConfiguration")
       .call(check = false)
 
   lazy val customDockerFormatCall =
+    val classpathPath = overrideClasspathPath.getOrElse("/app/main")
     os
-      .proc("docker", "run", "--rm", "--entrypoint", "java", image, "-cp", "/app/main", "besom.cfg.SummonConfiguration")
+      .proc("docker", "run", "--rm", "--entrypoint", "java", image, "-cp", classpathPath, "besom.cfg.SummonConfiguration")
       .call(check = false)
 
   if sbtNativePackagerFormatCall.exitCode == 0 then sbtNativePackagerFormatCall.out.text().trim()
   else if customDockerFormatCall.exitCode == 0 then customDockerFormatCall.out.text().trim()
   else throw RuntimeException(s"Failed to get configuration from $image")
 
-def getDockerImageMetadata(image: String): Either[Throwable, Schema] =
+def getDockerImageMetadata(image: String, dontUseCache: Boolean, overrideClasspathPath: Option[String] = None): Either[Throwable, Schema] =
   Try {
-    // 1. cache result per image in /tmp DONE
-    // 2. verify the version of the library used, fail macro if we are older than it
-    // 3. parse the json to correct structure DONE
-    // next:
-    // - support different image setups, autodetect which one is used somehow? somewhat DONE
-    // - cp argument should be configurable
-    val json = fetchFromCache(image) match {
+    val maybeCachedJson = if dontUseCache then None else fetchFromCache(image)
+
+    val json = maybeCachedJson match {
       case Some(cachedJson) => cachedJson
       case None =>
-        val json = resolveMetadataFromImage(image)
+        val json = resolveMetadataFromImage(image, overrideClasspathPath)
 
         saveToCache(image, json)
 
         json
     }
 
-    summon[JsonFormat[Schema]].read(json.parseJson)
+    val schema                       = summon[JsonFormat[Schema]].read(json.parseJson)
+    val obtainedSchemaVersion        = SemanticVersion.parse(schema.version).toTry.get
+    val besomCfgVersionFromClasspath = SemanticVersion.parse(besom.cfg.Version).toTry.get
+
+    if obtainedSchemaVersion > besomCfgVersionFromClasspath then
+      throw Exception(
+        s"Version of besom-cfg-lib used in image $image is '$obtainedSchemaVersion' and is newer than the present library version '$besomCfgVersionFromClasspath'. Please update the besom-cfg extension in your besom project."
+      )
+    else schema
+
   }.toEither