Update password (#227)

Ganeshwara Hananda · web-flow · commit d1d8222d47da · 2021-06-25T13:18:12.000+01:00
## What is the goal of this PR?

We've added the update password feature.

## What are the changes implemented in this PR?

1. Add support for updating user password
2. Updated the bootup command of TypeDB Cluster
diff --git a/dependencies/vaticle/artifacts.bzl b/dependencies/vaticle/artifacts.bzl
@@ -29,7 +29,7 @@ def vaticle_typedb_artifacts():
         artifact_name = "typedb-server-{platform}-{version}.{ext}",
         tag_source = deployment["artifact.release"],
         commit_source = deployment["artifact.snapshot"],
-        commit = "5ea116cb20c71e29eebf44c131b3a4775c5610de",
+        commit = "05fe4e64dc0f66d45f09e3f7dc88a47ce284587a",
     )
 
 def vaticle_typedb_cluster_artifacts():
@@ -39,5 +39,5 @@ def vaticle_typedb_cluster_artifacts():
         artifact_name = "typedb-cluster-all-{platform}-{version}.{ext}",
         tag_source = deployment_private["artifact.release"],
         commit_source = deployment_private["artifact.snapshot"],
-        commit = "117d690b95a049e0bbe2be9b9c024a20763fe6c2"
+        commit = "25e45df9512604812f800218066b0f93435e44d2"
     )
diff --git a/dependencies/vaticle/repositories.bzl b/dependencies/vaticle/repositories.bzl
@@ -39,5 +39,5 @@ def vaticle_typedb_behaviour():
     git_repository(
         name = "vaticle_typedb_behaviour",
         remote = "https://github.com/vaticle/typedb-behaviour",
-        commit = "90e12486779d0f95eacd63035621cb431b721921" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
+        commit = "28d283807607cd589d6261a0da62ecd414ed49d5" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
     )
diff --git a/requirements.txt b/requirements.txt
@@ -32,6 +32,6 @@
 ## Dependencies
 
 # IMPORTANT: Any changes to these dependencies should be copied to requirements_dev.txt.
-typedb-protocol==2.1.1
+typedb-protocol==0.0.0-008f0fc3bb11c221214a9b47899168680cf111be
 grpcio==1.38.0
 protobuf==3.15.5
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -30,7 +30,7 @@
 
 ## Dependencies
 
-typedb-protocol==2.1.1
+typedb-protocol==0.0.0-008f0fc3bb11c221214a9b47899168680cf111be
 grpcio==1.38.0
 protobuf==3.15.5
 
diff --git a/tests/behaviour/connection/user/user_steps.py b/tests/behaviour/connection/user/user_steps.py
@@ -18,11 +18,14 @@
 #   specific language governing permissions and limitations
 #   under the License.
 #
+import os
+
 from behave import step
 from hamcrest import assert_that, has_item, not_
 
 from tests.behaviour.context import Context
 from typedb.api.connection.client import TypeDBClusterClient
+from typedb.client import TypeDB, TypeDBCredential
 
 
 def _get_client(context: Context):
@@ -42,6 +45,17 @@ def step_impl(context: Context, name: str):
 def step_impl(context: Context, name: str, password: str):
     _get_client(context).users().create(name, password)
 
+@step("user password: {name}, {password}")
+def step_impl(context: Context, name: str, password: str):
+    _get_client(context).users().get(name).password(password)
+
+@step("user connect: {name}, {password}")
+def step_impl(context: Context, name: str, password: str):
+    root_ca_path = os.environ["ROOT_CA"]
+    credential = TypeDBCredential(name, password, root_ca_path)
+    with TypeDB.cluster_client(addresses=["127.0.0.1:" + context.config.userdata["port"]], credential=credential) as client:
+        client.databases().all()
+
 @step("user delete: {name}")
 def step_impl(context: Context, name: str):
     user = _get_client(context).users().get(name)
