Merge pull request #187 from udda1996/fix-use-command

Add distribution availability check
ballerina-platform · Dec 20, 2021 · d93e195 · d93e195
2 parents 52c6696 + b4efb40
commit d93e195
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/main/java/org/ballerinalang/command/cmd/UseCommand.java b/src/main/java/org/ballerinalang/command/cmd/UseCommand.java
@@ -17,6 +17,8 @@
 package org.ballerinalang.command.cmd;
 
 import org.ballerinalang.command.BallerinaCliCommands;
+import org.ballerinalang.command.util.Channel;
+import org.ballerinalang.command.util.Distribution;
 import org.ballerinalang.command.util.ErrorUtil;
 import org.ballerinalang.command.util.ToolUtil;
 import picocli.CommandLine;
@@ -68,8 +70,23 @@ public void execute() {
             return;
         }
         printStream.println("Distribution '" + distribution + "' not found");
-        printStream.println("Run 'bal dist pull " + distribution + "' to fetch and set the distribution as the " +
-                                    "active distribution");
+
+        List<Channel> channels = ToolUtil.getDistributions(printStream);
+        boolean validDistribution = false;
+        for (Channel channel : channels) {
+            for (Distribution dist : channel.getDistributions()) {
+                if (distribution.equals(dist.getVersion()) ) {
+                    validDistribution = true;
+                    printStream.println("Run 'bal dist pull " + distribution + "' to fetch and set the distribution " +
+                            "as the active distribution");
+                    break;
+                }
+            }
+        }
+        if (!validDistribution){
+            printStream.println( "'" + distribution + "' is not a valid distribution. Use 'bal dist list -a' for the " +
+                    "available distributions list");
+        }
     }
 
     @Override

diff --git a/src/test/java/org/ballerinalang/command/UseCommandTest.java b/src/test/java/org/ballerinalang/command/UseCommandTest.java
@@ -54,6 +54,11 @@ public void useCommandTest() {
         new CommandLine(useCmd).parse("slp3");
         useCmd.execute();
         Assert.assertTrue(outContent.toString().contains("not found"));
+
+        UseCommand useCommandInvalidDist = new UseCommand(testStream);
+        new CommandLine(useCommandInvalidDist).parse("slbeta7");
+        useCommandInvalidDist.execute();
+        Assert.assertTrue(outContent.toString().contains("not a valid distribution"));
     }
 
     @Test