Move shared code

Author: Joeavaikath

README.md

@@ -20,6 +20,7 @@ kubectl oadp
 ├── backup          # Velero cluster-wide backups (admin)
 ├── restore         # Velero cluster-wide restores (admin) 
 ├── version         # Version information
+├── nabsl-request   # Manage NonAdminBackupStorageLocation approval requests
 └── nonadmin (na)   # Namespace-scoped operations (non-admin)
     └── backup
         ├── create

TESTING.md

@@ -69,7 +69,7 @@ make test-integration
 ### Specific Package
 ```bash
 # Test specific command
-go test ./cmd/nabsl -v
+go test ./cmd/nabsl-request -v
 
 # Test with coverage
 go test ./cmd/... -cover

cmd/nabsl/approve.go cmd/nabsl-request/approve.gocmd/nabsl/approve.go renamed to cmd/nabsl-request/approve.go

@@ -40,10 +40,10 @@ func NewApproveCommand(f client.Factory) *cobra.Command {
 		Long:  "Approve a pending backup storage location request to allow the controller to create the corresponding BackupStorageLocation",
 		Args:  cobra.ExactArgs(1),
 		Example: `  # Approve a request by NABSL name (admin access required)
-  kubectl oadp nabsl approve user-test-bsl
+  kubectl oadp nabsl-request approve user-test-bsl
 
   # Approve a request by UUID with reason
-  kubectl oadp nabsl approve nacuser01-user-test-bsl-96dfa8b7-3f6f-4c8d-a168-8527b00fbed8 --reason "Approved for production use"`,
+  kubectl oadp nabsl-request approve nacuser01-user-test-bsl-96dfa8b7-3f6f-4c8d-a168-8527b00fbed8 --reason "Approved for production use"`,
 		Run: func(c *cobra.Command, args []string) {
 			cmd.CheckError(o.Complete(args, f))
 			cmd.CheckError(o.Validate(c, args, f))
@@ -94,7 +94,7 @@ func (o *ApproveOptions) Run(c *cobra.Command, f client.Factory) error {
 	adminNS := f.Namespace()
 
 	// Find the request either by UUID or by looking up NABSL name
-	requestName, err := o.findRequestName(adminNS)
+	requestName, err := shared.FindNABSLRequestByNameOrUUID(context.Background(), o.client, o.RequestName, adminNS)
 	if err != nil {
 		return err
 	}
@@ -141,32 +141,3 @@ func (o *ApproveOptions) Run(c *cobra.Command, f client.Factory) error {
 	return nil
 }
 
-func (o *ApproveOptions) findRequestName(adminNS string) (string, error) {
-	// First check if o.RequestName is already a UUID by trying to get it directly
-	var testRequest nacv1alpha1.NonAdminBackupStorageLocationRequest
-	err := o.client.Get(context.Background(), kbclient.ObjectKey{
-		Name:      o.RequestName,
-		Namespace: adminNS,
-	}, &testRequest)
-	if err == nil {
-		// Found it directly, it's a UUID
-		return o.RequestName, nil
-	}
-
-	// Not found directly, so o.RequestName might be a NABSL name
-	// We need to search through all requests to find one with matching source NABSL name
-	var requestList nacv1alpha1.NonAdminBackupStorageLocationRequestList
-	err = o.client.List(context.Background(), &requestList, kbclient.InNamespace(adminNS))
-	if err != nil {
-		return "", fmt.Errorf("failed to list requests: %w", err)
-	}
-
-	for _, request := range requestList.Items {
-		if request.Status.SourceNonAdminBSL != nil &&
-			request.Status.SourceNonAdminBSL.Name == o.RequestName {
-			return request.Name, nil
-		}
-	}
-
-	return "", fmt.Errorf("request for NABSL %q not found", o.RequestName)
-}

cmd/nabsl/describe.go cmd/nabsl-request/describe.gocmd/nabsl/describe.go renamed to cmd/nabsl-request/describe.go

@@ -44,10 +44,10 @@ func NewDescribeCommand(f client.Factory) *cobra.Command {
 			cmd.CheckError(o.Run(c, f))
 		},
 		Example: `  # Describe a request by NABSL name
-  kubectl oadp nabsl describe my-bsl-request
+  kubectl oadp nabsl-request describe my-bsl-request
 
   # Describe a request by UUID
-  kubectl oadp nabsl describe nacuser01-my-bsl-96dfa8b7-3f6f-4c8d-a168-8527b00fbed8`,
+  kubectl oadp nabsl-request describe nacuser01-my-bsl-96dfa8b7-3f6f-4c8d-a168-8527b00fbed8`,
 	}
 
 	return c

cmd/nabsl/get.go cmd/nabsl-request/get.gocmd/nabsl/get.go renamed to cmd/nabsl-request/get.go

@@ -47,16 +47,16 @@ func NewGetCommand(f client.Factory) *cobra.Command {
 			cmd.CheckError(o.Run(c, f))
 		},
 		Example: `  # Get all backup storage location requests (admin access required)
-  kubectl oadp nabsl get
+  kubectl oadp nabsl-request get
 
   # Get a specific request by NABSL name
-  kubectl oadp nabsl get my-bsl-request
+  kubectl oadp nabsl-request get my-bsl-request
 
   # Get a specific request by UUID
-  kubectl oadp nabsl get nacuser01-my-bsl-96dfa8b7-3f6f-4c8d-a168-8527b00fbed8
+  kubectl oadp nabsl-request get nacuser01-my-bsl-96dfa8b7-3f6f-4c8d-a168-8527b00fbed8
 
   # Get output in YAML format
-  kubectl oadp nabsl get my-bsl-request -o yaml`,
+  kubectl oadp nabsl-request get my-bsl-request -o yaml`,
 	}
 
 	o.BindFlags(c.Flags())

cmd/nabsl/nabsl.go cmd/nabsl-request/nabsl.gocmd/nabsl/nabsl.go renamed to cmd/nabsl-request/nabsl.go

@@ -21,28 +21,28 @@ import (
 	"github.com/vmware-tanzu/velero/pkg/client"
 )
 
-// NewNABSLCommand creates the "nabsl" command for managing non-admin backup storage location requests
-func NewNABSLCommand(f client.Factory) *cobra.Command {
+// NewNABSLRequestCommand creates the "nabsl-request" command for managing non-admin backup storage location requests
+func NewNABSLRequestCommand(f client.Factory) *cobra.Command {
 	c := &cobra.Command{
-		Use:   "nabsl",
-		Short: "Manage non-admin backup storage location requests",
+		Use:   "nabsl-request",
+		Short: "Manage non-admin backup storage location approval requests",
 		Long: `Manage approval requests for non-admin backup storage locations.
 
 Non-admin backup storage locations (NABSL) require admin approval before they can be used.
 When users create NABSLs, approval requests are automatically generated for admin review.
 
 Use these commands to view, approve, or reject pending NABSL requests.`,
-		Example: `  # List all pending NABSL requests
-  kubectl oadp nabsl get
+		Example: `  # List all pending NABSL approval requests
+  kubectl oadp nabsl-request get
 
-  # Describe a specific NABSL request
-  kubectl oadp nabsl describe my-storage-request
+  # Describe a specific NABSL approval request
+  kubectl oadp nabsl-request describe my-storage-request
 
-  # Approve a NABSL request
-  kubectl oadp nabsl approve my-storage-request
+  # Approve a NABSL approval request
+  kubectl oadp nabsl-request approve my-storage-request
 
-  # Reject a NABSL request  
-  kubectl oadp nabsl reject my-storage-request`,
+  # Reject a NABSL approval request  
+  kubectl oadp nabsl-request reject my-storage-request`,
 	}
 
 	c.AddCommand(

cmd/nabsl/nabsl_test.go cmd/nabsl-request/nabsl_test.gocmd/nabsl/nabsl_test.go renamed to cmd/nabsl-request/nabsl_test.go

@@ -32,8 +32,8 @@ func TestNABSLCommands(t *testing.T) {
 		expectContains []string
 	}{
 		{
-			name: "nabsl help",
-			args: []string{"nabsl", "--help"},
+			name: "nabsl-request help",
+			args: []string{"nabsl-request", "--help"},
 			expectContains: []string{
 				"Manage approval requests for non-admin backup storage locations",
 				"approve",
@@ -43,31 +43,31 @@ func TestNABSLCommands(t *testing.T) {
 			},
 		},
 		{
-			name: "nabsl approve help",
-			args: []string{"nabsl", "approve", "--help"},
+			name: "nabsl-request approve help",
+			args: []string{"nabsl-request", "approve", "--help"},
 			expectContains: []string{
 				"Approve a pending backup storage location request",
 				"--reason",
 			},
 		},
 		{
-			name: "nabsl reject help",
-			args: []string{"nabsl", "reject", "--help"},
+			name: "nabsl-request reject help",
+			args: []string{"nabsl-request", "reject", "--help"},
 			expectContains: []string{
 				"Reject a pending backup storage location request",
 				"--reason",
 			},
 		},
 		{
-			name: "nabsl get help",
-			args: []string{"nabsl", "get", "--help"},
+			name: "nabsl-request get help",
+			args: []string{"nabsl-request", "get", "--help"},
 			expectContains: []string{
 				"Get non-admin backup storage location requests",
 			},
 		},
 		{
-			name: "nabsl describe help",
-			args: []string{"nabsl", "describe", "--help"},
+			name: "nabsl-request describe help",
+			args: []string{"nabsl-request", "describe", "--help"},
 			expectContains: []string{
 				"Describe a non-admin backup storage location request",
 			},
@@ -81,21 +81,21 @@ func TestNABSLCommands(t *testing.T) {
 	}
 }
 
-// TestNABSLHelpFlags tests that both --help and -h work for nabsl commands
+// TestNABSLHelpFlags tests that both --help and -h work for nabsl-request commands
 func TestNABSLHelpFlags(t *testing.T) {
 	binaryPath := testutil.BuildCLIBinary(t)
 
 	commands := [][]string{
-		{"nabsl", "--help"},
-		{"nabsl", "-h"},
-		{"nabsl", "approve", "--help"},
-		{"nabsl", "approve", "-h"},
-		{"nabsl", "reject", "--help"},
-		{"nabsl", "reject", "-h"},
-		{"nabsl", "get", "--help"},
-		{"nabsl", "get", "-h"},
-		{"nabsl", "describe", "--help"},
-		{"nabsl", "describe", "-h"},
+		{"nabsl-request", "--help"},
+		{"nabsl-request", "-h"},
+		{"nabsl-request", "approve", "--help"},
+		{"nabsl-request", "approve", "-h"},
+		{"nabsl-request", "reject", "--help"},
+		{"nabsl-request", "reject", "-h"},
+		{"nabsl-request", "get", "--help"},
+		{"nabsl-request", "get", "-h"},
+		{"nabsl-request", "describe", "--help"},
+		{"nabsl-request", "describe", "-h"},
 	}
 
 	for _, cmd := range commands {
@@ -105,33 +105,33 @@ func TestNABSLHelpFlags(t *testing.T) {
 	}
 }
 
-// TestNABSLClientConfigIntegration tests that NABSL commands respect client config
+// TestNABSLClientConfigIntegration tests that NABSL request commands respect client config
 func TestNABSLClientConfigIntegration(t *testing.T) {
 	binaryPath := testutil.BuildCLIBinary(t)
 	_, cleanup := testutil.SetupTempHome(t)
 	defer cleanup()
 
-	t.Run("nabsl commands work with client config", func(t *testing.T) {
+	t.Run("nabsl-request commands work with client config", func(t *testing.T) {
 		// Set a known namespace
 		_, err := testutil.RunCommand(t, binaryPath, "client", "config", "set", "namespace=admin-namespace")
 		if err != nil {
 			t.Fatalf("Failed to set client config: %v", err)
 		}
 
-		// Test that nabsl commands can be invoked (they should respect the namespace)
+		// Test that nabsl-request commands can be invoked (they should respect the namespace)
 		// We test help commands since they don't require actual K8s resources
 		commands := [][]string{
-			{"nabsl", "get", "--help"},
-			{"nabsl", "approve", "--help"},
-			{"nabsl", "reject", "--help"},
-			{"nabsl", "describe", "--help"},
+			{"nabsl-request", "get", "--help"},
+			{"nabsl-request", "approve", "--help"},
+			{"nabsl-request", "reject", "--help"},
+			{"nabsl-request", "describe", "--help"},
 		}
 
 		for _, cmd := range commands {
 			t.Run("config_test_"+cmd[1], func(t *testing.T) {
 				output, err := testutil.RunCommand(t, binaryPath, cmd...)
 				if err != nil {
-					t.Fatalf("NABSL command should work with client config: %v", err)
+					t.Fatalf("NABSL request command should work with client config: %v", err)
 				}
 				if output == "" {
 					t.Errorf("Expected help output for %v", cmd)

cmd/nabsl/reject.go cmd/nabsl-request/reject.gocmd/nabsl/reject.go renamed to cmd/nabsl-request/reject.go

@@ -40,10 +40,10 @@ func NewRejectCommand(f client.Factory) *cobra.Command {
 		Long:  "Reject a pending backup storage location request to deny the user's request for a backup storage location",
 		Args:  cobra.ExactArgs(1),
 		Example: `  # Deny a request by NABSL name (admin access required)
-  kubectl oadp nabsl reject user-test-bsl --reason "Invalid configuration"
+  kubectl oadp nabsl-request reject user-test-bsl --reason "Invalid configuration"
 
   # Deny a request by UUID with detailed reason
-  kubectl oadp nabsl reject nacuser01-user-test-bsl-96dfa8b7-3f6f-4c8d-a168-8527b00fbed8 --reason "Bucket does not exist in specified region"`,
+  kubectl oadp nabsl-request reject nacuser01-user-test-bsl-96dfa8b7-3f6f-4c8d-a168-8527b00fbed8 --reason "Bucket does not exist in specified region"`,
 		Run: func(c *cobra.Command, args []string) {
 			cmd.CheckError(o.Complete(args, f))
 			cmd.CheckError(o.Validate(c, args, f))
@@ -94,7 +94,7 @@ func (o *RejectOptions) Run(c *cobra.Command, f client.Factory) error {
 	adminNS := f.Namespace()
 
 	// Find the request either by UUID or by looking up NABSL name
-	requestName, err := o.findRequestName(adminNS)
+	requestName, err := shared.FindNABSLRequestByNameOrUUID(context.Background(), o.client, o.RequestName, adminNS)
 	if err != nil {
 		return err
 	}
@@ -143,32 +143,3 @@ func (o *RejectOptions) Run(c *cobra.Command, f client.Factory) error {
 	return nil
 }
 
-func (o *RejectOptions) findRequestName(adminNS string) (string, error) {
-	// First check if o.RequestName is already a UUID by trying to get it directly
-	var testRequest nacv1alpha1.NonAdminBackupStorageLocationRequest
-	err := o.client.Get(context.Background(), kbclient.ObjectKey{
-		Name:      o.RequestName,
-		Namespace: adminNS,
-	}, &testRequest)
-	if err == nil {
-		// Found it directly, it's a UUID
-		return o.RequestName, nil
-	}
-
-	// Not found directly, so o.RequestName might be a NABSL name
-	// We need to search through all requests to find one with matching source NABSL name
-	var requestList nacv1alpha1.NonAdminBackupStorageLocationRequestList
-	err = o.client.List(context.Background(), &requestList, kbclient.InNamespace(adminNS))
-	if err != nil {
-		return "", fmt.Errorf("failed to list requests: %w", err)
-	}
-
-	for _, request := range requestList.Items {
-		if request.Status.SourceNonAdminBSL != nil &&
-			request.Status.SourceNonAdminBSL.Name == o.RequestName {
-			return request.Name, nil
-		}
-	}
-
-	return "", fmt.Errorf("request for NABSL %q not found", o.RequestName)
-}