fix: check existence before banning namespace

dgraph-io · May 31, 2023 · 0a9c5ca · 0a9c5ca
1 parent 845593a
commit 0a9c5ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/edgraph/multi_tenancy_ee.go b/edgraph/multi_tenancy_ee.go
@@ -138,5 +138,8 @@ func createGuardianAndGroot(ctx context.Context, namespace uint64, passwd string
 // Authorization is handled by middlewares.
 func (s *Server) DeleteNamespace(ctx context.Context, namespace uint64) error {
 	glog.Info("Deleting namespace", namespace)
+	if _, ok := schema.State().Namespaces()[namespace]; !ok {
+		return errors.Errorf("The namespace %#x doesn't exist", namespace)
+	}
 	return worker.ProcessDeleteNsRequest(ctx, namespace)
 }
diff --git a/systest/multi-tenancy/basic_test.go b/systest/multi-tenancy/basic_test.go
@@ -276,6 +276,11 @@ func TestDeleteNamespace(t *testing.T) {
 		testutil.CompareJSON(t, expected, string(resp))
 	}
 
+	// Deleting a non-existent namespace should error out.
+	err = testutil.DeleteNamespace(t, galaxyToken, 1000)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "The namespace 0x3e8 doesn't exist")
+
 	require.NoError(t, addData(x.GalaxyNamespace))
 	check(x.GalaxyNamespace, `{"me": [{"name":"0"}]}`)
 	require.NoError(t, addData(ns))