From ab44170ee72a70d2f55b72fd2f74fb511d6eb1fd Mon Sep 17 00:00:00 2001 From: Georgii Novoselov <22564079+farost@users.noreply.github.com> Date: Fri, 17 May 2024 16:21:13 +0100 Subject: [PATCH 01/11] Turn off statistics reporting in CI (#651) ## Usage and product changes We turn off the `--diagnostics.reporting.statistics` in our CI builds not to send non-real diagnostics data. In version 2.28 and earlier, this flag purely prevents `TypeDB` from sending any diagnostics data. In the upcoming version 2.28.1, this flag still allows `TypeDB` to send a single diagnostics snapshot with the information of when the diagnostics data has been turned off, but it happens only after the server runs for 1 hour, so we expect the CI builds not to reach this point and not to send any diagnostics data as well. --------- Co-authored-by: Krishnan Govindraj --- .circleci/windows/clib/test_assembly.bat | 2 +- .circleci/windows/cpp/test_assembly.bat | 2 +- .circleci/windows/csharp/test_deploy_snapshot.bat | 2 +- .circleci/windows/java/test_deploy_snapshot.bat | 2 +- .circleci/windows/python/test_deploy_snapshot.bat | 2 +- java/test/integration/DriverQueryTest.java | 1 + nodejs/test/integration/test-cloud-failover.js | 1 + python/tests/integration/cloud_test_rule.bzl | 1 + python/tests/integration/test_cloud_failover.py | 1 + tool/test/start-cloud-servers.sh | 1 + tool/test/start-core-server.sh | 2 +- 11 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.circleci/windows/clib/test_assembly.bat b/.circleci/windows/clib/test_assembly.bat index 68b6140081..8a20d3b674 100644 --- a/.circleci/windows/clib/test_assembly.bat +++ b/.circleci/windows/clib/test_assembly.bat @@ -35,7 +35,7 @@ cmake --build . --config release popd set PATH=%cd%\test_assembly_clib\typedb-driver-clib-windows-x86_64\lib;%PATH%; -START /B "" typedb-server-windows\typedb server +START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false powershell -Command "Start-Sleep -Seconds 10" test_assembly_clib\Release\test_assembly.exe diff --git a/.circleci/windows/cpp/test_assembly.bat b/.circleci/windows/cpp/test_assembly.bat index e9928777b6..4702cb9c13 100644 --- a/.circleci/windows/cpp/test_assembly.bat +++ b/.circleci/windows/cpp/test_assembly.bat @@ -35,7 +35,7 @@ cmake --build . --config release popd set PATH=%cd%\test_assembly_cpp\typedb-driver-cpp-windows-x86_64\lib;%PATH%; -START /B "" typedb-server-windows\typedb server +START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false powershell -Command "Start-Sleep -Seconds 10" test_assembly_cpp\Release\test_assembly.exe diff --git a/.circleci/windows/csharp/test_deploy_snapshot.bat b/.circleci/windows/csharp/test_deploy_snapshot.bat index 8eb4c614fc..874151250c 100644 --- a/.circleci/windows/csharp/test_deploy_snapshot.bat +++ b/.circleci/windows/csharp/test_deploy_snapshot.bat @@ -25,7 +25,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb 7z x typedb-server-windows.zip RD /S /Q typedb-server-windows powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows" -START /B "" typedb-server-windows\typedb server +START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false powershell -Command "(gc csharp\Test\Deployment\NugetApplicationTest.csproj) -replace 'DRIVER_CSHARP_VERSION_MARKER', '0.0.0-%CIRCLE_SHA1%' | Out-File -encoding ASCII csharp\Test\Deployment\NugetApplicationTest.csproj" type csharp\Test\Deployment\NugetApplicationTest.csproj diff --git a/.circleci/windows/java/test_deploy_snapshot.bat b/.circleci/windows/java/test_deploy_snapshot.bat index ef352bc160..a36684b938 100644 --- a/.circleci/windows/java/test_deploy_snapshot.bat +++ b/.circleci/windows/java/test_deploy_snapshot.bat @@ -25,7 +25,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb 7z x typedb-server-windows.zip RD /S /Q typedb-server-windows powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows" -START /B "" typedb-server-windows\typedb server +START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false powershell -Command "(gc java\test\deployment\pom.xml) -replace 'DRIVER_JAVA_VERSION_MARKER', '0.0.0-%CIRCLE_SHA1%' | Out-File -encoding ASCII java\test\deployment\pom.xml" type java\test\deployment\pom.xml diff --git a/.circleci/windows/python/test_deploy_snapshot.bat b/.circleci/windows/python/test_deploy_snapshot.bat index c5ec37a840..0520674008 100644 --- a/.circleci/windows/python/test_deploy_snapshot.bat +++ b/.circleci/windows/python/test_deploy_snapshot.bat @@ -27,7 +27,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb 7z x typedb-server-windows.zip RD /S /Q typedb-server-windows powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows" -START /B "" typedb-server-windows\typedb server +START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false python3 -m pip install --extra-index-url https://repo.typedb.com/public/public-snapshot/python/simple typedb-driver==0.0.0+%VER% cd python/tests/deployment diff --git a/java/test/integration/DriverQueryTest.java b/java/test/integration/DriverQueryTest.java index 248b19499c..16c0466bc0 100644 --- a/java/test/integration/DriverQueryTest.java +++ b/java/test/integration/DriverQueryTest.java @@ -73,6 +73,7 @@ public class DriverQueryTest { public static void setUpClass() throws InterruptedException, IOException, TimeoutException { Map options = new HashMap<>(); options.put("--diagnostics.reporting.errors", "false"); + options.put("--diagnostics.reporting.statistics", "false"); typedb = new TypeDBCoreRunner(options); typedb.start(); typedbDriver = TypeDB.coreDriver(typedb.address()); diff --git a/nodejs/test/integration/test-cloud-failover.js b/nodejs/test/integration/test-cloud-failover.js index d766f7bb8a..bcac518d42 100644 --- a/nodejs/test/integration/test-cloud-failover.js +++ b/nodejs/test/integration/test-cloud-failover.js @@ -71,6 +71,7 @@ function serverStart(idx) { "--server.encryption.file.internal-zmq.private-key", encryptionResourceDir + "int-zmq-private-key", "--server.encryption.file.internal-zmq.public-key", encryptionResourceDir + "int-zmq-public-key", "--diagnostics.reporting.errors", "false", + "--diagnostics.reporting.statistics", "false", "--diagnostics.monitoring.enable", "false" ]); node.stdout.on('data', (data) => { diff --git a/python/tests/integration/cloud_test_rule.bzl b/python/tests/integration/cloud_test_rule.bzl index ad414c95db..b2a62a6763 100644 --- a/python/tests/integration/cloud_test_rule.bzl +++ b/python/tests/integration/cloud_test_rule.bzl @@ -45,6 +45,7 @@ def _rule_implementation(ctx): --server.peers.peer-3.internal-address.grpc=localhost:31731 \ --server.encryption.enable=true \ --diagnostics.reporting.errors=false \ + --diagnostics.reporting.statistics=false \ --diagnostics.monitoring.enable=false } if test -d typedb_distribution; then diff --git a/python/tests/integration/test_cloud_failover.py b/python/tests/integration/test_cloud_failover.py index 00b5efa4b3..11a251e24b 100644 --- a/python/tests/integration/test_cloud_failover.py +++ b/python/tests/integration/test_cloud_failover.py @@ -57,6 +57,7 @@ def server_start(index): "--server.peers.peer-3.internal-address.grpc", "localhost:31731", "--server.encryption.enable", "true", "--diagnostics.reporting.errors", "false", + "--diagnostics.reporting.statistics", "false", "--diagnostics.monitoring.enable", "false" ]) diff --git a/tool/test/start-cloud-servers.sh b/tool/test/start-cloud-servers.sh index 4e13f96abd..3e5358a976 100755 --- a/tool/test/start-cloud-servers.sh +++ b/tool/test/start-cloud-servers.sh @@ -46,6 +46,7 @@ function server_start() { --server.encryption.file.internal-zmq.private-key=`realpath tool/test/resources/encryption/int-zmq-private-key` \ --server.encryption.file.internal-zmq.public-key=`realpath tool/test/resources/encryption/int-zmq-public-key` \ --diagnostics.reporting.errors=false \ + --diagnostics.reporting.statistics=false \ --diagnostics.monitoring.enable=false } diff --git a/tool/test/start-core-server.sh b/tool/test/start-core-server.sh index 8af670c9c7..16e5e98f0b 100755 --- a/tool/test/start-core-server.sh +++ b/tool/test/start-core-server.sh @@ -22,7 +22,7 @@ rm -rf typedb-all bazel run //tool/test:typedb-extractor -- typedb-all BAZEL_JAVA_HOME=$(bazel run //tool/test:echo-java-home) -JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.errors=false --diagnostics.monitoring.enable=false & +JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.errors=false --diagnostics.reporting.statistics=false --diagnostics.monitoring.enable=false & set +e POLL_INTERVAL_SECS=0.5 From 1a27466fcc7804065cadb65523e7847b36f0ef7e Mon Sep 17 00:00:00 2001 From: Alex Walker Date: Tue, 21 May 2024 10:31:11 +0100 Subject: [PATCH 02/11] Update README.md badge links --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ed37de981e..663bed433b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # TypeDB Drivers [![Factory](https://factory.vaticle.com/api/status/vaticle/typedb-driver/badge.svg)](https://factory.vaticle.com/vaticle/typedb-driver) -[![Discord](https://img.shields.io/discord/665254494820368395?color=7389D8&label=chat&logo=discord&logoColor=ffffff)](https://vaticle.com/discord) +[![Discord](https://img.shields.io/discord/665254494820368395?color=7389D8&label=chat&logo=discord&logoColor=ffffff)](https://typedb.com/discord) [![Discussion Forum](https://img.shields.io/discourse/https/forum.typedb.com/topics.svg)](https://forum.typedb.com) [![Stack Overflow](https://img.shields.io/badge/stackoverflow-typedb-796de3.svg)](https://stackoverflow.com/questions/tagged/typedb) [![Stack Overflow](https://img.shields.io/badge/stackoverflow-typeql-3dce8c.svg)](https://stackoverflow.com/questions/tagged/typeql) From 391c3ac10fe4ae791aefb2a0de298e675c4c92e1 Mon Sep 17 00:00:00 2001 From: vaticle-bot Date: Wed, 12 Jun 2024 14:21:13 +0000 Subject: [PATCH 03/11] //tool/sync:dependencies vaticle/typedb-protocol@24f9e9d --- dependencies/vaticle/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 956df59c80..bf44c23a97 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -36,7 +36,7 @@ def vaticle_typedb_protocol(): name = "vaticle_typedb_protocol", remote = "https://github.com/vaticle/typedb-protocol", # NOTE: the sync-marker is also used for workspace status by Bazel! - tag = "2.28.0", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol + commit = "24f9e9d2f72383cb2aebb028418e1c2a127bc82a", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol ) def vaticle_typedb_behaviour(): From 120509ddf27ad5c0640007b2e1e00901cb3744d2 Mon Sep 17 00:00:00 2001 From: Georgii Novoselov <22564079+farost@users.noreply.github.com> Date: Wed, 12 Jun 2024 16:15:44 +0100 Subject: [PATCH 04/11] Fix aspect_bazel_lib dependency, update typedb and nodejs dependencies (#658) ## Usage and product changes 1. We update `typedb` dependencies to `2.28.3` before the release to verify that the builds are still correct before the `driver` release. 2. We update other dependencies that have previously broken the build because of the updated `ts` (`nodejs`) rules: **dependencies** ref with `nodejs` and `csharp` rules becoming more mature based on [aspect_bazel_lib version globalization](https://github.com/vaticle/dependencies/pull/547); **typedb-protocol** ref to [propagate](https://github.com/vaticle/typedb-protocol/pull/202) the fixed `ts` rules and fix its build based on this propagation. ## Implementation We use the updated rules fixed in [dependencies](https://github.com/vaticle/dependencies/pull/547) and also update the code based on the new requirements of the updates `ts` rules. More details in the comments. --- .bazelrc | 4 ++++ WORKSPACE | 3 ++- dependencies/maven/artifacts.snapshot | 5 +++-- dependencies/vaticle/artifacts.bzl | 8 ++++---- dependencies/vaticle/repositories.bzl | 2 +- nodejs/BUILD | 2 ++ nodejs/test/behaviour/concept/thing/BUILD | 1 + nodejs/test/behaviour/concept/thing/attribute/BUILD | 1 + nodejs/test/behaviour/concept/thing/entity/BUILD | 1 + nodejs/test/behaviour/concept/thing/relation/BUILD | 1 + nodejs/test/behaviour/concept/type/attributetype/BUILD | 1 + nodejs/test/behaviour/concept/type/relationtype/BUILD | 1 + nodejs/test/behaviour/concept/type/thingtype/BUILD | 1 + nodejs/test/behaviour/config/BUILD | 1 + nodejs/test/behaviour/connection/BUILD | 3 +++ nodejs/test/behaviour/connection/database/BUILD | 1 + nodejs/test/behaviour/connection/session/BUILD | 1 + nodejs/test/behaviour/connection/transaction/BUILD | 1 + nodejs/test/behaviour/connection/user/BUILD | 1 + nodejs/test/behaviour/query/BUILD | 1 + nodejs/test/behaviour/util/BUILD | 2 ++ 21 files changed, 34 insertions(+), 8 deletions(-) diff --git a/.bazelrc b/.bazelrc index a4244de29e..b5994516f4 100644 --- a/.bazelrc +++ b/.bazelrc @@ -33,3 +33,7 @@ build:macos --stamp --workspace_status_command=$PWD/workspace-status.sh # TODO # build:windows --stamp --workspace_status_command=workspace-status.bat + +build --@aspect_rules_ts//ts:skipLibCheck=always +fetch --@aspect_rules_ts//ts:skipLibCheck=always +query --@aspect_rules_ts//ts:skipLibCheck=always diff --git a/WORKSPACE b/WORKSPACE index a6df7ba268..45c1eb46e1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -63,12 +63,14 @@ cpp_deps() # Load //builder/csharp load("@vaticle_dependencies//builder/csharp:deps.bzl", dotnet_deps = "deps") dotnet_deps() + load( "@rules_dotnet//dotnet:repositories.bzl", "dotnet_register_toolchains", "rules_dotnet_dependencies", ) rules_dotnet_dependencies() + dotnet_register_toolchains("dotnet", "6.0.413") load("@rules_dotnet//dotnet:paket.rules_dotnet_nuget_packages.bzl", "rules_dotnet_nuget_packages") rules_dotnet_nuget_packages() @@ -244,7 +246,6 @@ vaticle_typedb_protocol_npm_repositories() # Setup rules_ts load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies") - rules_ts_dependencies( ts_version_from = "//nodejs:package.json", ) diff --git a/dependencies/maven/artifacts.snapshot b/dependencies/maven/artifacts.snapshot index 96c0624742..db5bfc341b 100644 --- a/dependencies/maven/artifacts.snapshot +++ b/dependencies/maven/artifacts.snapshot @@ -18,8 +18,9 @@ @maven//:com_google_http_client_google_http_client_1_34_2 @maven//:com_google_j2objc_j2objc_annotations_1_3 @maven//:com_google_protobuf_protobuf_java_3_21_1 -@maven//:com_vaticle_typedb_typedb_cloud_runner_2_28_0 -@maven//:com_vaticle_typedb_typedb_runner_2_28_0 +@maven//:com_vaticle_typedb_typedb_cloud_runner_2_28_3 +@maven//:com_vaticle_typedb_typedb_common_2_28_1 +@maven//:com_vaticle_typedb_typedb_runner_2_28_3 @maven//:com_vdurmont_semver4j_3_1_0 @maven//:commons_codec_commons_codec_1_13 @maven//:commons_io_commons_io_2_3 diff --git a/dependencies/vaticle/artifacts.bzl b/dependencies/vaticle/artifacts.bzl index b683ec5d06..23a4b54ff5 100644 --- a/dependencies/vaticle/artifacts.bzl +++ b/dependencies/vaticle/artifacts.bzl @@ -25,7 +25,7 @@ def vaticle_typedb_artifact(): artifact_name = "typedb-server-{platform}-{version}.{ext}", tag_source = deployment["artifact"]["release"]["download"], commit_source = deployment["artifact"]["snapshot"]["download"], - tag = "2.28.0" + tag = "2.28.3" ) def vaticle_typedb_cloud_artifact(): @@ -35,10 +35,10 @@ def vaticle_typedb_cloud_artifact(): artifact_name = "typedb-cloud-server-{platform}-{version}.{ext}", tag_source = deployment_private["artifact"]["release"]["download"], commit_source = deployment_private["artifact"]["snapshot"]["download"], - tag = "2.28.0", + tag = "2.28.3", ) maven_artifacts = { - 'com.vaticle.typedb:typedb-runner': '2.28.0', - 'com.vaticle.typedb:typedb-cloud-runner': '2.28.0', + 'com.vaticle.typedb:typedb-runner': '2.28.3', + 'com.vaticle.typedb:typedb-cloud-runner': '2.28.3', } diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index bf44c23a97..6d22583bc2 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -21,7 +21,7 @@ def vaticle_dependencies(): git_repository( name = "vaticle_dependencies", remote = "https://github.com/vaticle/dependencies", - commit = "729d960a92e145e03794395bbe59e02f122f1aee", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies + commit = "b89c25993c1e4f11b367435b83ac19bb658bb712", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies ) def vaticle_typeql(): diff --git a/nodejs/BUILD b/nodejs/BUILD index fb27256942..eee76e3ca0 100644 --- a/nodejs/BUILD +++ b/nodejs/BUILD @@ -82,6 +82,7 @@ ts_project( ":node_modules/uuid", ":node_modules/@types/uuid", ], + transpiler = "tsc", visibility = ["//visibility:public"], out_dir = "dist", ) @@ -133,6 +134,7 @@ ts_project( ":node_modules/typedoc", ":node_modules/@types/node", ], + transpiler = "tsc", visibility = ["//visibility:public"], out_dir = ".", ) diff --git a/nodejs/test/behaviour/concept/thing/BUILD b/nodejs/test/behaviour/concept/thing/BUILD index b99ca9d637..dd95e506f4 100644 --- a/nodejs/test/behaviour/concept/thing/BUILD +++ b/nodejs/test/behaviour/concept/thing/BUILD @@ -37,6 +37,7 @@ ts_project( "//nodejs/test/behaviour/connection:steps-base", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", declaration = True, resolve_json_module = True, visibility = ["//visibility:public"], diff --git a/nodejs/test/behaviour/concept/thing/attribute/BUILD b/nodejs/test/behaviour/concept/thing/attribute/BUILD index 93f4d2286a..ea39c9d420 100644 --- a/nodejs/test/behaviour/concept/thing/attribute/BUILD +++ b/nodejs/test/behaviour/concept/thing/attribute/BUILD @@ -37,6 +37,7 @@ ts_project( "//nodejs/test/behaviour/connection:steps-base", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/concept/thing/entity/BUILD b/nodejs/test/behaviour/concept/thing/entity/BUILD index 78a0db971c..df42679102 100644 --- a/nodejs/test/behaviour/concept/thing/entity/BUILD +++ b/nodejs/test/behaviour/concept/thing/entity/BUILD @@ -37,6 +37,7 @@ ts_project( "//nodejs/test/behaviour/connection:steps-base", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/concept/thing/relation/BUILD b/nodejs/test/behaviour/concept/thing/relation/BUILD index 1a4186f11a..294418c045 100644 --- a/nodejs/test/behaviour/concept/thing/relation/BUILD +++ b/nodejs/test/behaviour/concept/thing/relation/BUILD @@ -37,6 +37,7 @@ ts_project( "//nodejs/test/behaviour/connection:steps-base", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/concept/type/attributetype/BUILD b/nodejs/test/behaviour/concept/type/attributetype/BUILD index d21f77944d..0d61410436 100644 --- a/nodejs/test/behaviour/concept/type/attributetype/BUILD +++ b/nodejs/test/behaviour/concept/type/attributetype/BUILD @@ -36,6 +36,7 @@ ts_project( "//nodejs/test/behaviour/connection:steps-base", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/concept/type/relationtype/BUILD b/nodejs/test/behaviour/concept/type/relationtype/BUILD index 88b94c77e3..6945782055 100644 --- a/nodejs/test/behaviour/concept/type/relationtype/BUILD +++ b/nodejs/test/behaviour/concept/type/relationtype/BUILD @@ -36,6 +36,7 @@ ts_project( "//nodejs/test/behaviour/connection:steps-base", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/concept/type/thingtype/BUILD b/nodejs/test/behaviour/concept/type/thingtype/BUILD index a499762054..260cf92670 100644 --- a/nodejs/test/behaviour/concept/type/thingtype/BUILD +++ b/nodejs/test/behaviour/concept/type/thingtype/BUILD @@ -36,6 +36,7 @@ ts_project( "//nodejs/test/behaviour/connection:steps-base", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", declaration = True, resolve_json_module = True, visibility = ["//visibility:public"], diff --git a/nodejs/test/behaviour/config/BUILD b/nodejs/test/behaviour/config/BUILD index 498717c3a1..7b009232f3 100644 --- a/nodejs/test/behaviour/config/BUILD +++ b/nodejs/test/behaviour/config/BUILD @@ -29,6 +29,7 @@ ts_project( "//nodejs:node_modules/@types/node", "//nodejs:node_modules/@cucumber/cucumber", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/connection/BUILD b/nodejs/test/behaviour/connection/BUILD index 39a1890b41..277e8ac4db 100644 --- a/nodejs/test/behaviour/connection/BUILD +++ b/nodejs/test/behaviour/connection/BUILD @@ -34,6 +34,7 @@ ts_project( "//nodejs:node_modules/google-protobuf", "//nodejs:node_modules/@types/google-protobuf", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) @@ -50,6 +51,7 @@ ts_project( "//nodejs:node_modules/@cucumber/cucumber", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) @@ -66,6 +68,7 @@ ts_project( "//nodejs:node_modules/@cucumber/cucumber", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/connection/database/BUILD b/nodejs/test/behaviour/connection/database/BUILD index dc1e669743..6ba7a75f07 100644 --- a/nodejs/test/behaviour/connection/database/BUILD +++ b/nodejs/test/behaviour/connection/database/BUILD @@ -35,6 +35,7 @@ ts_project( "//nodejs/test/behaviour/util:util", "//nodejs/test/behaviour/connection:steps-base", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/connection/session/BUILD b/nodejs/test/behaviour/connection/session/BUILD index eb9fcb73fb..798a0d48d0 100644 --- a/nodejs/test/behaviour/connection/session/BUILD +++ b/nodejs/test/behaviour/connection/session/BUILD @@ -35,6 +35,7 @@ ts_project( "//nodejs/test/behaviour/util:util", "//nodejs/test/behaviour/connection:steps-base", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/connection/transaction/BUILD b/nodejs/test/behaviour/connection/transaction/BUILD index 95ac1a9d10..0ac186ab9d 100644 --- a/nodejs/test/behaviour/connection/transaction/BUILD +++ b/nodejs/test/behaviour/connection/transaction/BUILD @@ -35,6 +35,7 @@ ts_project( "//nodejs/test/behaviour/util:util", "//nodejs/test/behaviour/connection:steps-base", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/connection/user/BUILD b/nodejs/test/behaviour/connection/user/BUILD index 8c0117a229..9c62ae9123 100644 --- a/nodejs/test/behaviour/connection/user/BUILD +++ b/nodejs/test/behaviour/connection/user/BUILD @@ -35,6 +35,7 @@ ts_project( "//nodejs/test/behaviour/util:util", "//nodejs/test/behaviour/connection:steps-base", ], + transpiler = "tsc", resolve_json_module = True, visibility = ["//visibility:public"], ) diff --git a/nodejs/test/behaviour/query/BUILD b/nodejs/test/behaviour/query/BUILD index 57b93e79ae..e6b776b7e9 100644 --- a/nodejs/test/behaviour/query/BUILD +++ b/nodejs/test/behaviour/query/BUILD @@ -38,6 +38,7 @@ ts_project( "//nodejs/test/behaviour/connection:steps-base", "//nodejs/test/behaviour/util:util", ], + transpiler = "tsc", declaration = True, resolve_json_module = True, visibility = ["//visibility:public"], diff --git a/nodejs/test/behaviour/util/BUILD b/nodejs/test/behaviour/util/BUILD index ca4dcdcafb..e1c6ad82e6 100644 --- a/nodejs/test/behaviour/util/BUILD +++ b/nodejs/test/behaviour/util/BUILD @@ -29,6 +29,7 @@ ts_project( "//nodejs:node_modules/@types/node", ], + transpiler = "tsc", visibility = ["//visibility:public"], ) @@ -41,6 +42,7 @@ ts_project( "//nodejs:node_modules/@cucumber/cucumber", "//nodejs:node_modules/@types/node", ], + transpiler = "tsc", visibility = ["//visibility:public"], ) From 9997d593468d93d12ee96b07e9bdc1c6ba8f3f43 Mon Sep 17 00:00:00 2001 From: vaticle-bot Date: Thu, 13 Jun 2024 10:59:29 +0000 Subject: [PATCH 05/11] //tool/sync:dependencies vaticle/typedb-protocol@59318bd --- dependencies/vaticle/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 6d22583bc2..34756d4540 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -36,7 +36,7 @@ def vaticle_typedb_protocol(): name = "vaticle_typedb_protocol", remote = "https://github.com/vaticle/typedb-protocol", # NOTE: the sync-marker is also used for workspace status by Bazel! - commit = "24f9e9d2f72383cb2aebb028418e1c2a127bc82a", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol + commit = "59318bda46354f2ac2d788e714d6bdc0398e1b27", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol ) def vaticle_typedb_behaviour(): From 2ff42fb9a7f63bf30b10d4c6f14ef8edf71dfd22 Mon Sep 17 00:00:00 2001 From: vaticle-bot Date: Thu, 13 Jun 2024 11:37:25 +0000 Subject: [PATCH 06/11] //tool/sync:dependencies vaticle/typedb-protocol@f09d868 --- dependencies/vaticle/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 34756d4540..6d390c2d37 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -36,7 +36,7 @@ def vaticle_typedb_protocol(): name = "vaticle_typedb_protocol", remote = "https://github.com/vaticle/typedb-protocol", # NOTE: the sync-marker is also used for workspace status by Bazel! - commit = "59318bda46354f2ac2d788e714d6bdc0398e1b27", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol + commit = "f09d868891d8fedd0dde044cea6a0993d3ad2105", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol ) def vaticle_typedb_behaviour(): From fb0e60e1e64ab345d13a88d89746d1567603f842 Mon Sep 17 00:00:00 2001 From: vaticle-bot Date: Thu, 13 Jun 2024 12:04:04 +0000 Subject: [PATCH 07/11] //tool/sync:dependencies vaticle/typedb-protocol@2.28.4 --- dependencies/vaticle/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 6d390c2d37..17d69ab195 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -36,7 +36,7 @@ def vaticle_typedb_protocol(): name = "vaticle_typedb_protocol", remote = "https://github.com/vaticle/typedb-protocol", # NOTE: the sync-marker is also used for workspace status by Bazel! - commit = "f09d868891d8fedd0dde044cea6a0993d3ad2105", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol + tag = "2.28.4", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol ) def vaticle_typedb_behaviour(): From f4aa1167e44a8ba21ff0d4c8f631d28f187ca88d Mon Sep 17 00:00:00 2001 From: vaticle-bot Date: Thu, 13 Jun 2024 12:46:28 +0000 Subject: [PATCH 08/11] //tool/sync:dependencies vaticle/dependencies@294ef72 --- dependencies/vaticle/repositories.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 17d69ab195..11c82130ad 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -21,14 +21,14 @@ def vaticle_dependencies(): git_repository( name = "vaticle_dependencies", remote = "https://github.com/vaticle/dependencies", - commit = "b89c25993c1e4f11b367435b83ac19bb658bb712", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies + commit = "294ef724c3853c9851e1e0c6bc04e0470c724e10", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies ) def vaticle_typeql(): git_repository( name = "vaticle_typeql", remote = "https://github.com/vaticle/typeql", - tag = "2.28.1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typeql + commit = "a4d6f02d79a72b6e02c6870b92b8b20a1f4291d4", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typeql ) def vaticle_typedb_protocol(): @@ -36,12 +36,12 @@ def vaticle_typedb_protocol(): name = "vaticle_typedb_protocol", remote = "https://github.com/vaticle/typedb-protocol", # NOTE: the sync-marker is also used for workspace status by Bazel! - tag = "2.28.4", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol + commit = "aea498d852d763c20d9ecc7d11423d7506964b95", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol ) def vaticle_typedb_behaviour(): git_repository( name = "vaticle_typedb_behaviour", remote = "https://github.com/vaticle/typedb-behaviour", - commit = "0d5e332128de7d7644cd5403c25ca986f3f2718a", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour + commit = "c196a09fdf0d6af8e09b3f9096b38e455c9e28e2", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour ) From 410e6c6e401a6a630eb627e50f1aea3b00fe3e92 Mon Sep 17 00:00:00 2001 From: Georgii Novoselov <22564079+farost@users.noreply.github.com> Date: Fri, 14 Jun 2024 10:07:09 +0100 Subject: [PATCH 09/11] Remove excessive diagnostics flags, turn on development mode for tests (#659) ## Usage and product changes We clean the usage of `--diagnostics.***` flags used in the test servers because of the recent propagation of a newer version of `TypeDB`, now supporting the `--development-mode.enable` flag. As the development mode includes disabling any outer reporting, it is a perfect substitution for this logic. ## Implementation We remove the unnecessary flags everywhere, aiming to cover it by the activated development mode. * This mode is activated by default for all the `TypeDB***Runner`s [relevant for the `Java` driver] * This mode is **not** activated for `vaticle_typedb_artifact` fetched by `vaticle_typedb_artifact()` or built by `bazel build @vaticle_typedb_artifact_*platform*//file`, so we need to manually add `--development-mode.enable=true` for all the invocations of these artifacts. --- .circleci/windows/clib/test_assembly.bat | 2 +- .circleci/windows/cpp/test_assembly.bat | 2 +- .circleci/windows/csharp/test_deploy_snapshot.bat | 2 +- .circleci/windows/java/test_deploy_snapshot.bat | 2 +- .circleci/windows/python/test_deploy_snapshot.bat | 2 +- csharp/Test/Behaviour/Connection/ConnectionStepsBase.cs | 5 ----- dependencies/vaticle/repositories.bzl | 2 +- java/test/behaviour/connection/ConnectionStepsBase.java | 7 ++----- java/test/integration/AddressTranslationTest.java | 7 +------ java/test/integration/DriverQueryTest.java | 5 +---- nodejs/test/integration/test-cloud-failover.js | 5 ++--- python/tests/integration/cloud_test_rule.bzl | 5 ++--- python/tests/integration/test_cloud_failover.py | 5 ++--- tool/test/start-cloud-servers.sh | 5 ++--- tool/test/start-core-server.sh | 2 +- 15 files changed, 19 insertions(+), 39 deletions(-) diff --git a/.circleci/windows/clib/test_assembly.bat b/.circleci/windows/clib/test_assembly.bat index 8a20d3b674..619c1f7410 100644 --- a/.circleci/windows/clib/test_assembly.bat +++ b/.circleci/windows/clib/test_assembly.bat @@ -35,7 +35,7 @@ cmake --build . --config release popd set PATH=%cd%\test_assembly_clib\typedb-driver-clib-windows-x86_64\lib;%PATH%; -START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false +START /B "" typedb-server-windows\typedb server --development-mode.enable=true powershell -Command "Start-Sleep -Seconds 10" test_assembly_clib\Release\test_assembly.exe diff --git a/.circleci/windows/cpp/test_assembly.bat b/.circleci/windows/cpp/test_assembly.bat index 4702cb9c13..4092e6886a 100644 --- a/.circleci/windows/cpp/test_assembly.bat +++ b/.circleci/windows/cpp/test_assembly.bat @@ -35,7 +35,7 @@ cmake --build . --config release popd set PATH=%cd%\test_assembly_cpp\typedb-driver-cpp-windows-x86_64\lib;%PATH%; -START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false +START /B "" typedb-server-windows\typedb server --development-mode.enable=true powershell -Command "Start-Sleep -Seconds 10" test_assembly_cpp\Release\test_assembly.exe diff --git a/.circleci/windows/csharp/test_deploy_snapshot.bat b/.circleci/windows/csharp/test_deploy_snapshot.bat index 874151250c..be779e03a7 100644 --- a/.circleci/windows/csharp/test_deploy_snapshot.bat +++ b/.circleci/windows/csharp/test_deploy_snapshot.bat @@ -25,7 +25,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb 7z x typedb-server-windows.zip RD /S /Q typedb-server-windows powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows" -START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false +START /B "" typedb-server-windows\typedb server --development-mode.enable=true powershell -Command "(gc csharp\Test\Deployment\NugetApplicationTest.csproj) -replace 'DRIVER_CSHARP_VERSION_MARKER', '0.0.0-%CIRCLE_SHA1%' | Out-File -encoding ASCII csharp\Test\Deployment\NugetApplicationTest.csproj" type csharp\Test\Deployment\NugetApplicationTest.csproj diff --git a/.circleci/windows/java/test_deploy_snapshot.bat b/.circleci/windows/java/test_deploy_snapshot.bat index a36684b938..6ce2f7533a 100644 --- a/.circleci/windows/java/test_deploy_snapshot.bat +++ b/.circleci/windows/java/test_deploy_snapshot.bat @@ -25,7 +25,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb 7z x typedb-server-windows.zip RD /S /Q typedb-server-windows powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows" -START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false +START /B "" typedb-server-windows\typedb server --development-mode.enable=true powershell -Command "(gc java\test\deployment\pom.xml) -replace 'DRIVER_JAVA_VERSION_MARKER', '0.0.0-%CIRCLE_SHA1%' | Out-File -encoding ASCII java\test\deployment\pom.xml" type java\test\deployment\pom.xml diff --git a/.circleci/windows/python/test_deploy_snapshot.bat b/.circleci/windows/python/test_deploy_snapshot.bat index 0520674008..50cf2fa33b 100644 --- a/.circleci/windows/python/test_deploy_snapshot.bat +++ b/.circleci/windows/python/test_deploy_snapshot.bat @@ -27,7 +27,7 @@ powershell -Command "Move-Item -Path bazel-typedb-driver\external\vaticle_typedb 7z x typedb-server-windows.zip RD /S /Q typedb-server-windows powershell -Command "Move-Item -Path typedb-server-windows-* -Destination typedb-server-windows" -START /B "" typedb-server-windows\typedb server --diagnostics.reporting.statistics=false --diagnostics.reporting.errors=false +START /B "" typedb-server-windows\typedb server --development-mode.enable=true python3 -m pip install --extra-index-url https://repo.typedb.com/public/public-snapshot/python/simple typedb-driver==0.0.0+%VER% cd python/tests/deployment diff --git a/csharp/Test/Behaviour/Connection/ConnectionStepsBase.cs b/csharp/Test/Behaviour/Connection/ConnectionStepsBase.cs index 48180acc7d..768ac7a79d 100644 --- a/csharp/Test/Behaviour/Connection/ConnectionStepsBase.cs +++ b/csharp/Test/Behaviour/Connection/ConnectionStepsBase.cs @@ -52,11 +52,6 @@ public abstract class ConnectionStepsBase : Feature, IDisposable {"transaction-timeout-millis", (option, val) => option.TransactionTimeoutMillis(Int32.Parse(val))} }; - public static readonly Dictionary ServerOptions = - new Dictionary(){ - {"--diagnostics.reporting.enable", "false"} - }; - // TODO: implement configuration and remove skips when @ignore-typedb-driver is removed from .feature. protected bool _requiredConfiguration = false; diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 11c82130ad..8c77733bc7 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -36,7 +36,7 @@ def vaticle_typedb_protocol(): name = "vaticle_typedb_protocol", remote = "https://github.com/vaticle/typedb-protocol", # NOTE: the sync-marker is also used for workspace status by Bazel! - commit = "aea498d852d763c20d9ecc7d11423d7506964b95", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol + tag = "2.28.4", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_protocol ) def vaticle_typedb_behaviour(): diff --git a/java/test/behaviour/connection/ConnectionStepsBase.java b/java/test/behaviour/connection/ConnectionStepsBase.java index be8658e661..ceaef4b548 100644 --- a/java/test/behaviour/connection/ConnectionStepsBase.java +++ b/java/test/behaviour/connection/ConnectionStepsBase.java @@ -27,6 +27,7 @@ import com.vaticle.typedb.driver.api.database.Database; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -60,11 +61,7 @@ public abstract class ConnectionStepsBase { pair("transaction-timeout-millis", (option, val) -> option.transactionTimeoutMillis(Integer.parseInt(val))) ); - public static final Map serverOptions = map( - pair("--diagnostics.reporting.errors", "false"), - pair("--diagnostics.reporting.statistics", "false"), - pair("--diagnostics.monitoring.enable", "false") - ); + public static final Map serverOptions = Collections.emptyMap(); public static TypeDBTransaction tx() { return sessionsToTransactions.get(sessions.get(0)).get(0); diff --git a/java/test/integration/AddressTranslationTest.java b/java/test/integration/AddressTranslationTest.java index f25da6bbae..05a01482f3 100644 --- a/java/test/integration/AddressTranslationTest.java +++ b/java/test/integration/AddressTranslationTest.java @@ -47,16 +47,11 @@ public class AddressTranslationTest { private static final Logger LOG = LoggerFactory.getLogger(AddressTranslationTest.class); - private static final Map serverOptions = map( - pair("--diagnostics.reporting.errors", "false"), - pair("--diagnostics.reporting.statistics", "false"), - pair("--diagnostics.monitoring.enable", "false") - ); private static final TypeDBCredential credential = new TypeDBCredential("admin", "password", false); @Test public void testAddressTranslation() { - TypeDBCloudRunner typedb = TypeDBCloudRunner.create(Paths.get("."), 3, serverOptions); + TypeDBCloudRunner typedb = TypeDBCloudRunner.create(Paths.get("."), 3); typedb.start(); Map addresses = typedb.externalAddresses().stream().map(address -> pair(address, address)) .collect(Collectors.toMap(Pair::first, Pair::second)); diff --git a/java/test/integration/DriverQueryTest.java b/java/test/integration/DriverQueryTest.java index 16c0466bc0..80f45f9f19 100644 --- a/java/test/integration/DriverQueryTest.java +++ b/java/test/integration/DriverQueryTest.java @@ -71,10 +71,7 @@ public class DriverQueryTest { @BeforeClass public static void setUpClass() throws InterruptedException, IOException, TimeoutException { - Map options = new HashMap<>(); - options.put("--diagnostics.reporting.errors", "false"); - options.put("--diagnostics.reporting.statistics", "false"); - typedb = new TypeDBCoreRunner(options); + typedb = new TypeDBCoreRunner(); typedb.start(); typedbDriver = TypeDB.coreDriver(typedb.address()); if (typedbDriver.databases().contains("typedb")) typedbDriver.databases().get("typedb").delete(); diff --git a/nodejs/test/integration/test-cloud-failover.js b/nodejs/test/integration/test-cloud-failover.js index bcac518d42..47f53e53e6 100644 --- a/nodejs/test/integration/test-cloud-failover.js +++ b/nodejs/test/integration/test-cloud-failover.js @@ -70,9 +70,8 @@ function serverStart(idx) { "--server.encryption.file.internal-grpc.root-ca", encryptionResourceDir + "int-grpc-root-ca.pem", "--server.encryption.file.internal-zmq.private-key", encryptionResourceDir + "int-zmq-private-key", "--server.encryption.file.internal-zmq.public-key", encryptionResourceDir + "int-zmq-public-key", - "--diagnostics.reporting.errors", "false", - "--diagnostics.reporting.statistics", "false", - "--diagnostics.monitoring.enable", "false" + "--diagnostics.monitoring.port", `${idx}1732`, + "--development-mode.enable", "true" ]); node.stdout.on('data', (data) => { console.log(`stdout: ${data}`); diff --git a/python/tests/integration/cloud_test_rule.bzl b/python/tests/integration/cloud_test_rule.bzl index b2a62a6763..da34596584 100644 --- a/python/tests/integration/cloud_test_rule.bzl +++ b/python/tests/integration/cloud_test_rule.bzl @@ -44,9 +44,8 @@ def _rule_implementation(ctx): --server.peers.peer-3.internal-address.zeromq=localhost:31730 \ --server.peers.peer-3.internal-address.grpc=localhost:31731 \ --server.encryption.enable=true \ - --diagnostics.reporting.errors=false \ - --diagnostics.reporting.statistics=false \ - --diagnostics.monitoring.enable=false + --diagnostics.monitoring.port=${1}1732 \ + --development-mode.enable=true } if test -d typedb_distribution; then echo Existing distribution detected. Cleaning. diff --git a/python/tests/integration/test_cloud_failover.py b/python/tests/integration/test_cloud_failover.py index 11a251e24b..0030bdbce7 100644 --- a/python/tests/integration/test_cloud_failover.py +++ b/python/tests/integration/test_cloud_failover.py @@ -56,9 +56,8 @@ def server_start(index): "--server.peers.peer-3.internal-address.zeromq", "localhost:31730", "--server.peers.peer-3.internal-address.grpc", "localhost:31731", "--server.encryption.enable", "true", - "--diagnostics.reporting.errors", "false", - "--diagnostics.reporting.statistics", "false", - "--diagnostics.monitoring.enable", "false" + "--diagnostics.monitoring.port", "%s1732" % index, + "--development-mode.enable", "true" ]) def get_primary_replica(self, database_manager: DatabaseManager): diff --git a/tool/test/start-cloud-servers.sh b/tool/test/start-cloud-servers.sh index 3e5358a976..9a43255332 100755 --- a/tool/test/start-cloud-servers.sh +++ b/tool/test/start-cloud-servers.sh @@ -45,9 +45,8 @@ function server_start() { --server.encryption.file.internal-grpc.root-ca=`realpath tool/test/resources/encryption/int-grpc-root-ca.pem` \ --server.encryption.file.internal-zmq.private-key=`realpath tool/test/resources/encryption/int-zmq-private-key` \ --server.encryption.file.internal-zmq.public-key=`realpath tool/test/resources/encryption/int-zmq-public-key` \ - --diagnostics.reporting.errors=false \ - --diagnostics.reporting.statistics=false \ - --diagnostics.monitoring.enable=false + --diagnostics.monitoring.port=${1}1732 \ + --development-mode.enable=true } rm -rf $(seq 1 $NODE_COUNT) typedb-cloud-all diff --git a/tool/test/start-core-server.sh b/tool/test/start-core-server.sh index 16e5e98f0b..9c5767660b 100755 --- a/tool/test/start-core-server.sh +++ b/tool/test/start-core-server.sh @@ -22,7 +22,7 @@ rm -rf typedb-all bazel run //tool/test:typedb-extractor -- typedb-all BAZEL_JAVA_HOME=$(bazel run //tool/test:echo-java-home) -JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.errors=false --diagnostics.reporting.statistics=false --diagnostics.monitoring.enable=false & +JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --development-mode.enable=true & set +e POLL_INTERVAL_SECS=0.5 From e7de41e3d43c27a4711accec824a5ea4b8f82618 Mon Sep 17 00:00:00 2001 From: Georgii Novoselov <22564079+farost@users.noreply.github.com> Date: Fri, 14 Jun 2024 10:21:08 +0100 Subject: [PATCH 10/11] Update version to 2.28.4 and prepare release notes (#660) ## Usage and product changes Update version to 2.28.4 and prepare release notes --- RELEASE_NOTES_LATEST.md | 31 ++++++++++++++++--------------- VERSION | 2 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/RELEASE_NOTES_LATEST.md b/RELEASE_NOTES_LATEST.md index 8fb64da863..1317bb5de9 100644 --- a/RELEASE_NOTES_LATEST.md +++ b/RELEASE_NOTES_LATEST.md @@ -9,7 +9,7 @@ Documentation: https://typedb.com/docs/drivers/rust/overview ```sh -cargo add typedb-driver@2.28.2-rc1 +cargo add typedb-driver@2.28.4 ``` @@ -29,7 +29,7 @@ Documentation: https://typedb.com/docs/drivers/java/overview com.vaticle.typedb typedb-driver - 2.28.2-rc1 + 2.28.4 ``` @@ -42,7 +42,7 @@ Documentation: https://typedb.com/docs/drivers/python/overview Available through https://pypi.org ``` -pip install typedb-driver==2.28.2-rc1 +pip install typedb-driver==2.28.4 ``` ### NodeJS driver @@ -51,7 +51,7 @@ NPM package: https://www.npmjs.com/package/typedb-driver Documentation: https://typedb.com/docs/drivers/nodejs/overview ``` -npm install typedb-driver@2.28.2-rc1 +npm install typedb-driver@2.28.4 ``` ### C# driver @@ -61,23 +61,23 @@ Documentation: https://typedb.com/docs/drivers/csharp/overview ```xml - - - - - - + + + + + + ``` ### C++ driver -Compiled distributions comprising headers and shared libraries available at: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-driver-cpp+version:2.28.2-rc1 +Compiled distributions comprising headers and shared libraries available at: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-driver-cpp+version:2.28.4 Documentation: https://typedb.com/docs/drivers/cpp/overview ### C driver -Compiled distributions comprising headers and shared libraries available at: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-driver-clib+version:2.28.2-rc1 +Compiled distributions comprising headers and shared libraries available at: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-driver-clib+version:2.28.4 ## New Features @@ -93,6 +93,7 @@ Compiled distributions comprising headers and shared libraries available at: htt ## Other Improvements - - - +- **Turn on development mode for tests** + We activate the newly introduced in `TypeDB` `--development-mode.enable` flag for all the CI builds of the driver. + +- **Update `nodejs` driver dependencies and fix builds based on the updated `typescript` rules** diff --git a/VERSION b/VERSION index 57d085110f..d422cdf098 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.28.2-rc1 +2.28.4 From 05b3bf107e494d80399d4ace8a1c542532ee56f4 Mon Sep 17 00:00:00 2001 From: Georgii Novoselov <22564079+farost@users.noreply.github.com> Date: Fri, 14 Jun 2024 10:30:26 +0100 Subject: [PATCH 11/11] Downgrade typeql to the latest tag version for the release (#662) ## Usage and product changes Downgrade typeql to the latest tag version for the release --- dependencies/vaticle/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl index 8c77733bc7..2971eedca5 100644 --- a/dependencies/vaticle/repositories.bzl +++ b/dependencies/vaticle/repositories.bzl @@ -28,7 +28,7 @@ def vaticle_typeql(): git_repository( name = "vaticle_typeql", remote = "https://github.com/vaticle/typeql", - commit = "a4d6f02d79a72b6e02c6870b92b8b20a1f4291d4", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typeql + tag = "2.28.1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typeql ) def vaticle_typedb_protocol():