Skip to content

Commit

Permalink
types: Add custom marhsaling for desiredState
Browse files Browse the repository at this point in the history
Representing yaml inside yaml is kind of problematic so the yaml parser
has to be instructed just ignore those fields and store them as []byte.
This change uses MarshalJSON/UnmarshalJSON functions to do that, also
they will need a specific NMState struct so we can put those receivers
on it.

Signed-off-by: Quique Llorente <ellorent@redhat.com>
  • Loading branch information
qinqon committed Jan 27, 2022
1 parent fef3f3e commit 20f4a0b
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 3 deletions.
32 changes: 32 additions & 0 deletions nmpolicy/types/json.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright 2021 NMPolicy 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 types

import "sigs.k8s.io/yaml"

func (s *NMState) UnmarshalJSON(b []byte) error {
output, err := yaml.JSONToYAML(b)
if err != nil {
return err
}
*s = output
return nil
}

func (s NMState) MarshalJSON() ([]byte, error) {
return yaml.YAMLToJSON([]byte(s))
}
8 changes: 5 additions & 3 deletions nmpolicy/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ package types

import "time"

type NMState []byte

type PolicySpec struct {
Capture map[string]string
DesiredState []byte
DesiredState NMState
}

type CachedState struct {
Expand All @@ -29,12 +31,12 @@ type CachedState struct {

type GeneratedState struct {
Cache CachedState
DesiredState []byte
DesiredState NMState
MetaInfo MetaInfo
}

type CaptureState struct {
State []byte
State NMState
MetaInfo MetaInfo
}

Expand Down

0 comments on commit 20f4a0b

Please sign in to comment.