Add AwsLinux support (#456)

v-safilho · web-flow · commit 87ee2aa332ba · 2025-03-07T11:28:13.000-08:00
* add AwsLinux implementation and artifcacts

* Update VERSION

Signed-off-by: v-safilho &lt;v-safilho@microsoft.com&gt;

---------

Signed-off-by: v-safilho &lt;v-safilho@microsoft.com&gt;
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.16.31
+1.16.32
diff --git a/src/VirtualClient/VirtualClient.Actions/Gzip/GzipExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Gzip/GzipExecutor.cs
@@ -212,6 +212,7 @@ private async Task CheckDistroSupportAsync(EventContext telemetryContext, Cancel
                     case LinuxDistribution.AzLinux:
                     case LinuxDistribution.CentOS7:
                     case LinuxDistribution.RHEL7:
+                    case LinuxDistribution.AwsLinux:
                         break;
                     default:
                         throw new WorkloadException(
diff --git a/src/VirtualClient/VirtualClient.Actions/Memcached/MemcachedExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Memcached/MemcachedExecutor.cs
@@ -220,13 +220,14 @@ private async Task ValidatePlatformSupportAsync(CancellationToken cancellationTo
                             case LinuxDistribution.CentOS8:
                             case LinuxDistribution.RHEL8:
                             case LinuxDistribution.AzLinux:
+                            case LinuxDistribution.AwsLinux:
                                 break;
                             default:
                                 throw new WorkloadException(
                                     $"The workload/benchmark is not supported on the current Linux distro " +
                                     $"'{distroInfo.LinuxDistribution}'.  Supported distros include: " +
                                     $"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.Ubuntu)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.Debian)}" +
-                                    $"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.CentOS8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.RHEL8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.AzLinux)}",
+                                    $"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.CentOS8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.RHEL8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.AzLinux)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.AwsLinux)}",
                                     ErrorReason.LinuxDistributionNotSupported);
                         }
 
diff --git a/src/VirtualClient/VirtualClient.Actions/Pbzip2/Pbzip2Executor.cs b/src/VirtualClient/VirtualClient.Actions/Pbzip2/Pbzip2Executor.cs
@@ -216,6 +216,7 @@ private async Task CheckDistroSupportAsync(EventContext telemetryContext, Cancel
                     case LinuxDistribution.AzLinux:
                     case LinuxDistribution.CentOS7:
                     case LinuxDistribution.RHEL7:
+                    case LinuxDistribution.AwsLinux:
                         break;
                     default:
                         throw new WorkloadException(
diff --git a/src/VirtualClient/VirtualClient.Actions/Redis/RedisExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Redis/RedisExecutor.cs
@@ -179,13 +179,15 @@ private async Task ValidatePlatformSupportAsync(CancellationToken cancellationTo
                                 case LinuxDistribution.CentOS8:
                                 case LinuxDistribution.RHEL8:
                                 case LinuxDistribution.AzLinux:
+                                case LinuxDistribution.AwsLinux:
                                     break;
                                 default:
                                     throw new WorkloadException(
                                         $"The Redis Memtier benchmark workload is not supported on the current Linux distro " +
                                         $"'{distroInfo.LinuxDistribution}'.  Supported distros include: " +
                                         $"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.Ubuntu)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.Debian)}" +
-                                        $"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.CentOS8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.RHEL8)}",
+                                        $"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.CentOS8)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.RHEL8)}" +
+                                        $"{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.AzLinux)},{Enum.GetName(typeof(LinuxDistribution), LinuxDistribution.AwsLinux)}",
                                         ErrorReason.LinuxDistributionNotSupported);
                             }
                         }
diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Examples/hostnamectl/AwsLinuxExample.txt b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Examples/hostnamectl/AwsLinuxExample.txt
@@ -0,0 +1,11 @@
+﻿   Static hostname: arm64-ct79-vcuser1
+   Pretty hostname: ARM64-CT79-vcuser1
+Transient hostname: ARM64-CT79-vcuser1
+         Icon name: computer-desktop
+           Chassis: desktop
+        Machine ID: 26ae5f478d834c38838208981747c006
+           Boot ID: 67bf1d1af77b496484ec5cfa0fcd27d5
+  Operating System: Amazon Linux
+       CPE OS Name: cpe:2.3:o:amazon:amazon_linux:2023
+            Kernel: Amazon Linux 2023.6.20250218
+      Architecture: arm64a
diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Examples/os-release/AwsLinuxExample.txt b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Examples/os-release/AwsLinuxExample.txt
@@ -0,0 +1,16 @@
+NAME="Amazon Linux"
+VERSION="2023"
+ID="amzn"
+ID_LIKE="fedora"
+VERSION_ID="2023"
+PLATFORM_ID="platform:al2023"
+PRETTY_NAME="Amazon Linux 2023.6.20250218"
+ANSI_COLOR="0;33"
+CPE_NAME="cpe:2.3:o:amazon:amazon_linux:2023"
+HOME_URL="https://aws.amazon.com/linux/amazon-linux-2023/"
+DOCUMENTATION_URL="https://docs.aws.amazon.com/linux/"
+SUPPORT_URL="https://aws.amazon.com/premiumsupport/"
+BUG_REPORT_URL="https://github.com/amazonlinux/amazon-linux-2023"
+VENDOR_NAME="AWS"
+VENDOR_URL="https://aws.amazon.com/"
+SUPPORT_END="2029-06-30"
diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/HostnamectlParserUnitTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/HostnamectlParserUnitTests.cs
@@ -134,5 +134,15 @@ public void HostnamectlParserRecognizeRedhat93()
             Assert.AreEqual(LinuxDistribution.RHEL8, this.testParser.Parse().LinuxDistribution);
             Assert.AreEqual("Red Hat Enterprise Linux 9.3 (Plow)", this.testParser.Parse().OperationSystemFullName);
         }
+
+        [Test]
+        public void HostnamectlParserRecognizeAwsLinux()
+        {
+            string outputPath = Path.Combine(this.ExamplePath, "AwsLinuxExample.txt");
+            this.rawText = File.ReadAllText(outputPath);
+            this.testParser = new HostnamectlParser(this.rawText);
+            Assert.AreEqual(LinuxDistribution.AwsLinux, this.testParser.Parse().LinuxDistribution);
+            Assert.AreEqual("Amazon Linux", this.testParser.Parse().OperationSystemFullName);
+        }
     }
 }
diff --git a/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/OsReleaseFileParserUnitTests.cs b/src/VirtualClient/VirtualClient.Contracts.UnitTests/Parser/OsReleaseFileParserUnitTests.cs
@@ -75,5 +75,15 @@ public void OsReleaseFileParserRecognizeAzLinux3()
             Assert.AreEqual(LinuxDistribution.AzLinux, this.testParser.Parse().LinuxDistribution);
             Assert.AreEqual("Microsoft Azure Linux 3.0", this.testParser.Parse().OperationSystemFullName);
         }
