fixup

tinkerbell · Jul 7, 2020 · 2cbe40f · 2cbe40f
1 parent 51a34dd
commit 2cbe40f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/go.sum b/go.sum
@@ -103,6 +103,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/kdeng3849/tink v0.0.0-20200520101934-527cd4267ae6/go.mod h1:8GgEepVuZzEryfZlSD6SSVy1f5YDRssuJuzydgrH6vU=
 github.com/kdeng3849/tink v0.0.0-20200706184442-ed174c5a9d20 h1:b69jnofKDgyh0j/70j1HFws/spJgC2zlWm8cv2l13ao=
 github.com/kdeng3849/tink v0.0.0-20200706184442-ed174c5a9d20/go.mod h1:76mIaisvbix90uCd7nRXXNO198WiL+TeJihDr4BXRas=
+github.com/kdeng3849/tink v0.0.0-20200707134055-37bac1d809b1 h1:PRIIgoWz4b7b0qLDBT0U8cuI1HmIYaY3Pkmb9cJWZPk=
 github.com/kdeng3849/tink v0.0.0-20200707134055-37bac1d809b1/go.mod h1:76mIaisvbix90uCd7nRXXNO198WiL+TeJihDr4BXRas=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=

diff --git a/grpc_server.go b/grpc_server.go
@@ -51,15 +51,6 @@ type exportedHardwareTinkerbell struct {
 	Metadata interface{} `json:"metadata"`
 }
 
-type metadata struct {
-	State        string      `json:"state"`
-	BondingMode  int         `json:"bonding_mode"`
-	Manufacturer interface{} `json:"manufacturer"`
-	Instance     instance    `json:"instance"`
-	Custom       interface{} `json:"custom"`
-	Facility     interface{} `json:"facility"`
-}
-
 type instance struct {
 	ID       string `json:"id"`
 	State    string `json:"state"`

diff --git a/grpc_server_test.go b/grpc_server_test.go
@@ -91,7 +91,7 @@ func TestGetByIPTinkerbell(t *testing.T) {
 		hw := exportedHardwareTinkerbell{}
 		err = json.Unmarshal(ehw, &hw)
 		if err != nil {
-			t.Fatal("Error in unmarshalling hardware:", err)
+			t.Error("Error in unmarshalling hardware:", err)
 		}
 
 		if hw.Metadata == nil {
@@ -101,9 +101,12 @@ func TestGetByIPTinkerbell(t *testing.T) {
 		var metadata packet.Metadata
 		md, err := json.Marshal(hw.Metadata)
 		if err != nil {
-			t.Fatal("Error in unmarshalling hardware", err)
+			t.Error("Error in unmarshalling hardware", err)
 		}
 		err = json.Unmarshal(md, &metadata)
+		if err != nil {
+			t.Error("Error in unmarshalling hardware metadata", err)
+		}
 
 		if metadata.State != test.state {
 			t.Fatalf("unexpected state, want: %v, got: %v\n", test.state, metadata.State)

diff --git a/http_handlers_test.go b/http_handlers_test.go
@@ -89,9 +89,12 @@ func TestGetMetadataTinkerbell(t *testing.T) {
 		var metadata packet.Metadata
 		md, err := json.Marshal(hw.Metadata)
 		if err != nil {
-			t.Fatal("Error in unmarshalling hardware", err)
+			t.Error("Error in marshalling hardware metadata", err)
 		}
 		err = json.Unmarshal(md, &metadata)
+		if err != nil {
+			t.Error("Error in unmarshalling hardware metadata", err)
+		}
 
 		if metadata.BondingMode != test.bondingMode {
 			t.Errorf("handler returned unexpected bonding mode: got %v want %v",