Merge pull request #11 from hasura/fix-config-env-cli

Fix CLI config directory env var and handle null values in response

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.1]
+
+- Fixed the configuration directory environment variable in the CLI.
+- Handled null values for nested fields in the response.
+
 ## [0.1.0]
 
 - Initial release of the Hasura connector for Elasticsearch.

cli/cli.go

@@ -9,7 +9,7 @@ import (
 
 type Arguments struct {
 	// The path to the configuration. Defaults to the current directory.
-	Configuration string `help:"Configuration directory." env:"HASURA_CONFIGURATION_DIRECTORY"`
+	Configuration string `help:"Configuration directory." env:"HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH"`
 }
 
 type CLI struct {

connector/response.go

@@ -83,24 +83,37 @@ func prepareResponse(ctx context.Context, response map[string]interface{}) *sche
 func extractDocument(source map[string]interface{}, selectedFields map[string]types.Field) map[string]interface{} {
 	document := make(map[string]interface{})
 	for fieldName, fieldData := range selectedFields {
-		if fieldData.Fields != nil {
-			if fieldDataSource, ok := source[fieldData.Name].(map[string]interface{}); ok {
-				documents := extractDocument(fieldDataSource, selectedFields[fieldName].Fields)
-				document[fieldName] = []interface{}{documents}
-			}
-			if fieldDataSource, ok := source[fieldData.Name].([]interface{}); ok {
-				docs := make([]interface{}, 0)
-				for _, data := range fieldDataSource {
-					doc := extractDocument(data.(map[string]interface{}), selectedFields[fieldName].Fields)
-					docs = append(docs, doc)
-				}
-				document[fieldName] = docs
+		document[fieldName] = extractSubDocument(source, fieldData)
+	}
+	return document
+}
+
+// extractSubDocument extracts sub-documents based on the selected fields.
+func extractSubDocument(source map[string]interface{}, fieldData types.Field) interface{} {
+	if fieldData.Fields != nil {
+		sourceData, ok := source[fieldData.Name]
+		if !ok {
+			return []interface{}{extractDocument(make(map[string]interface{}), fieldData.Fields)}
+		}
+
+		if subDocument, ok := sourceData.(map[string]interface{}); ok {
+			return []interface{}{extractDocument(subDocument, fieldData.Fields)}
+		}
+
+		if subDocuments, ok := sourceData.([]interface{}); ok {
+			subDocumentsList := make([]interface{}, 0)
+			for _, subDocument := range subDocuments {
+				subDocumentsList = append(subDocumentsList, extractDocument(subDocument.(map[string]interface{}), fieldData.Fields))
 			}
-		} else {
-			document[fieldName] = source[fieldData.Name]
+			return subDocumentsList
 		}
 	}
-	return document
+
+	if fieldValue, ok := source[fieldData.Name]; ok {
+		return fieldValue
+	}
+
+	return nil
 }
 
 // extractAggregates extracts aggregate values from the source data and updates the row set aggregates.