+
+        [Test]
+        public void OsReleaseFileParserRecognizeAwsLinux()
+        {
+            string outputPath = Path.Combine(this.ExamplePath, "AwsLinuxExample.txt");
+            this.rawText = File.ReadAllText(outputPath);
+            this.testParser = new OsReleaseFileParser(this.rawText);
+            Assert.AreEqual(LinuxDistribution.AwsLinux, this.testParser.Parse().LinuxDistribution);
+            Assert.AreEqual("Amazon Linux 2023.6.20250218", this.testParser.Parse().OperationSystemFullName);
+        }
     }
 }
diff --git a/src/VirtualClient/VirtualClient.Contracts/Enumerations.cs b/src/VirtualClient/VirtualClient.Contracts/Enumerations.cs
@@ -556,7 +556,12 @@ public enum LinuxDistribution
         /// <summary>
         /// MSFT internal CentOS based distro AzLinux (Previously Mariner)
         /// </summary>
-        AzLinux
+        AzLinux,
+
+        /// <summary>
+        /// AwsLinux
+        /// </summary>
+        AwsLinux
     }
 
     /// <summary>
diff --git a/src/VirtualClient/VirtualClient.Contracts/Parser/HostnamectlParser.cs b/src/VirtualClient/VirtualClient.Contracts/Parser/HostnamectlParser.cs
@@ -37,6 +37,7 @@ public override LinuxDistributionInfo Parse()
             // Mariner 3+ renamed to AzLinux 3
             Regex azLinuxRegex = new Regex("Operating System: (CBL-Mariner|Microsoft Azure Linux)", RegexOptions.Multiline | RegexOptions.IgnoreCase);
             Regex suseRegex = new Regex("Operating System: SUSE", RegexOptions.Multiline | RegexOptions.IgnoreCase);
