From 772941e02e77c74a70137c1ffc4235e968702f5b Mon Sep 17 00:00:00 2001
From: Pradeep Lakshmi Narasimha <pradeep.vaishnav4@gmail.com>
Date: Fri, 22 Oct 2021 13:27:28 +0530
Subject: [PATCH] Adding validations for env/fn before listing pods (#2231)

---
 pkg/fission-cli/cmd/environment/pods.go | 10 ++++++++++
 pkg/fission-cli/cmd/function/pods.go    |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/pkg/fission-cli/cmd/environment/pods.go b/pkg/fission-cli/cmd/environment/pods.go
index fe1dddd6..810c6ad7 100644
--- a/pkg/fission-cli/cmd/environment/pods.go
+++ b/pkg/fission-cli/cmd/environment/pods.go
@@ -41,6 +41,16 @@ func ListPods(input cli.Input) error {
 
 func (opts *ListPodsSubCommand) do(input cli.Input) error {
 
+	// validate environment
+	_, err := opts.Client().V1().Environment().Get(
+		&metav1.ObjectMeta{
+			Name:      input.String(flagkey.EnvName),
+			Namespace: input.String(flagkey.NamespaceEnvironment),
+		})
+	if err != nil {
+		return errors.Wrap(err, "error getting environment")
+	}
+
 	m := &metav1.ObjectMeta{
 		Name: input.String(flagkey.EnvName),
 		Labels: map[string]string{
diff --git a/pkg/fission-cli/cmd/function/pods.go b/pkg/fission-cli/cmd/function/pods.go
index 4bbdb0ba..8972fb6f 100644
--- a/pkg/fission-cli/cmd/function/pods.go
+++ b/pkg/fission-cli/cmd/function/pods.go
@@ -41,6 +41,15 @@ func ListPods(input cli.Input) error {
 
 func (opts *ListPodsSubCommand) do(input cli.Input) error {
 
+	// validate function
+	_, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
+		Name:      input.String(flagkey.FnName),
+		Namespace: input.String(flagkey.NamespaceFunction),
+	})
+	if err != nil {
+		return errors.Wrap(err, "error getting function")
+	}
+
 	m := &metav1.ObjectMeta{
 		Name: input.String(flagkey.FnName),
 		Labels: map[string]string{