Initialize environment and add E2E tests with formatting by AmelBawa-msft · Pull Request #14475 · microsoft/WSL

AmelBawa-msft · 2026-03-19T00:21:34Z

Summary of the Pull Request

Added support for -e option in wslc run/create/exec
Added E2E tests

PR Checklist

Closes: Link to issue #xxx
Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
Tests: Added/updated if needed and all pass
Localization: All end user facing strings can be localized
Dev docs: Added/updated if needed
Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Copilot

Pull request overview

This PR adds initial support for passing environment variables from the wslc CLI into container creation/run flows (via -e/--env) and introduces E2E coverage for the new CLI behavior.

Changes:

Extend ContainerOptions to carry environment variables and populate it from CLI args (-e/--env).
Plumb ContainerOptions.EnvironmentVariables into WSLAContainerLauncher during container creation/run.
Add E2E tests validating container run environment variable propagation.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.

File	Description
`test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp`	Adds E2E coverage for `container run -e/--env` and test setup/cleanup env initialization.
`src/windows/wslc/tasks/ContainerTasks.cpp`	Parses `-e/--env` arguments into `ContainerOptions.EnvironmentVariables`.
`src/windows/wslc/services/ContainerService.cpp`	Passes `EnvironmentVariables` into `WSLAContainerLauncher` for container creation.
`src/windows/wslc/services/ContainerModel.h`	Extends `ContainerOptions` with an environment variables list.

src/windows/wslc/tasks/ContainerTasks.cpp

src/windows/wslc/services/ContainerService.cpp

src/windows/wslc/tasks/ContainerTasks.cpp

Copilot

Pull request overview

Adds WSLC support for passing environment variables into containers (via -e/--env and --env-file) and validates the behavior through new unit and end-to-end tests.

Changes:

Extend container run/create argument definitions to accept repeated -e and --env-file.
Parse/validate env entries (including key-only resolution from host env) and plumb them through ContainerOptions into WSLAContainerLauncher.
Add new unit tests for env parsing and E2E coverage for env/env-file scenarios and precedence.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp	Adds E2E coverage for `-e` and `--env-file` behavior (including precedence and error cases).
test/windows/wslc/WSLCCLIEnvVarParserUnitTests.cpp	New unit tests for env var parsing and env-file parsing behavior.
src/windows/wslc/tasks/ContainerTasks.cpp	Parses `--env-file` and `-e` args into `ContainerOptions.EnvironmentVariables`.
src/windows/wslc/services/ContainerService.cpp	Passes environment variables to `WSLAContainerLauncher` during container create/run.
src/windows/wslc/services/ContainerModel.h	Adds `ContainerOptions.EnvironmentVariables` and declares `EnvironmentVariable` parsing helpers.
src/windows/wslc/services/ContainerModel.cpp	Implements env parsing and env-file parsing/validation.
src/windows/wslc/commands/ContainerRunCommand.cpp	Updates `container run` argument definitions to allow repeated env/env-file.
src/windows/wslc/commands/ContainerCreateCommand.cpp	Updates `container create` argument definitions to allow repeated env/env-file.

src/windows/wslc/services/ContainerModel.cpp

test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 6 comments.

src/windows/wslc/services/ContainerModel.cpp

test/windows/wslc/e2e/WSLCE2EHelpers.cpp

test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp

test/windows/wslc/WSLCCLIEnvVarParserUnitTests.cpp

src/windows/wslc/commands/ContainerCreateCommand.cpp

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.

test/windows/wslc/e2e/WSLCE2EHelpers.cpp

test/windows/wslc/WSLCCLIEnvVarParserUnitTests.cpp

src/windows/wslc/services/ContainerModel.cpp

OneBlue · 2026-03-21T00:16:25Z

test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp

        EnsureImageIsLoaded(AlpineImage);
+        EnsureImageIsLoaded(DebianImage);
+
+        VERIFY_IS_TRUE(::SetEnvironmentVariableW(HostEnvVariableName.c_str(), HostEnvVariableValue.c_str()));


nit:: I recommend using ScopedEnvVariable instead

Reopening since this isn't resolved on the latest iteration

…into user/amelbawa/env

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

src/windows/wslc/services/ContainerModel.cpp

test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.

src/windows/wslc/services/ContainerModel.cpp

OneBlue

LGTM, minor comments

OneBlue · 2026-03-25T00:13:25Z

src/windows/wslc/services/ContainerModel.cpp

