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.

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

ssh - completion with machine objects #347

Merged
merged 16 commits into from
Jan 10, 2024
Merged

ssh - completion with machine objects #347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6850243
get machine object
tedteng Oct 12, 2023
12af451
add checkuserroes
tedteng Oct 17, 2023
2fc9b0c
add unit test
tedteng Oct 19, 2023
2e5c18d
update
tedteng Oct 24, 2023
d27bcfa
update
tedteng Oct 31, 2023
a05a315
update MCM to 0.50.0
tedteng Dec 8, 2023
90fccbc
update ssh_test
tedteng Dec 11, 2023
16456f1
add more machines in ssh_test
tedteng Dec 12, 2023
e8436ee
add more machines in ssh_test
tedteng Dec 13, 2023
bc7ba8a
feedback
tedteng Dec 18, 2023
fac7dde
fix newtarget and test
tedteng Dec 26, 2023
8dae0bc
improve ssh tests
petersutter Jan 8, 2024
6cf5a94
fallback to node objects in case of errors
petersutter Jan 9, 2024
7211b3d
PR feedback
petersutter Jan 9, 2024
b0dd990
PR feedback
petersutter Jan 9, 2024
502ebf0
rename sshTarget to currentTarget
tedteng Jan 10, 2024
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
Prev Previous commit
Next Next commit
PR feedback
  • Loading branch information
@petersutter
petersutter committed Jan 9, 2024
commit 7211b3d9eeb2754f62625a54c07f0a3e28ba2e5a
8 changes: 1 addition & 7 deletions pkg/cmd/ssh/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,15 +821,9 @@ func cleanup(ctx context.Context, o *SSHOptions, gardenClient client.Client, bas
}
}

func getNodeNamesFromMachinesOrNodes(f util.Factory) ([]string, error) {
ctx := f.Context()
func getNodeNamesFromMachinesOrNodes(ctx context.Context, manager target.Manager) ([]string, error) {
logger := klog.FromContext(ctx)

manager, err := f.Manager()
if err != nil {
return nil, err
}

currentTarget, err := manager.CurrentTarget()
if err != nil {
return nil, err
Expand Down
8 changes: 7 additions & 1 deletion pkg/cmd/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ gardenctl ssh --keep-bastion --bastion-name cli-xxxxxxxx --public-key-file /path
return nil, cobra.ShellCompDirectiveNoFileComp
}

nodeNames, err := getNodeNamesFromMachinesOrNodes(f)
manager, err := f.Manager()
if err != nil {
logger.Error(err, "could not get manager from factory")
return nil, cobra.ShellCompDirectiveNoFileComp
}

nodeNames, err := getNodeNamesFromMachinesOrNodes(ctx, manager)
if err != nil {
logger.Error(err, "could not get node names from shoot")
return nil, cobra.ShellCompDirectiveNoFileComp
Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/ssh/ssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,13 +682,13 @@ var _ = Describe("SSH Command", func() {

factory.ManagerImpl = manager
manager.EXPECT().CurrentTarget().Return(currentTarget, nil)
manager.EXPECT().GardenClient(currentTarget.GardenName()).Return(client, nil).AnyTimes()
manager.EXPECT().GardenClient(currentTarget.GardenName()).Return(client, nil)

client.EXPECT().FindShoot(ctx, currentTarget.AsListOption()).Return(testShoot, nil)
})

It("should return all names based on machine objects", func() {
manager.EXPECT().SeedClient(ctx, gomock.Any()).Return(seedClient, nil).AnyTimes()
manager.EXPECT().SeedClient(ctx, gomock.Any()).Return(seedClient, nil)

options := ssh.NewSSHOptions(streams)
cmd := ssh.NewCmdSSH(factory, options)
Expand All @@ -701,8 +701,8 @@ var _ = Describe("SSH Command", func() {

It("should return all names based on node objects", func() {
errForbidden := &apierrors.StatusError{ErrStatus: metav1.Status{Reason: metav1.StatusReasonForbidden}}
manager.EXPECT().SeedClient(gomock.Any(), gomock.Any()).Return(nil, errForbidden).AnyTimes()
manager.EXPECT().ShootClient(gomock.Any(), gomock.Any()).Return(shootClient, nil).AnyTimes()
manager.EXPECT().SeedClient(gomock.Any(), gomock.Any()).Return(nil, errForbidden)
manager.EXPECT().ShootClient(gomock.Any(), gomock.Any()).Return(shootClient, nil)
petersutter marked this conversation as resolved.
Show resolved Hide resolved

options := ssh.NewSSHOptions(streams)
cmd := ssh.NewCmdSSH(factory, options)
Expand All @@ -714,7 +714,7 @@ var _ = Describe("SSH Command", func() {
})

It("should find nodes based on their prefix from machine objects", func() {
manager.EXPECT().SeedClient(ctx, gomock.Any()).Return(seedClient, nil).AnyTimes()
manager.EXPECT().SeedClient(ctx, gomock.Any()).Return(seedClient, nil)

options := ssh.NewSSHOptions(streams)
cmd := ssh.NewCmdSSH(factory, options)
Expand Down