add grpc API for creating/deleting/rename/listing namespaces (#9252)

dgraph/cmd/alpha/run.go

@@ -39,6 +39,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4"
 	"github.com/dgraph-io/dgo/v240/protos/api"
+	apiv25 "github.com/dgraph-io/dgo/v240/protos/api.v25"
 	_ "github.com/dgraph-io/gqlparser/v2/validator/rules" // make gql validator init() all rules
 	"github.com/dgraph-io/ristretto/v2/z"
 	"github.com/hypermodeinc/dgraph/v24/edgraph"
@@ -461,6 +462,7 @@ func serveGRPC(l net.Listener, tlsCfg *tls.Config, closer *z.Closer) {
 
 	s := grpc.NewServer(opt...)
 	api.RegisterDgraphServer(s, &edgraph.Server{})
+	apiv25.RegisterDgraphHMServer(s, &edgraph.Server{})
 	hapi.RegisterHealthServer(s, health.NewServer())
 	worker.RegisterZeroProxyServer(s)
 

dgraphapi/schema.go

@@ -1,17 +1,6 @@
 /*
- * Copyright 2025 Dgraph Labs, Inc. and Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: © Hypermode Inc. <[email protected]>
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package dgraphapi

dgraphtest/compose_cluster.go

@@ -7,6 +7,9 @@ package dgraphtest
 
 import (
 	"github.com/dgraph-io/dgo/v240"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+
 	"github.com/hypermodeinc/dgraph/v24/dgraphapi"
 	"github.com/hypermodeinc/dgraph/v24/testutil"
 )
@@ -18,12 +21,12 @@ func NewComposeCluster() *ComposeCluster {
 }
 
 func (c *ComposeCluster) Client() (*dgraphapi.GrpcClient, func(), error) {
-	client, err := testutil.DgraphClient(testutil.SockAddr)
+	dg, err := dgo.NewClient(testutil.SockAddr,
+		dgo.WithGrpcOption(grpc.WithTransportCredentials(insecure.NewCredentials())))
 	if err != nil {
 		return nil, nil, err
 	}
-
-	return &dgraphapi.GrpcClient{Dgraph: client}, func() {}, nil
+	return &dgraphapi.GrpcClient{Dgraph: dg}, func() { dg.Close() }, nil
 }
 
 // HTTPClient creates an HTTP client

dgraphtest/image.go

@@ -13,16 +13,25 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"sync"
 
 	"github.com/pkg/errors"
 	"golang.org/x/mod/modfile"
 )
 
+var (
+	cloneOnce sync.Once
+)
+
 func (c *LocalCluster) dgraphImage() string {
 	return "dgraph/dgraph:local"
 }
 
 func (c *LocalCluster) setupBinary() error {
+	if err := ensureDgraphClone(); err != nil {
+		panic(err)
+	}
+
 	if c.conf.customPlugins {
 		race := false // Explicit var declaration to avoid confusion on the next line
 		if err := c.GeneratePlugins(race); err != nil {
@@ -52,21 +61,25 @@ func (c *LocalCluster) setupBinary() error {
 }
 
 func ensureDgraphClone() error {
-	if _, err := os.Stat(repoDir); err != nil {
-		return runGitClone()
-	}
+	f := func() error {
+		if _, err := os.Stat(repoDir); err != nil {
+			return runGitClone()
+		}
 
-	if err := runGitStatus(); err != nil {
-		if ierr := cleanupRepo(); ierr != nil {
-			return ierr
+		if err := runGitStatus(); err != nil {
+			if err := os.RemoveAll(repoDir); err != nil {
+				return err
+			}
+			return runGitClone()
 		}
-		return runGitClone()
+		return nil
 	}
-	return nil
-}
 
-func cleanupRepo() error {
-	return os.RemoveAll(repoDir)
+	var err error
+	cloneOnce.Do(func() {
+		err = f()
+	})
+	return err
 }
 
 func runGitClone() error {

dgraphtest/paths.go

@@ -40,9 +40,6 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
-	if err := ensureDgraphClone(); err != nil {
-		panic(err)
-	}
 
 	log.Printf("[INFO] baseRepoDir: %v", baseRepoDir)
 	log.Printf("[INFO] repoDir: %v", repoDir)

edgraph/access_ee.go

@@ -114,8 +114,7 @@ func (s *Server) Login(ctx context.Context,
 // authenticateLogin authenticates the login request using either the refresh token if present, or
 // the <userId, password> pair. If authentication passes, it queries the user's uid and associated
 // groups from DB and returns the user object
-func (s *Server) authenticateLogin(ctx context.Context, request *api.LoginRequest) (*acl.User,
-	error) {
+func (s *Server) authenticateLogin(ctx context.Context, request *api.LoginRequest) (*acl.User, error) {
 	if err := validateLoginRequest(request); err != nil {
 		return nil, errors.Wrapf(err, "invalid login request")
 	}

edgraph/multi_tenancy.go

@@ -16,7 +16,7 @@ type ResetPasswordInput struct {
 	Namespace uint64
 }
 
-func (s *Server) CreateNamespace(ctx context.Context, passwd string) (uint64, error) {
+func (s *Server) CreateNamespaceInternal(ctx context.Context, passwd string) (uint64, error) {
 	return 0, nil
 }
 

edgraph/multi_tenancy_ee.go

@@ -82,9 +82,9 @@ func (s *Server) ResetPassword(ctx context.Context, inp *ResetPasswordInput) err
 	return nil
 }
 
-// CreateNamespace creates a new namespace. Only guardian of galaxy is authorized to do so.
+// CreateNamespaceInternal creates a new namespace. Only guardian of galaxy is authorized to do so.
 // Authorization is handled by middlewares.
-func (s *Server) CreateNamespace(ctx context.Context, passwd string) (uint64, error) {
+func (s *Server) CreateNamespaceInternal(ctx context.Context, passwd string) (uint64, error) {
 	glog.V(2).Info("Got create namespace request.")
 
 	num := &pb.Num{Val: 1, Type: pb.Num_NS_ID}