-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from vshn/fix/default-settings
Fix reconcile loop for DBaaS with reported default settings
- Loading branch information
Showing
19 changed files
with
817 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package settings | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| "github.com/vshn/provider-exoscale/operator/mapper" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| ) | ||
|
|
||
| type Schemas interface { | ||
| SetDefaults(schema string, input runtime.RawExtension) (runtime.RawExtension, error) | ||
| } | ||
|
|
||
| // ParseSchemas takes an object containing a map of json schemas and parses it | ||
| func ParseSchemas(raw []byte) (Schemas, error) { | ||
| req := struct { | ||
| Settings schemas | ||
| }{} | ||
|
|
||
| err := json.Unmarshal(raw, &req) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return req.Settings, nil | ||
| } | ||
|
|
||
| type schemas map[string]schema | ||
|
|
||
| type schema struct { | ||
| Default interface{} | ||
| Properties schemas | ||
| } | ||
|
|
||
| // SetDefaults takes a setting for a DBaaS and will set the defaults of the schema with name `name` | ||
| func (s schemas) SetDefaults(name string, input runtime.RawExtension) (runtime.RawExtension, error) { | ||
| sc, ok := s[name] | ||
| if !ok { | ||
| return runtime.RawExtension{}, fmt.Errorf("unknown schema: %q", name) | ||
| } | ||
|
|
||
| inMap, err := mapper.ToMap(input) | ||
| if err != nil { | ||
| return runtime.RawExtension{}, fmt.Errorf("failed to parse input: %w", err) | ||
| } | ||
|
|
||
| setDefaults(sc, inMap) | ||
|
|
||
| out, err := mapper.ToRawExtension(&inMap) | ||
| if err != nil { | ||
| return runtime.RawExtension{}, fmt.Errorf("failed to parse defaulted setting: %w", err) | ||
| } | ||
| return out, nil | ||
| } | ||
|
|
||
| func setDefaults(sc schema, input map[string]interface{}) bool { | ||
| hasSetDefaults := false | ||
|
|
||
| for key, val := range sc.Properties { | ||
| if len(val.Properties) > 0 { | ||
| submap := map[string]interface{}{} | ||
|
|
||
| if _, ok := input[key]; ok { | ||
| submap, ok = input[key].(map[string]interface{}) | ||
| if !ok { | ||
| continue | ||
| } | ||
| } | ||
|
|
||
| if setDefaults(val, submap) { | ||
| input[key] = submap | ||
| hasSetDefaults = true | ||
| } | ||
| } else { | ||
| _, ok := input[key] | ||
| if ok { | ||
| continue | ||
| } | ||
|
|
||
| if val.Default != nil { | ||
| input[key] = val.Default | ||
| hasSetDefaults = true | ||
| } | ||
| } | ||
| } | ||
| return hasSetDefaults | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| package settings | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/vshn/provider-exoscale/operator/mapper" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| ) | ||
|
|
||
| var exampleSchemas = []byte(`{ | ||
| "settings": { | ||
| "simple": { | ||
| "type": "object", | ||
| "properties": { | ||
| "foo": { | ||
| "default": true, | ||
| "type": "boolean" | ||
| }, | ||
| "bar": { | ||
| "default": "buzz", | ||
| "type": "string" | ||
| }, | ||
| "count": { | ||
| "default": 42, | ||
| "type": "integer" | ||
| }, | ||
| "nodefault": { | ||
| "type": ["string", "null"] | ||
| } | ||
| } | ||
| }, | ||
| "nested": { | ||
| "type": "object", | ||
| "properties": { | ||
| "foo": { | ||
| "default": true, | ||
| "type": "boolean" | ||
| }, | ||
| "obj": { | ||
| "type": "object", | ||
| "properties": { | ||
| "bar": { | ||
| "default": "buzz", | ||
| "type": "string" | ||
| }, | ||
| "obj": { | ||
| "type": "object", | ||
| "properties": { | ||
| "count": { | ||
| "default": 42, | ||
| "type": "integer" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }`) | ||
|
|
||
| func TestSetDefaultSimple(t *testing.T) { | ||
| schemas, err := ParseSchemas(exampleSchemas) | ||
| require.NoError(t, err, "failed to parse example schema") | ||
|
|
||
| input := runtime.RawExtension{ | ||
| Raw: []byte(`{"bar": "blub"}`), | ||
| } | ||
| out, err := schemas.SetDefaults("simple", input) | ||
| require.NoError(t, err, "failed to set defaults") | ||
|
|
||
| outMap, err := mapper.ToMap(out) | ||
| require.NoError(t, err, "failed to set defaults") | ||
|
|
||
| assert.EqualValues(t, true, outMap["foo"]) | ||
| assert.EqualValues(t, "blub", outMap["bar"]) | ||
| assert.EqualValues(t, 42, outMap["count"]) | ||
| _, ok := outMap["nodefault"] | ||
| assert.Falsef(t, ok, "should not set values withou defaults") | ||
| } | ||
|
|
||
| func TestSetDefaultNested(t *testing.T) { | ||
| schemas, err := ParseSchemas(exampleSchemas) | ||
| require.NoError(t, err, "failed to parse example schema") | ||
|
|
||
| input := runtime.RawExtension{ | ||
| Raw: []byte(`{"bar": "blub"}`), | ||
| } | ||
| out, err := schemas.SetDefaults("nested", input) | ||
| require.NoError(t, err, "failed to set defaults") | ||
|
|
||
| outMap, err := mapper.ToMap(out) | ||
| require.NoError(t, err, "failed to set defaults") | ||
|
|
||
| assert.EqualValues(t, true, outMap["foo"]) | ||
| assert.EqualValues(t, "blub", outMap["bar"]) | ||
|
|
||
| sub1, ok := outMap["obj"] | ||
| require.Truef(t, ok, "should set sub object") | ||
| sub1Map, ok := sub1.(map[string]interface{}) | ||
| require.Truef(t, ok, "should set sub object as map") | ||
| assert.EqualValues(t, "buzz", sub1Map["bar"]) | ||
|
|
||
| sub2, ok := sub1Map["obj"] | ||
| require.Truef(t, ok, "should set sub-sub object") | ||
| sub2Map, ok := sub2.(map[string]interface{}) | ||
| require.Truef(t, ok, "should set sub-sub object as map") | ||
| assert.EqualValues(t, 42, sub2Map["count"]) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.