+            Regex awsLinuxRegex = new Regex("Operating System: Amazon Linux", RegexOptions.Multiline | RegexOptions.IgnoreCase);
 
             Dictionary<Regex, LinuxDistribution> distroMapping = new Dictionary<Regex, LinuxDistribution>()
             {
@@ -48,7 +49,8 @@ public override LinuxDistributionInfo Parse()
                 { centos7Regex, LinuxDistribution.CentOS7 },
                 { centos8Regex, LinuxDistribution.CentOS8 },
                 { suseRegex, LinuxDistribution.SUSE },
-                { azLinuxRegex, LinuxDistribution.AzLinux }
+                { azLinuxRegex, LinuxDistribution.AzLinux },
+                { awsLinuxRegex, LinuxDistribution.AwsLinux }
             };
 
             LinuxDistribution distribution = LinuxDistribution.Unknown;
diff --git a/src/VirtualClient/VirtualClient.Contracts/Parser/OsReleaseFileParser.cs b/src/VirtualClient/VirtualClient.Contracts/Parser/OsReleaseFileParser.cs
@@ -39,6 +39,7 @@ public override LinuxDistributionInfo Parse()
             Regex marinerRegex = new Regex("Name=(\")?(CBL-Mariner|Microsoft Azure Linux)", RegexOptions.Multiline | RegexOptions.IgnoreCase);
             Regex suseRegex = new Regex("Name=(\")?SUSE", RegexOptions.Multiline | RegexOptions.IgnoreCase);
             Regex fedoraRegex = new Regex("Name=(\")?Fedora", RegexOptions.Multiline | RegexOptions.IgnoreCase);
+            Regex awsLinuxRegex = new Regex("Name=(\")?Amazon Linux", RegexOptions.Multiline | RegexOptions.IgnoreCase);
 
             Dictionary<Regex, LinuxDistribution> distroMapping = new Dictionary<Regex, LinuxDistribution>()
             {
@@ -51,7 +52,8 @@ public override LinuxDistributionInfo Parse()
                 { centos8Regex, LinuxDistribution.CentOS8 },
                 { suseRegex, LinuxDistribution.SUSE },
                 { marinerRegex, LinuxDistribution.AzLinux },
-                { fedoraRegex, LinuxDistribution.Fedora }
+                { fedoraRegex, LinuxDistribution.Fedora },
+                { awsLinuxRegex, LinuxDistribution.AwsLinux }
             };
 
             LinuxDistribution distribution = LinuxDistribution.Unknown;
diff --git a/src/VirtualClient/VirtualClient.Dependencies.UnitTests/Packaging/LinuxPackageInstallationTests.cs b/src/VirtualClient/VirtualClient.Dependencies.UnitTests/Packaging/LinuxPackageInstallationTests.cs
@@ -176,6 +176,42 @@ public async Task LinuxPackageInstallationInstantiateCorrectDnfInstalltionMarine
             }
         }
 
