Skip to content

daemon.Service: Rename GetCluster to ResolveFullCluster #19180

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
ravicious merged 2 commits into from
Dec 8, 2022
Merged

daemon.Service: Rename GetCluster to ResolveFullCluster #19180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16f8969
daemon.Service: Rename GetCluster to ResolveFullCluster
ravicious Dec 8, 2022
9c27e65
Merge branch 'master' into ravicious/rename-get-cluster
ravicious Dec 8, 2022
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
2 changes: 1 addition & 1 deletion lib/teleterm/apiserver/handler/handler_clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (s *Handler) RemoveCluster(ctx context.Context, req *api.RemoveClusterReque

// GetCluster returns a cluster
func (s *Handler) GetCluster(ctx context.Context, req *api.GetClusterRequest) (*api.Cluster, error) {
cluster, err := s.DaemonService.GetCluster(ctx, req.ClusterUri)
cluster, err := s.DaemonService.ResolveFullCluster(ctx, req.ClusterUri)
if err != nil {
return nil, trace.Wrap(err)
}
Expand Down
4 changes: 2 additions & 2 deletions lib/teleterm/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ func (s *Service) ResolveCluster(uri string) (*clusters.Cluster, error) {
return cluster, nil
}

// GetCluster returns full cluster information. It makes a request to the auth server.
func (s *Service) GetCluster(ctx context.Context, uri string) (*clusters.Cluster, error) {
// ResolveFullCluster returns full cluster information. It makes a request to the auth server.
func (s *Service) ResolveFullCluster(ctx context.Context, uri string) (*clusters.Cluster, error) {
cluster, err := s.ResolveCluster(uri)
if err != nil {
return nil, trace.Wrap(err)
Expand Down