kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Hide unstructured.Unstructured behind interface.

Browse Source
This commit is contained in:
jregan
2018-10-06 10:44:34 -07:00
committed by Jeffrey Regan
parent 9c8302b2d2
commit 0f5a39f328
35 changed files with 527 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/patch/transformer/factory_test.go
View File

@@ -182,7 +182,7 @@ func TestNewPatchJson6902FactoryMulti(t *testing.T) {
id := resid.NewResId(gvk.FromKind("foo"), "some-name")
base := resmap.ResMap{
id: resource.NewResourceFromMap(
id: resource.NewFromMap(
map[string]interface{}{
"kind": "foo",
"metadata": map[string]interface{}{
@@ -208,7 +208,7 @@ func TestNewPatchJson6902FactoryMulti(t *testing.T) {
}),
}
expected := resmap.ResMap{
id: resource.NewResourceFromMap(
id: resource.NewFromMap(
map[string]interface{}{
"kind": "foo",
"metadata": map[string]interface{}{
@@ -296,7 +296,7 @@ func TestNewPatchJson6902FactoryMultiConflict(t *testing.T) {
id := resid.NewResId(gvk.FromKind("foo"), "some-name")
base := resmap.ResMap{
id: resource.NewResourceFromMap(
id: resource.NewFromMap(
map[string]interface{}{
"kind": "foo",
"metadata": map[string]interface{}{

2
pkg/patch/transformer/patchjson6902json.go
View File

@@ -45,7 +45,7 @@ func (t *patchJson6902JSONTransformer) Transform(baseResourceMap resmap.ResMap)
if obj == nil {
return err
}
rawObj, err := obj.Unstructured.MarshalJSON()
rawObj, err := obj.MarshalJSON()
if err != nil {
return err
}

4
pkg/patch/transformer/patchjson6902json_test.go
View File

@@ -32,7 +32,7 @@ var deploy = gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"}
func TestJsonPatchJSONTransformer_Transform(t *testing.T) {
id := resid.NewResId(deploy, "deploy1")
base := resmap.ResMap{
id: resource.NewResourceFromMap(
id: resource.NewFromMap(
map[string]interface{}{
"apiVersion": "apps/v1",
"kind": "Deployment",
@@ -69,7 +69,7 @@ func TestJsonPatchJSONTransformer_Transform(t *testing.T) {
t.Fatalf("unexpected error : %v", err)
}
expected := resmap.ResMap{
id: resource.NewResourceFromMap(
id: resource.NewFromMap(
map[string]interface{}{
"apiVersion": "apps/v1",
"kind": "Deployment",