add changelog and fix local dev

Author: hgiasac

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.9.9]
+
+- Fix reported vulnerabilities.
+
 ## [1.9.8]
 
 - Fix reported vulnerabilities.

docker-compose.yaml

@@ -1,10 +1,12 @@
-version: '3.8'
 services:
   ndc-elasticsearch:
     image: ghcr.io/hasura/ndc-elasticsearch:latest
+    build:
+      context: .
     volumes:
       - ./resources/configuration.json:/etc/connector/configuration.json
       - certs:/usr/share/elasticsearch/config/certs
+    user: "0"
     ports:
       - 8080:8080
     environment:
@@ -16,6 +18,7 @@ services:
       ELASTICSEARCH_USERNAME: elastic
       ELASTICSEARCH_PASSWORD: ${ELASTIC_PASSWORD:-default}
       ELASTICSEARCH_CA_CERT_PATH: /usr/share/elasticsearch/config/certs/es01/es01.crt
+      HASURA_LOG_LEVEL: debug
     command: serve
     depends_on:
       jaeger:
@@ -58,22 +61,18 @@ services:
         chown -R root:root config/certs;
         find . -type d -exec chmod 750 \{\} \;;
         find . -type f -exec chmod 640 \{\} \;;
-        echo "Waiting for Elasticsearch availability";
-        until curl -s --cacert config/certs/ca/ca.crt https://es01:9200 | grep -q "missing authentication credentials"; do sleep 30; done;
-        echo "Setting kibana_system password";
-        until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD:-default}" -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD:-default}\"}" | grep -q "^{}"; do sleep 10; done;
         echo "All done!";
       '
     healthcheck:
       test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"]
       interval: 1s
       timeout: 5s
       retries: 120
-  
+
   es01:
     depends_on:
       setup:
-        condition: service_healthy
+        condition: service_completed_successfully
     image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION:-8.13.4}
     volumes:
       - certs:/usr/share/elasticsearch/config/certs

internal/utils.go

@@ -191,18 +191,20 @@ func Contains(s []string, e string) bool {
 //
 // The path of the file will change based on the component that is accessing it
 func GetUsersFile(filePath string) ([]byte, error) {
-	if os.Getenv("HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH") != "" {
-		// the plugin is accessing the file
-		// we'll prepend the value of this env var to the file path
-		filePath = filepath.Join(os.Getenv("HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH"), filePath)
-	} else if os.Getenv("HASURA_CONFIGURATION_DIRECTORY") != "" {
-		// the docker container is accessing the file
-		filePath = filepath.Join(os.Getenv("HASURA_CONFIGURATION_DIRECTORY"), filePath)
-	} else {
-		// since no env var is set, we'll assume that the docker container is accessing the file
-		// and the file is mounted to the /etc/connector/ directory, according to the spec:
-		// https://github.com/hasura/ndc-hub/blob/a764938e13fa3cc719745edaff73b584a936e3ef/rfcs/0000-deployment.md?plain=1#L23
-		filePath = filepath.Join("/etc/connector/", filePath)
+	if !filepath.IsAbs(filePath) {
+		if os.Getenv("HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH") != "" {
+			// the plugin is accessing the file
+			// we'll prepend the value of this env var to the file path
+			filePath = filepath.Join(os.Getenv("HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH"), filePath)
+		} else if os.Getenv("HASURA_CONFIGURATION_DIRECTORY") != "" {
+			// the docker container is accessing the file
+			filePath = filepath.Join(os.Getenv("HASURA_CONFIGURATION_DIRECTORY"), filePath)
+		} else {
+			// since no env var is set, we'll assume that the docker container is accessing the file
+			// and the file is mounted to the /etc/connector/ directory, according to the spec:
+			// https://github.com/hasura/ndc-hub/blob/a764938e13fa3cc719745edaff73b584a936e3ef/rfcs/0000-deployment.md?plain=1#L23
+			filePath = filepath.Join("/etc/connector/", filePath)
+		}
 	}
 
 	if !FileExists(filePath) {