Skip to content

[v15] Fix TestReadEnvironmentFile on macOS#38215

Merged
zmb3 merged 2 commits intobranch/v15from
bot/backport-38022-branch/v15
Feb 15, 2024
Merged

[v15] Fix TestReadEnvironmentFile on macOS#38215
zmb3 merged 2 commits intobranch/v15from
bot/backport-38022-branch/v15

Conversation

@zmb3
Copy link
Copy Markdown
Collaborator

@zmb3 zmb3 commented Feb 14, 2024

Backport #38022 to branch/v15

zmb3 and others added 2 commits February 14, 2024 01:08
This test writes sample data to a temporary file and then tries to
parse it. In #34177 we disallowed reading the environment file from
a symlink, but the Go utilities we use to create temp files end up
using symlinks on macOS.

Fix this by breaking out the core functionality such that it only
requires an io.Reader instead of an os.File.
Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
@zmb3 zmb3 added the no-changelog Indicates that a PR does not require a changelog entry label Feb 14, 2024
@zmb3 zmb3 enabled auto-merge February 14, 2024 16:10
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from jakule February 15, 2024 09:50
@zmb3 zmb3 added this pull request to the merge queue Feb 15, 2024
Merged via the queue into branch/v15 with commit 8aeccf6 Feb 15, 2024
@zmb3 zmb3 deleted the bot/backport-38022-branch/v15 branch February 15, 2024 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport no-changelog Indicates that a PR does not require a changelog entry size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants