rename validateProject function

Benjosh95 · Benjosh95 · commit f287833f5436 · 2025-09-25T11:19:26.000+02:00
diff --git a/internal/cmd/ske/cluster/create/create.go b/internal/cmd/ske/cluster/create/create.go
@@ -71,7 +71,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Validate project ID (exists and user has access)
-			projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
+			projectLabel, err := validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
 			if err != nil {
 				return err
 			}
diff --git a/internal/cmd/ske/cluster/delete/delete.go b/internal/cmd/ske/cluster/delete/delete.go
@@ -46,7 +46,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Validate project ID (exists and user has access)
-			_, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
+			_, err = validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
 			if err != nil {
 				return err
 			}
diff --git a/internal/cmd/ske/cluster/describe/describe.go b/internal/cmd/ske/cluster/describe/describe.go
@@ -51,7 +51,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Validate project ID (exists and user has access)
-			_, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
+			_, err = validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
 			if err != nil {
 				return err
 			}
diff --git a/internal/cmd/ske/cluster/list/list.go b/internal/cmd/ske/cluster/list/list.go
@@ -58,7 +58,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Validate project ID (exists and user has access)
-			projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
+			projectLabel, err := validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
 			if err != nil {
 				return err
 			}
diff --git a/internal/cmd/ske/describe/describe.go b/internal/cmd/ske/describe/describe.go
@@ -43,7 +43,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Validate project ID (exists and user has access)
-			_, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
+			_, err = validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
 			if err != nil {
 				return err
 			}
diff --git a/internal/cmd/ske/disable/disable.go b/internal/cmd/ske/disable/disable.go
@@ -42,7 +42,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Validate project ID (exists and user has access)
-			projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
+			projectLabel, err := validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
 			if err != nil {
 				return err
 			}
diff --git a/internal/cmd/ske/enable/enable.go b/internal/cmd/ske/enable/enable.go
@@ -42,7 +42,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Validate project ID (exists and user has access)
-			projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
+			projectLabel, err := validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
 			if err != nil {
 				return err
 			}
diff --git a/internal/cmd/ske/kubeconfig/create/create.go b/internal/cmd/ske/kubeconfig/create/create.go
@@ -85,7 +85,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			}
 
 			// Validate project ID (exists and user has access)
-			_, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
+			_, err = validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
 			if err != nil {
 				return err
 			}
diff --git a/internal/pkg/validation/project.go b/internal/pkg/validation/project.go
@@ -14,9 +14,9 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 )
 
-// ValidateProject validates that the project ID is not empty, exists, and the user has access to it.
-// It returns the project name for display purposes.
-func ValidateProject(ctx context.Context, p *print.Printer, cliVersion string, cmd *cobra.Command, projectId string) (string, error) {
+// ValidateAndGetProjectLabel validates that the project ID is not empty, exists, and the user has access to it.
+// It returns the project label (name or ID) for display purposes.
+func ValidateAndGetProjectLabel(ctx context.Context, p *print.Printer, cliVersion string, cmd *cobra.Command, projectId string) (string, error) {
 	// Check if project ID is empty
 	if projectId == "" {
 		return "", &errors.ProjectIdError{}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func NewCmd(params params.CmdParams) cobra.Command {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Validate project ID (exists and user has access)`
`74`		`- projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
	`74`	`+ projectLabel, err := validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
`75`	`75`	`if err != nil {`
`76`	`76`	`return err`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func NewCmd(params params.CmdParams) cobra.Command {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// Validate project ID (exists and user has access)`
`49`		`- _, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
	`49`	`+ _, err = validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
`50`	`50`	`if err != nil {`
`51`	`51`	`return err`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func NewCmd(params params.CmdParams) cobra.Command {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// Validate project ID (exists and user has access)`
`54`		`- _, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
	`54`	`+ _, err = validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
`55`	`55`	`if err != nil {`
`56`	`56`	`return err`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func NewCmd(params params.CmdParams) cobra.Command {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// Validate project ID (exists and user has access)`
`61`		`- projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
	`61`	`+ projectLabel, err := validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
`62`	`62`	`if err != nil {`
`63`	`63`	`return err`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func NewCmd(params params.CmdParams) cobra.Command {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// Validate project ID (exists and user has access)`
`46`		`- _, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
	`46`	`+ _, err = validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return err`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func NewCmd(params params.CmdParams) cobra.Command {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// Validate project ID (exists and user has access)`
`45`		`- projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
	`45`	`+ projectLabel, err := validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
`46`	`46`	`if err != nil {`
`47`	`47`	`return err`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func NewCmd(params params.CmdParams) cobra.Command {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// Validate project ID (exists and user has access)`
`88`		`- _, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
	`88`	`+ _, err = validation.ValidateAndGetProjectLabel(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)`
`89`	`89`	`if err != nil {`
`90`	`90`	`return err`
`91`	`91`	`}`