feature: implemented review suggestions

Author: bahkauv70

internal/cmd/beta/security-group/delete/delete.go

@@ -12,6 +12,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client"
+	iaas_utils "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
 )
@@ -47,16 +48,18 @@ func NewCmd(p *print.Printer) *cobra.Command {
 
 			projectLabel, err := projectname.GetProjectName(ctx, p, cmd)
 			if err != nil {
-				return fmt.Errorf("get project name: %w", err)
+				p.Debug(print.ErrorLevel, "get project name: %v", err)
+				projectLabel = model.ProjectId
 			}
 
-			securityGroupResp, err := apiClient.GetSecurityGroup(ctx, model.ProjectId, model.SecurityGroupId).Execute()
+			groupLabel, err := iaas_utils.GetGroupName(ctx, apiClient, model.ProjectId, model.SecurityGroupId)
 			if err != nil {
-				return fmt.Errorf("get security group %q: %w", model.SecurityGroupId, err)
+				p.Warn("get security group name: %v", err)
+				groupLabel = model.SecurityGroupId
 			}
 
 			if !model.AssumeYes {
-				prompt := fmt.Sprintf("Are you sure you want to delete the security group %q for %q?", *securityGroupResp.Name, projectLabel)
+				prompt := fmt.Sprintf("Are you sure you want to delete the security group %q for %q?", groupLabel, projectLabel)
 				err = p.PromptForConfirmation(prompt)
 				if err != nil {
 					return err
@@ -69,7 +72,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err := request.Execute(); err != nil {
 				return fmt.Errorf("delete security group: %w", err)
 			}
-			p.Info("Deleted security group %q for %q\n", *securityGroupResp.Name, projectLabel)
+			p.Info("Deleted security group %q for %q\n", groupLabel, projectLabel)
 
 			return nil
 		},

internal/cmd/beta/security-group/update/update.go

@@ -14,6 +14,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client"
+	iaas_utils "github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/utils"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
 )
@@ -63,8 +64,14 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				projectLabel = model.ProjectId
 			}
 
+			groupLabel, err := iaas_utils.GetGroupName(ctx, apiClient, model.ProjectId, model.SecurityGroupId)
+			if err != nil {
+				p.Warn("cannot retrieve groupname: %v", err)
+				groupLabel = model.SecurityGroupId
+			}
+
 			if !model.AssumeYes {
-				prompt := fmt.Sprintf("Are you sure you want to update the security group %q?", model.SecurityGroupId)
+				prompt := fmt.Sprintf("Are you sure you want to update the security group %q?", groupLabel)
 				err = p.PromptForConfirmation(prompt)
 				if err != nil {
 					return err

internal/pkg/services/iaas/utils/utils.go

@@ -15,6 +15,7 @@ type IaaSClient interface {
 	GetNetworkAreaExecute(ctx context.Context, organizationId, areaId string) (*iaas.NetworkArea, error)
 	ListNetworkAreaProjectsExecute(ctx context.Context, organizationId, areaId string) (*iaas.ProjectListResponse, error)
 	GetNetworkAreaRangeExecute(ctx context.Context, organizationId, areaId, networkRangeId string) (*iaas.NetworkRange, error)
+	GetSecurityGroupExecute(ctx context.Context, projectId string, securityGroupId string) (*iaas.SecurityGroup, error)
 }
 
 func GetPublicIP(ctx context.Context, apiClient IaaSClient, projectId, publicIpId string) (ip, associatedResource string, err error) {
@@ -98,3 +99,12 @@ func GetNetworkRangeFromAPIResponse(prefix string, networkRanges *[]iaas.Network
 	}
 	return iaas.NetworkRange{}, fmt.Errorf("new network range not found in API response")
 }
+
+// GetGroupName retrieves the name of a security group for a project
+func GetGroupName(ctx context.Context, apiClient IaaSClient, projectId string, securityGroupId string) (string, error) {
+	group, err := apiClient.GetSecurityGroupExecute(ctx, projectId, securityGroupId)
+	if err != nil {
+		return "", fmt.Errorf("get security group: %v", err)
+	}
+	return *group.Name, nil
+}

internal/pkg/services/iaas/utils/utils_test.go

@@ -6,6 +6,7 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/google/uuid"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas"
 )
@@ -25,6 +26,8 @@ type IaaSClientMocked struct {
 	GetAttachedProjectsResp  *iaas.ProjectListResponse
 	GetNetworkAreaRangeFails bool
 	GetNetworkAreaRangeResp  *iaas.NetworkRange
+	GetSecurityGroupFails    bool
+	ApiGetSecurityGroupResp  *iaas.SecurityGroup
 }
 
 func (m *IaaSClientMocked) GetPublicIPExecute(_ context.Context, _, _ string) (*iaas.PublicIp, error) {
@@ -76,6 +79,13 @@ func (m *IaaSClientMocked) GetNetworkAreaRangeExecute(_ context.Context, _, _, _
 	return m.GetNetworkAreaRangeResp, nil
 }
 
+func (m *IaaSClientMocked) GetSecurityGroupExecute(ctx context.Context, projectId string, securityGroupId string) (*iaas.SecurityGroup, error) {
+	if m.GetSecurityGroupFails {
+		return nil, fmt.Errorf("could not get security group")
+	}
+	return m.ApiGetSecurityGroupResp, nil
+}
+
 func TestGetPublicIp(t *testing.T) {
 	type args struct {
 		getPublicIpFails bool
@@ -551,3 +561,53 @@ func TestGetNetworkRangeFromAPIResponse(t *testing.T) {
 		})
 	}
 }
+
+func TestGetGroupName(t *testing.T) {
+	testProjectId := uuid.NewString()
+	type args struct {
+		securityGroupId string
+	}
+	tests := []struct {
+		name         string
+		args         args
+		getGroupResp *iaas.SecurityGroup
+		want         string
+		wantErr      bool
+	}{
+		{
+			name: "base",
+			args: args{
+				securityGroupId: uuid.NewString(),
+			},
+			getGroupResp: &iaas.SecurityGroup{
+				Name: utils.Ptr("test-group"),
+			},
+			want:    "test-group",
+			wantErr: false,
+		},
+		{
+			name: "get fails",
+			args: args{
+				securityGroupId: uuid.NewString(),
+			},
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m := &IaaSClientMocked{
+				GetSecurityGroupFails: tt.wantErr,
+				ApiGetSecurityGroupResp: tt.getGroupResp,
+			}
+
+			got, err := GetGroupName(context.Background(), m, testProjectId, tt.args.securityGroupId)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GetGroupName() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("GetGroupName() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}