Skip to content

Commit 674d387

Browse files
authored
fix: deprecated endpoints for validating ske service state (#562)
* Fix: Replace deprecated endpoint for ske service state * Remove deprecated commands (`ske credentials rotate` and `ske credentials describe`)
1 parent b39e32c commit 674d387

File tree

13 files changed

+166
-786
lines changed

13 files changed

+166
-786
lines changed

internal/cmd/ske/cluster/create/create.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
16+
serviceEnablementClient "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/client"
17+
serviceEnablementUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/utils"
1618
"github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/client"
1719
skeUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/utils"
1820
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
@@ -87,8 +89,14 @@ func NewCmd(p *print.Printer) *cobra.Command {
8789
}
8890
}
8991

92+
// Configure ServiceEnable API client
93+
serviceEnablementApiClient, err := serviceEnablementClient.ConfigureClient(p)
94+
if err != nil {
95+
return err
96+
}
97+
9098
// Check if the project is enabled before trying to create
91-
enabled, err := skeUtils.ProjectEnabled(ctx, apiClient, model.ProjectId)
99+
enabled, err := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId)
92100
if err != nil {
93101
return err
94102
}

internal/cmd/ske/cluster/list/list.go

+9-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ import (
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
16+
serviceEnablementClient "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/client"
17+
serviceEnablementUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/utils"
1618
"github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/client"
17-
skeUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/utils"
1819
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
1920

2021
"github.com/spf13/cobra"
@@ -60,8 +61,14 @@ func NewCmd(p *print.Printer) *cobra.Command {
6061
return err
6162
}
6263

64+
// Configure ServiceEnable API client
65+
serviceEnablementApiClient, err := serviceEnablementClient.ConfigureClient(p)
66+
if err != nil {
67+
return err
68+
}
69+
6370
// Check if SKE is enabled for this project
64-
enabled, err := skeUtils.ProjectEnabled(ctx, apiClient, model.ProjectId)
71+
enabled, err := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId)
6572
if err != nil {
6673
return err
6774
}

internal/cmd/ske/credentials/credentials.go

-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package credentials
22

33
import (
44
completerotation "github.com/stackitcloud/stackit-cli/internal/cmd/ske/credentials/complete-rotation"
5-
"github.com/stackitcloud/stackit-cli/internal/cmd/ske/credentials/describe"
6-
"github.com/stackitcloud/stackit-cli/internal/cmd/ske/credentials/rotate"
75
startrotation "github.com/stackitcloud/stackit-cli/internal/cmd/ske/credentials/start-rotation"
86
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
97
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
@@ -25,8 +23,6 @@ func NewCmd(p *print.Printer) *cobra.Command {
2523
}
2624

2725
func addSubcommands(cmd *cobra.Command, p *print.Printer) {
28-
cmd.AddCommand(describe.NewCmd(p))
29-
cmd.AddCommand(rotate.NewCmd(p))
3026
cmd.AddCommand(startrotation.NewCmd(p))
3127
cmd.AddCommand(completerotation.NewCmd(p))
3228
}

internal/cmd/ske/credentials/describe/describe.go

-146
This file was deleted.

0 commit comments

Comments
 (0)