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

[v10] Ensure tctl windows_desktops ls produces expected output #19015

Merged
merged 3 commits into from Dec 5, 2022

Conversation

vitorenesduarte
Copy link
Contributor

Backport #18779 to branch/v10

This commit ensures that `tctl desktops ls --format json|yaml` outputs a
list of `windows_desktop` resources. Note that `tctl desktops ls`
displays additional information that is only present in the
`windows_desktop_service`.

With `tctl windows_desktops ls --format json` now we get something like the
following:
```json
[
    {
        "kind": "windows_desktop",
        "version": "v3",
        "metadata": {
            ...
        },
        "spec": {
            ...
        }
    },
    ...
]
```

`tctl windows_desktops ls --format text` now also displays the same information
as `tctl get windows_desktop --format text` (removing all the info about the
`windows_desktop_service`):

```bash
❯ tctl get windows_desktop --format text 
Name                        Address           AD Domain   Labels 
--------------------------- ----------------- ----------- ------ 
EC2AMAZ-QME01PL-example-com 172.31.4.209:3389 example.com        

❯ tctl windows_desktops ls             
Name                        Address           AD Domain   Labels 
--------------------------- ----------------- ----------- ------ 
EC2AMAZ-QME01PL-example-com 172.31.4.209:3389 example.com      
```
@github-actions github-actions bot added backport tctl tctl - Teleport admin tool labels Dec 2, 2022
@vitorenesduarte vitorenesduarte enabled auto-merge (squash) December 2, 2022 18:38
@vitorenesduarte vitorenesduarte merged commit b6c235e into branch/v10 Dec 5, 2022
@vitorenesduarte vitorenesduarte deleted the vitor/backport-18779/v10 branch December 5, 2022 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport tctl tctl - Teleport admin tool
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants