Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions schema/fromvalue.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
Copyright 2019 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package schema

import (
"sigs.k8s.io/structured-merge-diff/value"
)

// TypeRefFromValue creates an inlined type from a value v
func TypeRefFromValue(v value.Value) TypeRef {
atom := atomFor(v)
return TypeRef{
Inlined: atom,
}
}

func atomFor(v value.Value) Atom {
switch {
// Untyped cases (handled at the bottom of this function)
case v.Null:
case v.ListValue != nil:
case v.FloatValue != nil:
case v.IntValue != nil:
case v.StringValue != nil:
case v.BooleanValue != nil:
// Recursive case
case v.MapValue != nil:
s := Struct{}
for i := range v.MapValue.Items {
child := v.MapValue.Items[i]
field := StructField{
Name: child.Name,
Type: TypeRef{
Inlined: atomFor(child.Value),
},
}
s.Fields = append(s.Fields, field)
}
return Atom{Struct: &s}
}

return Atom{Untyped: &Untyped{}}
}
88 changes: 88 additions & 0 deletions schema/fromvalue_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*
Copyright 2019 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package schema_test

import (
"reflect"
"testing"

"gopkg.in/yaml.v2"
"sigs.k8s.io/structured-merge-diff/schema"
"sigs.k8s.io/structured-merge-diff/value"
)

func TestTypeRefFromValue(t *testing.T) {

table := []struct {
objYAML string
typeRef string
}{
{`a: a`, `
Copy link
Contributor

@apelisse apelisse Jan 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you split these on multiple lines? It's very hard to parse.

e.g.

{
  `a: a`,
  `......`,
}

struct:
fields:
- name: a
type:
untyped: {}`},
{`{"a": [{"a": null}]}`, `
struct:
fields:
- name: a
type:
untyped: {}`},
{`{"a": null}`, `
struct:
fields:
- name: a
type:
untyped: {}`},
{`{"q": {"y": 6, "b": [7, 8, 9]}}`, `
struct:
fields:
- name: q
type:
struct:
fields:
- name: y
type:
untyped: {}
- name: b
type:
untyped: {}`},
}

for _, tt := range table {
tt := tt
t.Run(tt.objYAML, func(t *testing.T) {
t.Parallel()
v, err := value.FromYAML([]byte(tt.objYAML))
if err != nil {
t.Fatalf("couldn't parse: %v", err)
}
got := schema.TypeRefFromValue(v)

expected := schema.TypeRef{}
err = yaml.Unmarshal([]byte(tt.typeRef), &expected)
if err != nil {
t.Fatalf("couldn't parse: %v", err)
}

if !reflect.DeepEqual(got, expected) {
t.Errorf("wanted\n%+v\nbut got\n%+v\n", expected, got)
}
})
}
}