From ffedba869d4e5f3a7e0d6eff207750699502795e Mon Sep 17 00:00:00 2001 From: kenstott <128912107+kenstott@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:08:20 -0700 Subject: [PATCH 1/4] Calcite file adapter will now recursively look for files through a directory. Now supports XLSX files. --- .../files/2022-cbp-ocean-economy-table.xlsx | Bin 0 -> 40129 bytes crates/connectors/ndc-calcite/src/lib.rs | 1 + 2 files changed, 1 insertion(+) create mode 100644 adapters/file/data/files/2022-cbp-ocean-economy-table.xlsx diff --git a/adapters/file/data/files/2022-cbp-ocean-economy-table.xlsx b/adapters/file/data/files/2022-cbp-ocean-economy-table.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..713b1d7fa938447981f13a3e43414ebe8c2250a4 GIT binary patch literal 40129 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 bZ{q)UT`(oWL*gMoG0uUO041q>d3g0N*v%e{ literal 0 HcmV?d00001 diff --git a/crates/connectors/ndc-calcite/src/lib.rs b/crates/connectors/ndc-calcite/src/lib.rs index 4f7ce0c..605dd1a 100644 --- a/crates/connectors/ndc-calcite/src/lib.rs +++ b/crates/connectors/ndc-calcite/src/lib.rs @@ -13,6 +13,7 @@ //! - Cassandra (tested) //! - CSV (tested) //! - JSON (tested) +//! - XLSX (tested) //! - Druid //! - ElasticSearch //! - Geode From 4cfa5f0bfed1b30b822ab784de52bbc11385c85f Mon Sep 17 00:00:00 2001 From: "David A. Ventimiglia" Date: Mon, 16 Sep 2024 08:56:02 -0700 Subject: [PATCH 2/4] Replaced kstott with ghcr.io/hasura --- .github/workflows/docker-image.yml | 2 +- adapters/jdbc/build.sh | 2 +- build-local.sh | 8 ++++---- build.sh | 8 ++++---- cli-update-model.sh | 4 ++-- cli.sh | 4 ++-- cmd.sh | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9e1b83c..a489282 100644 --- 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: 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 diff --git a/adapters/jdbc/build.sh b/adapters/jdbc/build.sh index c063186..dbd1f98 100755 --- a/adapters/jdbc/build.sh +++ b/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 diff --git a/build-local.sh b/build-local.sh index cddc7c0..b822e5e 100755 --- 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 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 diff --git a/build.sh b/build.sh index a95243e..d5b028f 100755 --- a/build.sh +++ b/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" diff --git a/cli-update-model.sh b/cli-update-model.sh index df3dcff..48021c2 100755 --- a/cli-update-model.sh +++ b/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 docker.io/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: diff --git a/cli.sh b/cli.sh index 02e5885..a04ef2d 100755 --- 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 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: diff --git a/cmd.sh b/cmd.sh index 05fa29e..8e202ef 100755 --- a/cmd.sh +++ b/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 docker.io/ghcr.io/hasura/meta_connector:latest From 3d3d6318d0770c800c58dc26088f799acad14154 Mon Sep 17 00:00:00 2001 From: "David A. Ventimiglia" Date: Mon, 16 Sep 2024 08:57:12 -0700 Subject: [PATCH 3/4] Replaced kstott with ghcr.io/hasura --- crates/values/src/values.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/values/src/values.rs b/crates/values/src/values.rs index 259649f..b041ab7 100644 --- a/crates/values/src/values.rs +++ b/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 = "docker.io/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."; \ No newline at end of file +pub const UNABLE_TO_WRITE_TO_FILE: &str = "Unable to write file."; From 74e8fc7086165ab7e02ffb6797366499b24c4ec4 Mon Sep 17 00:00:00 2001 From: "David A. Ventimiglia" Date: Tue, 17 Sep 2024 10:51:39 -0700 Subject: [PATCH 4/4] Replaced kstott with ghcr.io/hasura --- cli-update-model.sh | 2 +- cmd.sh | 2 +- crates/values/src/values.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli-update-model.sh b/cli-update-model.sh index 48021c2..5173382 100755 --- a/cli-update-model.sh +++ b/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/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/meta_connector:latest update #echo "include:\n - path: ${filepath}/compose.yaml" > temp.yml #echo "$content" >> temp.yml diff --git a/cmd.sh b/cmd.sh index 8e202ef..85e229c 100755 --- 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 docker.io/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/meta_connector:latest diff --git a/crates/values/src/values.rs b/crates/values/src/values.rs index b041ab7..c6d82c7 100644 --- 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 = "docker.io/ghcr.io/hasura/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";