From ea89df17e0a7201c568851199b86921d5cad4e5c Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Thu, 4 Apr 2024 17:41:41 -0400 Subject: [PATCH 1/2] update yaml for services -> service --- opentdf-example-no-kas.yaml | 2 +- opentdf-example.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opentdf-example-no-kas.yaml b/opentdf-example-no-kas.yaml index 350e8d587a..af7aabfda3 100644 --- a/opentdf-example-no-kas.yaml +++ b/opentdf-example-no-kas.yaml @@ -8,7 +8,7 @@ logger: # port: 5432 # user: postgres # password: changeme -services: +service: kas: enabled: false policy: diff --git a/opentdf-example.yaml b/opentdf-example.yaml index 263aef4703..d99335f0bf 100644 --- a/opentdf-example.yaml +++ b/opentdf-example.yaml @@ -8,7 +8,7 @@ logger: # port: 5432 # user: postgres # password: changeme -services: +service: kas: enabled: true policy: From 4f51be1bc6ebe8ce18926fc3624aafc938a5864b Mon Sep 17 00:00:00 2001 From: Elizabeth Healy Date: Thu, 4 Apr 2024 18:04:14 -0400 Subject: [PATCH 2/2] update services key --- opentdf-example-no-kas.yaml | 2 +- opentdf-example.yaml | 2 +- service/internal/config/config.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opentdf-example-no-kas.yaml b/opentdf-example-no-kas.yaml index af7aabfda3..350e8d587a 100644 --- a/opentdf-example-no-kas.yaml +++ b/opentdf-example-no-kas.yaml @@ -8,7 +8,7 @@ logger: # port: 5432 # user: postgres # password: changeme -service: +services: kas: enabled: false policy: diff --git a/opentdf-example.yaml b/opentdf-example.yaml index d99335f0bf..263aef4703 100644 --- a/opentdf-example.yaml +++ b/opentdf-example.yaml @@ -8,7 +8,7 @@ logger: # port: 5432 # user: postgres # password: changeme -service: +services: kas: enabled: true policy: diff --git a/service/internal/config/config.go b/service/internal/config/config.go index f3cb3ea118..35a1c09d54 100644 --- a/service/internal/config/config.go +++ b/service/internal/config/config.go @@ -74,7 +74,7 @@ func LoadConfig(key string) (*Config, error) { // Manually handle unmarshaling of ExtraProps for each service for serviceKey, service := range config.Services { var extraProps map[string]interface{} - if err := viper.UnmarshalKey("service."+serviceKey, &extraProps); err != nil { + if err := viper.UnmarshalKey("services."+serviceKey, &extraProps); err != nil { return nil, errors.Join(err, ErrLoadingConfig) } service.ExtraProps = extraProps