Remove dependency on unicode

reecetech · Nov 23, 2023 · d0adfcc · d0adfcc
1 parent dc0fc5a
commit d0adfcc
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/internal/service/nvme.go b/internal/service/nvme.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 	"syscall"
-	"unicode"
 	"unsafe"
 )
 
@@ -151,13 +150,13 @@ func (ns *AwsNitroNVMeService) GetBlockDeviceMapping(device string) (string, err
 
 func (ns *AwsNitroNVMeService) isEBSVolume(nd *NVMeDevice) bool {
 	vid := nd.IdCtrl.Vid
-	mn := strings.TrimRightFunc(string(nd.IdCtrl.Mn[:]), unicode.IsSpace)
+	mn := strings.TrimRightFunc(string(nd.IdCtrl.Mn[:]), ns.TrimModelNumber)
 	return vid == AMZN_NVME_VID && mn == AMZN_NVME_EBS_MN
 }
 
 func (ns *AwsNitroNVMeService) isInstanceStoreVolume(nd *NVMeDevice) bool {
 	vid := nd.IdCtrl.Vid
-	mn := strings.TrimRightFunc(string(nd.IdCtrl.Mn[:]), unicode.IsSpace)
+	mn := strings.TrimRightFunc(string(nd.IdCtrl.Mn[:]), ns.TrimModelNumber)
 	return vid == AMZN_NVME_VID && mn == AMZN_NVME_INS_MN
 }
 
@@ -188,6 +187,12 @@ func (ns *AwsNitroNVMeService) getBlockDeviceMapping(nd *NVMeDevice) (string, er
 	return bdm, nil
 }
 
+func (ns *AwsNitroNVMeService) TrimModelNumber(r rune) bool {
+// Explanation:
+// 	- Both the AWS EC2 and EBS team use the 0x20 (space) byte to pad out the Model Number
+	return r == 0x20
+}
+
 func (ns *AwsNitroNVMeService) TrimVendorSpecfic(r rune) bool {
 // Explanation:
 // 	- The AWS EC2 team uses the 0x00 (null) byte to pad out the Vendor Specific allocation