diff --git a/tests/integration/test_cluster_failover.py b/tests/integration/test_cluster_failover.py
@@ -90,7 +90,7 @@ def test_put_entity_type_to_crashed_primary_replica(self):
                     print("Retrieved entity type with label '%s' from new primary replica." % person.get_label())
                     assert person.get_label().name() == "person"
                 idx = str(primary_replica.address())[10]
-                subprocess.Popen(["./%s/typedb" % idx, "server", "--data", "server/data", "--address", "127.0.0.1:%s1729:%s1730:%s1731" % (idx, idx, idx), "--peer", "127.0.0.1:11729:11730:11731", "--peer", "127.0.0.1:21729:21730:21731", "--peer", "127.0.0.1:31729:31730:31731", "--encryption-enabled=true"])
+                subprocess.Popen(["./%s/typedb" % idx, "cluster", "--data", "server/data", "--address", "127.0.0.1:%s1729:%s1730:%s1731" % (idx, idx, idx), "--peer", "127.0.0.1:11729:11730:11731", "--peer", "127.0.0.1:21729:21730:21731", "--peer", "127.0.0.1:31729:31730:31731", "--encryption-enabled=true"])
                 lsof = None
                 live_check_iteration = 0
                 while not lsof and live_check_iteration < 60:
diff --git a/tools/behave_rule.bzl b/tools/behave_rule.bzl
@@ -83,7 +83,7 @@ def _rule_implementation(ctx):
            if [[ $PRODUCT == "Core" ]]; then
              ./typedb_distribution/"$DIRECTORY"/typedb server --port $PORT --data typedb_test &
            else
-             ./typedb_distribution/"$DIRECTORY"/typedb server --address "127.0.0.1:$PORT:$(($PORT+1)):$(($PORT+2))" --data typedb_test --encryption-enabled=true &
+             ./typedb_distribution/"$DIRECTORY"/typedb cluster --address "127.0.0.1:$PORT:$(($PORT+1)):$(($PORT+2))" --data typedb_test --encryption-enabled=true &
 
              ROOT_CA=`realpath ./typedb_distribution/"$DIRECTORY"/server/conf/encryption/rpc-root-ca.pem`
              export ROOT_CA
diff --git a/tools/cluster_test_rule.bzl b/tools/cluster_test_rule.bzl
@@ -56,9 +56,9 @@ def _rule_implementation(ctx):
            echo Successfully unarchived TypeDB distribution. Creating 3 copies.
            cp -r typedb_distribution/$TYPEDB/ 1 && cp -r typedb_distribution/$TYPEDB/ 2 && cp -r typedb_distribution/$TYPEDB/ 3
            echo Starting 3 TypeDB servers.
-           ./1/typedb server --data server/data --address 127.0.0.1:11729:11730:11731 --peer 127.0.0.1:11729:11730:11731 --peer 127.0.0.1:21729:21730:21731 --peer 127.0.0.1:31729:31730:31731  --encryption-enabled=true &
-           ./2/typedb server --data server/data --address 127.0.0.1:21729:21730:21731 --peer 127.0.0.1:11729:11730:11731 --peer 127.0.0.1:21729:21730:21731 --peer 127.0.0.1:31729:31730:31731  --encryption-enabled=true &
-           ./3/typedb server --data server/data --address 127.0.0.1:31729:31730:31731 --peer 127.0.0.1:11729:11730:11731 --peer 127.0.0.1:21729:21730:21731 --peer 127.0.0.1:31729:31730:31731  --encryption-enabled=true &
+           ./1/typedb cluster --data server/data --address 127.0.0.1:11729:11730:11731 --peer 127.0.0.1:11729:11730:11731 --peer 127.0.0.1:21729:21730:21731 --peer 127.0.0.1:31729:31730:31731  --encryption-enabled=true &
+           ./2/typedb cluster --data server/data --address 127.0.0.1:21729:21730:21731 --peer 127.0.0.1:11729:11730:11731 --peer 127.0.0.1:21729:21730:21731 --peer 127.0.0.1:31729:31730:31731  --encryption-enabled=true &
+           ./3/typedb cluster --data server/data --address 127.0.0.1:31729:31730:31731 --peer 127.0.0.1:11729:11730:11731 --peer 127.0.0.1:21729:21730:21731 --peer 127.0.0.1:31729:31730:31731  --encryption-enabled=true &
 
            ROOT_CA=`realpath typedb_distribution/$TYPEDB/server/conf/encryption/rpc-root-ca.pem`
            export ROOT_CA
diff --git a/typedb/api/connection/user.py b/typedb/api/connection/user.py
@@ -29,6 +29,10 @@ class User(ABC):
     def name(self) -> str:
         pass
 
+    @abstractmethod
+    def password(self, password: str) -> None:
+        pass
+
     @abstractmethod
     def delete(self) -> None:
         pass
diff --git a/typedb/common/rpc/request_builder.py b/typedb/common/rpc/request_builder.py
@@ -105,6 +105,12 @@ def cluster_user_manager_contains_req(name: str):
 
 # ClusterUser
 
+def cluster_user_password_req(name: str, password: str):
+    req = cluster_user_proto.ClusterUser.Password.Req()
+    req.name = name
+    req.password = password
+    return req
+
 def cluster_user_delete_req(name: str):
     req = cluster_user_proto.ClusterUser.Delete.Req()
     req.name = name
diff --git a/typedb/connection/cluster/stub.py b/typedb/connection/cluster/stub.py
@@ -51,15 +51,18 @@ def databases_get(self, req: cluster_database_proto.ClusterDatabaseManager.Get.R
     def databases_all(self, req: cluster_database_proto.ClusterDatabaseManager.All.Req) -> cluster_database_proto.ClusterDatabaseManager.All.Res:
         return resilient_call(lambda: self._clusterStub.databases_all(req))
 
-    def usersAll(self, req: cluster_user_proto.ClusterUserManager.All.Req) -> cluster_user_proto.ClusterUserManager.All.Res:
+    def users_all(self, req: cluster_user_proto.ClusterUserManager.All.Req) -> cluster_user_proto.ClusterUserManager.All.Res:
         return resilient_call(lambda: self._clusterStub.users_all(req))
 
-    def usersContains(self, req: cluster_user_proto.ClusterUserManager.Contains.Req) -> cluster_user_proto.ClusterUserManager.Contains.Res:
+    def users_contains(self, req: cluster_user_proto.ClusterUserManager.Contains.Req) -> cluster_user_proto.ClusterUserManager.Contains.Res:
         return resilient_call(lambda: self._clusterStub.users_contains(req))
 
-    def usersCreate(self, req: cluster_user_proto.ClusterUserManager.Create.Req) -> cluster_user_proto.ClusterUserManager.Create.Res:
+    def users_create(self, req: cluster_user_proto.ClusterUserManager.Create.Req) -> cluster_user_proto.ClusterUserManager.Create.Res:
         return resilient_call(lambda: self._clusterStub.users_create(req))
 
-    def userDelete(self, req: cluster_user_proto.ClusterUser.Delete.Req) -> cluster_user_proto.ClusterUser.Delete.Res:
+    def user_password(self, req: cluster_user_proto.ClusterUser.Delete.Req) -> cluster_user_proto.ClusterUser.Delete.Res:
+        return resilient_call(lambda: self._clusterStub.user_password(req))
+
+    def user_delete(self, req: cluster_user_proto.ClusterUser.Delete.Req) -> cluster_user_proto.ClusterUser.Delete.Res:
         return resilient_call(lambda: self._clusterStub.user_delete(req))
 
diff --git a/typedb/connection/cluster/user.py b/typedb/connection/cluster/user.py
@@ -21,7 +21,7 @@
 from typing import TYPE_CHECKING
 
 from typedb.api.connection.user import User
-from typedb.common.rpc.request_builder import cluster_user_delete_req
+from typedb.common.rpc.request_builder import cluster_user_password_req, cluster_user_delete_req
 from typedb.connection.cluster.database import _FailsafeTask, _ClusterDatabase
 
 if TYPE_CHECKING:
@@ -36,8 +36,12 @@ def __init__(self, client: "_ClusterClient", name: str):
     def name(self) -> str:
         return self._name
 
+    def password(self, password: str) -> None:
+        failsafe_task = _UserFailsafeTask(self._client, lambda replica: self._client._stub(replica.address()).user_password(cluster_user_password_req(self.name(), password)))
+        failsafe_task.run_primary_replica()
+
     def delete(self) -> None:
-        failsafe_task = _UserFailsafeTask(self._client, lambda replica: self._client._stub(replica.address()).userDelete(cluster_user_delete_req(self.name())))
+        failsafe_task = _UserFailsafeTask(self._client, lambda replica: self._client._stub(replica.address()).user_delete(cluster_user_delete_req(self.name())))
         failsafe_task.run_primary_replica()
 
 
diff --git a/typedb/connection/cluster/user_manager.py b/typedb/connection/cluster/user_manager.py
@@ -40,7 +40,7 @@ def __init__(self, client: "_ClusterClient"):
     def create(self, name: str, password: str) -> None:
         failsafe_task = _UserManagerFailsafeTask(
             self._client,
-            lambda replica: self._client._stub(replica.address()).usersCreate(
+            lambda replica: self._client._stub(replica.address()).users_create(
                 cluster_user_manager_create_req(name, password))
         )
         failsafe_task.run_primary_replica()
@@ -54,13 +54,13 @@ def all(self) -> List[User]:
         return val
 
     def _get_user_list(self, replica: _ClusterDatabase.Replica):
-        users_proto = self._client._stub(replica.address()).usersAll(cluster_user_manager_all_req())
+        users_proto = self._client._stub(replica.address()).users_all(cluster_user_manager_all_req())
         return [_ClusterUser(self._client, username) for username in users_proto.names]
 
     def contains(self, name: str) -> bool:
         failsafe_task = _UserManagerFailsafeTask(
             self._client,
-            lambda replica: self._client._stub(replica.address()).usersContains(cluster_user_manager_contains_req(name))
+            lambda replica: self._client._stub(replica.address()).users_contains(cluster_user_manager_contains_req(name))
         )
         return failsafe_task.run_primary_replica()
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ def vaticle_typedb_artifacts():`
`29`	`29`	`artifact_name = "typedb-server-{platform}-{version}.{ext}",`
`30`	`30`	`tag_source = deployment["artifact.release"],`
`31`	`31`	`commit_source = deployment["artifact.snapshot"],`
`32`		`- commit = "5ea116cb20c71e29eebf44c131b3a4775c5610de",`
	`32`	`+ commit = "05fe4e64dc0f66d45f09e3f7dc88a47ce284587a",`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`def vaticle_typedb_cluster_artifacts():`
`@@ -39,5 +39,5 @@ def vaticle_typedb_cluster_artifacts():`
`39`	`39`	`artifact_name = "typedb-cluster-all-{platform}-{version}.{ext}",`
`40`	`40`	`tag_source = deployment_private["artifact.release"],`
`41`	`41`	`commit_source = deployment_private["artifact.snapshot"],`
`42`		`- commit = "117d690b95a049e0bbe2be9b9c024a20763fe6c2"`
	`42`	`+ commit = "25e45df9512604812f800218066b0f93435e44d2"`
`43`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ def vaticle_typedb_behaviour():`
`39`	`39`	`git_repository(`
`40`	`40`	`name = "vaticle_typedb_behaviour",`
`41`	`41`	`remote = "https://github.com/vaticle/typedb-behaviour",`
`42`		`- commit = "90e12486779d0f95eacd63035621cb431b721921" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour`
	`42`	`+ commit = "28d283807607cd589d6261a0da62ecd414ed49d5" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour`
`43`	`43`	`)`