Merge remote-tracking branch 'origin/main'

.github/workflows/docker-image.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: docker/build-push-action@v5
       with:
         context: .
-        tags: kstott/meta_connector:latest
+        tags: ghcr.io/hasura/meta_connector:latest
         platforms: linux/amd64,linux/arm64
         cache-from: type=gha
         cache-to: type=gha,mode=max

adapters/jdbc/build.sh

@@ -1,2 +1,2 @@
 cd ../..
-docker build --platform linux/arm64,linux/amd64 . -t kstott/meta_connector:latest
+docker build --platform linux/arm64,linux/amd64 . -t ghcr.io/hasura/meta_connector:latest

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 kstott/meta_connector:latest
+docker build . --platform linux/arm64 -t ghcr.io/hasura/meta_connector:latest
 #docker buildx build --platform linux/arm64 --output type=oci,dest=./image.tar .
-#docker tag kstott/meta_connector:latest kstott/meta_connector:"$TAG"
-#docker push kstott/meta_connector:latest
-#docker push kstott/meta_connector:"$TAG"
+#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"
 
 cd calcite-rs-jni/calcite
 ./gradlew assemble

build.sh

@@ -14,10 +14,10 @@ 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 kstott/meta_connector:latest
+docker build . --no-cache --platform linux/arm64,linux/amd64 -t ghcr.io/hasura/meta_connector:latest
 #docker buildx build --platform linux/arm64 --output type=oci,dest=./image.tar .
-docker tag kstott/meta_connector:latest kstott/meta_connector:"$TAG"
+docker tag ghcr.io/hasura/meta_connector:"$TAG"
 
 # push to docker hub
-docker push kstott/meta_connector:latest
-docker push kstott/meta_connector:"$TAG"
+docker push ghcr.io/hasura/meta_connector:latest
+docker push ghcr.io/hasura/meta_connector:"$TAG"

cli-update-model.sh

@@ -10,7 +10,7 @@ export HASURA_PLUGIN_CONNECTOR_CONTEXT_PATH="$(cd "$(dirname "$1")"; pwd -P)/$(b
 #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 docker.io/kstott/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/meta_connector:latest update
 
 #echo "include:\n  - path: ${filepath}/compose.yaml" > temp.yml
 #echo "$content" >> temp.yml
@@ -31,7 +31,7 @@ docker run --entrypoint ndc-calcite-cli -e "OTEL_LOG_LEVEL=trace" -e "OTEL_LOGS_
 #    build:
 #      context: .
 #      dockerfile_inline: |-
-#        FROM kstott/meta_connector:latest
+#        FROM ghcr.io/hasura/meta_connector:latest
 #        COPY ./ /etc/connector
 #    develop:
 #      watch:

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 docker.io/kstott/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/meta_connector:latest update
 
 echo "include:\n  - path: ${filepath}/compose.yaml" > temp.yml
 echo "$content" >> temp.yml
@@ -31,7 +31,7 @@ services:
     build:
       context: .
       dockerfile_inline: |-
-        FROM kstott/meta_connector:latest
+        FROM ghcr.io/hasura/meta_connector:latest
         COPY ./ /etc/connector
     develop:
       watch:

cmd.sh

@@ -1,2 +1,2 @@
-export LOCAL_PATH=/Users/kennethstott/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 docker.io/kstott/meta_connector:latest
+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

crates/values/src/values.rs

@@ -1,8 +1,8 @@
 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 = "docker.io/kstott/meta_connector";
+pub const DOCKER_IMAGE_NAME: &str = "ghcr.io/hasura/meta_connector";
 pub const DOCKER_CONNECTOR_DIR: &str = "/etc/connector";
 
 pub const DOCKER_CONNECTOR_RW: &str = "/app/output";
-pub const UNABLE_TO_WRITE_TO_FILE: &str = "Unable to write file.";
+pub const UNABLE_TO_WRITE_TO_FILE: &str = "Unable to write file.";