changed field names in hardware proto to use snake case (convention)

Author: kqdeng

cli/tink/cmd/hardware/id.go

@@ -23,7 +23,7 @@ var idCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, id := range args {
-			hw, err := client.HardwareClient.ByID(context.Background(), &hardware.GetRequest{ID: id})
+			hw, err := client.HardwareClient.ByID(context.Background(), &hardware.GetRequest{Id: id})
 			if err != nil {
 				log.Fatal(err)
 			}

cli/tink/cmd/hardware/ip.go

@@ -29,7 +29,7 @@ var ipCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, ip := range args {
-			hw, err := client.HardwareClient.ByIP(context.Background(), &hardware.GetRequest{IP: ip})
+			hw, err := client.HardwareClient.ByIP(context.Background(), &hardware.GetRequest{Ip: ip})
 			if err != nil {
 				log.Fatal(err)
 			}

cli/tink/cmd/hardware/mac.go

@@ -29,7 +29,7 @@ var macCmd = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		for _, mac := range args {
-			hw, err := client.HardwareClient.ByMAC(context.Background(), &hardware.GetRequest{MAC: mac})
+			hw, err := client.HardwareClient.ByMAC(context.Background(), &hardware.GetRequest{Mac: mac})
 			if err != nil {
 				log.Fatal(err)
 			}

cli/tink/cmd/hardware/watch.go

@@ -27,7 +27,7 @@ var watchCmd = &cobra.Command{
 		stdoutLock := sync.Mutex{}
 		for _, id := range args {
 			go func(id string) {
-				stream, err := client.HardwareClient.Watch(context.Background(), &hardware.GetRequest{ID: id})
+				stream, err := client.HardwareClient.Watch(context.Background(), &hardware.GetRequest{Id: id})
 				if err != nil {
 					log.Fatal(err)
 				}

db/hardware.go

@@ -141,7 +141,7 @@ func GetByID(ctx context.Context, db *sql.DB, id string) (string, error) {
 }
 
 // GetAll : get data for all machine
-func GetAll(db *sql.DB, fn func(string) error) error {
+func GetAll(db *sql.DB, fn func([]byte) error) error {
 	rows, err := db.Query(`
 	SELECT data
 	FROM hardware
@@ -163,7 +163,7 @@ func GetAll(db *sql.DB, fn func(string) error) error {
 			return err
 		}
 
-		err = fn(string(buf))
+		err = fn(buf)
 		if err != nil {
 			return err
 		}

grpc-server/hardware.go

@@ -132,20 +132,20 @@ func (s *server) by(method string, fn func() (string, error)) (*hardware.Hardwar
 
 func (s *server) ByMAC(ctx context.Context, in *hardware.GetRequest) (*hardware.Hardware, error) {
 	return s.by("ByMAC", func() (string, error) {
-		return db.GetByMAC(ctx, s.db, in.MAC)
+		return db.GetByMAC(ctx, s.db, in.Mac)
 	})
 }
 
 func (s *server) ByIP(ctx context.Context, in *hardware.GetRequest) (*hardware.Hardware, error) {
 	return s.by("ByIP", func() (string, error) {
-		return db.GetByIP(ctx, s.db, in.IP)
+		return db.GetByIP(ctx, s.db, in.Ip)
 	})
 }
 
 // ByID implements hardware.ByID
 func (s *server) ByID(ctx context.Context, in *hardware.GetRequest) (*hardware.Hardware, error) {
 	return s.by("ByID", func() (string, error) {
-		return db.GetByID(ctx, s.db, in.ID)
+		return db.GetByID(ctx, s.db, in.Id)
 	})
 }
 
@@ -167,9 +167,9 @@ func (s *server) All(_ *hardware.Empty, stream hardware.HardwareService_AllServe
 
 	timer := prometheus.NewTimer(metrics.CacheDuration.With(labels))
 	defer timer.ObserveDuration()
-	err := db.GetAll(s.db, func(j string) error {
+	err := db.GetAll(s.db, func(j []byte) error {
 		hw := &hardware.Hardware{}
-		json.Unmarshal([]byte(j), hw)
+		json.Unmarshal(j, hw)
 		return stream.Send(hw)
 	})
 	if err != nil {
@@ -182,16 +182,16 @@ func (s *server) All(_ *hardware.Empty, stream hardware.HardwareService_AllServe
 }
 
 func (s *server) Watch(in *hardware.GetRequest, stream hardware.HardwareService_WatchServer) error {
-	l := logger.With("id", in.ID)
+	l := logger.With("id", in.Id)
 
 	ch := make(chan string, 1)
 	s.watchLock.Lock()
-	old, ok := s.watch[in.ID]
+	old, ok := s.watch[in.Id]
 	if ok {
 		l.Info("evicting old watch")
 		close(old)
 	}
-	s.watch[in.ID] = ch
+	s.watch[in.Id] = ch
 	s.watchLock.Unlock()
 
 	labels := prometheus.Labels{"method": "Watch", "op": "push"}
@@ -204,7 +204,7 @@ func (s *server) Watch(in *hardware.GetRequest, stream hardware.HardwareService_
 			return
 		}
 		s.watchLock.Lock()
-		delete(s.watch, in.ID)
+		delete(s.watch, in.Id)
 		s.watchLock.Unlock()
 		close(ch)
 	}()