From 7dd7d3696c1d9083f295f1cadd121f304e6d0496 Mon Sep 17 00:00:00 2001 From: Sam Marley-Jarrett Date: Fri, 10 May 2024 11:44:45 +1000 Subject: [PATCH 1/2] Ephemeral disks should be able to use 'xvdZ' device naming --- internal/service/nvme.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/nvme.go b/internal/service/nvme.go index a4be66b..b8bc654 100644 --- a/internal/service/nvme.go +++ b/internal/service/nvme.go @@ -163,7 +163,7 @@ func (ns *AwsNitroNVMeService) getBlockDeviceMapping(nir *NVMeIoctlResult) (stri // Vendor Specfic (vs) vs := strings.TrimRightFunc(string(nir.IdCtrl.Vs.Bdev[:]), ns.trimBlockDevice) // Regex Block device Mapping - rebdm := regexp.MustCompile(`^(ephemeral[0-9]):(sd[a-z]|none)`) + rebdm := regexp.MustCompile(`^(ephemeral[0-9]):(sd[a-z]|xvd[a-z]|none)`) // Match Block Device Mapping mbdm := rebdm.FindStringSubmatch(vs) if len(mbdm) != 3 { From 18f500df25ca5bd091bbc9cc8255c8ea93b67be8 Mon Sep 17 00:00:00 2001 From: Sam Marley-Jarrett Date: Fri, 10 May 2024 11:46:48 +1000 Subject: [PATCH 2/2] Update nvme_test.go --- internal/service/nvme_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/nvme_test.go b/internal/service/nvme_test.go index 48f0e65..fa3c614 100644 --- a/internal/service/nvme_test.go +++ b/internal/service/nvme_test.go @@ -79,7 +79,7 @@ func TestGetBlockDeviceMapping(t *testing.T) { ModelNumber: AMZN_NVME_INS_MN, BlockDevice: "ephemeral0:vdb", ExpectedOutput: "", - ExpectedError: fmt.Errorf("🔴 /dev/nvme1n1: Instance-store vendor specific metadata did not match pattern. Pattern=^(ephemeral[0-9]):(sd[a-z]|none), Actual=ephemeral0:vdb"), + ExpectedError: fmt.Errorf("🔴 /dev/nvme1n1: Instance-store vendor specific metadata did not match pattern. Pattern=^(ephemeral[0-9]):(sd[a-z]|xvd[a-z]|none), Actual=ephemeral0:vdb"), }, { Name: "Invalid NVMe Device (Unsupported Vendor ID)",