Skip to content

feat(ske): Check service enablement only in error case #1457

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
Fyusel merged 1 commit into from
Jul 7, 2026
+21 −21
Merged

feat(ske): Check service enablement only in error case #1457

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
23 changes: 11 additions & 12 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 @@ -95,21 +95,20 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
return err
}

// Check if the project is enabled before trying to create
enabled, err := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId, model.Region)
if err != nil {
return err
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "ske",
}
}

// Check if cluster exists
exists, err := skeUtils.ClusterExists(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.ClusterName)
if err != nil {
return err
// Check if the project is enabled
enabled, enabledErr := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if project is enabled failed: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "ske",
}
}
return fmt.Errorf("cluster exists check failed: %w", err)
}
if exists {
return fmt.Errorf("cluster with name %s already exists", model.ClusterName)
Expand Down
19 changes: 10 additions & 9 deletions internal/cmd/ske/cluster/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,20 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
return err
}

// Check if SKE is enabled for this project
enabled, err := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId, model.Region)
if err != nil {
return err
}
if !enabled {
return fmt.Errorf("SKE isn't enabled for this project, please run 'stackit ske enable'")
}

// Call API
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if SKE is enabled for this project
enabled, enabledErr := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if project is enabled failed: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "ske",
}
}
return fmt.Errorf("get SKE clusters: %w", err)
}
clusters := resp.Items
Expand Down
Loading