From 130ceb6ef4f6f71cbe50f096da7980d3435fc320 Mon Sep 17 00:00:00 2001 From: ashish Date: Tue, 19 Oct 2021 13:15:50 +0530 Subject: [PATCH] fixed panic Signed-off-by: ashish --- app_mesh/error.go | 7 +++++++ app_mesh/sample_apps.go | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app_mesh/error.go b/app_mesh/error.go index 5def0d9..5be90f4 100644 --- a/app_mesh/error.go +++ b/app_mesh/error.go @@ -17,6 +17,9 @@ var ( ErrStreamEventCode = "appmesh_test_code" // ErrSampleAppCode failure ErrSampleAppCode = "appmesh_test_code" + // ErrLoadNamespaceToMeshCode represents the error + // which is generated when the namespace could not be labelled and updated + ErrLoadNamespaceToMeshCode = "appmesh_test_code" // ErrOpInvalidCode failure ErrOpInvalidCode = "appmesh_test_code" // ErrNilClientCode represents the error code which is @@ -96,3 +99,7 @@ func ErrAppMeshCoreComponentFail(err error) error { func ErrProcessOAM(err error) error { return errors.New(ErrProcessOAMCode, errors.Alert, []string{"error performing OAM operations"}, []string{err.Error()}, []string{}, []string{}) } + +func ErrLoadNamespaceToMesh(err error) error { + return errors.New(ErrLoadNamespaceToMeshCode, errors.Alert, []string{"Could not label the appropriate namespace"}, []string{err.Error()}, []string{}, []string{}) +} diff --git a/app_mesh/sample_apps.go b/app_mesh/sample_apps.go index 4a4777a..0b0f2a7 100644 --- a/app_mesh/sample_apps.go +++ b/app_mesh/sample_apps.go @@ -59,7 +59,7 @@ func (appMesh *AppMesh) installSampleApp(namespace string, del bool, templates [ func (appMesh *AppMesh) LoadNamespaceToMesh(namespace string, remove bool) error { ns, err := appMesh.KubeClient.CoreV1().Namespaces().Get(context.TODO(), namespace, metav1.GetOptions{}) if err != nil { - return err + return ErrLoadNamespaceToMesh(err) } if ns.ObjectMeta.Labels == nil { @@ -74,7 +74,7 @@ func (appMesh *AppMesh) LoadNamespaceToMesh(namespace string, remove bool) error _, err = appMesh.KubeClient.CoreV1().Namespaces().Update(context.TODO(), ns, metav1.UpdateOptions{}) if err != nil { - return err + return ErrLoadNamespaceToMesh(err) } return nil }