+        [Test]
+        public async Task LinuxPackageInstallationInstantiateCorrectDnfInstalltionAwsLinuxComplexCase()
+        {
+            LinuxDistributionInfo mockInfo = new LinuxDistributionInfo()
+            {
+                OperationSystemFullName = "TestAwsLinux",
+                LinuxDistribution = LinuxDistribution.AwsLinux
+            };
+            this.mockFixture.SystemManagement.Setup(sm => sm.GetLinuxDistributionAsync(It.IsAny<CancellationToken>())).ReturnsAsync(mockInfo);
+
+            this.mockFixture.Parameters = new Dictionary<string, IConvertible>()
+            {
+                { nameof(LinuxPackageInstallation.Packages), "pack1,pack2,pack3" },
+                { "Packages-Apt", "wrongpack1,wrongpack2" },
+                { "Packages-Dnf", "extrapack1,extrapack2" },
+                { "Repositories-Apt", "wrongrepo1,wrongrepo2" },
+                { "Packages-Yum", "wrongpack1,wrongpack2" },
+                { "Repositories-Ubuntu", "wrongpack1,wrongpack2" },
+                { "Repositories-Dnf", "repo1,repo2" },
+                { "Repositories-AwsLinux", "extrarepo1,extrarepo2" },
+                { "Packages-Ubuntu", "morepack1,morepack2" },
+                { "Packages-Debian", "wrongpack1,wrongpack2" },
+                { "Packages-AwsLinux", "morepack1,morepack2" },
+                { "Repositories-SUSE", "wrongrepo1,wrongrepo2" },
+            };
+
+            using (TestLinuxPackageInstallation packageInstallation = new TestLinuxPackageInstallation(this.mockFixture.Dependencies, this.mockFixture.Parameters))
+            {
+                await packageInstallation.ExecuteAsync(CancellationToken.None).ConfigureAwait(false);
+                Assert.IsTrue(packageInstallation.InstantiatedInstaller is DnfPackageInstallation);
+                DnfPackageInstallation aptInstall = (DnfPackageInstallation)packageInstallation.InstantiatedInstaller;
+                Assert.AreEqual("pack1,pack2,pack3,extrapack1,extrapack2,morepack1,morepack2", aptInstall.Packages);
+                Assert.AreEqual("repo1,repo2,extrarepo1,extrarepo2", aptInstall.Repositories);
+            }
+        }
+
         private class TestLinuxPackageInstallation : LinuxPackageInstallation
         {
             public TestLinuxPackageInstallation(IServiceCollection dependencies, IDictionary<string, IConvertible> parameters)
diff --git a/src/VirtualClient/VirtualClient.Dependencies/CompilerInstallation.cs b/src/VirtualClient/VirtualClient.Dependencies/CompilerInstallation.cs
@@ -236,6 +236,7 @@ private async Task InstallGccAsync(string gccVersion, EventContext telemetryCont
 
                 case LinuxDistribution.CentOS8:
                 case LinuxDistribution.RHEL8:
+                case LinuxDistribution.AwsLinux:
                     if (string.IsNullOrEmpty(gccVersion) && string.IsNullOrEmpty(installedVersion))
                     {
                         await this.ExecuteCommandAsync("dnf", "install kernel-headers kernel-devel -y", Environment.CurrentDirectory, telemetryContext, cancellationToken);
diff --git a/src/VirtualClient/VirtualClient.Dependencies/Packaging/LinuxPackageInstallation.cs b/src/VirtualClient/VirtualClient.Dependencies/Packaging/LinuxPackageInstallation.cs
@@ -197,6 +197,7 @@ protected override async Task ExecuteAsync(EventContext telemetryContext, Cancel
                     case LinuxDistribution.CentOS8:
                     case LinuxDistribution.RHEL8:
                     case LinuxDistribution.AzLinux:
+                    case LinuxDistribution.AwsLinux:
                         installer = this.InstantiateDnfInstaller();
                         break;
 

Original file line number	Diff line number	Diff line change
`@@ -134,5 +134,15 @@ public void HostnamectlParserRecognizeRedhat93()`
`134`	`134`	`Assert.AreEqual(LinuxDistribution.RHEL8, this.testParser.Parse().LinuxDistribution);`
`135`	`135`	`Assert.AreEqual("Red Hat Enterprise Linux 9.3 (Plow)", this.testParser.Parse().OperationSystemFullName);`
`136`	`136`	`}`
	`137`	`+`
	`138`	`+ [Test]`
	`139`	`+ public void HostnamectlParserRecognizeAwsLinux()`
	`140`	`+ {`
	`141`	`+ string outputPath = Path.Combine(this.ExamplePath, "AwsLinuxExample.txt");`
	`142`	`+ this.rawText = File.ReadAllText(outputPath);`
	`143`	`+ this.testParser = new HostnamectlParser(this.rawText);`
	`144`	`+ Assert.AreEqual(LinuxDistribution.AwsLinux, this.testParser.Parse().LinuxDistribution);`
	`145`	`+ Assert.AreEqual("Amazon Linux", this.testParser.Parse().OperationSystemFullName);`
	`146`	`+ }`
`137`	`147`	`}`
`138`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,15 @@ public void OsReleaseFileParserRecognizeAzLinux3()`
`75`	`75`	`Assert.AreEqual(LinuxDistribution.AzLinux, this.testParser.Parse().LinuxDistribution);`
`76`	`76`	`Assert.AreEqual("Microsoft Azure Linux 3.0", this.testParser.Parse().OperationSystemFullName);`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ [Test]`
	`80`	`+ public void OsReleaseFileParserRecognizeAwsLinux()`
	`81`	`+ {`
	`82`	`+ string outputPath = Path.Combine(this.ExamplePath, "AwsLinuxExample.txt");`
	`83`	`+ this.rawText = File.ReadAllText(outputPath);`
	`84`	`+ this.testParser = new OsReleaseFileParser(this.rawText);`
	`85`	`+ Assert.AreEqual(LinuxDistribution.AwsLinux, this.testParser.Parse().LinuxDistribution);`
	`86`	`+ Assert.AreEqual("Amazon Linux 2023.6.20250218", this.testParser.Parse().OperationSystemFullName);`
	`87`	`+ }`
`78`	`88`	`}`
`79`	`89`	`}`