vvraskin commented on a change in pull request #3077: Enable ssl on the path 
between edge and controllers
URL: 
https://github.com/apache/incubator-openwhisk/pull/3077#discussion_r167543012
 
 

 ##########
 File path: tests/src/test/scala/common/rest/WskRest.scala
 ##########
 @@ -85,15 +81,42 @@ import common.WskActorSystem
 import common.WskProps
 import whisk.core.entity.ByteSize
 import whisk.utils.retry
-import javax.net.ssl.{HostnameVerifier, KeyManager, SSLContext, SSLSession, 
X509TrustManager}
+import javax.net.ssl._
+
+import akka.actor.ActorSystem
 import com.typesafe.sslconfig.akka.AkkaSSLConfig
 import java.nio.charset.StandardCharsets
+import java.security.KeyStore
 
 class AcceptAllHostNameVerifier extends HostnameVerifier {
   override def verify(s: String, sslSession: SSLSession): Boolean = true
 }
 
 object SSL {
+
+  val controllerProtocol = WhiskProperties.getProperty("controller.protocol")
+  val controllerKeyStorePath = 
WhiskProperties.getProperty("controller.ssl.keystore.path")
+  val controllerKeyStorePassword = 
WhiskProperties.getProperty("controller.ssl.keystore.password")
+  val controllerKeyStoreFlavor = 
WhiskProperties.getProperty("controller.ssl.keystore.flavor")
+  val controllerClientAuth = 
WhiskProperties.getProperty("controller.ssl.clientAuth").toBoolean
 
 Review comment:
   The variables in the `application.conf` are only aim for the trigger api 
tests to make sure HttpConfig is instantiated and they are not actually used 
(the test is executed in memory). 
   For other tests that run against controller API I'd like to leave the 
possibility to configure the test via `whisk.properties`, do we test only the 
config which is currently deployed and do not enmesh pure config here. 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

Reply via email to