Fixes due to master changes in pureconfig versions.

adobe-apiplatform · Jan 9, 2020 · 94ff4bd · 94ff4bd
1 parent 3f324e2
commit 94ff4bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
@@ -49,7 +49,7 @@ whisk:
   version:
     date: "{{ansible_date_time.iso8601}}"
   feature_flags:
-    require_api_key_annotation: "{{ require_api_key_annotation | default(true) }}"
+    require_api_key_annotation: "{{ require_api_key_annotation | default(true) | lower  }}"
 
 ##
 # configuration parameters related to support runtimes (see org.apache.openwhisk.core.entity.ExecManifest for schema of the manifest).
@@ -388,4 +388,4 @@ metrics:
     host: "{{ metrics_kamon_statsd_host | default('') }}"
     port: "{{ metrics_kamon_statsd_port | default('8125') }}"
 
-user_events: "{{ user_events_enabled | default(false) }}"
+user_events: "{{ user_events_enabled | default(false) | lower }}"
diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/ParameterEncryption.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/ParameterEncryption.scala
@@ -27,6 +27,7 @@ import org.apache.openwhisk.core.ConfigKeys
 import pureconfig.loadConfig
 import spray.json.DefaultJsonProtocol._
 import spray.json.{JsNull, JsString}
+import pureconfig.generic.auto._
 
 private trait encrypter {
   def encrypt(p: ParameterValue): ParameterValue

diff --git a/tests/src/test/resources/application.conf.j2 b/tests/src/test/resources/application.conf.j2
@@ -92,6 +92,10 @@ whisk {
             url = "{{ user_images_registry | default('') }}"
         }
     }
+
+    parameter-storage {
+        key = ""
+    }
 }
 
 #test-only overrides so that tests can override defaults in application.conf (todo: move all defaults to reference.conf)