From 8257db6d4096e6936d578fa49eced0ecf6b3f236 Mon Sep 17 00:00:00 2001
From: Yogesh Deshpande <yogesh.deshpande@arm.com>
Date: Tue, 6 Feb 2024 07:27:01 -0500
Subject: [PATCH] Removing some lint errors

Signed-off-by: Yogesh Deshpande <yogesh.deshpande@arm.com>
---
 comid/integrityregisters.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/comid/integrityregisters.go b/comid/integrityregisters.go
index 22de98bf..fa934fa5 100644
--- a/comid/integrityregisters.go
+++ b/comid/integrityregisters.go
@@ -10,6 +10,8 @@ import (
 	"github.com/veraison/swid"
 )
 
+const TextType = "text"
+
 // IRegisterIndex is the interface to hold register index
 type IRegisterIndex interface{}
 
@@ -60,8 +62,8 @@ func (i *IntegrityRegisters) UnmarshalCBOR(data []byte) error {
 }
 
 type keyTypeandVal struct {
-	Key_type string `json:"key_type"`
-	Value    json.RawMessage
+	KeyType string `json:"key_type"`
+	Value   json.RawMessage
 }
 
 func (i IntegrityRegisters) MarshalJSON() ([]byte, error) {
@@ -71,10 +73,10 @@ func (i IntegrityRegisters) MarshalJSON() ([]byte, error) {
 		var ktv keyTypeandVal
 		switch t := key.(type) {
 		case uint, uint64:
-			ktv.Key_type = "uint"
+			ktv.KeyType = UintType
 			newkey = fmt.Sprintf("%v", key)
 		case string:
-			ktv.Key_type = "text"
+			ktv.KeyType = TextType
 			newkey = key.(string)
 		default:
 			return nil, fmt.Errorf("unknown type %T for index-type-choice", t)
@@ -110,8 +112,8 @@ func (i *IntegrityRegisters) UnmarshalJSON(data []byte) error {
 		if err := json.Unmarshal(ktv.Value, &d); err != nil {
 			return fmt.Errorf("unable to unmarshal Digest: %w", err)
 		}
-		switch ktv.Key_type {
-		case "uint":
+		switch ktv.KeyType {
+		case UintType:
 			u, err := strconv.Atoi(key)
 			if err != nil {
 				return fmt.Errorf("unable to convert key to uint: %v", err)
@@ -119,10 +121,10 @@ func (i *IntegrityRegisters) UnmarshalJSON(data []byte) error {
 				return fmt.Errorf("invalid negative integer key")
 			}
 			index = uint(u)
-		case "text":
+		case TextType:
 			index = key
 		default:
-			return fmt.Errorf("unexpected key type for index: %s", ktv.Key_type)
+			return fmt.Errorf("unexpected key type for index: %s", ktv.KeyType)
 		}
 		if err := i.AddDigests(index, d); err != nil {
 			return fmt.Errorf("unable to add digests into register set: %w", err)