summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCara Salter <cara@devcara.com>2022-07-10 07:43:40 -0400
committerCara Salter <cara@devcara.com>2022-07-10 07:43:40 -0400
commit131dd5ab9df295b0bad320675b2307afcbf7d076 (patch)
treea971b3506198935d98e87282deaa2297c4241d84
parent90823a79ef80f6a589a414fb8a3006c8ff17a95d (diff)
downloadhomeworld-131dd5ab9df295b0bad320675b2307afcbf7d076.tar.gz
homeworld-131dd5ab9df295b0bad320675b2307afcbf7d076.zip
colonies: List users
First work towards cloud-init data being stored in homeworld
-rw-r--r--migrations/20220710112943_colonies.sql7
-rw-r--r--sqlx-data.json12
-rw-r--r--src/handlers/colonies.rs46
-rw-r--r--src/handlers/mod.rs1
-rw-r--r--src/main.rs1
5 files changed, 67 insertions, 0 deletions
diff --git a/migrations/20220710112943_colonies.sql b/migrations/20220710112943_colonies.sql
new file mode 100644
index 0000000..805258e
--- /dev/null
+++ b/migrations/20220710112943_colonies.sql
@@ -0,0 +1,7 @@
+-- Add migration script here
+CREATE TABLE seed_users (
+ id SERIAL PRIMARY KEY,
+ name TEXT NOT NULL,
+ groups TEXT[] NOT NULL,
+ ssh_authorized_keys TEXT[] NOT NULL
+);
diff --git a/sqlx-data.json b/sqlx-data.json
index 3e0bb1e..4c90f0b 100644
--- a/sqlx-data.json
+++ b/sqlx-data.json
@@ -54,6 +54,11 @@
"name": "version",
"ordinal": 4,
"type_info": "Text"
+ },
+ {
+ "name": "colonizable",
+ "ordinal": 5,
+ "type_info": "Bool"
}
],
"nullable": [
@@ -61,6 +66,7 @@
false,
false,
false,
+ false,
false
],
"parameters": {
@@ -98,6 +104,11 @@
"name": "version",
"ordinal": 4,
"type_info": "Text"
+ },
+ {
+ "name": "colonizable",
+ "ordinal": 5,
+ "type_info": "Bool"
}
],
"nullable": [
@@ -105,6 +116,7 @@
false,
false,
false,
+ false,
false
],
"parameters": {
diff --git a/src/handlers/colonies.rs b/src/handlers/colonies.rs
new file mode 100644
index 0000000..37ec65a
--- /dev/null
+++ b/src/handlers/colonies.rs
@@ -0,0 +1,46 @@
+use std::sync::Arc;
+
+use axum::{Extension, Json};
+use sqlx::query_as;
+
+use crate::{
+ errors::{JsonResult, ServiceError, StringResult},
+ State,
+};
+
+use solarlib::colony::{User, UserData};
+
+#[derive(Debug, Clone)]
+pub struct DbUser {
+ pub id: i32,
+ pub name: String,
+ pub groups: Vec<String>,
+ pub ssh_authorized_keys: Vec<String>,
+}
+
+impl From<DbUser> for User {
+ fn from(o: DbUser) -> Self {
+ Self {
+ name: o.name,
+ groups: o.groups,
+ ssh_authorized_keys: o.ssh_authorized_keys,
+ }
+ }
+}
+
+pub async fn list_users(state: Extension<Arc<State>>) -> JsonResult<Json<UserData>> {
+ let mut conn = state.conn.acquire().await?;
+
+ let db_users = query_as!(DbUser, "SELECT * FROM seed_users")
+ .fetch_all(&mut conn)
+ .await?;
+
+ let users = db_users
+ .into_iter()
+ .map(|u| u.into())
+ .collect::<Vec<User>>();
+
+ let data = UserData { users };
+
+ Ok(Json(data))
+}
diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index 2b5bfaf..a643df3 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -1 +1,2 @@
+pub mod colonies;
pub mod ships;
diff --git a/src/main.rs b/src/main.rs
index 4a02f95..67b54ea 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -54,6 +54,7 @@ async fn main() {
.route("/ships/new", post(handlers::ships::new))
.route("/ships/delete/:shasum", delete(handlers::ships::delete))
.route("/ships/get/:shasum", get(handlers::ships::get))
+ .route("/users/list", get(handlers::colonies::list_users))
.layer(
ServiceBuilder::new()
.layer(HandleErrorLayer::new(|error: BoxError| async move {