renamed HARDWARE_DATA_MODEL to DATA_MODEL_VERSION

packethost · Jun 22, 2020 · 7753422 · 7753422
1 parent bc294dc
commit 7753422
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 24 deletions.
diff --git a/data_fetch.go b/data_fetch.go
@@ -167,9 +167,9 @@ func (d dataFetcher) GetByIP(ctx context.Context, s *server, userIP string) ([]b
 
 func (d dataFetcherMock) GetByIP(ctx context.Context, s *server, userIP string) ([]byte, error) {
 	var hw []byte
-	hardwareDataModel := os.Getenv("HARDWARE_DATA_MODEL")
-	switch hardwareDataModel {
-	case hardwareDataModelTinkerbell:
+	dataModelVersion := os.Getenv("DATA_MODEL_VERSION")
+	switch dataModelVersion {
+	case "1":
 		hw = []byte(tinkerbellDataModel)
 	default:
 		hw = []byte(cacherDataModel)

diff --git a/grpc/hegel/hegel.pb.go b/grpc/hegel/hegel.pb.go
diff --git a/grpc_server.go b/grpc_server.go
@@ -52,9 +52,9 @@ type Metadata struct {
 func exportHardware(hw []byte) ([]byte, error) {
 	var exported exportedHardware
 
-	hardwareDataModel := os.Getenv("HARDWARE_DATA_MODEL")
-	switch hardwareDataModel {
-	case hardwareDataModelTinkerbell:
+	dataModelVersion := os.Getenv("DATA_MODEL_VERSION")
+	switch dataModelVersion {
+	case "1":
 		exported = &exportedHardwareTinkerbell{}
 	default:
 		exported = &exportedHardwareCacher{}
@@ -129,9 +129,9 @@ func (s *server) Subscribe(in *hegel.SubscribeRequest, stream hegel.Hegel_Subscr
 	var watch watchClient
 	var ctx context.Context
 	var cancel context.CancelFunc
-	hardwareDataModel := os.Getenv("HARDWARE_DATA_MODEL")
-	switch hardwareDataModel {
-	case hardwareDataModelTinkerbell:
+	dataModelVersion := os.Getenv("DATA_MODEL_VERSION")
+	switch dataModelVersion {
+	case "1":
 		//tc := s.hardwareClient.(tink.HardwareServiceClient)
 		hw, err := s.hardwareClient.ByIP(stream.Context(), &tink.GetRequest{
 			Ip: ip,
@@ -195,9 +195,9 @@ func (s *server) Subscribe(in *hegel.SubscribeRequest, stream hegel.Hegel_Subscr
 	go func() {
 		for {
 			var hw []byte
-			hardwareDataModel := os.Getenv("HARDWARE_DATA_MODEL")
-			switch hardwareDataModel {
-			case hardwareDataModelTinkerbell:
+			dataModelVersion := os.Getenv("DATA_MODEL_VERSION")
+			switch dataModelVersion {
+			case "1":
 				wt := watch.(tink.HardwareService_WatchClient)
 				resp, err := wt.Recv()
 				if err != nil {
@@ -265,9 +265,9 @@ func (s *server) Subscribe(in *hegel.SubscribeRequest, stream hegel.Hegel_Subscr
 func getByIP(ctx context.Context, s *server, userIP string) ([]byte, error) {
 
 	var hw []byte
-	hardwareDataModel := os.Getenv("HARDWARE_DATA_MODEL")
-	switch hardwareDataModel {
-	case hardwareDataModelTinkerbell:
+	dataModelVersion := os.Getenv("DATA_MODEL_VERSION")
+	switch dataModelVersion {
+	case "1":
 		var req getRequest = tink.GetRequest{
 			Ip: userIP,
 		}
@@ -299,7 +299,7 @@ func getByIP(ctx context.Context, s *server, userIP string) ([]byte, error) {
 			return nil, errors.New("could not find hardware")
 		}
 
-		hw = []byte((*resp).(cacher.Hardware).JSON)
+		hw = []byte(resp.(cacher.Hardware).JSON)
 	}
 
 	ehw, err := exportHardware(hw)

diff --git a/http_handlers_test.go b/http_handlers_test.go
@@ -29,7 +29,7 @@ func TestGetMetadataCacher(t *testing.T) {
 	for name, test := range cacherTests {
 		t.Log(name)
 
-		os.Setenv("HARDWARE_DATA_MODEL", "")
+		os.Setenv("DATA_MODEL_VERSION", "")
 
 		req, err := http.NewRequest("GET", "/metadata", nil)
 		if err != nil {
@@ -61,7 +61,7 @@ func TestGetMetadataCacher(t *testing.T) {
 }
 
 func TestGetMetadataTinkerbell(t *testing.T) {
-	os.Setenv("HARDWARE_DATA_MODEL", "tinkerbell")
+	os.Setenv("DATA_MODEL_VERSION", "1")
 
 	for name, test := range tinkerbellTests {
 		t.Log(name)

diff --git a/main.go b/main.go
@@ -29,8 +29,6 @@ import (
 	"google.golang.org/grpc/credentials"
 )
 
-const hardwareDataModelTinkerbell = "tinkerbell"
-
 type server struct {
 	log            log.Logger
 	hardwareClient hardwareGetter
@@ -181,9 +179,9 @@ func main() {
 	)
 
 	var hg hardwareGetter
-	hardwareDataModel := os.Getenv("HARDWARE_DATA_MODEL")
-	switch hardwareDataModel {
-	case hardwareDataModelTinkerbell:
+	dataModelVersion := os.Getenv("DATA_MODEL_VERSION")
+	switch dataModelVersion {
+	case "1":
 		tc, err := tinkClient.NewTinkerbellClient()
 		if err != nil {
 			logger.Fatal(err, "Failed to create the tink client")