You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/02/07 14:52:35 UTC

[GitHub] dgrove-oss commented on a change in pull request #3259: use PureConfig for misc. runtimesManifest configuration

dgrove-oss commented on a change in pull request #3259: use PureConfig for misc. runtimesManifest configuration
URL: https://github.com/apache/incubator-openwhisk/pull/3259#discussion_r166640578
 
 

 ##########
 File path: common/scala/src/main/scala/whisk/core/entity/ExecManifest.scala
 ##########
 @@ -41,11 +43,11 @@ protected[core] object ExecManifest {
    * singleton Runtime instance.
    *
    * @param config a valid configuration
-   * @param localDockerImagePrefix optional local docker prefix, permitting images matching prefix to bypass docker pull
    * @return the manifest if initialized successfully, or an failure
    */
-  protected[core] def initialize(config: WhiskConfig, localDockerImagePrefix: Option[String] = None): Try[Runtimes] = {
-    val mf = Try(config.runtimesManifest.parseJson.asJsObject).flatMap(runtimes(_, localDockerImagePrefix))
+  protected[core] def initialize(config: WhiskConfig): Try[Runtimes] = {
+    val rmc = loadConfigOrThrow[RuntimeManifestConfig](ConfigKeys.runtimes)
+    val mf = Try(config.runtimesManifest.parseJson.asJsObject).flatMap(runtimes(_, rmc))
 
 Review comment:
   I think moving the manifest itself to pure config isn't a good idea.  We override it in our deployments and overriding a complex structure via an environment variable is going to be annoying.  Better to keep the manifest itself out of the docker images.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services