[incubator-openwhisk] branch master updated: Remove deadcode. (#4253)

[dubeejw]

This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a8564b  Remove deadcode. (#4253)
4a8564b is described below

commit 4a8564b9de9fa869a6c22e036b337f9cd2f46221
Author: rodric rabbah <rod...@gmail.com>
AuthorDate: Tue Feb 12 22:36:53 2019 -0500

    Remove deadcode. (#4253)
---
 ansible/templates/whisk.properties.j2              |  1 -
 tests/src/test/scala/common/WhiskProperties.java   | 13 +------------
 tests/src/test/scala/common/WskCliOperations.scala |  7 +------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/ansible/templates/whisk.properties.j2 
b/ansible/templates/whisk.properties.j2
index e946008..b821109 100644
--- a/ansible/templates/whisk.properties.j2
+++ b/ansible/templates/whisk.properties.j2
@@ -1,7 +1,6 @@
 openwhisk.home={{ openwhisk_home }}
 
 python.27=python
-use.cli.download=false
 nginx.conf.dir={{ nginx.confdir }}
 testing.auth={{ openwhisk_home }}/ansible/files/auth.guest
 vcap.services.file=
diff --git a/tests/src/test/scala/common/WhiskProperties.java 
b/tests/src/test/scala/common/WhiskProperties.java
index 0d44d8c..1b717e2 100644
--- a/tests/src/test/scala/common/WhiskProperties.java
+++ b/tests/src/test/scala/common/WhiskProperties.java
@@ -115,17 +115,10 @@ public class WhiskProperties {
     }
 
     /**
-     * The path to the CLI directory.
-     */
-    public static String getCLIDir() {
-        return whiskHome + "/bin";
-    }
-
-    /**
      * The path to the Go CLI executable.
      */
     public static String getCLIPath() {
-        return getCLIDir() + "/wsk";
+        return whiskHome + "/bin/wsk";
     }
 
     public static File getFileRelativeToWhiskHome(String name) {
@@ -152,10 +145,6 @@ public class WhiskProperties {
         return whiskProperties.getProperty("main.docker.endpoint");
     }
 
-    public static boolean useCLIDownload() {
-        return whiskProperties.getProperty("use.cli.download").equals("true");
-    }
-
     public static String[] getInvokerHosts() {
         // split of empty string is non-empty array
         String hosts = whiskProperties.getProperty("invoker.hosts");
diff --git a/tests/src/test/scala/common/WskCliOperations.scala 
b/tests/src/test/scala/common/WskCliOperations.scala
index 8c64e64..722bda5 100644
--- a/tests/src/test/scala/common/WskCliOperations.scala
+++ b/tests/src/test/scala/common/WskCliOperations.scala
@@ -972,10 +972,5 @@ class CliGatewayOperations(val wsk: RunCliCmd) extends 
GatewayOperations {
 
 object Wsk {
   val binaryName = "wsk"
-  val defaultCliPath = if (WhiskProperties.useCLIDownload) 
getDownloadedGoCLIPath else WhiskProperties.getCLIPath
-
-  /** What is the path to a downloaded CLI? **/
-  private def getDownloadedGoCLIPath = {
-    
s"${System.getProperty("user.home")}${File.separator}.local${File.separator}bin${File.separator}${binaryName}"
-  }
+  val defaultCliPath = WhiskProperties.getCLIPath
 }