fix(import): add sanity checks for connection string and bulk output directory in … (#9541)

…import client

Co-authored-by: Shiva <shiva@Shivajis-MacBook-Pro.local>

Author: shiva-istari

dgraph/cmd/dgraphimport/import_client.go

@@ -25,6 +25,10 @@ import (
 
 // newClient creates a new import client with the specified endpoint and gRPC options.
 func newClient(connectionString string) (api.DgraphClient, error) {
+	if connectionString == "" {
+		return nil, fmt.Errorf("connection string cannot be empty")
+	}
+
 	dg, err := dgo.Open(connectionString)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to endpoint [%s]: %w", connectionString, err)
@@ -35,6 +39,10 @@ func newClient(connectionString string) (api.DgraphClient, error) {
 }
 
 func Import(ctx context.Context, connectionString string, bulkOutDir string) error {
+	if bulkOutDir == "" {
+		return fmt.Errorf("bulk output directory cannot be empty")
+	}
+
 	dg, err := newClient(connectionString)
 	if err != nil {
 		return err

dgraph/cmd/dgraphimport/import_test.go

@@ -62,6 +62,18 @@ const expectedSchema = `{
 	]
 }`
 
+func TestEmptyConnStr(t *testing.T) {
+	err := Import(context.Background(), "", "/tmp")
+	require.Error(t, err)
+	require.ErrorContains(t, err, "connection string cannot be empty")
+}
+
+func TestEmptyBulkOutDir(t *testing.T) {
+	err := Import(context.Background(), "dgraph://localhost:9080", "")
+	require.Error(t, err)
+	require.ErrorContains(t, err, "bulk output directory cannot be empty")
+}
+
 func TestDrainModeAfterStartSnapshotStream(t *testing.T) {
 	t.Skip("Skipping... sometimes the query for schema succeeds even when the server is in draining mode")
 

dgraph/cmd/dgraphimport/run.go

@@ -36,12 +36,11 @@ func init() {
 	flag.StringP("files", "f", "", "Location of *.rdf(.gz) or *.json(.gz) file(s) to load.")
 	flag.StringP("snapshot-dir", "p", "", "Location of p directory")
 	flag.StringP("schema", "s", "", "Location of DQL schema file.")
-	flag.StringP("graphql_schema", "g", "", "Location of the GraphQL schema file.")
-	flag.StringP("graphql-schema", "", "", "Location of the GraphQL schema file.")
+	flag.StringP("graphql-schema", "g", "", "Location of the GraphQL schema file.")
 	flag.String("format", "", "Specify file format (rdf or json)")
 	flag.Bool("drop-all", false, "Drops all the existing data in the cluster before importing data into Dgraph.")
 	flag.Bool("drop-all-confirm", false, "Confirm drop-all operation.")
-	flag.StringP("conn-str", "c", "", "Dgraph connection string.")
+	flag.StringP("conn-str", "c", "dgraph://localhost:9080", "Dgraph connection string.")
 }
 
 func run() {