+
+static inline bool IsSpace(wchar_t ch)
+{
+    return std::iswspace(ch) != 0;


Could we use iswpace directly instead ?

OneBlue · 2026-03-25T00:15:59Z

src/windows/wslc/services/ContainerModel.cpp

+    if (!value.has_value())
+    {
+        wil::unique_hglobal_string envValue;
+        auto hr = wil::GetEnvironmentVariableW(key.c_str(), envValue);


wil::GetEnvironmentVariableW can be templated on std::wstring to avoid the need for copy below

OneBlue · 2026-03-25T00:19:12Z

src/windows/wslc/services/ContainerModel.cpp

+    while (std::getline(file, line))
+    {
+        // Remove leading whitespace
+        line.erase(line.begin(), std::find_if(line.begin(), line.end(), [](unsigned char ch) { return !std::isspace(ch); }));


This looks like it will only remove the first whitespace character. Instead we should probably loop and delete the first character as long as line is not empty and line[0] is a space

OneBlue · 2026-03-25T00:20:20Z

src/windows/wslc/services/ContainerModel.cpp

+            continue;
+        }
+
+        auto envVar = Parse(wsl::shared::string::MultiByteToWide(line));


I recommend using std::string in Parse as well, since that's what the service will expect

OneBlue · 2026-03-25T00:26:46Z

test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp

        EnsureImageIsLoaded(AlpineImage);
+        EnsureImageIsLoaded(DebianImage);
+
+        VERIFY_IS_TRUE(::SetEnvironmentVariableW(HostEnvVariableName.c_str(), HostEnvVariableValue.c_str()));


Reopening since this isn't resolved on the latest iteration

OneBlue · 2026-03-25T00:27:20Z

test/windows/wslc/WSLCCLIEnvVarParserUnitTests.cpp

+    TEST_METHOD(WSLCCLIEnvVarParser_UsesProcessEnvWhenValueMissing)
+    {
+        constexpr const auto key = L"WSLC_TEST_ENV_FROM_PROCESS";
+        VERIFY_IS_TRUE(SetEnvironmentVariableW(key, L"process_value"));


I recommend using ScopedEnvVariable here as well

OneBlue · 2026-03-25T00:27:53Z

test/windows/wslc/WSLCCLIEnvVarParserUnitTests.cpp

+
+    TEST_METHOD(WSLCCLIEnvVarParser_InvalidKeysThrow)
+    {
+        VERIFY_THROWS(models::EnvironmentVariable::Parse(L"=value"), std::exception);


nit: I recommend validating that the error message is what we expect

AmelBawa-msft added 3 commits March 18, 2026 15:28

Init env

fbc2aeb

Added E2E tests

596b4dd

Clang format

e802f4f

Copilot AI review requested due to automatic review settings March 19, 2026 00:21

AmelBawa-msft marked this pull request as ready for review March 19, 2026 00:24

AmelBawa-msft requested a review from a team as a code owner March 19, 2026 00:24

Copilot AI reviewed Mar 19, 2026

View reviewed changes

src/windows/wslc/tasks/ContainerTasks.cpp Show resolved Hide resolved

src/windows/wslc/services/ContainerService.cpp Show resolved Hide resolved

src/windows/wslc/tasks/ContainerTasks.cpp Show resolved Hide resolved

AmelBawa-msft marked this pull request as draft March 19, 2026 00:49

AmelBawa-msft added 10 commits March 19, 2026 10:51

WIP

d7fd8cd

Add envfile support

dee2dac

Init tests

52e9363

Added UT

de32712

Added more UT

e7b0303

Added more E2E Tests

9064bed

Added more E2E Tests

a72c357

Code enhancement

6eba41c

Added more E2E Tests

a8aefdd

Added more E2E Tests

6381793

Copilot AI review requested due to automatic review settings March 19, 2026 22:47

Copilot started reviewing on behalf of AmelBawa-msft March 19, 2026 22:49 View session

Copilot AI reviewed Mar 19, 2026

View reviewed changes

src/windows/wslc/services/ContainerModel.cpp Outdated Show resolved Hide resolved

src/windows/wslc/services/ContainerModel.cpp Outdated Show resolved Hide resolved

test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp Outdated Show resolved Hide resolved

AmelBawa-msft added 3 commits March 19, 2026 22:52

Added more E2E Tests

6af19b1

Clang format

289c031

Resolve conflicts

106b9c1

Copilot AI review requested due to automatic review settings March 20, 2026 17:32

Copilot AI reviewed Mar 20, 2026

View reviewed changes

Copilot started reviewing on behalf of AmelBawa-msft March 20, 2026 18:09 View session

Resolve copilot comment

5e8904b

AmelBawa-msft marked this pull request as ready for review March 20, 2026 21:07

Copilot AI review requested due to automatic review settings March 20, 2026 21:07

Copilot started reviewing on behalf of AmelBawa-msft March 20, 2026 21:08 View session

Merge branch 'feature/wsl-for-apps' into user/amelbawa/env

302eed9

Copilot AI reviewed Mar 20, 2026

View reviewed changes

test/windows/wslc/e2e/WSLCE2EHelpers.cpp Show resolved Hide resolved

test/windows/wslc/WSLCCLIEnvVarParserUnitTests.cpp Show resolved Hide resolved

OneBlue reviewed Mar 21, 2026

View reviewed changes

AmelBawa-msft added 3 commits March 20, 2026 20:37

Resolve conflicts

9a508a6

Merge branch 'user/amelbawa/env' of https://github.com/microsoft/wsl …

5997a19

…into user/amelbawa/env

Resolve conflicts

098a9b5

Copilot AI review requested due to automatic review settings March 23, 2026 17:36

Copilot started reviewing on behalf of AmelBawa-msft March 23, 2026 17:37 View session

Copilot AI reviewed Mar 23, 2026

View reviewed changes

src/windows/wslc/services/ContainerModel.cpp Outdated Show resolved Hide resolved

test/windows/wslc/e2e/WSLCE2EContainerCreateTests.cpp Show resolved Hide resolved

AmelBawa-msft added 2 commits March 23, 2026 11:18

Addressed comments

fa688d4

Fix test

1e5b7c2

Copilot AI review requested due to automatic review settings March 23, 2026 22:06

Copilot started reviewing on behalf of AmelBawa-msft March 23, 2026 22:07 View session

Copilot AI reviewed Mar 23, 2026

View reviewed changes

src/windows/wslc/services/ContainerModel.cpp Show resolved Hide resolved

AmelBawa-msft requested a review from OneBlue March 24, 2026 02:58

OneBlue approved these changes Mar 25, 2026

View reviewed changes

Conversation

AmelBawa-msft commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

OneBlue left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

AmelBawa-msft commented Mar 19, 2026 •

edited

Loading