Merge pull request #119 from LRZ-BADW/flavor-group-modify-tests

Flavor Group Modify Tests

api/src/database/resources/flavor_group.rs

@@ -72,9 +72,9 @@ pub async fn select_maybe_flavor_group_from_db(
 ) -> Result<Option<FlavorGroup>, UnexpectedOnlyError> {
     #[derive(FromRow)]
     pub struct FlavorGroupDb {
-        pub id: u32,
+        pub id: i32,
         pub name: String,
-        pub project_id: u32,
+        pub project_id: i32,
     }
     let query1 = sqlx::query!(
         r#"
@@ -117,9 +117,9 @@ pub async fn select_maybe_flavor_group_from_db(
         .map(|row| row.id)
         .collect::<Vec<_>>();
     Ok(Some(FlavorGroup {
-        id: flavor_group.id,
+        id: flavor_group.id as u32,
         name: flavor_group.name,
-        project: flavor_group.project_id,
+        project: flavor_group.project_id as u32,
         flavors,
     }))
 }

api/src/database/user/project.rs

@@ -53,7 +53,10 @@ pub async fn select_maybe_project_minimal_from_db(
 ) -> Result<Option<ProjectMinimal>, UnexpectedOnlyError> {
     let query = sqlx::query!(
         r#"
-        SELECT id, name
+        SELECT
+            id as project__id,
+            name as project__name,
+            user_class as project__user_class
         FROM user_project AS project
         WHERE project.id = ?
         "#,

lib/src/budgeting/budget_over_tree.rs

@@ -41,6 +41,11 @@ impl BudgetOverTreeRequest {
             params.push(("all", "1".to_string()));
         } else if let Some(project) = self.project {
             params.push(("project", project.to_string()));
+        } else if let Some(user) = self.user {
+            params.push(("user", user.to_string()));
+        }
+        if let Some(end) = self.end {
+            params.push(("end", end.to_string()));
         }
         params
     }

scripts/init_db.sh

@@ -21,8 +21,7 @@ DB_PASSWORD="${MARIADB_PASSWORD:=password}"
 DB_NAME="${MARIADB_DB:=lrzcc}"
 DB_PORT="${MARIADB_PORT:=3306}"
 
-if [[ -z "${SKIP_DOCKER}" ]]
-then
+if [[ -z "${SKIP_DOCKER}" ]]; then
     docker stop lrzcc-db || true
     docker rm lrzcc-db || true
     docker run \
@@ -40,8 +39,10 @@ done
 
 >&2 echo "MariaDB is up and running on ${DB_HOST} on port ${DB_PORT}!"
 
+mariadb -h "${DB_HOST}" -P "${DB_PORT}" -u "${DB_USER}" -p"${DB_PASSWORD}" -D "" -e "SET GLOBAL max_connections := 1000"
+
 export DATABASE_URL=mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}
 sqlx database create
 sqlx migrate run
 
->&2 echo "MariaDB has been migrated, ready to go!"
+>&2 echo "MariaDB has been configured and migrated, ready to go!"

test/tests/resources/flavor_group/mod.rs

@@ -1 +1,2 @@
 mod delete;
+mod modify;

test/tests/resources/flavor_group/modify.rs

@@ -0,0 +1,148 @@
+use lrzcc::{Api, Token};
+use lrzcc_test::{random_alphanumeric_string, spawn_app};
+use std::str::FromStr;
+use tokio::task::spawn_blocking;
+
+#[tokio::test]
+async fn e2e_lib_flavor_group_modify_denies_access_to_normal_user() {
+    // arrange
+    let server = spawn_app().await;
+    let test_project = server
+        .setup_test_project(0, 0, 1)
+        .await
+        .expect("Failed to setup test project");
+    let user = test_project.normals[0].user.clone();
+    let token = test_project.normals[0].token.clone();
+    let project = test_project.project.clone();
+    server
+        .mock_keystone_auth(&token, &user.openstack_id, &user.name)
+        .mount(&server.keystone_server)
+        .await;
+    let flavor_group = server
+        .setup_test_flavor_group(project.id)
+        .await
+        .expect("Failed to setup test server state");
+
+    spawn_blocking(move || {
+        // arrange
+        let client = Api::new(
+            format!("{}/api", &server.address),
+            Token::from_str(&token).unwrap(),
+            None,
+            None,
+        )
+        .unwrap();
+
+        // act
+        let modify = client.flavor_group.modify(flavor_group.id).send();
+
+        // assert
+        assert!(modify.is_err());
+        assert_eq!(
+            modify.unwrap_err().to_string(),
+            format!("Admin privileges required")
+        );
+    })
+    .await
+    .unwrap();
+}
+
+#[tokio::test]
+async fn e2e_lib_flavor_group_modify_denies_access_to_master_user() {
+    // arrange
+    let server = spawn_app().await;
+    let test_project = server
+        .setup_test_project(0, 1, 0)
+        .await
+        .expect("Failed to setup test project");
+    let user = test_project.masters[0].user.clone();
+    let token = test_project.masters[0].token.clone();
+    let project = test_project.project.clone();
+    server
+        .mock_keystone_auth(&token, &user.openstack_id, &user.name)
+        .mount(&server.keystone_server)
+        .await;
+    let flavor_group = server
+        .setup_test_flavor_group(project.id)
+        .await
+        .expect("Failed to setup test server state");
+
+    spawn_blocking(move || {
+        // arrange
+        let client = Api::new(
+            format!("{}/api", &server.address),
+            Token::from_str(&token).unwrap(),
+            None,
+            None,
+        )
+        .unwrap();
+
+        // act
+        let modify = client.flavor_group.modify(flavor_group.id).send();
+
+        // assert
+        assert!(modify.is_err());
+        assert_eq!(
+            modify.unwrap_err().to_string(),
+            format!("Admin privileges required")
+        );
+    })
+    .await
+    .unwrap();
+}
+
+#[tokio::test]
+async fn e2e_lib_flavor_group_modify_and_get_works() {
+    // arrange
+    let server = spawn_app().await;
+    let (user, project, token) = server
+        .setup_test_user_and_project(true)
+        .await
+        .expect("Failed to setup test user and project.");
+    server
+        .mock_keystone_auth(&token, &user.openstack_id, &user.name)
+        .mount(&server.keystone_server)
+        .await;
+    let flavor_group = server
+        .setup_test_flavor_group(project.id)
+        .await
+        .expect("Failed to setup test server state");
+
+    spawn_blocking(move || {
+        // arrange
+        let client = Api::new(
+            format!("{}/api", &server.address),
+            Token::from_str(&token).unwrap(),
+            None,
+            None,
+        )
+        .unwrap();
+
+        // act and assert 1 - modify
+        let name = random_alphanumeric_string(10);
+        let modified = client
+            .flavor_group
+            .modify(flavor_group.id)
+            .name(name.clone())
+            // TODO: test changing the project
+            .send()
+            .unwrap();
+        assert_eq!(&name, &modified.name);
+
+        // act and assert 2 - get
+        let retrieved = client.flavor_group.get(modified.id).unwrap();
+        assert_eq!(modified.id, retrieved.id);
+        assert_eq!(modified.name, retrieved.name);
+        assert_eq!(modified.project, retrieved.project.id);
+        assert_eq!(
+            modified.flavors,
+            retrieved
+                .flavors
+                .into_iter()
+                .map(|f| f.id)
+                .collect::<Vec<u32>>()
+        );
+    })
+    .await
+    .unwrap();
+}