[WIP] 0.8.0 Develop merge

.github/workflows/tests.yml

@@ -13,18 +13,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.23.6
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build
         run: go build -v ./
 
       - name: Store grip
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: gripBin
           path: grip
@@ -35,28 +35,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.18
+          go-version: ^1.23.6
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: run unit tests
         run: |
-          go test ./test/... -config badger.yml
-
-
+          go test ./test/... -config pebble.yml
+
 
   badgerTest:
     needs: build
     name: Badger Conformance
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Python Dependencies for Conformance
         run: pip install requests numpy
       - name: Download grip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: gripBin
       - name: Badger Test
@@ -65,19 +64,19 @@ jobs:
           ./grip server --rpc-port 18202 --http-port 18201 --config ./test/badger.yml &
           sleep 5
           make test-conformance
-  
+
 
   pebbleTest:
     needs: build
     name: Pebble Conformance
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Python Dependencies for Conformance
         run: pip install requests numpy
       - name: Download grip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: gripBin
       - name: Pebble Test
@@ -86,19 +85,19 @@ jobs:
           ./grip server --rpc-port 18202 --http-port 18201 --config ./test/pebble.yml &
           sleep 5
           make test-conformance
-    
+
 
   mongoTest:
     needs: build
     name: Mongo Test
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Python Dependencies for Conformance
         run: pip install requests numpy
       - name: Download grip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: gripBin
       - name: Mongo Conformance
@@ -108,89 +107,86 @@ jobs:
           ./grip server --rpc-port 18202 --http-port 18201 --config ./test/mongo.yml &
           sleep 5
           make test-conformance
-  
+
 
   mongoCoreTest:
     needs: build
     name: Mongo Core Test
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Python Dependencies for Conformance
         run: pip install requests numpy
       - name: Download grip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: gripBin
-      - name: Mongo Conformance
+      - name: Mongo Core Conformance
         run: |
           chmod +x grip
           make start-mongo
           ./grip server --rpc-port 18202 --http-port 18201 --config ./test/mongo-core-processor.yml &
           sleep 5
           make test-conformance
-
 
-  elasticTest:
+  postgresTest:
     needs: build
-    name: Elastic Test
+    name: Postgres Test
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Python Dependencies for Conformance
         run: pip install requests numpy
       - name: Download grip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: gripBin
-      - name: Elastic Conformance
+      - name: Postgres Conformance
         run: |
           chmod +x grip
-          make start-elastic
+          make start-postgres
           sleep 15
-          ./grip server --rpc-port 18202 --http-port 18201 --config ./test/elastic.yml &
+          ./grip server --rpc-port 18202 --http-port 18201 --config ./test/psql.yml &
           sleep 5
-          make test-conformance
-  
+          python conformance/run_conformance.py http://localhost:18201 --exclude index aggregations
+
 
-  portgresTest:
+  sqliteTest:
     needs: build
-    name: Portgres Test
+    name: Sqlite Test
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Python Dependencies for Conformance
         run: pip install requests numpy
       - name: Download grip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: gripBin
-      - name: Postgres Conformance
+      - name: Sqlite Conformance
         run: |
           chmod +x grip
-          make start-postgres
-          sleep 15
-          ./grip server --rpc-port 18202 --http-port 18201 --config ./test/psql.yml &
+          ./grip server --rpc-port 18202 --http-port 18201 --config ./test/sqlite.yml &
           sleep 5
           python conformance/run_conformance.py http://localhost:18201 --exclude index aggregations
-  
+
 
   gripperTest:
     needs: build
     name: Gripper Test
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Update pip
         run: pip install --upgrade pip
       - name: Python Dependencies for Conformance
         run: pip install -U requests numpy grpcio-tools protobuf
       - name: Download grip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: gripBin
       - name: Gripper Conformance
@@ -201,7 +197,7 @@ jobs:
           sleep 5
           ./grip server --rpc-port 18202 --http-port 18201 --config ./gripper/test-graph/config.yaml --er tableServer=localhost:50051 &
           sleep 5
-          python conformance/run_conformance.py http://localhost:18201 --readOnly swapi
+          python conformance/run_conformance.py http://localhost:18201 --readOnly swapi --exclude pivot
 
 
   authTest:
@@ -210,52 +206,51 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Python Dependencies for Conformance
         run: pip install requests numpy PyYAML
       - name: Download grip
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: gripBin
       - name: Auth Test
         run: |
           # start grip server
           chmod +x grip
-          ./grip server --rpc-port 18202 --http-port 18201 --config ./test/badger-auth.yml &
+          ./grip server --rpc-port 18202 --http-port 18201 --config ./test/pebble-auth.yml &
           sleep 5
           # simple auth
-          # run tests without credentials, should fail 
+          # run tests without credentials, should fail
           if make test-conformance
           then
             echo "ERROR: Conformance tests ran without credentials." ; exit 1
           else
-            echo "Got expected auth error" 
-          fi          
+            echo "Got expected auth error"
+          fi
           # run specialized role based tests
-          make test-authorization ARGS="--grip_config_file_path test/badger-auth.yml"
-
-
-
+          make test-authorization ARGS="--grip_config_file_path test/pebble-auth.yml"
 
-    #gridsTest:
-    #  needs: build
-    #  name: GRIDs Conformance
-    #  runs-on: ubuntu-latest
-    #  steps:
-    #  - name: Check out code
-    #    uses: actions/checkout@v2
-    #  - name: Python Dependencies for Conformance
-    #    run: pip install requests numpy
-    #  - name: Download grip
-    #    uses: actions/download-artifact@v2
-    #    with:
-    #      name: gripBin
-    #  - name: GRIDs unit tests
-    #    run: |
-    #      chmod +x grip
-    #      go test ./test -config grids.yml
-    #  - name: GRIDs Test
-    #    run: |
-    #      ./grip server --rpc-port 18202 --http-port 18201 --config ./test/grids.yml &
-    #      sleep 5
-    #      make test-conformance
+
+
+  gridsTest:
+    needs: build
+    name: GRIDs Conformance
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+    - name: Python Dependencies for Conformance
+      run: pip install requests numpy
+    - name: Download grip
+      uses: actions/download-artifact@v4
+      with:
+        name: gripBin
+    - name: GRIDs unit tests
+      run: |
+        chmod +x grip
+        go test ./test -config grids.yml
+    - name: GRIDs Test
+      run: |
+        ./grip server --rpc-port 18202 --http-port 18201 --config ./test/grids.yml &
+        sleep 5
+        make test-conformance

.gitignore

@@ -35,3 +35,4 @@ gripql/R/*.tar.gz
 # dev tools
 .idea/
 .vscode/
+.DS_Store

Makefile

@@ -41,12 +41,10 @@ proto:
 	  	--go_opt paths=source_relative \
 		--go-grpc_out ./ \
 		--go-grpc_opt paths=source_relative \
-		--grpc-gateway_out ./ \
+		--grpc-gateway_out allow_delete_body=true:./ \
 		--grpc-gateway_opt logtostderr=true \
 		--grpc-gateway_opt paths=source_relative \
 		--grpc-rest-direct_out . \
-		--grpc-gateway-client_out . \
-		--grpc-gateway-client_opt paths=source_relative \
 		gripql.proto
 	@cd kvindex && protoc \
 		-I ./ \
@@ -66,11 +64,11 @@ proto:
 
 proto-depends:
 	@git submodule update --init --recursive
-	@go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.11.1
-	@go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.11.1
-	@go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
+	@go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest
+	@go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@latest
+	@go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.2
 	@go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-	@go install github.com/ckaznocha/protoc-gen-lint@v0.2.4
+	@go install github.com/ckaznocha/protoc-gen-lint@latest
 	@go install github.com/bmeg/protoc-gen-grpc-rest-direct@latest
 	@go install github.com/ckaznocha/protoc-gen-lint@latest
 
@@ -91,7 +89,7 @@ lint:
 	flake8 gripql/python/ conformance/
 
 lint-depends:
-	go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.35.2
+	go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1
 	go install golang.org/x/tools/cmd/goimports
 
 # ---------------------
@@ -129,11 +127,7 @@ test-authorization:
 # ---------------------
 start-mongo:
 	@docker rm -f grip-mongodb-test > /dev/null 2>&1 || echo
-	docker run -d --name grip-mongodb-test -p 27017:27017 docker.io/mongo:3.6.4 > /dev/null
-
-start-elastic:
-	@docker rm -f grip-es-test > /dev/null 2>&1 || echo
-	docker run -d --name grip-es-test -p 19200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:5.6.3 > /dev/null
+	docker run -d --name grip-mongodb-test -p 27017:27017 mongo:7.0.13-rc0-jammy > /dev/null
 
 start-postgres:
 	@docker rm -f grip-postgres-test > /dev/null 2>&1 || echo

README.md

@@ -7,7 +7,7 @@
 
 https://bmeg.github.io/grip/
 
-GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.
+GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.
 
 Properties of an GRIP graph: