Skip to content

feat(ske): port to v2api version of SDK #1337

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
rubenhoenle merged 2 commits into from
Mar 11, 2026
Merged

feat(ske): port to v2api version of SDK #1337

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
6ee4f5c
feat(ske): port to v2api version of SDK
MichaelEischer Mar 10, 2026
e0e5f5c
fix test failures
MichaelEischer Mar 10, 2026
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.2.6
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7
github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0
github.com/stackitcloud/stackit-sdk-go/services/ske v1.9.0
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3
github.com/zalando/go-keyring v0.2.6
golang.org/x/mod v0.33.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,8 +654,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7 h1:M2PY
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7/go.mod h1:jitkQuP2K/SH63Qor0C4pcqz1GDCy/lK2H4t8/VDse4=
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.4.0 h1:ofdGO2dGH6ywKbIVxaxRVal3jWX9WlcHSm5BTud5bC4=
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.4.0/go.mod h1:r5lBwzJpJe2xBIYctkVIIpaZ41Y6vUEpkmsWR2VoQJs=
github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0 h1:l1QjxW7sdE/6B6BZtHxbmus8XJdI9KDuXX3fwUa5fog=
github.com/stackitcloud/stackit-sdk-go/services/ske v1.7.0/go.mod h1:1Jr+ImrmPERxbYnlTy6O2aSZYNnREf2qQyysv6YC1RY=
github.com/stackitcloud/stackit-sdk-go/services/ske v1.9.0 h1:pNEIQdUJMP5oMsBV/U9ENGBbzsFedb/3ZRC+Mw7bcYc=
github.com/stackitcloud/stackit-sdk-go/services/ske v1.9.0/go.mod h1:VW6csYWkytVufoiDMquVEdyF0amYICzOzSe6ynRRDsI=
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3 h1:AQrcr+qeIuZob+3TT2q1L4WOPtpsu5SEpkTnOUHDqfE=
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3/go.mod h1:8BBGC69WFXWWmKgzSjgE4HvsI7pEgO0RN2cASwuPJ18=
github.com/stbenjam/no-sprintf-host-port v0.3.1 h1:AyX7+dxI4IdLBPtDbsGAyqiTSLpCP9hWRrXQDU4Cm/g=
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/ske/cluster/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
skeUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/utils"
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
"github.com/stackitcloud/stackit-sdk-go/services/ske"
"github.com/stackitcloud/stackit-sdk-go/services/ske/wait"
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"
wait "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api/wait"
)

const (
Expand Down Expand Up @@ -106,7 +106,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
}

// Check if cluster exists
exists, err := skeUtils.ClusterExists(ctx, apiClient, model.ProjectId, model.Region, model.ClusterName)
exists, err := skeUtils.ClusterExists(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.ClusterName)
if err != nil {
return err
}
Expand All @@ -116,7 +116,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {

// Fill in default payload, if needed
if model.Payload == nil {
defaultPayload, err := skeUtils.GetDefaultPayload(ctx, apiClient, model.Region)
defaultPayload, err := skeUtils.GetDefaultPayload(ctx, apiClient.DefaultAPI, model.Region)
if err != nil {
return fmt.Errorf("get default payload: %w", err)
}
Expand All @@ -135,7 +135,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
if !model.Async {
s := spinner.New(params.Printer)
s.Start("Creating cluster")
_, err = wait.CreateOrUpdateClusterWaitHandler(ctx, apiClient, model.ProjectId, model.Region, name).WaitWithContext(ctx)
_, err = wait.CreateOrUpdateClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, name).WaitWithContext(ctx)
if err != nil {
return fmt.Errorf("wait for SKE cluster creation: %w", err)
}
Expand Down Expand Up @@ -182,7 +182,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
}

func buildRequest(ctx context.Context, model *inputModel, apiClient *ske.APIClient) ske.ApiCreateOrUpdateClusterRequest {
req := apiClient.CreateOrUpdateCluster(ctx, model.ProjectId, model.Region, model.ClusterName)
req := apiClient.DefaultAPI.CreateOrUpdateCluster(ctx, model.ProjectId, model.Region, model.ClusterName)

req = req.CreateOrUpdateClusterPayload(*model.Payload)
return req
Expand Down
59 changes: 29 additions & 30 deletions internal/cmd/ske/cluster/create/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package create

import (
"context"
"fmt"
"testing"
"time"

Expand All @@ -17,59 +16,59 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
"github.com/stackitcloud/stackit-sdk-go/services/ske"
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"
)

var projectIdFlag = globalflags.ProjectIdFlag

type testCtxKey struct{}

var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
var testClient = &ske.APIClient{}
var testClient = &ske.APIClient{DefaultAPI: &ske.DefaultAPIService{}}
var testProjectId = uuid.NewString()
var testClusterName = "cluster"

const testRegion = "eu01"

var testPayload = &ske.CreateOrUpdateClusterPayload{
Kubernetes: &ske.Kubernetes{
Version: utils.Ptr("1.25.15"),
Kubernetes: ske.Kubernetes{
Version: "1.25.15",
},
Nodepools: &[]ske.Nodepool{
Nodepools: []ske.Nodepool{
{
Name: utils.Ptr("np-name"),
Machine: &ske.Machine{
Image: &ske.Image{
Name: utils.Ptr("flatcar"),
Version: utils.Ptr("3760.2.1"),
Name: "np-name",
Machine: ske.Machine{
Image: ske.Image{
Name: "flatcar",
Version: "3760.2.1",
},
Type: utils.Ptr("b1.2"),
Type: "b1.2",
},
Minimum: utils.Ptr(int64(1)),
Maximum: utils.Ptr(int64(2)),
MaxSurge: utils.Ptr(int64(1)),
Volume: &ske.Volume{
Minimum: int32(1),
Maximum: int32(2),
MaxSurge: utils.Ptr(int32(1)),
Volume: ske.Volume{
Type: utils.Ptr("storage_premium_perf0"),
Size: utils.Ptr(int64(40)),
Size: int32(40),
},
AvailabilityZones: &[]string{"eu01-3"},
Cri: &ske.CRI{Name: ske.CRINAME_DOCKER.Ptr()},
AvailabilityZones: []string{"eu01-3"},
Cri: &ske.CRI{Name: utils.Ptr("containerd")},
},
},
Extensions: &ske.Extension{
Acl: &ske.ACL{
Enabled: utils.Ptr(true),
AllowedCidrs: &[]string{"0.0.0.0/0"},
Enabled: true,
AllowedCidrs: []string{"0.0.0.0/0"},
},
},
Maintenance: &ske.Maintenance{
AutoUpdate: &ske.MaintenanceAutoUpdate{
AutoUpdate: ske.MaintenanceAutoUpdate{
KubernetesVersion: utils.Ptr(true),
MachineImageVersion: utils.Ptr(true),
},
TimeWindow: &ske.TimeWindow{
End: utils.Ptr(time.Date(0, 1, 1, 5, 0, 0, 0, time.FixedZone("test-zone", 2*60*60))),
Start: utils.Ptr(time.Date(0, 1, 1, 3, 0, 0, 0, time.FixedZone("test-zone", 2*60*60))),
TimeWindow: ske.TimeWindow{
End: time.Date(0, 1, 1, 5, 0, 0, 0, time.FixedZone("test-zone", 2*60*60)),
Start: time.Date(0, 1, 1, 3, 0, 0, 0, time.FixedZone("test-zone", 2*60*60)),
},
},
}
Expand All @@ -88,8 +87,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
flagValues := map[string]string{
globalflags.ProjectIdFlag: testProjectId,
globalflags.RegionFlag: testRegion,
payloadFlag: fmt.Sprintf(`{
"name": "cli-jp",
payloadFlag: `{
"kubernetes": {
"version": "1.25.15"
},
Expand All @@ -107,7 +105,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
"maximum": 2,
"maxSurge": 1,
"volume": { "type": "storage_premium_perf0", "size": 40 },
"cri": { "name": "%s" },
"cri": { "name": "containerd" },
"availabilityZones": ["eu01-3"]
}
],
Expand All @@ -122,7 +120,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
"start": "0000-01-01T03:00:00+02:00"
}
}
}`, ske.CRINAME_DOCKER),
}`,
}
for _, mod := range mods {
mod(flagValues)
Expand All @@ -147,7 +145,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
}

func fixtureRequest(mods ...func(request *ske.ApiCreateOrUpdateClusterRequest)) ske.ApiCreateOrUpdateClusterRequest {
request := testClient.CreateOrUpdateCluster(testCtx, testProjectId, testRegion, fixtureInputModel().ClusterName)
request := testClient.DefaultAPI.CreateOrUpdateCluster(testCtx, testProjectId, testRegion, fixtureInputModel().ClusterName)
request = request.CreateOrUpdateClusterPayload(*testPayload)
for _, mod := range mods {
mod(&request)
Expand Down Expand Up @@ -262,6 +260,7 @@ func TestBuildRequest(t *testing.T) {
diff := cmp.Diff(request, tt.expectedRequest,
cmp.AllowUnexported(tt.expectedRequest),
cmpopts.EquateComparable(testCtx),
cmpopts.EquateComparable(testClient.DefaultAPI),
)
if diff != "" {
t.Fatalf("Data does not match: %s", diff)
Expand Down
8 changes: 4 additions & 4 deletions internal/cmd/ske/cluster/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"

"github.com/spf13/cobra"
"github.com/stackitcloud/stackit-sdk-go/services/ske"
"github.com/stackitcloud/stackit-sdk-go/services/ske/wait"
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"
wait "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api/wait"
)

const (
Expand Down Expand Up @@ -69,7 +69,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
if !model.Async {
s := spinner.New(params.Printer)
s.Start("Deleting cluster")
_, err = wait.DeleteClusterWaitHandler(ctx, apiClient, model.ProjectId, model.Region, model.ClusterName).WaitWithContext(ctx)
_, err = wait.DeleteClusterWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.ClusterName).WaitWithContext(ctx)
if err != nil {
return fmt.Errorf("wait for SKE cluster deletion: %w", err)
}
Expand Down Expand Up @@ -105,6 +105,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
}

func buildRequest(ctx context.Context, model *inputModel, apiClient *ske.APIClient) ske.ApiDeleteClusterRequest {
req := apiClient.DeleteCluster(ctx, model.ProjectId, model.Region, model.ClusterName)
req := apiClient.DefaultAPI.DeleteCluster(ctx, model.ProjectId, model.Region, model.ClusterName)
return req
}
7 changes: 4 additions & 3 deletions internal/cmd/ske/cluster/delete/delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
"github.com/stackitcloud/stackit-sdk-go/services/ske"
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"
)

var projectIdFlag = globalflags.ProjectIdFlag

type testCtxKey struct{}

var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
var testClient = &ske.APIClient{}
var testClient = &ske.APIClient{DefaultAPI: &ske.DefaultAPIService{}}
var testProjectId = uuid.NewString()
var testClusterName = "cluster"

Expand Down Expand Up @@ -61,7 +61,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
}

func fixtureRequest(mods ...func(request *ske.ApiDeleteClusterRequest)) ske.ApiDeleteClusterRequest {
request := testClient.DeleteCluster(testCtx, testProjectId, testRegion, testClusterName)
request := testClient.DefaultAPI.DeleteCluster(testCtx, testProjectId, testRegion, testClusterName)
for _, mod := range mods {
mod(&request)
}
Expand Down Expand Up @@ -156,6 +156,7 @@ func TestBuildRequest(t *testing.T) {
diff := cmp.Diff(request, tt.expectedRequest,
cmp.AllowUnexported(tt.expectedRequest),
cmpopts.EquateComparable(testCtx),
cmpopts.EquateComparable(testClient.DefaultAPI),
)
if diff != "" {
t.Fatalf("Data does not match: %s", diff)
Expand Down
14 changes: 7 additions & 7 deletions internal/cmd/ske/cluster/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/client"
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
"github.com/stackitcloud/stackit-sdk-go/services/ske"
ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api"
)

const (
Expand Down Expand Up @@ -85,7 +85,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
}

func buildRequest(ctx context.Context, model *inputModel, apiClient *ske.APIClient) ske.ApiGetClusterRequest {
req := apiClient.GetCluster(ctx, model.ProjectId, model.Region, model.ClusterName)
req := apiClient.DefaultAPI.GetCluster(ctx, model.ProjectId, model.Region, model.ClusterName)
return req
}

Expand All @@ -97,11 +97,11 @@ func outputResult(p *print.Printer, outputFormat string, cluster *ske.Cluster) e
return p.OutputResult(outputFormat, cluster, func() error {
acl := []string{}
if cluster.Extensions != nil && cluster.Extensions.Acl != nil {
acl = *cluster.Extensions.Acl.AllowedCidrs
acl = cluster.Extensions.Acl.AllowedCidrs
}

table := tables.NewTable()
table.AddRow("NAME", utils.PtrString(cluster.Name))
table.AddRow("NAME", cluster.Name)
table.AddSeparator()
if cluster.HasStatus() {
table.AddRow("STATE", utils.PtrString(cluster.Status.Aggregated))
Expand All @@ -110,8 +110,8 @@ func outputResult(p *print.Printer, outputFormat string, cluster *ske.Cluster) e
handleClusterErrors(clusterErrs, &table)
}
}
if cluster.Kubernetes != nil {
table.AddRow("VERSION", utils.PtrString(cluster.Kubernetes.Version))
if cluster.Kubernetes.Version != "" {
table.AddRow("VERSION", cluster.Kubernetes.Version)
table.AddSeparator()
}

Expand All @@ -131,7 +131,7 @@ func handleClusterErrors(clusterErrs []ske.ClusterError, table *tables.Table) {
b := new(strings.Builder)
fmt.Fprint(b, e.GetCode())
if msg, ok := e.GetMessageOk(); ok {
fmt.Fprintf(b, ": %s", msg)
fmt.Fprintf(b, ": %s", *msg)
}
errs = append(errs, b.String())
}
Expand Down
Loading
Loading