Skip to content

[v15] Fix access request promotion of windows_desktop resources #40712

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.

Sign up for GitHub

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

Merged
lxea merged 1 commit into from
Apr 23, 2024
Merged

[v15] Fix access request promotion of windows_desktop resources #40712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions lib/services/local/presence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,9 @@ func (s *PresenceService) listResources(ctx context.Context, req proto.ListResou
case types.KindWindowsDesktopService:
keyPrefix = []string{windowsDesktopServicesPrefix}
unmarshalItemFunc = backendItemToWindowsDesktopService
case types.KindWindowsDesktop:
keyPrefix = []string{windowsDesktopsPrefix}
unmarshalItemFunc = backendItemToWindowsDesktop
case types.KindKubeServer:
keyPrefix = []string{kubeServersPrefix}
unmarshalItemFunc = backendItemToKubernetesServer
Expand Down Expand Up @@ -1937,6 +1940,17 @@ func backendItemToServer(kind string) backendItemToResourceFunc {
}
}

// backendItemToWindowsDesktop unmarshals `backend.Item` into a
// `types.WindowsDesktop`, returning it as a `types.ResourceWithLabels`.
func backendItemToWindowsDesktop(item backend.Item) (types.ResourceWithLabels, error) {
return services.UnmarshalWindowsDesktop(
item.Value,
services.WithResourceID(item.ID),
services.WithExpires(item.Expires),
services.WithRevision(item.Revision),
)
}

// backendItemToWindowsDesktopService unmarshals `backend.Item` into a
// `types.WindowsDesktopService`, returning it as a `types.ResourceWithLabels`.
func backendItemToWindowsDesktopService(item backend.Item) (types.ResourceWithLabels, error) {
Expand Down
19 changes: 19 additions & 0 deletions lib/services/local/presence_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,25 @@ func TestListResources(t *testing.T) {
return presence.DeleteAllWindowsDesktopServices(ctx)
},
},
"WindowsDesktop": {
resourceType: types.KindWindowsDesktop,
createResourceFunc: func(ctx context.Context, presence *PresenceService, name string, labels map[string]string) error {
desktopService := NewWindowsDesktopService(presence.Backend)
desktop, err := types.NewWindowsDesktopV3(name, labels, types.WindowsDesktopSpecV3{
Addr: "localhost:1234",
})
if err != nil {
return err
}

err = desktopService.UpsertWindowsDesktop(ctx, desktop)
return err
},
deleteAllResourcesFunc: func(ctx context.Context, presence *PresenceService) error {
desktopService := NewWindowsDesktopService(presence.Backend)
return desktopService.DeleteAllWindowsDesktops(ctx)
},
},
}

for testName, test := range tests {
Expand Down