chore(core): remove slash grpc handling

Author: xqqp

dgraph/cmd/live/run.go

@@ -25,8 +25,6 @@ import (
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 
 	"github.com/dgraph-io/badger/v4"
@@ -142,12 +140,7 @@ func init() {
 		"Number of N-Quads to send as part of a mutation.")
 	flag.StringP("xidmap", "x", "", "Directory to store xid to uid mapping")
 	flag.StringP("auth_token", "t", "",
-		"The auth token passed to the server for Alter operation of the schema file. "+
-			"If used with --slash_grpc_endpoint, then this should be set to the API token issued"+
-			"by Slash GraphQL")
-	flag.String("slash_grpc_endpoint", "", "Path to Slash GraphQL GRPC endpoint. "+
-		"If --slash_grpc_endpoint is set, all other TLS options and connection options will be"+
-		"ignored")
+		"The auth token passed to the server for Alter operation of the schema file")
 	flag.BoolP("use_compression", "C", false,
 		"Enable compression on connection to alpha server")
 	flag.Bool("new_uids", false,
@@ -584,7 +577,7 @@ func (l *loader) processLoadFile(ctx context.Context, rd *bufio.Reader, ck chunk
 	return <-errCh
 }
 
-func setup(opts batchMutationOptions, dc *dgo.Dgraph, conf *viper.Viper) *loader {
+func setup(opts batchMutationOptions, dc *dgo.Dgraph) *loader {
 	var db *badger.DB
 	if len(opt.clientDir) > 0 {
 		x.Check(os.MkdirAll(opt.clientDir, 0700))
@@ -599,11 +592,6 @@ func setup(opts batchMutationOptions, dc *dgo.Dgraph, conf *viper.Viper) *loader
 		x.Checkf(err, "Error while creating badger KV posting store")
 	}
 
-	dialOpts := []grpc.DialOption{}
-	if conf.GetString("slash_grpc_endpoint") != "" && conf.IsSet("auth_token") {
-		dialOpts = append(dialOpts, x.WithAuthorizationCredentials(conf.GetString("auth_token")))
-	}
-
 	xopts := xidmap.XidMapOptions{DB: db, DgClient: dc}
 	alloc := xidmap.New(xopts)
 	l := &loader{
@@ -745,7 +733,7 @@ func run() error {
 	dg, closeFunc := x.GetDgraphClient(Live.Conf, true)
 	defer closeFunc()
 
-	l := setup(bmOpts, dg, Live.Conf)
+	l := setup(bmOpts, dg)
 	if err := l.populateNamespaces(ctx, dg, singleNsOp); err != nil {
 		fmt.Printf("Error while populating namespaces %s\n", err)
 		return err

upgrade/upgrade.go

@@ -33,7 +33,6 @@ type versionComparisonResult uint8
 const (
 	dryRun    = "dry-run"
 	alpha     = "alpha"
-	slashGrpc = "slash_grpc_endpoint"
 	authToken = "auth_token"
 	alphaHttp = "alpha-http"
 	user      = "user"
@@ -146,13 +145,8 @@ func init() {
 	flag.Bool(dryRun, false, "dry-run the upgrade")
 	flag.StringP(alpha, "a", "127.0.0.1:9080",
 		"Comma separated list of Dgraph Alpha gRPC server address")
-	flag.String(slashGrpc, "", "Path to Slash GraphQL GRPC endpoint. "+
-		"If --slash_grpc_endpoint is set, all other TLS options and connection options will be "+
-		"ignored")
 	flag.String(authToken, "",
-		"The auth token passed to the server for Alter operation of the schema file. "+
-			"If used with --slash_grpc_endpoint, then this should be set to the API token issued"+
-			"by Slash GraphQL")
+		"The auth token passed to the server for Alter operation of the schema file")
 	flag.String(alphaHttp, "http://127.0.0.1:8080", "Draph Alpha HTTP(S) endpoint.")
 	flag.StringP(user, "u", "", "Username of ACL user")
 	flag.StringP(password, "p", "", "Password of ACL user")

x/tls_helper.go

@@ -147,31 +147,12 @@ func LoadServerTLSConfig(v *viper.Viper) (*tls.Config, error) {
 	return GenerateServerTLSConfig(&conf)
 }
 
-// SlashTLSConfig returns the TLS config appropriate for SlashGraphQL
-// This assumes that endpoint is not empty, and in the format "domain.grpc.cloud.dg.io:443"
-func SlashTLSConfig(endpoint string) (*tls.Config, error) {
-	pool, err := generateCertPool("", true)
-	if err != nil {
-		return nil, err
-	}
-	hostWithoutPort := strings.Split(endpoint, ":")[0]
-	return &tls.Config{
-		RootCAs:    pool,
-		ServerName: hostWithoutPort,
-		MinVersion: tls.VersionTLS12,
-	}, nil
-}
-
 // LoadClientTLSConfig loads the TLS config into the client with the given parameters.
 func LoadClientTLSConfig(v *viper.Viper) (*tls.Config, error) {
-	if v.GetString("slash_grpc_endpoint") != "" {
-		return SlashTLSConfig(v.GetString("slash_grpc_endpoint"))
-	}
-
 	tlsFlag := z.NewSuperFlag(v.GetString("tls")).MergeAndCheckDefault(TLSDefaults)
 
 	// When the --tls ca-cert="..."; option is specified, the connection will be set up using TLS
-	// instead of plaintext. However the client cert files are optional, depending on whether the
+	// instead of plaintext. However, the client cert files are optional, depending on whether the
 	// server requires a client certificate.
 	caCert := tlsFlag.GetPath("ca-cert")
 	if caCert != "" {

x/x.go

@@ -1034,25 +1034,13 @@ func (a *authorizationCredentials) RequireTransportSecurity() bool {
 	return true
 }
 
-// WithAuthorizationCredentials adds Authorization: <api-token> to every GRPC request
-// This is mostly used by Slash GraphQL to authenticate requests
-func WithAuthorizationCredentials(authToken string) grpc.DialOption {
-	return grpc.WithPerRPCCredentials(&authorizationCredentials{authToken})
-}
-
 // GetDgraphClient creates a Dgraph client based on the following options in the configuration:
-// --slash_grpc_endpoint specifies the grpc endpoint for slash. It takes precedence over --alpha and TLS
 // --alpha specifies a comma separated list of endpoints to connect to
 // --tls "ca-cert=; client-cert=; client-key=;" etc specify the TLS configuration of the connection
 // --retries specifies how many times we should retry the connection to each endpoint upon failures
 // --user and --password specify the credentials we should use to login with the server
 func GetDgraphClient(conf *viper.Viper, login bool) (*dgo.Dgraph, CloseFunc) {
-	var alphas string
-	if conf.GetString("slash_grpc_endpoint") != "" {
-		alphas = conf.GetString("slash_grpc_endpoint")
-	} else {
-		alphas = conf.GetString("alpha")
-	}
+	var alphas = conf.GetString("alpha")
 
 	if len(alphas) == 0 {
 		glog.Fatalf("The --alpha option must be set in order to connect to Dgraph")
@@ -1074,15 +1062,10 @@ func GetDgraphClient(conf *viper.Viper, login bool) (*dgo.Dgraph, CloseFunc) {
 		}
 	}
 
-	dialOpts := []grpc.DialOption{}
-	if conf.GetString("slash_grpc_endpoint") != "" && conf.IsSet("auth_token") {
-		dialOpts = append(dialOpts, WithAuthorizationCredentials(conf.GetString("auth_token")))
-	}
-
 	for _, d := range ds {
 		var conn *grpc.ClientConn
 		for range retries {
-			conn, err = SetupConnection(d, tlsCfg, false, dialOpts...)
+			conn, err = SetupConnection(d, tlsCfg, false)
 			if err == nil {
 				break
 			}