Skip to content

[v17] Machine ID: Fix tshwrap destination dir handling#48250

Merged
timothyb89 merged 4 commits intobranch/v17from
bot/backport-48186-branch/v17
Nov 1, 2024
Merged

[v17] Machine ID: Fix tshwrap destination dir handling#48250
timothyb89 merged 4 commits intobranch/v17from
bot/backport-48186-branch/v17

Conversation

@timothyb89
Copy link
Copy Markdown
Contributor

Backport #48186 to branch/v17

Recent CLI handling changes broke destination dir resolution for
commands that use `tshwrap.GetDestinationDir()` to resolve
destinations from either the CLI or config file.

The old behavior depends on implicit creation of an identity service
if `--destination-dir` was provided on the CLI and no config file is
loaded. We now no longer make this assumption and prefer to only
resolve explicit configurations, so this tweaks
`tshwrap.GetDestinationDir()` to explicitly handle the CLI parameter
rather than hoping it appears in the generated config.

While this is legacy functionality, it's not slated for removal in
v17. Most users should still prefer to use the new app and database
tunnel services wherever possible.

Fixes #48107
@timothyb89 timothyb89 added the no-changelog Indicates that a PR does not require a changelog entry label Oct 31, 2024
@timothyb89 timothyb89 enabled auto-merge November 1, 2024 19:47
@timothyb89 timothyb89 added this pull request to the merge queue Nov 1, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Nov 1, 2024
@timothyb89 timothyb89 added this pull request to the merge queue Nov 1, 2024
Merged via the queue into branch/v17 with commit dab886c Nov 1, 2024
@timothyb89 timothyb89 deleted the bot/backport-48186-branch/v17 branch November 1, 2024 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport machine-id 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.

3 participants