Merge remote-tracking branch 'origin/main'

hasura · Sep 30, 2024 · ab975d5 · ab975d5
2 parents f5272da + 0b86832
commit ab975d5
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 28 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: docker/build-push-action@v5
       with:
         context: .
-        tags: ghcr.io/hasura/meta_connector:latest
+        tags: ghcr.io/hasura/ndc-calcite:latest
         platforms: linux/amd64,linux/arm64
         cache-from: type=gha
         cache-to: type=gha,mode=max

diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,5 @@ target/
 /adapters/hive/hadoop_data/
 
 /test-connector/
-/adapters/file/data/files/2022CbpOceanEconomyTable__2022CbpIaOceanEconomy.json
-/adapters/file/data/files/2022CbpOceanEconomyTable__Notes.json
-/grafana/tempo-data/*
-
+adapters/file/data/files/2022CbpOceanEconomyTable__2022CbpIaOceanEconomy.json
+adapters/file/data/files/2022CbpOceanEconomyTable__Notes.json
diff --git a/adapters/cassandra/configuration.json b/adapters/cassandra/configuration.json
@@ -1,6 +1,6 @@
 {
-  "version": "5",
-  "$schema": "schema.json",
-  "model_file_path": "/Users/kennethstott/Documents/GitHub/calcite-connector/adapters/cassandra/model.json",
-  "fixes": true
-}
+    "version": "5",
+    "$schema": "schema.json",
+    "model_file_path": "/etc/connector/model.json",
+    "fixes": true
+}
diff --git a/adapters/jdbc/build.sh b/adapters/jdbc/build.sh
@@ -1,2 +1,2 @@
 cd ../..
-docker build --platform linux/arm64,linux/amd64 . -t ghcr.io/hasura/meta_connector:latest
+docker build --platform linux/arm64,linux/amd64 . -t ghcr.io/hasura/ndc-calcite:latest
diff --git a/adapters/jdbc/dev.docker-compose.calcite.yaml b/adapters/jdbc/dev.docker-compose.calcite.yaml
@@ -3,7 +3,7 @@ services:
     build:
       context: .
       dockerfile_inline: |-
-        FROM meta_connector:latest
+        FROM ndc-calcite:latest
         COPY ./ /etc/connector
     develop:
       watch:

diff --git a/adapters/jdbc/docker-compose.calcite.yaml b/adapters/jdbc/docker-compose.calcite.yaml
@@ -3,7 +3,7 @@ services:
     build:
       context: .
       dockerfile_inline: |-
-        FROM meta_connector:latest
+        FROM ndc-calcite:latest
         COPY ./ /etc/connector
     develop:
       watch:

diff --git a/build-local.sh b/build-local.sh
@@ -12,11 +12,11 @@ cd ../..
 #  -H "X-GitHub-Api-Version: 2022-11-28" \
 #  https://api.github.com/repos/hasura/ndc-calcite/releases/latest)
 #TAG=$(echo "$release_info" | grep 'tag_name' | awk -F':' '{print $2}' | tr -d ' "",')
-docker build . --platform linux/arm64 -t ghcr.io/hasura/meta_connector:latest
+docker build . --platform linux/arm64 -t ghcr.io/hasura/ndc-calcite:latest
 #docker buildx build --platform linux/arm64 --output type=oci,dest=./image.tar .
-#docker tag ghcr.io/hasura/meta_connector:latest ghcr.io/hasura/meta_connector:"$TAG"
-#docker push ghcr.io/hasura/meta_connector:latest
-#docker push ghcr.io/hasura/meta_connector:"$TAG"
+#docker tag ghcr.io/hasura/ndc-calcite:latest ghcr.io/hasura/ndc-calcite:"$TAG"
+#docker push ghcr.io/hasura/ndc-calcite:latest
+#docker push ghcr.io/hasura/ndc-calcite:"$TAG"
 
 cd calcite-rs-jni/calcite
 ./gradlew assemble

diff --git a/build.sh b/build.sh
@@ -4,7 +4,7 @@ mvn clean
 cd calcite
 ./gradlew clean
 
- create a tag name from the last connector release
+# create a tag name from the last connector release
 cd ../..
 release_info=$(curl -L \
   -H "Accept: application/vnd.github+json" \
@@ -14,10 +14,11 @@ release_info=$(curl -L \
 TAG=$(echo "$release_info" | grep 'tag_name' | awk -F':' '{print $2}' | tr -d ' "",')
 
 # build arm & amd versions
-docker build . --no-cache --platform linux/arm64,linux/amd64 -t ghcr.io/hasura/meta_connector:latest
+# docker build . --no-cache --platform linux/arm64,linux/amd64 -t ghcr.io/hasura/ndc-calcite:latest
+docker build . --no-cache -t ghcr.io/hasura/ndc-calcite:latest
 #docker buildx build --platform linux/arm64 --output type=oci,dest=./image.tar .
-docker tag ghcr.io/hasura/meta_connector:"$TAG"
+docker tag ghcr.io/hasura/ndc-calcite:"$TAG"
 
 # push to docker hub
-docker push ghcr.io/hasura/meta_connector:latest
-docker push ghcr.io/hasura/meta_connector:"$TAG"
+docker push ghcr.io/hasura/ndc-calcite:latest
+docker push ghcr.io/hasura/ndc-calcite:"$TAG"
diff --git a/calcite-rs-jni/calcite b/calcite-rs-jni/calcite
diff --git a/cli-update-model.sh b/cli-update-model.sh
@@ -1,2 +1,2 @@
 export HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH="$(cd "$(dirname "$1")"; pwd -P)/$(basename "$1")"
-docker run --entrypoint ndc-calcite-cli "OTEL_LOGS_EXPORTER=console" -e "OTEL_TRACES_EXPORTER=console" -e "OTEL_METRICS_EXPORTER=console" -e "RUST_LOG=debug" -e "LOG_LEVEL=all" -e HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH -v "${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}":/app/output -v "${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}":/etc/connector:ro ghcr.io/hasura/meta_connector:latest update
+docker run --entrypoint ndc-calcite-cli "OTEL_LOGS_EXPORTER=console" -e "OTEL_TRACES_EXPORTER=console" -e "OTEL_METRICS_EXPORTER=console" -e "RUST_LOG=debug" -e "LOG_LEVEL=all" -e HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH -v "${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}":/app/output -v "${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}":/etc/connector:ro ghcr.io/hasura/ndc-calcite:latest update
diff --git a/cli.sh b/cli.sh
@@ -10,7 +10,7 @@ echo $HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH
 mkdir -p $HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH
 #rm -rf ${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}
 #mkdir -p ${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}
-docker run --entrypoint ndc-calcite-cli -e "OTEL_LOG_LEVEL=trace" -e "OTEL_LOGS_EXPORTER=console" -e "OTEL_TRACES_EXPORTER=console" -e "RUST_LOG=debug" -e "LOG_LEVEL=all" -e HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH -v "${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}":/app/output -v "${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}":/etc/connector:ro ghcr.io/hasura/meta_connector:latest update
+docker run --entrypoint ndc-calcite-cli -e "OTEL_LOG_LEVEL=trace" -e "OTEL_LOGS_EXPORTER=console" -e "OTEL_TRACES_EXPORTER=console" -e "RUST_LOG=debug" -e "LOG_LEVEL=all" -e HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH -v "${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}":/app/output -v "${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}":/etc/connector:ro ghcr.io/hasura/ndc-calcite:latest update
 
 echo "include:\n  - path: ${filepath}/compose.yaml" > temp.yml
 echo "$content" >> temp.yml
@@ -33,7 +33,7 @@ services:
     build:
       context: .
       dockerfile_inline: |-
-        FROM ghcr.io/hasura/meta_connector:latest
+        FROM ghcr.io/hasura/ndc-calcite:latest
         COPY ./ /etc/connector
     develop:
       watch:

diff --git a/cmd.sh b/cmd.sh
@@ -1,2 +1,2 @@
 export LOCAL_PATH=$(PWD)/test3/app/connector/calcite
-docker run -it --entrypoint /bin/bash -e "OTEL_LOG_LEVEL=trace" -e "OTEL_LOGS_EXPORTER=console" -e "OTEL_TRACES_EXPORTER=console" -e "RUST_LOG=debug" -e "LOG_LEVEL=all" -e "HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH=${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}" -v ${LOCAL_PATH}:/etc/connector ghcr.io/hasura/meta_connector:latest
+docker run -it --entrypoint /bin/bash -e "OTEL_LOG_LEVEL=trace" -e "OTEL_LOGS_EXPORTER=console" -e "OTEL_TRACES_EXPORTER=console" -e "RUST_LOG=debug" -e "LOG_LEVEL=all" -e "HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH=${HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH}" -v ${LOCAL_PATH}:/etc/connector ghcr.io/hasura/ndc-calcite:latest
diff --git a/crates/values/src/values.rs b/crates/values/src/values.rs
@@ -1,7 +1,7 @@
 pub const DEV_CONFIG_FILE_NAME: &str = "dev.local.configuration.json";
 pub const CONFIGURATION_FILENAME: &str = "configuration.json";
 pub const CONFIGURATION_JSONSCHEMA_FILENAME: &str = "schema.json";
-pub const DOCKER_IMAGE_NAME: &str = "ghcr.io/hasura/meta_connector";
+pub const DOCKER_IMAGE_NAME: &str = "ghcr.io/hasura/ndc-calcite";
 pub const DOCKER_CONNECTOR_DIR: &str = "/etc/connector";
 
 pub const DOCKER_CONNECTOR_RW: &str = "/app/output";