[incubator-openwhisk-cli] branch master updated: golint package path update (#374)

[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-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new 9740d5d  golint package path update (#374)
9740d5d is described below

commit 9740d5dfe0084a978c812982187cbb4eab0b3690
Author: Mark Deuser <mdeu...@us.ibm.com>
AuthorDate: Mon Oct 15 19:30:18 2018 -0400

    golint package path update (#374)
    
    * golint package path update
    
    * use controller.protocol instead of hardcoding protocol in test
    
    * remove controller http port now that the http api is no longer exposed
---
 build.gradle                                                  | 2 +-
 tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 68302d4..a3e2296 100644
--- a/build.gradle
+++ b/build.gradle
@@ -211,7 +211,7 @@ resolveBuildDependencies.dependsOn(goI18n)
        The get step is needed to be sure a golint binary is available to run.
  */
 task getGoLint(type: com.github.blindpirate.gogradle.Go) {
-    go 'get -u github.com/golang/lint/golint'
+    go 'get -u golang.org/x/lint/golint'
 }
 
 task goLint(type: com.github.blindpirate.gogradle.Go, dependsOn: getGoLint) {
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala 
b/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
index aa49ded..039692c 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskConfigTests.scala
@@ -265,11 +265,13 @@ class WskConfigTests extends TestHelpers with 
WskTestHelpers {
     }
   }
 
-  it should "show api build using http apihost" in {
+  it should "show api build using explicit protocol for apihost" in {
     val tmpwskprops = File.createTempFile("wskprops", ".tmp")
     try {
       val env = Map("WSK_CONFIG_FILE" -> tmpwskprops.getAbsolutePath())
-      val apihost = s"http://${WhiskProperties.getBaseControllerAddress()}"
+      val controllerProtocol = 
WhiskProperties.getProperty("controller.protocol")
+      val apihost =
+        s"${controllerProtocol}://${WhiskProperties.getBaseControllerHost()}"
       wsk.cli(Seq("property", "set", "--apihost", apihost), env = env)
       val rr = wsk.cli(Seq("property", "get", "--apibuild", "-i"), env = env)
       rr.stdout should not include regex("""whisk API build\s*Unknown""")