From 37e1c5297a84c56d5684e48bb4529ce6d537a6a8 Mon Sep 17 00:00:00 2001 From: Nicholas Dujay <3258756+dat2@users.noreply.github.com> Date: Tue, 21 Feb 2023 16:08:43 -0500 Subject: [PATCH] implement show users (#329) * implement show users * fix compile errors * add basic ruby test * gitignore things --- .gitignore | 5 ++++- src/admin.rs | 33 +++++++++++++++++++++++++++++++++ tests/ruby/admin_spec.rb | 10 ++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3c65453..cf28bff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ .idea /target *.deb -.vscode \ No newline at end of file +.vscode +.profraw +cov/ +lcov.info diff --git a/src/admin.rs b/src/admin.rs index 71d3e48..406b0fe 100644 --- a/src/admin.rs +++ b/src/admin.rs @@ -100,6 +100,10 @@ where trace!("SHOW VERSION"); show_version(stream).await } + "USERS" => { + trace!("SHOW USERS"); + show_users(stream).await + } _ => error_response(stream, "Unsupported SHOW query against the admin database").await, }, _ => error_response(stream, "Unsupported query against the admin database").await, @@ -666,3 +670,32 @@ where } } } + +/// Show Users. +async fn show_users(stream: &mut T) -> Result<(), Error> +where + T: tokio::io::AsyncWrite + std::marker::Unpin, +{ + let mut res = BytesMut::new(); + + res.put(row_description(&vec![ + ("name", DataType::Text), + ("pool_mode", DataType::Text), + ])); + + for (user_pool, pool) in get_all_pools() { + let pool_config = &pool.settings; + res.put(data_row(&vec![ + user_pool.user.clone(), + pool_config.pool_mode.to_string(), + ])); + } + + res.put(command_complete("SHOW")); + + res.put_u8(b'Z'); + res.put_i32(5); + res.put_u8(b'I'); + + write_all_half(stream, &res).await +} diff --git a/tests/ruby/admin_spec.rb b/tests/ruby/admin_spec.rb index 2000e5d..7836415 100644 --- a/tests/ruby/admin_spec.rb +++ b/tests/ruby/admin_spec.rb @@ -286,4 +286,14 @@ describe "Admin" do connections.map(&:close) end end + + describe "SHOW users" do + it "returns the right users" do + admin_conn = PG::connect(processes.pgcat.admin_connection_string) + results = admin_conn.async_exec("SHOW USERS")[0] + admin_conn.close + expect(results["name"]).to eq("sharding_user") + expect(results["pool_mode"]).to eq("transaction") + end + end end