Consistent use of remove/delete/rm for secrets/fns/namespaces

Consistent "delete", "remove", and "rm" usage for secrets, functions, and namespaces. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
openfaas · Sep 4, 2024 · 565bbaf · 565bbaf
1 parent f509dd3
commit 565bbaf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 60 deletions.
diff --git a/commands/namespace_delete.go → commands/namespace_remove.go b/commands/namespace_delete.go → commands/namespace_remove.go
@@ -10,20 +10,21 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var namespaceDeleteCmd = &cobra.Command{
-	Use:     `delete NAME`,
-	Short:   "Delete existing namespace",
-	Long:    "Delete existing namespace",
-	Example: `  faas-cli namespace delete NAME`,
-	RunE:    deleteNamespace,
-	PreRunE: preDeleteNamespace,
+var namespaceRemoveCmd = &cobra.Command{
+	Use:     `remove NAME`,
+	Short:   "Remove existing namespace",
+	Long:    "Remove existing namespace",
+	Example: `  faas-cli namespace remove NAME`,
+	Aliases: []string{"rm", "delete"},
+	RunE:    removeNamespace,
+	PreRunE: preRemoveNamespace,
 }
 
 func init() {
-	namespaceCmd.AddCommand(namespaceDeleteCmd)
+	namespaceCmd.AddCommand(namespaceRemoveCmd)
 }
 
-func preDeleteNamespace(cmd *cobra.Command, args []string) error {
+func preRemoveNamespace(cmd *cobra.Command, args []string) error {
 	if len(args) == 0 {
 		return fmt.Errorf("namespace name required")
 	}
@@ -35,7 +36,7 @@ func preDeleteNamespace(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func deleteNamespace(cmd *cobra.Command, args []string) error {
+func removeNamespace(cmd *cobra.Command, args []string) error {
 	client, err := GetDefaultSDKClient()
 	if err != nil {
 		return err
@@ -48,7 +49,7 @@ func deleteNamespace(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	fmt.Printf("Namespace Deleted: %s\n", ns)
+	fmt.Printf("Namespace Removed: %s\n", ns)
 
 	return nil
 }
diff --git a/commands/namespace_delete_test.go → commands/namespace_remove_test.go b/commands/namespace_delete_test.go → commands/namespace_remove_test.go
@@ -3,7 +3,7 @@ package commands
 import "testing"
 
 func Test_preDeleteNamespace_NoArgs_Fails(t *testing.T) {
-	res := preDeleteNamespace(nil, []string{})
+	res := preRemoveNamespace(nil, []string{})
 
 	want := "namespace name required"
 	if res.Error() != want {
@@ -12,7 +12,7 @@ func Test_preDeleteNamespace_NoArgs_Fails(t *testing.T) {
 }
 
 func Test_preDeleteNamespace_MoreThan1Arg_Fails(t *testing.T) {
-	res := preDeleteNamespace(nil, []string{
+	res := preRemoveNamespace(nil, []string{
 		"secret1",
 		"secret2",
 	})
@@ -24,7 +24,7 @@ func Test_preDeleteNamespace_MoreThan1Arg_Fails(t *testing.T) {
 }
 
 func Test_preDeleteNamespace_ExtactlyOneArgIsFine(t *testing.T) {
-	res := preDeleteNamespace(nil, []string{
+	res := preRemoveNamespace(nil, []string{
 		"namespace1",
 	})
 

diff --git a/commands/secret_remove.go b/commands/secret_remove.go
@@ -15,7 +15,7 @@ import (
 
 var secretRemoveCmd = &cobra.Command{
 	Use:     "remove [--tls-no-verify]",
-	Aliases: []string{"rm"},
+	Aliases: []string{"rm", "delete"},
 	Short:   "remove a secret",
 	Long:    `Remove a secret by name`,
 	Example: `faas-cli secret remove NAME

diff --git a/schema/openfaas/v1alpha2/crd.go b/schema/openfaas/v1alpha2/crd.go