add namespace param for fn and env (#2556)

This PR moves fission CLI as closer as possible to kubectl command behaviour. We have improved namespace handling behaviour across CLI. * add namespace param for fn and env * use common fn for ns check * update validation * default namespace for httpTrigger, env and package, config and triggers * use default ns * add namespace filter to spec * add forceNamespace flag * set current namespace * add default namespace in config * add namespace specific destroy * add all namespace in the list of resources * add namespace as global tag * use %s instead of %v * add test cases for namespace * use ns in get all functions
2022-10-11 13:23:47 +05:30
parent 0739aca920
commit b9513868ed
74 changed files with 1289 additions and 304 deletions
@@ -17,12 +17,19 @@ limitations under the License.
 package spec

 import (
+	"fmt"
+	"strings"
+
 	"github.com/pkg/errors"

+	fv1 "github.com/fission/fission/pkg/apis/core/v1"
 	"github.com/fission/fission/pkg/controller/client"
 	"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
 	"github.com/fission/fission/pkg/fission-cli/cmd"
+	"github.com/fission/fission/pkg/fission-cli/console"
+	flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
 	"github.com/fission/fission/pkg/fission-cli/util"
+	"github.com/fission/fission/pkg/utils"
 )

 type DestroySubCommand struct {
@@ -49,12 +56,26 @@ func (opts *DestroySubCommand) run(input cli.Input) error {
 		return errors.Wrap(err, "error reading specs")
 	}

-	// set desired state to nothing, but keep the UID so "apply" can find it
-	emptyFr := FissionResources{}
-	emptyFr.DeploymentConfig = fr.DeploymentConfig
+	if !input.Bool(flagkey.ForceDelete) {
+		err = opts.insertNSToResource(input, fr)
+		if err != nil {
+			return errors.Wrap(err, "error adding namespace")
+		}
+	} else {
+		// if force delete set to true we fetch all resources with our deployment ID and delete them
+		// set desired state to nothing, but keep the UID so "apply" can find it
+		emptyFr := FissionResources{}
+		emptyFr.DeploymentConfig = fr.DeploymentConfig

-	// "apply" the empty state
-	err = deleteResources(opts.Client(), &emptyFr)
+		// "apply" the empty state
+		err = forceDeleteResources(opts.Client(), &emptyFr)
+		if err != nil {
+			return errors.Wrap(err, "error deleting resources")
+		}
+		return nil
+	}
+	forceDelete := input.Bool(flagkey.ForceDelete)
+	err = deleteResources(opts.Client(), fr, forceDelete)
 	if err != nil {
 		return errors.Wrap(err, "error deleting resources")
 	}
@@ -62,7 +83,7 @@ func (opts *DestroySubCommand) run(input cli.Input) error {
 	return nil
 }

-func deleteResources(fclient client.Interface, fr *FissionResources) error {
+func forceDeleteResources(fclient client.Interface, fr *FissionResources) error {

 	var err error

@@ -103,3 +124,219 @@ func deleteResources(fclient client.Interface, fr *FissionResources) error {

 	return nil
 }
+
+// insertNSToResource provides a namespace to all resource which don't have a namespace specified
+// in resource
+func (opts *DestroySubCommand) insertNSToResource(input cli.Input, fr *FissionResources) error {
+
+	result := utils.MultiErrorWithFormat()
+
+	_, currentNS, err := util.GetResourceNamespace(input, flagkey.NamespaceEnvironment)
+	if err != nil {
+		return fv1.AggregateValidationErrors("Environment", err)
+	}
+
+	for i := range fr.Functions {
+		if fr.Functions[i].Namespace == "" {
+			fr.Functions[i].Namespace = currentNS
+		}
+	}
+	for i := range fr.Environments {
+		if fr.Environments[i].Namespace == "" {
+			fr.Environments[i].Namespace = currentNS
+		}
+	}
+	for i := range fr.Packages {
+		if fr.Packages[i].Namespace == "" {
+			fr.Packages[i].Namespace = currentNS
+		}
+	}
+	for i := range fr.HttpTriggers {
+		if fr.HttpTriggers[i].Namespace == "" {
+			fr.HttpTriggers[i].Namespace = currentNS
+		}
+	}
+	for i := range fr.MessageQueueTriggers {
+		if fr.MessageQueueTriggers[i].Namespace == "" {
+			fr.MessageQueueTriggers[i].Namespace = currentNS
+		}
+	}
+	for i := range fr.TimeTriggers {
+		if fr.TimeTriggers[i].Namespace == "" {
+			fr.TimeTriggers[i].Namespace = currentNS
+		}
+	}
+	for i := range fr.KubernetesWatchTriggers {
+		if fr.KubernetesWatchTriggers[i].Namespace == "" {
+			fr.KubernetesWatchTriggers[i].Namespace = currentNS
+		}
+	}
+
+	return result.ErrorOrNil()
+}
+
+func deleteResources(fclient client.Interface, fr *FissionResources, forceDelete bool) error {
+
+	var err error
+
+	err = destroyHTTPTriggers(fclient, fr)
+	if err != nil {
+		return errors.Wrap(err, "HTTPTrigger delete failed")
+	}
+
+	err = destroyKubernetesWatchTriggers(fclient, fr)
+	if err != nil {
+		return errors.Wrap(err, "KubernetesWatchTrigger delete failed")
+	}
+
+	err = destroyTimeTriggers(fclient, fr)
+	if err != nil {
+		return errors.Wrap(err, "TimeTrigger delete failed")
+	}
+
+	err = destroyMessageQueueTriggers(fclient, fr)
+	if err != nil {
+		return errors.Wrap(err, "MessageQueueTrigger delete failed")
+	}
+
+	err = destroyFunctions(fclient, fr)
+	if err != nil {
+		return errors.Wrap(err, "function delete failed")
+	}
+
+	err = destroyPackages(fclient, fr)
+	if err != nil {
+		return errors.Wrap(err, "package delete failed")
+	}
+
+	err = destroyEnvironments(fclient, fr)
+	if err != nil {
+		return errors.Wrap(err, "environment delete failed")
+	}
+
+	return nil
+}
+
+func destroyHTTPTriggers(fclient client.Interface, fr *FissionResources) error {
+	for _, o := range fr.HttpTriggers {
+		err := fclient.V1().HTTPTrigger().Delete(&o.ObjectMeta)
+		if err != nil && strings.Contains(err.Error(), "not found") {
+			console.Verbose(2, fmt.Sprintf("could not delete httptrigger: %s Namespace: %s", o.ObjectMeta.Name, o.ObjectMeta.Namespace))
+			err = nil
+			continue
+
+		} else if err != nil {
+			return err
+		}
+		fmt.Printf("Deleted %s %s/%s\n", o.TypeMeta.Kind, o.ObjectMeta.Namespace, o.ObjectMeta.Name)
+	}
+	return nil
+}
+
+func destroyKubernetesWatchTriggers(fclient client.Interface, fr *FissionResources) error {
+
+	for _, o := range fr.KubernetesWatchTriggers {
+		err := fclient.V1().KubeWatcher().Delete(&o.ObjectMeta)
+		if err != nil && strings.Contains(err.Error(), "not found") {
+			console.Verbose(2, fmt.Sprintf("could not delete watch: %s Namespace: %s", o.ObjectMeta.Name, o.ObjectMeta.Namespace))
+			err = nil
+			continue
+
+		} else if err != nil {
+			return err
+		}
+		fmt.Printf("Deleted %s %s/%s\n", o.TypeMeta.Kind, o.ObjectMeta.Namespace, o.ObjectMeta.Name)
+	}
+
+	return nil
+}
+
+func destroyTimeTriggers(fclient client.Interface, fr *FissionResources) error {
+
+	for _, o := range fr.TimeTriggers {
+		err := fclient.V1().TimeTrigger().Delete(&o.ObjectMeta)
+		if err != nil && strings.Contains(err.Error(), "not found") {
+			console.Verbose(2, fmt.Sprintf("could not delete Time trigger: %s Namespace: %s", o.ObjectMeta.Name, o.ObjectMeta.Namespace))
+			err = nil
+			continue
+
+		} else if err != nil {
+			return err
+		}
+		fmt.Printf("Deleted %s %s/%s\n", o.TypeMeta.Kind, o.ObjectMeta.Namespace, o.ObjectMeta.Name)
+	}
+
+	return nil
+}
+
+func destroyMessageQueueTriggers(fclient client.Interface, fr *FissionResources) error {
+
+	for _, o := range fr.MessageQueueTriggers {
+		err := fclient.V1().MessageQueueTrigger().Delete(&o.ObjectMeta)
+		if err != nil && strings.Contains(err.Error(), "not found") {
+			console.Verbose(2, fmt.Sprintf("could not delete Message trigger: %s Namespace: %s", o.ObjectMeta.Name, o.ObjectMeta.Namespace))
+			err = nil
+			continue
+
+		} else if err != nil {
+			return err
+		}
+		fmt.Printf("Deleted %s %s/%s\n", o.TypeMeta.Kind, o.ObjectMeta.Namespace, o.ObjectMeta.Name)
+	}
+
+	return nil
+}
+
+func destroyFunctions(fclient client.Interface, fr *FissionResources) error {
+
+	for _, o := range fr.Functions {
+		err := fclient.V1().Function().Delete(&o.ObjectMeta)
+		if err != nil && strings.Contains(err.Error(), "not found") {
+			console.Verbose(2, fmt.Sprintf("could not delete Functions: %s Namespace: %s", o.ObjectMeta.Name, o.ObjectMeta.Namespace))
+			err = nil
+			continue
+
+		} else if err != nil {
+			return err
+		}
+		fmt.Printf("Deleted %s %s/%s\n", o.TypeMeta.Kind, o.ObjectMeta.Namespace, o.ObjectMeta.Name)
+	}
+
+	return nil
+}
+
+func destroyPackages(fclient client.Interface, fr *FissionResources) error {
+
+	for _, o := range fr.Packages {
+		err := fclient.V1().Package().Delete(&o.ObjectMeta)
+		if err != nil && strings.Contains(err.Error(), "not found") {
+			console.Verbose(2, fmt.Sprintf("could not delete Package: %s Namespace: %s", o.ObjectMeta.Name, o.ObjectMeta.Namespace))
+			err = nil
+			continue
+
+		} else if err != nil {
+			return err
+		}
+		fmt.Printf("Deleted %s %s/%s\n", o.TypeMeta.Kind, o.ObjectMeta.Namespace, o.ObjectMeta.Name)
+	}
+
+	return nil
+}
+
+func destroyEnvironments(fclient client.Interface, fr *FissionResources) error {
+
+	for _, o := range fr.Environments {
+		err := fclient.V1().Environment().Delete(&o.ObjectMeta)
+		if err != nil && strings.Contains(err.Error(), "not found") {
+			console.Verbose(2, fmt.Sprintf("could not delete Env: %s Namespace: %s", o.ObjectMeta.Name, o.ObjectMeta.Namespace))
+			err = nil
+			continue
+
+		} else if err != nil {
+			return err
+		}
+		fmt.Printf("Deleted %s %s/%s\n", o.TypeMeta.Kind, o.ObjectMeta.Namespace, o.ObjectMeta.Name)
+	}
+
+	return nil
+}