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.

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

chore: restructure vnet for windows support #49921

Merged
merged 4 commits into from
Dec 10, 2024

Conversation

nklaassen
Copy link
Contributor

In preparation for adding Windows support to VNet, I have restructured the package/file structure a bit in a way that I think makes more sense and narrows the scope of OS-specific code. I'm not adding or removing any real code here, just moving things around and adding some stubs for Windows.

I also unexported some identifiers that did not need to be exported, in an attempt to make it more clear what is actually called from outside the vnet package.

This commit does not make any functional changes except for adding the hidden tsh vnet and tsh vnet-admin-setup commands on windows that will just return errors.

In preparation for adding Windows support to VNet, I have restructured
the package/file structure a bit in a way that I think makes more sense
and narrows the scope of OS-specific code.

I also unexported some identifiers that did not need to be exported, in
an attempt to make it more clear what is actually called from outside
the vnet package.

This commit does not make any functional changes except for adding the
hidden `tsh vnet` and `tsh vnet-admin-setup` commands on windows that
will just return errors.
@github-actions github-actions bot added size/md tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Dec 7, 2024
@github-actions github-actions bot requested review from avatus and mvbrock December 7, 2024 02:24
@ravicious ravicious self-requested a review December 9, 2024 10:18
lib/vnet/app_resolver.go Outdated Show resolved Hide resolved
lib/vnet/app_resolver.go Outdated Show resolved Hide resolved
lib/vnet/reexec_daemon_darwin.go Outdated Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding the filename, I'm not sure how accurate reexec is in the context of the daemon – there's no reexecing being done. OTOH, I don't have a better idea. The only thing that comes to my mind is renaming this and others to run_daemon_darwin.go.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

renamed to escalate since the point is to escalate to root/administrator

@nklaassen nklaassen added the no-changelog Indicates that a PR does not require a changelog entry label Dec 9, 2024
@nklaassen nklaassen enabled auto-merge December 9, 2024 21:54
@nklaassen nklaassen disabled auto-merge December 9, 2024 22:22
@nklaassen nklaassen enabled auto-merge December 9, 2024 22:25
@nklaassen nklaassen added this pull request to the merge queue Dec 9, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 9, 2024
@nklaassen nklaassen added this pull request to the merge queue Dec 9, 2024
Merged via the queue into master with commit 986bad7 Dec 10, 2024
40 checks passed
@nklaassen nklaassen deleted the nklaassen/windows-vnet-restructure branch December 10, 2024 00:15
@public-teleport-github-review-bot

@nklaassen See the table below for backport results.

Branch Result
branch/v17 Failed

ravicious pushed a commit that referenced this pull request Dec 10, 2024
* chore: restructure vnet for windows support

In preparation for adding Windows support to VNet, I have restructured
the package/file structure a bit in a way that I think makes more sense
and narrows the scope of OS-specific code.

I also unexported some identifiers that did not need to be exported, in
an attempt to make it more clear what is actually called from outside
the vnet package.

This commit does not make any functional changes except for adding the
hidden `tsh vnet` and `tsh vnet-admin-setup` commands on windows that
will just return errors.

* fix renames in comments

* switch reexec to escalate

* fix-imports
ravicious pushed a commit that referenced this pull request Dec 10, 2024
* chore: restructure vnet for windows support

In preparation for adding Windows support to VNet, I have restructured
the package/file structure a bit in a way that I think makes more sense
and narrows the scope of OS-specific code.

I also unexported some identifiers that did not need to be exported, in
an attempt to make it more clear what is actually called from outside
the vnet package.

This commit does not make any functional changes except for adding the
hidden `tsh vnet` and `tsh vnet-admin-setup` commands on windows that
will just return errors.

* fix renames in comments

* switch reexec to escalate

* fix-imports
ravicious pushed a commit that referenced this pull request Dec 17, 2024
* chore: restructure vnet for windows support

In preparation for adding Windows support to VNet, I have restructured
the package/file structure a bit in a way that I think makes more sense
and narrows the scope of OS-specific code.

I also unexported some identifiers that did not need to be exported, in
an attempt to make it more clear what is actually called from outside
the vnet package.

This commit does not make any functional changes except for adding the
hidden `tsh vnet` and `tsh vnet-admin-setup` commands on windows that
will just return errors.

* fix renames in comments

* switch reexec to escalate

* fix-imports
github-merge-queue bot pushed a commit that referenced this pull request Dec 17, 2024
* chore: restructure vnet for windows support

In preparation for adding Windows support to VNet, I have restructured
the package/file structure a bit in a way that I think makes more sense
and narrows the scope of OS-specific code.

I also unexported some identifiers that did not need to be exported, in
an attempt to make it more clear what is actually called from outside
the vnet package.

This commit does not make any functional changes except for adding the
hidden `tsh vnet` and `tsh vnet-admin-setup` commands on windows that
will just return errors.

* fix renames in comments

* switch reexec to escalate

* fix-imports

Co-authored-by: Nic Klaassen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/branch/v17 no-changelog Indicates that a PR does not require a changelog entry size/md tsh tsh - Teleport's command line tool for logging into nodes running Teleport.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants