fix: move docker-credential-osxkeychain back to /usr/local/bin - #1803
Merged
Merged
Conversation
Swapnanil-Gupta
force-pushed
the
oskeychain-path-fix
branch
from
August 26, 2026 23:01
933ae0e to
5fe6598
Compare
Signed-off-by: Swapnanil-Gupta <swpnlg@amazon.com>
Signed-off-by: Swapnanil-Gupta <swpnlg@amazon.com>
Signed-off-by: Swapnanil-Gupta <swpnlg@amazon.com>
Swapnanil-Gupta
force-pushed
the
oskeychain-path-fix
branch
6 times, most recently
from
August 28, 2026 21:00
9b31306 to
b3b377d
Compare
Swapnanil-Gupta
changed the title
Swapnanil-Gupta
force-pushed
the
oskeychain-path-fix
branch
3 times, most recently
from
August 28, 2026 21:56
ed7e297 to
37c7deb
Compare
Signed-off-by: Swapnanil-Gupta <swpnlg@amazon.com>
Swapnanil-Gupta
force-pushed
the
oskeychain-path-fix
branch
from
August 31, 2026 16:26
37c7deb to
6a46fe5
Compare
coderbirju
marked this pull request as ready for review
September 9, 2026 18:52
…tainer running on WS2025
- cmd/finch/nerdctl_windows.go: resolveIP queried the WSL adapter as
"vEthernet (WSL)", but Windows Server 2025 renamed it to
"vEthernet (WSL (Hyper-V firewall))". On WS2025 the old name matches no
adapter, so host-gateway resolved to an empty IP and `run --add-host
test-host:host-gateway` failed. Updated the adapter name (and the two unit
test mocks) to match. Verified the adapter name empirically on a WS2025 host
(netsh reports "vEthernet (WSL (Hyper-V firewall))") and via
go test ./cmd/finch/ on Windows Server 2025.
- e2e/vm/additional_disk_test.go: after recreating the VM, `start` returns
before the container task is running, so the immediate `exec` failed with
"cannot exec in a stopped state" for the whole 15s window. Wait for
{{.State.Running}}==true before exec'ing, matching the pattern already used in
cosign_test.go and finch_config_file_remote_test.go.
Signed-off-by: Arjun Yogidas <arjunry@amazon.com>
coderbirju
force-pushed
the
oskeychain-path-fix
branch
from
September 10, 2026 00:59
c340e20 to
1ae94b7
Compare
wsl --list exits 1 when no distributions are installed (expected on a fresh/recreated WS2025 runner), which failed the Remove Finch VM step before build/test could run. Force exit 0, harden Remove-Item, and drop the invalid 'timeout 60s'. Signed-off-by: Arjun Yogidas <arjunry@amazon.com>
…dapters The WSL host adapter name differs by Windows version: - Server 2022 / older WSL: "vEthernet (WSL)" - Server 2025 / Win11 22H2+ (mirrored): "vEthernet (WSL (Hyper-V firewall))" resolveIP hardcoded the 2025 name, so `finch run --add-host X:host-gateway` failed with "exit status 1" on Server 2022 runners (netsh couldn't find the interface). Try both adapter names and use the first that yields an address, so it works on both. Also invoke netsh.exe directly instead of via "cmd /C" (routing the quoted, parenthesized interface name through cmd mangles the argument) and surface the netsh output on failure. Unit tests updated to match. Signed-off-by: ShashankReddy Boyapally <shasboy@amazon.com>
Signed-off-by: ShashankReddy Boyapally <shasboy@amazon.com>
smandhada16
approved these changes
Sep 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
#1785 moved
docker-credential-osxkeychainto/opt/finch/binfrom/usr/local/bin. So any runner that does not have/opt/finch/binin PATH will fail to finddocker-credential-osxkeychainand fall back to plain text creds.This PR fixes it by:
/usr/local/bin(reverts the path changes made in fix: credhelper fixups #1785).Testing done:
License Acceptance
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.