Skip to content

Commit bd67b2f

Browse files
committed
feat(telemetrylink): use util function
relates to STACKITCLI-383
1 parent ea56e48 commit bd67b2f

2 files changed

Lines changed: 10 additions & 22 deletions

File tree

‎internal/cmd/beta/telemetrylink/create/create.go‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import (
66

77
"github.com/stackitcloud/stackit-sdk-go/services/telemetrylink/v1api/wait"
88

9+
"github.com/stackitcloud/stackit-cli/internal/pkg/services/telemetrylink/utils"
10+
911
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1012

1113
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
@@ -21,7 +23,6 @@ import (
2123
telemetrylink "github.com/stackitcloud/stackit-sdk-go/services/telemetrylink/v1api"
2224

2325
rmClient "github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/client"
24-
rmUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/utils"
2526
)
2627

2728
const (
@@ -86,16 +87,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
8687
var resourceLabel string
8788
rmApiClient, err := rmClient.ConfigureClient(params.Printer, params.CliVersion)
8889
if err == nil {
89-
switch model.ResourceType {
90-
case "project":
91-
resourceLabel, err = rmUtils.GetProjectName(ctx, rmApiClient.DefaultAPI, model.ResourceId)
92-
case "organization":
93-
resourceLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient.DefaultAPI, model.ResourceId)
94-
case "folder":
95-
resourceLabel, err = rmUtils.GetFolderName(ctx, rmApiClient.DefaultAPI, model.ResourceId)
96-
default:
97-
params.Printer.Debug(print.ErrorLevel, "unknown resource type: %v", model.ResourceType)
98-
}
90+
resourceLabel, err = utils.GetResourceLabel(ctx, rmApiClient.DefaultAPI, model.ResourceId, model.ResourceType)
9991
if err != nil {
10092
params.Printer.Debug(print.ErrorLevel, "get %v name: %v", model.ResourceType, err)
10193
resourceLabel = model.ResourceId

‎internal/cmd/beta/telemetrylink/delete/delete.go‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ import (
66

77
"github.com/stackitcloud/stackit-sdk-go/services/telemetrylink/v1api/wait"
88

9+
"github.com/stackitcloud/stackit-cli/internal/pkg/services/telemetrylink/utils"
10+
911
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1012
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1113
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
1214
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
1315
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1416
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1517
rmClient "github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/client"
16-
rmUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/resourcemanager/utils"
1718
"github.com/stackitcloud/stackit-cli/internal/pkg/services/telemetrylink/client"
1819
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
1920
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
@@ -71,16 +72,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7172
var resourceLabel string
7273
rmApiClient, err := rmClient.ConfigureClient(params.Printer, params.CliVersion)
7374
if err == nil {
74-
switch model.ResourceType {
75-
case "project":
76-
resourceLabel, err = rmUtils.GetProjectName(ctx, rmApiClient.DefaultAPI, model.ResourceId)
77-
case "organization":
78-
resourceLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient.DefaultAPI, model.ResourceId)
79-
case "folder":
80-
resourceLabel, err = rmUtils.GetFolderName(ctx, rmApiClient.DefaultAPI, model.ResourceId)
81-
default:
82-
params.Printer.Debug(print.ErrorLevel, "unknown resource type: %v", model.ResourceType)
83-
}
75+
resourceLabel, err = utils.GetResourceLabel(ctx, rmApiClient.DefaultAPI, model.ResourceId, model.ResourceType)
8476
if err != nil {
8577
params.Printer.Debug(print.ErrorLevel, "get %v name: %v", model.ResourceType, err)
8678
resourceLabel = model.ResourceId
@@ -89,6 +81,10 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
8981
params.Printer.Debug(print.ErrorLevel, "configure resource manager client: %v", err)
9082
}
9183

84+
if resourceLabel == "" {
85+
resourceLabel = model.ResourceId
86+
}
87+
9288
prompt := fmt.Sprintf("Are you sure you want to delete the Telemetry Link for %q %q?", model.ResourceType, resourceLabel)
9389
err = params.Printer.PromptForConfirmation(prompt)
9490
if err != nil {

0 commit comments

Comments
 (0)