Skip to content

Commit 132fcd6

Browse files
committed
Fixes due to master changes in pureconfig versions.
1 parent 638ff24 commit 132fcd6

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

ansible/group_vars/all

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ whisk:
4949
version:
5050
date: "{{ansible_date_time.iso8601}}"
5151
feature_flags:
52-
require_api_key_annotation: "{{ require_api_key_annotation | default(true) }}"
52+
require_api_key_annotation: "{{ require_api_key_annotation | default(true) | lower }}"
5353

5454
##
5555
# configuration parameters related to support runtimes (see org.apache.openwhisk.core.entity.ExecManifest for schema of the manifest).
@@ -388,4 +388,4 @@ metrics:
388388
host: "{{ metrics_kamon_statsd_host | default('') }}"
389389
port: "{{ metrics_kamon_statsd_port | default('8125') }}"
390390

391-
user_events: "{{ user_events_enabled | default(false) }}"
391+
user_events: "{{ user_events_enabled | default(false) | lower }}"

common/scala/src/main/scala/org/apache/openwhisk/core/entity/ParameterEncryption.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import org.apache.openwhisk.core.ConfigKeys
2727
import pureconfig.loadConfig
2828
import spray.json.DefaultJsonProtocol._
2929
import spray.json.{JsNull, JsString}
30+
import pureconfig.generic.auto._
3031

3132
private trait encrypter {
3233
def encrypt(p: ParameterValue): ParameterValue

tests/src/test/resources/application.conf.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ whisk {
9292
url = "{{ user_images_registry | default('') }}"
9393
}
9494
}
95+
96+
parameter-storage {
97+
key = ""
98+
}
9599
}
96100

97101
#test-only overrides so that tests can override defaults in application.conf (todo: move all defaults to reference.conf)

0 commit comments

Comments
 (0)