fix unmarshalling errors

LINBIT · Sep 23, 2021 · f346624 · f346624
1 parent 47e221e
commit f346624
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/go.sum b/go.sum
@@ -2,8 +2,6 @@ bitbucket.org/creachadair/shell v0.0.6 h1:reJflDbKqnlnqb4Oo2pQ1/BqmY/eCWcNGHrIUO
 bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/LINBIT/golinstor v0.35.0 h1:EzazRrI6i6xdXVrlxQOus7GAN/v/B6FFwlclzqxySXQ=
-github.com/LINBIT/golinstor v0.35.0/go.mod h1:506Wb/BCd449g/u2IGXlsIKNdiEmAEsgyOPrIYjbKyg=
 github.com/LINBIT/golinstor v0.36.0 h1:+kY3IIRQngq6Tr3zYH97yA4KqiiM9p3yk6UpHiY8d0k=
 github.com/LINBIT/golinstor v0.36.0/go.mod h1:506Wb/BCd449g/u2IGXlsIKNdiEmAEsgyOPrIYjbKyg=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=

diff --git a/pkg/common/net.go b/pkg/common/net.go
@@ -33,7 +33,7 @@ func (s *IpCidr) Set(raw string) error {
 	return nil
 }
 
-func (s *IpCidr) MarshalJSON() ([]byte, error) {
+func (s IpCidr) MarshalJSON() ([]byte, error) {
 	return json.Marshal(s.IPNet.String())
 }
 

diff --git a/pkg/common/resource.go b/pkg/common/resource.go
@@ -70,8 +70,10 @@ func (l *ResourceState) UnmarshalJSON(text []byte) error {
 		*l = ResourceStateDegraded
 	case "Bad":
 		*l = ResourceStateBad
+	case "Unknown":
+		*l = Unknown
 	default:
-		return errors.New(fmt.Sprintf("unknown resource state: %s", l))
+		return errors.New(fmt.Sprintf("unknown resource state: %s", string(text)))
 	}
 
 	return nil

diff --git a/pkg/iscsi/iqn.go b/pkg/iscsi/iqn.go
@@ -70,11 +70,11 @@ func (i *Iqn) UnmarshalJSON(b []byte) error {
 	return i.UnmarshalText([]byte(raw))
 }
 
-func (i *Iqn) MarshalText() ([]byte, error) {
+func (i Iqn) MarshalText() ([]byte, error) {
 	return []byte(i.String()), nil
 }
 
-func (i *Iqn) MarshalJSON() ([]byte, error) {
+func (i Iqn) MarshalJSON() ([]byte, error) {
 	return json.Marshal(i.String())
 }