Skip to content

lsblk defined expected columns by using -o #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matihuf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

lsblk defined expected columns by using -o #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DeviceId.Linux/Components/LinuxRootDriveSerialNumberDeviceIdComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal LinuxRootDriveSerialNumberDeviceIdComponent(ICommandExecutor commandExe
/// <returns>The component value.</returns>
public string GetValue()
{
var outputJson = _commandExecutor.Execute("lsblk -f -J");
var outputJson = _commandExecutor.Execute("lsblk -f -J -o Name,MountPoint");
var output = JsonSerializer.Deserialize<LsblkOutput>(outputJson, _jsonSerializerOptions);

var device = FindRootParent(output);
Expand Down
32 changes: 31 additions & 1 deletion test/DeviceId.Tests/Components/LinuxRootDriveSerialNumberDeviceIdComponentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,40 @@ public void DigitalOceanVmWithoutSerialId()
componentValue.Should().BeNull();
}

[Fact]
public void OnlyNameAndMountPointColumn()
{
const string deviceName = "nvme0n1";

const string lsblkOutput = @"
{
""blockdevices"": [
{ ""name"": ""loop0"", ""mountpoint"": ""/snap/bare/5"" },
{ ""name"": ""loop1"", ""mountpoint"": ""/snap/core22/1612"" },
{ ""name"": ""loop2"", ""mountpoint"": ""/snap/firefox/4848"" },
{ ""name"": ""loop3"", ""mountpoint"": ""/snap/gnome-42-2204/176"" },
{ ""name"": ""loop4"", ""mountpoint"": ""/snap/gtk-common-themes/1535"" },
{ ""name"": ""loop5"", ""mountpoint"": ""/snap/snapd/21759"" },
{ ""name"": ""nvme0n1"", ""mountpoint"": null,
""children"": [
{ ""name"": ""nvme0n1p1"", ""mountpoint"": ""/boot/efi"" },
{ ""name"": ""nvme0n1p2"", ""mountpoint"": ""/"" }
]
}
]
}";

const string udevadmOutput = "E: ID_SERIAL=WDC_PC_SN520_SDAPNUW-128G-1006_191855800528_1";

var componentValue = GetComponentValue(deviceName, lsblkOutput, udevadmOutput);

componentValue.Should().Be("WDC_PC_SN520_SDAPNUW-128G-1006_191855800528_1");
}

private static string GetComponentValue(string rootParentDeviceName, string lsblkOutput, string udevadmOutput)
{
var commandExecutorMock = Substitute.For<ICommandExecutor>();
commandExecutorMock.Execute("lsblk -f -J").Returns(lsblkOutput);
commandExecutorMock.Execute("lsblk -f -J -o Name,MountPoint").Returns(lsblkOutput);
commandExecutorMock.Execute($"udevadm info --query=all --name=/dev/{rootParentDeviceName} | grep ID_SERIAL=").Returns(udevadmOutput);

var component = new LinuxRootDriveSerialNumberDeviceIdComponent(commandExecutorMock);
Expand Down