Add support for beta native CLI version

marc0der · claude · marc0der · commit 7fec913f8cf5 · 2025-03-28T13:42:16.000Z
- Update controllers to use beta native version for beta channel
- Update test suite to support separate beta and stable native versions
- Fix all tests to use correct native CLI version

Co-Authored-By: Claude &lt;noreply@anthropic.com&gt;
diff --git a/app/controllers/InstallController.scala b/app/controllers/InstallController.scala
@@ -28,12 +28,13 @@ class InstallController @Inject() (
         stableVersion       = app.stableCliVersion
         betaVersion         = app.betaCliVersion
         stableNativeVersion = app.stableNativeCliVersion
+        betaNativeVersion   = app.betaNativeCliVersion
       } yield
         if (beta) {
           Ok(
             views.txt.install_beta(
               cliVersion = betaVersion,
-              cliNativeVersion = stableNativeVersion,
+              cliNativeVersion = betaNativeVersion,
               baseUrl = betaBaseUrl,
               rcUpdate = rcUpdate.getOrElse(true),
               beta = true
diff --git a/app/controllers/SelfUpdateController.scala b/app/controllers/SelfUpdateController.scala
@@ -27,13 +27,14 @@ class SelfUpdateController @Inject() (
         stableVersion       = app.stableCliVersion
         betaVersion         = app.betaCliVersion
         stableNativeVersion = app.stableNativeCliVersion
+        betaNativeVersion   = app.betaNativeCliVersion
         platform            = Platform(platformId).native
       } yield
         if (beta) {
           Ok(
             views.txt.selfupdate_beta(
               cliVersion = betaVersion,
-              cliNativeVersion = stableNativeVersion,
+              cliNativeVersion = betaNativeVersion,
               baseUrl = betaBaseUrl,
               platform = platform,
               beta = true
diff --git a/build.sbt b/build.sbt
@@ -28,7 +28,7 @@ resolvers ++= Seq(
 libraryDependencies ++= Seq(
   guice,
   ws,
-  "com.github.sdkman" % "sdkman-mongodb-persistence" % "2.3",
+  "com.github.sdkman" % "sdkman-mongodb-persistence" % "2.4",
   "org.scalatest" %% "scalatest" % "3.0.0" % Test,
   "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test,
   "io.cucumber" %% "cucumber-scala" % "4.7.1" % Test,
diff --git a/features/installation.feature b/features/installation.feature
@@ -4,6 +4,7 @@ Feature: Installation
     Given the stable CLI Version is "1.0.0"
     And the beta CLI Version is "latest+bff371f"
     And the stable native CLI Version is "0.1.0"
+    And the beta native CLI Version is "0.2.0"
 
   Scenario: Install SDKMAN stable from the command line
     When a request is made to the /install/stable endpoint
@@ -35,9 +36,9 @@ Feature: Installation
     Then a 200 status code is received
     And a "text/plain; charset=UTF-8" content type is received
     And the response script starts with "#!/bin/bash"
-    And the response script contains "# install:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.1.0; api: https://beta.sdkman.io/2"
+    And the response script contains "# install:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.2.0; api: https://beta.sdkman.io/2"
     And the response script contains "SDKMAN_VERSION="latest+bff371f""
-    And the response script contains "SDKMAN_NATIVE_VERSION="0.1.0""
+    And the response script contains "SDKMAN_NATIVE_VERSION="0.2.0""
     And the response script contains "SDKMAN_SERVICE="https://beta.sdkman.io/2"
 
   Scenario: Install SDKMAN beta from the command line without updating rc files
diff --git a/features/native.feature b/features/native.feature
@@ -4,20 +4,21 @@ Feature: Native CLI
     Given the stable CLI Version is "1.0.0"
     And the beta CLI Version is "latest+bff371f"
     And the stable native CLI Version is "0.1.0"
+    And the beta native CLI Version is "0.2.0"
 
   Scenario: A selfupdate is performed on the beta channel for a know platform
     When a request is made to the /selfupdate/beta/linuxx64 endpoint
     Then a 200 status code is received
-    And the response script contains "# selfupdate:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.1.0; api: https://beta.sdkman.io/2"
-    And the response script contains "SDKMAN_NATIVE_VERSION="0.1.0""
+    And the response script contains "# selfupdate:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.2.0; api: https://beta.sdkman.io/2"
+    And the response script contains "SDKMAN_NATIVE_VERSION="0.2.0""
     And the response script contains "# native cli distribution for supported platforms only"
     And the response script contains "native_triple="x86_64-unknown-linux-gnu""
 
   Scenario: A selfupdate is performed on the beta channel for an unknown platform
     When a request is made to the /selfupdate/beta/unknown endpoint
     Then a 200 status code is received
-    And the response script contains "# selfupdate:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.1.0; api: https://beta.sdkman.io/2"
-    And the response script contains "SDKMAN_NATIVE_VERSION="0.1.0""
+    And the response script contains "# selfupdate:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.2.0; api: https://beta.sdkman.io/2"
+    And the response script contains "SDKMAN_NATIVE_VERSION="0.2.0""
     And the response script does not contain "# native cli distribution for supported platforms only"
     And the response script does not contain "native_triple"
 
diff --git a/features/selfupdate.feature b/features/selfupdate.feature
@@ -4,6 +4,7 @@ Feature: Selfupdate
     Given the stable CLI Version is "1.0.0"
     And the beta CLI Version is "latest+bff371f"
     And the stable native CLI Version is "0.1.0"
+    And the beta native CLI Version is "0.2.0"
 
   Scenario: A selfupdate is performed on the Stable Channel
     When a request is made to the /selfupdate/stable endpoint
@@ -19,9 +20,9 @@ Feature: Selfupdate
     Then a 200 status code is received
     And a "text/plain; charset=UTF-8" content type is received
     And the response script starts with "#!/bin/bash"
-    And the response script contains "# selfupdate:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.1.0; api: https://beta.sdkman.io/2"
+    And the response script contains "# selfupdate:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.2.0; api: https://beta.sdkman.io/2"
     And the response script contains "SDKMAN_VERSION="latest+bff371f""
-    And the response script contains "SDKMAN_NATIVE_VERSION="0.1.0""
+    And the response script contains "SDKMAN_NATIVE_VERSION="0.2.0""
     And the response script contains "SDKMAN_SERVICE="https://beta.sdkman.io/2""
 
   Scenario: A selfupdate is performed on the legacy Stable Channel
@@ -38,6 +39,6 @@ Feature: Selfupdate
     Then a 200 status code is received
     And a "text/plain; charset=UTF-8" content type is received
     And the response script starts with "#!/bin/bash"
-    And the response script contains "# selfupdate:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.1.0; api: https://beta.sdkman.io/2"
+    And the response script contains "# selfupdate:- channel: beta; cliVersion: latest+bff371f; cliNativeVersion: 0.2.0; api: https://beta.sdkman.io/2"
     And the response script contains "SDKMAN_VERSION="latest+bff371f""
     And the response script contains "SDKMAN_SERVICE="https://beta.sdkman.io/2""
diff --git a/test/steps/Steps.scala b/test/steps/Steps.scala
@@ -25,7 +25,12 @@ class Steps extends ScalaDsl with EN with Matchers {
 
   And("""^the stable native CLI Version is "(.*)"""") { native: String =>
     stableNativeCliVersion = native
-    Mongo.insertCliVersions(stableCliVersion, betaCliVersion, stableNativeCliVersion)
+  }
+  
+  And("""^the beta native CLI Version is "(.*)"""") { native: String =>
+    betaNativeCliVersion = native
+    // Insert all CLI versions after both stable and beta native CLI versions are set
+    Mongo.insertCliVersions(stableCliVersion, betaCliVersion, stableNativeCliVersion, betaNativeCliVersion)
   }
 
   And("""^a request is made to the (.*) endpoint$""") { endpoint: String =>
diff --git a/test/steps/support/Mongo.scala b/test/steps/support/Mongo.scala
@@ -26,18 +26,19 @@ object Mongo {
   lazy val appCollection: MongoCollection[Application] = db.getCollection("application")
 
   def insertAliveOk(): Seq[Completed] =
-    appCollection.insertOne(Application("OK", "", "", "")).results()
+    appCollection.insertOne(Application("OK", "", "", "", "")).results()
 
   def insertAliveKo(): Seq[Completed] =
-    appCollection.insertOne(Application("KO", "", "", "")).results()
+    appCollection.insertOne(Application("KO", "", "", "", "")).results()
 
   def insertCliVersions(
       stableCliVersion: String,
       betaCliVersion: String,
-      stableNativeCliVersion: String
+      stableNativeCliVersion: String,
+      betaNativeCliVersion: String
   ): Seq[Completed] =
     appCollection
-      .insertOne(Application("OK", stableCliVersion, betaCliVersion, stableNativeCliVersion))
+      .insertOne(Application("OK", stableCliVersion, betaCliVersion, stableNativeCliVersion, betaNativeCliVersion))
       .results()
 
   def dropAppCollection(): Seq[Completed] = appCollection.drop().results()
diff --git a/test/steps/support/World.scala b/test/steps/support/World.scala
@@ -15,4 +15,6 @@ object World {
   var betaCliVersion = ""
 
   var stableNativeCliVersion = ""
+  
+  var betaNativeCliVersion = ""
 }

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,6 @@ object World {`
`15`	`15`	`var betaCliVersion = ""`
`16`	`16`
`17`	`17`	`var stableNativeCliVersion = ""`
	`18`	`+`
	`19`	`+ var betaNativeCliVersion = ""`
`18`	`20`	`}`