Skip to content

Repository navigation

Suggest closest package when trying to create or scale a cluster #235

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

Open
bashofmann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Suggest closest package when trying to create or scale a cluster #235

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
197 changes: 197 additions & 0 deletions internal/cmd/cluster/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cluster_test
import (
"context"
"encoding/json"
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -437,6 +438,202 @@ func TestCreateCluster_PackageByResourcesNoMatch(t *testing.T) {
assert.Contains(t, err.Error(), "no package found")
}

func TestCreateCluster_PackageByResourcesNoMatchSuggestsClosest(t *testing.T) {
env := testutil.NewTestEnv(t)

pkg := func(name, cpu, ram, disk string) *bookingv1.Package {
return &bookingv1.Package{
Id: "pkg-" + name,
Name: name,
ResourceConfiguration: &bookingv1.ResourceConfiguration{
Cpu: cpu,
Ram: ram,
Disk: disk,
},
}
}
env.BookingServer.ListPackagesCalls.Returns(&bookingv1.ListPackagesResponse{
Items: []*bookingv1.Package{
pkg("large", "4000m", "16GiB", "128Gi"),
pkg("tiny", "500m", "1GiB", "8GiB"),
pkg("medium", "2000m", "8GiB", "64GiB"),
pkg("small", "1000m", "4GiB", "32GiB"),
},
}, nil)

_, _, err := testutil.Exec(t, env,
"cluster", "create",
"--name", "my-cluster",
"--cloud-provider", "aws",
"--cloud-region", "us-east-1",
"--cpu", "2",
"--ram", "4GiB",
)
require.Error(t, err)
assert.Equal(t, `no package found matching cpu="2" ram="4GiB"
next biggest package: medium (cpu=2 ram=8GiB)
closest available packages:
NAME CPU RAM DISK
medium 2 8GiB 64GiB
small 1 4GiB 32GiB
large 4 16GiB 128GiB
tiny 500m 1GiB 8GiB
use 'package list' to see all available packages`, err.Error())
assert.Equal(t, 0, env.Server.CreateClusterCalls.Count())
}

func TestCreateCluster_PackageByResourcesNoMatchSuggestsNextBiggestFirst(t *testing.T) {
env := testutil.NewTestEnv(t)

pkg := func(name, cpu, ram string) *bookingv1.Package {
return &bookingv1.Package{
Id: "pkg-" + name,
Name: name,
ResourceConfiguration: &bookingv1.ResourceConfiguration{Cpu: cpu, Ram: ram, Disk: "16Gi"},
}
}
env.BookingServer.ListPackagesCalls.Returns(&bookingv1.ListPackagesResponse{
Items: []*bookingv1.Package{
pkg("gpx1", "500m", "2Gi"),
pkg("mx1", "500m", "4Gi"),
pkg("mx2", "1000m", "8Gi"),
pkg("mx3", "2000m", "16Gi"),
pkg("gpx4", "4000m", "16Gi"),
},
}, nil)

_, _, err := testutil.Exec(t, env,
"cluster", "create",
"--name", "my-cluster",
"--cloud-provider", "aws",
"--cloud-region", "eu-central-1",
"--cpu", "0.5",
"--ram", "12Gi",
)
require.Error(t, err)
assert.Equal(t, `no package found matching cpu="500m" ram="12GiB"
next biggest package: mx3 (cpu=2 ram=16GiB)
closest available packages:
NAME CPU RAM DISK
mx3 2 16GiB 16GiB
mx1 500m 4GiB 16GiB
mx2 1 8GiB 16GiB
gpx1 500m 2GiB 16GiB
gpx4 4 16GiB 16GiB
use 'package list' to see all available packages`, err.Error())
}

func TestCreateCluster_PackageByResourcesNoMatchNothingBigEnough(t *testing.T) {
env := testutil.NewTestEnv(t)

pkg := func(name, cpu, ram string) *bookingv1.Package {
return &bookingv1.Package{
Id: "pkg-" + name,
Name: name,
ResourceConfiguration: &bookingv1.ResourceConfiguration{Cpu: cpu, Ram: ram, Disk: "32Gi"},
}
}
env.BookingServer.ListPackagesCalls.Returns(&bookingv1.ListPackagesResponse{
Items: []*bookingv1.Package{
pkg("small", "1000m", "4Gi"),
pkg("large", "4000m", "16Gi"),
pkg("medium", "2000m", "8Gi"),
},
}, nil)

_, _, err := testutil.Exec(t, env,
"cluster", "create",
"--name", "my-cluster",
"--cloud-provider", "aws",
"--cloud-region", "us-east-1",
"--cpu", "8",
"--ram", "64Gi",
)
require.Error(t, err)
assert.Equal(t, `no package found matching cpu="8" ram="64GiB"
closest available packages:
NAME CPU RAM DISK
large 4 16GiB 32GiB
medium 2 8GiB 32GiB
small 1 4GiB 32GiB
use 'package list' to see all available packages`, err.Error())
}

func TestCreateCluster_PackageByResourcesNoMatchWithGPU(t *testing.T) {
env := testutil.NewTestEnv(t)

pkg := func(name, cpu, ram, gpu string) *bookingv1.Package {
return &bookingv1.Package{
Id: "pkg-" + name,
Name: name,
ResourceConfiguration: &bookingv1.ResourceConfiguration{Cpu: cpu, Ram: ram, Gpu: &gpu, Disk: "128Gi"},
}
}
env.BookingServer.ListPackagesCalls.Returns(&bookingv1.ListPackagesResponse{
Items: []*bookingv1.Package{
pkg("ax4", "4000m", "16Gi", "1000m"),
pkg("ax5", "8000m", "32Gi", "1000m"),
pkg("ax-big", "8000m", "64Gi", "2000m"),
},
}, nil)

_, _, err := testutil.Exec(t, env,
"cluster", "create",
"--name", "my-cluster",
"--cloud-provider", "aws",
"--cloud-region", "us-east-1",
"--cpu", "4",
"--ram", "32Gi",
"--gpu", "2",
)
require.Error(t, err)
assert.Equal(t, `no package found matching cpu="4" ram="32GiB" gpu="2"
next biggest package: ax-big (cpu=8 ram=64GiB gpu=2)
closest available packages:
NAME CPU RAM GPU DISK
ax-big 8 64GiB 2 128GiB
ax4 4 16GiB 1 128GiB
ax5 8 32GiB 1 128GiB
use 'package list' to see all available packages`, err.Error())

req, ok := env.BookingServer.ListPackagesCalls.Last()
require.True(t, ok)
assert.True(t, req.GetGpu())
}

func TestCreateCluster_PackageByResourcesNoMatchLimitsSuggestions(t *testing.T) {
env := testutil.NewTestEnv(t)

var items []*bookingv1.Package
for i := 1; i <= 8; i++ {
items = append(items, &bookingv1.Package{
Id: fmt.Sprintf("pkg-%d", i),
Name: fmt.Sprintf("pkg-%d", i),
ResourceConfiguration: &bookingv1.ResourceConfiguration{Cpu: fmt.Sprintf("%d", i), Ram: fmt.Sprintf("%dGiB", 4*i)},
})
}

env.BookingServer.ListPackagesCalls.Returns(&bookingv1.ListPackagesResponse{Items: items}, nil)

_, _, err := testutil.Exec(t, env,
"cluster", "create",
"--name", "my-cluster",
"--cloud-provider", "aws",
"--cloud-region", "us-east-1",
"--cpu", "3",
"--ram", "4GiB",
)
require.Error(t, err)
msg := err.Error()
for _, name := range []string{"pkg-1 ", "pkg-2 ", "pkg-3 ", "pkg-4 ", "pkg-5 "} {
assert.Contains(t, msg, name)
}

for _, name := range []string{"pkg-6 ", "pkg-7 ", "pkg-8 "} {
assert.NotContains(t, msg, name)
}
}

func TestCreateCluster_PackageByResourcesAmbiguous(t *testing.T) {
env := testutil.NewTestEnv(t)

Expand Down
22 changes: 22 additions & 0 deletions internal/cmd/cluster/scale_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,28 @@ func TestScale_PackageNotFound(t *testing.T) {
assert.Contains(t, err.Error(), "no package found")
}

func TestScale_PackageNotFoundSuggestsClosest(t *testing.T) {
env := testutil.NewTestEnv(t)
currentPkg := newPkg(pkgID1, "1000m", "4GiB", "50GiB")
env.Server.GetClusterCalls.Returns(&clusterv1.GetClusterResponse{Cluster: baseCluster()}, nil)
env.BookingServer.GetPackageCalls.Returns(&bookingv1.GetPackageResponse{Package: currentPkg}, nil)
env.BookingServer.ListPackagesCalls.Returns(&bookingv1.ListPackagesResponse{Items: []*bookingv1.Package{
newPkg("pkg-big", "4000m", "16GiB", "100GiB"),
newPkg("pkg-near", "2000m", "8GiB", "80GiB"),
}}, nil)

_, _, err := testutil.Exec(t, env, "cluster", "scale", "cluster-123", "--cpu", "3", "--force")
require.Error(t, err)
assert.Equal(t, `no package found matching cpu="3" ram="4GiB"
next biggest package: pkg-big (cpu=4 ram=16GiB)
closest available packages:
NAME CPU RAM DISK
pkg-big 4 16GiB 100GiB
pkg-near 2 8GiB 80GiB
use 'package list' to see all available packages`, err.Error())
assert.Equal(t, 0, env.Server.UpdateClusterCalls.Count())
}

func TestScale_AmbiguousPackageMatch(t *testing.T) {
env := testutil.NewTestEnv(t)
currentPkg := newPkg(pkgID1, "1000m", "4GiB", "50GiB")
Expand Down
Loading
Loading