Merge for 2.29.0 release (#262)

## Usage and product changes
Merge for 2.29.0 release

Author: typedb-bot

.circleci/config.yml

@@ -6,6 +6,7 @@ version: 2.1
 
 orbs:
   win: circleci/[email protected]
+  macos: circleci/[email protected]
 
 executors:
   linux-arm64-amazonlinux-2:
@@ -32,11 +33,6 @@ executors:
     resource_class: macos.m1.medium.gen1
     working_directory: ~/typedb-console
 
-  mac-x86_64:
-    macos:
-      xcode: "13.4.1"
-    working_directory: ~/typedb-console
-
   win-x86_64:
     resource_class: windows.xlarge
     machine:
@@ -70,9 +66,16 @@ commands:
           mv "bazelisk-linux-<<parameters.arch>>" /usr/local/bin/bazel
           chmod a+x /usr/local/bin/bazel
 
-  install-bazel-brew:
+  install-bazel-mac:
+    parameters:
+      bazel-arch:
+        type: string
     steps:
-      - run: brew install bazelisk
+      - run: |
+          brew install [email protected]
+          curl -OL "https://github.com/bazelbuild/bazelisk/releases/download/v1.17.0/bazelisk-darwin-<<parameters.bazel-arch>>"
+          sudo mv "bazelisk-darwin-<<parameters.bazel-arch>>" /usr/local/bin/bazel
+          chmod a+x /usr/local/bin/bazel
 
 jobs:
   deploy-artifact-snapshot-linux-x86_64:
@@ -98,10 +101,12 @@ jobs:
           bazel run --define version=$(git rev-parse HEAD) //:deploy-linux-arm64-targz -- snapshot
 
   deploy-artifact-snapshot-mac-x86_64:
-    executor: mac-x86_64
+    executor: mac-arm64
     steps:
       - checkout
-      - install-bazel-brew
+      - macos/install-rosetta
+      - install-bazel-mac:
+          bazel-arch: amd64
       - run: |
           export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
           export DEPLOY_ARTIFACT_PASSWORD=$REPO_TYPEDB_PASSWORD
@@ -111,7 +116,8 @@ jobs:
     executor: mac-arm64
     steps:
       - checkout
-      - install-bazel-brew
+      - install-bazel-mac:
+          bazel-arch: arm64
       - run: |
           export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
           export DEPLOY_ARTIFACT_PASSWORD=$REPO_TYPEDB_PASSWORD
@@ -148,10 +154,12 @@ jobs:
           bazel run --define version=$(cat VERSION) //:deploy-linux-arm64-targz --compilation_mode=opt -- release
 
   deploy-artifact-release-mac-x86_64:
-    executor: mac-x86_64
+    executor: mac-arm64
     steps:
       - checkout
-      - install-bazel-brew
+      - macos/install-rosetta
+      - install-bazel-mac:
+          bazel-arch: amd64
       - run: |
           export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
           export DEPLOY_ARTIFACT_PASSWORD=$REPO_TYPEDB_PASSWORD
@@ -161,7 +169,8 @@ jobs:
     executor: mac-arm64
     steps:
       - checkout
-      - install-bazel-brew
+      - install-bazel-mac:
+          bazel-arch: arm64
       - run: |
           export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
           export DEPLOY_ARTIFACT_PASSWORD=$REPO_TYPEDB_PASSWORD

RELEASE_NOTES_LATEST.md

@@ -1,20 +1,25 @@
 ## Distribution
 
-Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-console+version:2.28.4
+Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-console+version:2.29.0
 
 
 ## New Features
+- **TypeQL queries executed via source command are asynchronous**
+  TypeQL files executed via source command are asynchronous
+
+  
+- **Directly specify password in the 'password-update' command**
+  
+  It is now possible to invoke `password-update` command and specify the password together, instead of having to supply them in the following prompt. This new variant makes it possible to call it non-interactively.
+   
 
 ## Bugs Fixed
-- **Remove hard-coded value for transaction timeout**
-  Removes a hard-coded value for transaction timeout, which prevented the user's setting from taking effect.
+
 
 ## Code Refactors
 
+
 ## Other Improvements
-- **Bump dependencies for rules-python & pin CircleCI windows executor**
-  Bump dependencies for rules-python update. This fixes an error on windows builds in CircleCI.
-  We also pin the image used for Windows builds  on CircleCI to prevent updates from breaking the pipeline.
+- **Migrate CircleCI mac jobs to arm64 executors**
+  Migrates the  CircleCI mac jobs to arm64 executors
 
-- **Turn off statistics reporting in CI**
-  We turn off the statistics reporting in our CI builds not to send non-real diagnostics data.

TypeDBConsole.java

@@ -22,9 +22,9 @@
 import com.vaticle.typedb.driver.api.answer.ConceptMapGroup;
 import com.vaticle.typedb.driver.api.answer.JSON;
 import com.vaticle.typedb.driver.api.answer.ValueGroup;
-import com.vaticle.typedb.driver.api.concept.value.Value;
 import com.vaticle.typedb.driver.api.database.Database;
 import com.vaticle.typedb.driver.api.user.User;
+import com.vaticle.typedb.driver.common.Promise;
 import com.vaticle.typedb.driver.common.exception.TypeDBDriverException;
 import com.vaticle.typeql.lang.TypeQL;
 import com.vaticle.typeql.lang.common.TypeQLArg;
@@ -409,6 +409,17 @@ private boolean runInlineCommandMode(CLIOptions options, List<String> inlineComm
                     } else if (command.isUserCreate()) {
                         boolean success = runUserCreate(driver, isCloud, command.asUserCreate().user(), command.asUserCreate().password());
                         if (!success) return false;
+                    } else if (command.isUserPasswordUpdate()) {
+                        REPLCommand.User.PasswordUpdate userPasswordUpdate = command.asUserPasswordUpdate();
+                        boolean passwordUpdateSuccessful = runUserPasswordUpdate(driver,
+                                isCloud,
+                                options.username,
+                                userPasswordUpdate.passwordOld(),
+                                userPasswordUpdate.passwordNew());
+                        if (passwordUpdateSuccessful) {
+                            printer.info("Please login again with your updated password.");
+                            break;
+                        } else return false;
                     } else if (command.isUserDelete()) {
                         boolean success = runUserDelete(driver, isCloud, command.asUserDelete().user());
                         if (!success) return false;
@@ -708,7 +719,8 @@ private RunQueriesResult runSource(TypeDBTransaction tx, String file, boolean pr
     private RunQueriesResult runQueries(TypeDBTransaction tx, String queryString) {
         Optional<List<TypeQLQuery>> queries = parseQueries(queryString);
         if (queries.isEmpty()) return RunQueriesResult.error();
-        queries.get().forEach(query -> runQuery(tx, query));
+        List<Runnable> promiseResolvers = queries.get().stream().map(query -> runQuery(tx, query)).collect(toList());
+        promiseResolvers.forEach(Runnable::run);
         boolean hasChanges = queries.get().stream().anyMatch(query -> query.type() == TypeQLArg.QueryType.WRITE);
         return new RunQueriesResult(true, hasChanges);
     }
@@ -722,34 +734,48 @@ private RunQueriesResult runQueriesPrintAnswers(TypeDBTransaction tx, String que
     }
 
     @SuppressWarnings("CheckReturnValue")
-    private void runQuery(TypeDBTransaction tx, TypeQLQuery query) {
+    private Runnable runQuery(TypeDBTransaction tx, TypeQLQuery query) {
         if (query instanceof TypeQLDefine) {
             tx.query().define(query.asDefine()).resolve();
             printer.info("Concepts have been defined");
+            return () -> {};
         } else if (query instanceof TypeQLUndefine) {
             tx.query().undefine(query.asUndefine()).resolve();
             printer.info("Concepts have been undefined");
+            return () -> {};
         } else if (query instanceof TypeQLInsert) {
-            Optional<ConceptMap> ignore = tx.query().insert(query.asInsert()).findFirst();
+            return findFirstMayThrow(tx.query().insert(query.asInsert()));
         } else if (query instanceof TypeQLDelete) {
-            tx.query().delete(query.asDelete()).resolve();
+            return resolvePromiseMayThrow(tx.query().delete(query.asDelete()));
         } else if (query instanceof TypeQLUpdate) {
-            Optional<ConceptMap> ignore = tx.query().update(query.asUpdate()).findFirst();
+            return findFirstMayThrow(tx.query().update(query.asUpdate()));
         } else if (query instanceof TypeQLGet) {
-            Optional<ConceptMap> ignore = tx.query().get(query.asGet()).findFirst();
+            return findFirstMayThrow(tx.query().get(query.asGet()));
         } else if (query instanceof TypeQLGet.Aggregate) {
-            Optional<Value> ignore = tx.query().get(query.asGetAggregate()).resolve();
+            return resolvePromiseMayThrow(tx.query().get(query.asGetAggregate()));
         } else if (query instanceof TypeQLGet.Group) {
-            Optional<ConceptMapGroup> ignore = tx.query().get(query.asGetGroup()).findFirst();
+            return findFirstMayThrow(tx.query().get(query.asGetGroup()));
         } else if (query instanceof TypeQLGet.Group.Aggregate) {
-            Optional<ValueGroup> ignore = tx.query().get(query.asGetGroupAggregate()).findFirst();
+            return findFirstMayThrow(tx.query().get(query.asGetGroupAggregate()));
         } else if (query instanceof TypeQLFetch) {
-            Optional<JSON> ignore = tx.query().fetch(query.asFetch()).findFirst();
+            return findFirstMayThrow(tx.query().fetch(query.asFetch()));
         } else {
             throw new TypeDBConsoleException("Query is of unrecognized type: " + query);
         }
     }
 
+    private Runnable findFirstMayThrow(Stream<?> stream) {
+        return () -> {
+            Optional<?> ignore = stream.findFirst();
+        };
+    }
+
+    private Runnable resolvePromiseMayThrow(Promise<?> promise) {
+        return () -> {
+            Object ignore = promise.resolve();
+        };
+    }
+
     private void runQueryPrintAnswers(TypeDBTransaction tx, TypeQLQuery query) {
         if (query instanceof TypeQLDefine) {
             tx.query().define(query.asDefine()).resolve();

VERSION

@@ -1 +1 @@
-2.28.4
+2.29.0

command/REPLCommand.java

@@ -379,7 +379,7 @@ public User.Create asUserCreate() {
         public static class PasswordUpdate extends REPLCommand.User {
 
             public static String token = "password-update";
-            private static String helpCommand = User.token + " " + token;
+            private static String helpCommand = User.token + " " + token + " [old-password new-password]";
             private static String description = "Update the password of the current user";
 
             private final String passwordOld;
@@ -751,10 +751,17 @@ static REPLCommand readREPLCommand(String line, @Nullable LineReader passwordRea
             if (passwordReader == null) throw new TypeDBConsoleException(UNABLE_TO_READ_PASSWORD_INTERACTIVELY);
             String password = Utils.readPassword(passwordReader, "Password: ");
             command = new User.Create(name, password);
-        } else if (tokens.length == 2 && tokens[0].equals(User.token) && tokens[1].equals(User.PasswordUpdate.token)) {
-            if (passwordReader == null) throw new TypeDBConsoleException(UNABLE_TO_READ_PASSWORD_INTERACTIVELY);
-            String passwordOld = Utils.readPassword(passwordReader, "Old password: ");
-            String passwordNew = Utils.readPassword(passwordReader, "New password: ");
+        } else if ((tokens.length == 2 || tokens.length == 4) && tokens[0].equals(User.token) && tokens[1].equals(User.PasswordUpdate.token)) {
+            String passwordOld;
+            String passwordNew;
+            if (tokens.length == 2) {
+                if (passwordReader == null) throw new TypeDBConsoleException(UNABLE_TO_READ_PASSWORD_INTERACTIVELY);
+                passwordOld = Utils.readPassword(passwordReader, "Old password: ");
+                passwordNew = Utils.readPassword(passwordReader, "New password: ");
+            } else {
+                passwordOld = tokens[2];
+                passwordNew = tokens[3];
+            }
             command = new User.PasswordUpdate(passwordOld, passwordNew);
         } else if (tokens.length == 3 && tokens[0].equals(User.token) && tokens[1].equals(User.PasswordSet.token)) {
             String name = tokens[2];

dependencies/maven/artifacts.snapshot

@@ -28,9 +28,9 @@
 @maven//:com_googlecode_java_diff_utils_diffutils_1_3_0
 @maven//:com_squareup_okhttp_okhttp_2_7_5
 @maven//:com_squareup_okio_okio_1_17_5
-@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_vaticle_typedb_typedb_cloud_runner_0_0_0_5dac26a166b026e306f2e1cd86462785a85c997d
+@maven//:com_vaticle_typedb_typedb_common_2_28_6
+@maven//:com_vaticle_typedb_typedb_runner_0_0_0_bf02c9c734eec2cb71ddaaa9f7050e18c2a003eb
 @maven//:com_vdurmont_semver4j_3_1_0
 @maven//:commons_codec_commons_codec_1_13
 @maven//:commons_io_commons_io_2_3

dependencies/vaticle/repositories.bzl

@@ -15,5 +15,5 @@ def vaticle_typedb_driver():
     git_repository(
         name = "vaticle_typedb_driver",
         remote = "https://github.com/vaticle/typedb-driver",
-        tag = "2.28.4",  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
+        tag = "2.29.0",  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
     )