check for invalid hardware (nil) before sending to server

tinkerbell · Jul 13, 2020 · 17caa6a · 17caa6a
1 parent 12ceff5
commit 17caa6a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cmd/tink-cli/cmd/hardware/commands.go b/cmd/tink-cli/cmd/hardware/commands.go
@@ -3,10 +3,11 @@ package hardware
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/tinkerbell/tink/util"
 	"log"
 	"os"
 
+	"github.com/tinkerbell/tink/util"
+
 	"github.com/tinkerbell/tink/protos/hardware"
 
 	"github.com/jedib0t/go-pretty/table"

diff --git a/http-server/http-handlers.go b/http-server/http-handlers.go
@@ -58,8 +58,8 @@ func RegisterHardwareServiceHandlerFromEndpoint(ctx context.Context, mux *runtim
 			return
 		}
 
-		if hw.Id == "" {
-			writeResponse(w, http.StatusBadRequest, status.Errorf(codes.InvalidArgument, "id must be set to a UUID, got id: %v", hw.Id).Error())
+		if hw.Hardware == nil || hw.Id == "" {
+			writeResponse(w, http.StatusBadRequest, status.Errorf(codes.InvalidArgument, "invalid hardware data, must contain an id").Error())
 			return
 		}
 

diff --git a/http-server/http_handlers_test.go b/http-server/http_handlers_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+
 	grpcRuntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/packethost/pkg/log"