Skip to content

Commit

Permalink
remove add_password
Browse files Browse the repository at this point in the history
  • Loading branch information
rb-determined-ai committed Jan 12, 2024
1 parent ae2f73f commit d192bb4
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 27 deletions.
3 changes: 1 addition & 2 deletions e2e_tests/tests/api_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def get_random_string() -> str:


def create_test_user(
add_password: bool = False,
user: Optional[bindings.v1User] = None,
) -> Tuple[api.Session, str]:
"""
Expand All @@ -58,7 +57,7 @@ def create_test_user(
session = admin_session()
username = get_random_string()
user = user or bindings.v1User(username=username, admin=False, active=True)
password = get_random_string() if add_password else ""
password = get_random_string()
bindings.post_PostUser(session, body=bindings.v1PostUserRequest(user=user, password=password))
sess = make_session(username, password)
return sess, password
Expand Down
2 changes: 0 additions & 2 deletions e2e_tests/tests/cluster/test_model_registry_rbac.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@ def test_model_rbac_deletes() -> None:

# create cluster admin user
cluster_admin, _ = api_utils.create_test_user(
add_password=True,
user=bindings.v1User(username=get_random_string(), active=True, admin=False),
)
api_utils.assign_user_role(
Expand All @@ -300,7 +299,6 @@ def test_model_rbac_deletes() -> None:

# create non-cluster admin user with OSS admin flag
oss_admin, _ = api_utils.create_test_user(
add_password=True,
user=bindings.v1User(username=get_random_string(), active=True, admin=True),
)

Expand Down
2 changes: 0 additions & 2 deletions e2e_tests/tests/cluster/test_rbac_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ def test_cluster_admin_only_calls() -> None:
]
) as (_, creds):
u_admin_role, _ = api_utils.create_test_user(
add_password=True,
user=bindings.v1User(username=api_utils.get_random_string(), active=True, admin=False),
)
api_utils.assign_user_role(
Expand All @@ -32,7 +31,6 @@ def test_cluster_admin_only_calls() -> None:

# normal determined admins without ClusterAdmin role.
u_det_admin, _ = api_utils.create_test_user(
add_password=True,
user=bindings.v1User(username=api_utils.get_random_string(), active=True, admin=True),
)

Expand Down
4 changes: 2 additions & 2 deletions e2e_tests/tests/cluster/test_rbac_ntsc.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def filter_out_ntsc(
@pytest.mark.e2e_cpu_rbac
@api_utils.skipif_rbac_not_enabled()
def test_notebook() -> None:
u_viewer_ws0, _ = api_utils.create_test_user(add_password=True)
u_editor_ws0, _ = api_utils.create_test_user(add_password=True)
u_viewer_ws0, _ = api_utils.create_test_user()
u_editor_ws0, _ = api_utils.create_test_user()
admin = api_utils.admin_session()

with test_workspace_org.setup_workspaces(count=2) as workspaces:
Expand Down
38 changes: 19 additions & 19 deletions e2e_tests/tests/cluster/test_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def test_logout() -> None:
@pytest.mark.e2e_cpu
@pytest.mark.e2e_cpu_postgres
def test_activate_deactivate() -> None:
sess, password = api_utils.create_test_user(True)
sess, password = api_utils.create_test_user()

# Deactivate user.
admin = api_utils.admin_session()
Expand Down Expand Up @@ -200,8 +200,8 @@ def test_change_username() -> None:
@pytest.mark.e2e_cpu_cross_version
def test_experiment_creation_and_listing() -> None:
# Create 2 users.
sess1, _ = api_utils.create_test_user(True)
sess2, _ = api_utils.create_test_user(True)
sess1, _ = api_utils.create_test_user()
sess2, _ = api_utils.create_test_user()

# Create an experiment as first user.
experiment_id1 = exp.run_basic_test(
Expand Down Expand Up @@ -231,7 +231,7 @@ def test_experiment_creation_and_listing() -> None:

@pytest.mark.e2e_cpu
def test_login_wrong_password() -> None:
sess, password = api_utils.create_test_user(True)
sess, password = api_utils.create_test_user()
with pytest.raises(errors.UnauthenticatedException):
api_utils.make_session(sess.username, "wrong" + password)

Expand All @@ -244,7 +244,7 @@ def test_login_as_non_existent_user() -> None:

@pytest.mark.e2e_cpu
def test_login_as_non_active_user() -> None:
sess, password = api_utils.create_test_user(True)
sess, password = api_utils.create_test_user()
admin = api_utils.admin_session()
d = client.Determined._from_session(admin)
userobj = d.get_user_by_name(sess.username)
Expand All @@ -257,7 +257,7 @@ def test_login_as_non_active_user() -> None:
@pytest.mark.e2e_cpu
def test_non_admin_user_link_with_agent_user() -> None:
sess1 = api_utils.user_session()
sess2, _ = api_utils.create_test_user(True)
sess2, _ = api_utils.create_test_user()

cmd = [
"det",
Expand Down Expand Up @@ -372,8 +372,8 @@ def kill_tensorboards(sess: api.Session, *tensorboard_ids: str) -> None:

@pytest.mark.e2e_cpu
def test_notebook_creation_and_listing() -> None:
sess1, _ = api_utils.create_test_user(True)
sess2, _ = api_utils.create_test_user(True)
sess1, _ = api_utils.create_test_user()
sess2, _ = api_utils.create_test_user()

notebook_id1 = start_notebook(sess1)

Expand All @@ -397,8 +397,8 @@ def test_notebook_creation_and_listing() -> None:

@pytest.mark.e2e_cpu
def test_tensorboard_creation_and_listing() -> None:
sess1, _ = api_utils.create_test_user(True)
sess2, _ = api_utils.create_test_user(True)
sess1, _ = api_utils.create_test_user()
sess2, _ = api_utils.create_test_user()

# Create an experiment.
experiment_id1 = exp.run_basic_test(
Expand Down Expand Up @@ -436,8 +436,8 @@ def test_tensorboard_creation_and_listing() -> None:

@pytest.mark.e2e_cpu
def test_command_creation_and_listing() -> None:
sess1, _ = api_utils.create_test_user(True)
sess2, _ = api_utils.create_test_user(True)
sess1, _ = api_utils.create_test_user()
sess2, _ = api_utils.create_test_user()

command_id1 = run_command(session=sess1)
command_id2 = run_command(session=sess2)
Expand All @@ -455,7 +455,7 @@ def test_command_creation_and_listing() -> None:

def create_linked_user(uid: int, user: str, gid: int, group: str) -> api.Session:
admin = api_utils.admin_session()
sess, _ = api_utils.create_test_user(False)
sess, _ = api_utils.create_test_user()

cmd = [
"det",
Expand All @@ -478,7 +478,7 @@ def create_linked_user(uid: int, user: str, gid: int, group: str) -> api.Session


def create_linked_user_sdk(uid: int, agent_user: str, gid: int, group: str) -> api.Session:
sess, _ = api_utils.create_test_user(False)
sess, _ = api_utils.create_test_user()
det_obj = client.Determined._from_session(api_utils.admin_session())
user = det_obj.get_user_by_name(user_name=sess.username)
user.link_with_agent(agent_gid=gid, agent_uid=uid, agent_group=group, agent_user=agent_user)
Expand Down Expand Up @@ -577,7 +577,7 @@ def test_non_root_experiment(tmp_path: pathlib.Path) -> None:

@pytest.mark.e2e_cpu
def test_link_without_agent_user() -> None:
sess, _ = api_utils.create_test_user(False)
sess, _ = api_utils.create_test_user()

check_link_with_agent_output(sess, "root:0:root:0")

Expand Down Expand Up @@ -632,7 +632,7 @@ def test_experiment_delete() -> None:
@pytest.mark.e2e_cpu
@pytest.mark.e2e_cpu_postgres
def test_change_displayname() -> None:
sess, _ = api_utils.create_test_user(False)
sess, _ = api_utils.create_test_user()
original_name = sess.username

det_obj = client.Determined._from_session(api_utils.admin_session())
Expand Down Expand Up @@ -671,7 +671,7 @@ def test_change_displayname() -> None:

@pytest.mark.e2e_cpu
def test_patch_agentusergroup() -> None:
sess, _ = api_utils.create_test_user(False)
sess, _ = api_utils.create_test_user()

# Patch - normal.
admin = api_utils.admin_session()
Expand Down Expand Up @@ -702,7 +702,7 @@ def test_patch_agentusergroup() -> None:
@pytest.mark.e2e_cpu
def test_user_edit() -> None:
admin = api_utils.admin_session()
sess, _ = api_utils.create_test_user(False)
sess, _ = api_utils.create_test_user()
original_name = sess.username

det_obj = client.Determined._from_session(admin)
Expand Down Expand Up @@ -739,7 +739,7 @@ def test_user_edit() -> None:
@pytest.mark.e2e_cpu
def test_user_list() -> None:
admin = api_utils.admin_session()
sess, _ = api_utils.create_test_user(False)
sess, _ = api_utils.create_test_user()
output = detproc.check_output(admin, ["det", "user", "ls"])
assert sess.username in output

Expand Down

0 comments on commit d192bb4

Please sign in to comment.