Skip to content
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

Add support for Windows Server 2025 as a valid platform in ECS Agent #4547

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
+31 −0
Open

Add support for Windows Server 2025 as a valid platform in ECS Agent #4547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e14a10f
Initial changes to support Windows Server 2025
Mar 25, 2025
f89e392
Fix 2025 test in os family test file
Mar 26, 2025
72aa4dd
Fix test for 2025 core and full os family tests
Mar 26, 2025
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
1 change: 1 addition & 0 deletions agent/config/os_family_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ var (
19041: "2004",
19042: "20H2",
20348: "2022",
26100: "2025",
}
// windowsGetVersionFunc is the method used to obtain information about current Windows version.
windowsGetVersionFunc = windows.RtlGetVersion
Expand Down
28 changes: 28 additions & 0 deletions agent/config/os_family_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,34 @@ func getMockWindowsRegistryKey(ctrl *gomock.Controller) *mock_dependencies.MockR
return mockKey
}

func TestGetOSFamilyForWS2025Full(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

windowsGetVersionFunc = fakeWindowsGetVersionFunc(26100)
mockKey := getMockWindowsRegistryKey(ctrl)
gomock.InOrder(
mockKey.EXPECT().GetStringValue("InstallationType").Return(`Server`, uint32(0), nil),
mockKey.EXPECT().Close(),
)

assert.Equal(t, "WINDOWS_SERVER_2025_FULL", GetOSFamily())
}

func TestGetOSFamilyForWS2025Core(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

windowsGetVersionFunc = fakeWindowsGetVersionFunc(26100)
mockKey := getMockWindowsRegistryKey(ctrl)
gomock.InOrder(
mockKey.EXPECT().GetStringValue("InstallationType").Return(`Server Core`, uint32(0), nil),
mockKey.EXPECT().Close(),
)

assert.Equal(t, "WINDOWS_SERVER_2025_CORE", GetOSFamily())
}

func TestGetOSFamilyForWS2022Core(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
Expand Down
2 changes: 2 additions & 0 deletions scripts/run-integ-tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ if ($Platform -like "windows2016") {
$RegistryImageName="mcr.microsoft.com/windows/servercore:20H2"
} elseif ($Platform -like "windows2022") {
$RegistryImageName="mcr.microsoft.com/windows/servercore:ltsc2022"
} elseif ($Platform -like "windows2025") {
$RegistryImageName="mcr.microsoft.com/windows/servercore:ltsc2025"
} else {
echo "Invalid platform parameter"
exit 1
Expand Down
Loading