touch up group queries

cmu-sei · Feb 13, 2025 · 2280298 · 2280298
1 parent ecf9721
commit 2280298
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/agents/broker/src/main.rs b/src/agents/broker/src/main.rs
@@ -13,7 +13,7 @@ async fn main() {
     let server_cert_file = env::var("TLS_SERVER_CERT_CHAIN").unwrap();
     let private_key_file = env::var("TLS_SERVER_KEY").unwrap();
     let ca_cert_file = env::var("TLS_CA_CERT").unwrap();
-    let bind_addr = env::var("CASSINI_BIND_ADDR").unwrap();
+    let bind_addr = env::var("CASSINI_BIND_ADDR").unwrap(); // add default?
 
     //TODO: Make bind address configurable so that we can provide an IP via config.
 

diff --git a/src/agents/gitlab/consume/src/groups.rs b/src/agents/gitlab/consume/src/groups.rs
@@ -120,9 +120,11 @@ impl Actor for GitlabGroupConsumer {
 
                     let cypher_query = format!(
                         "
-                        MATCH (group:GitlabGroup {{ group_id: \"{group_id}\" }})
+                        MERGE (group:GitlabGroup {{ group_id: \"{group_id}\" }})
+                        WITH group
                         UNWIND [{group_memberships}] AS membership
                         MERGE (user:GitlabUser {{ user_id: membership.user_id }})
+                        WITH membership, user
                         MERGE (user)-[r:IN_GROUP]->(group)
                         SET r.access_level = membership.access_level,
                             r.created_at = membership.created_at,
@@ -157,9 +159,11 @@ impl Actor for GitlabGroupConsumer {
 
                     let cypher_query = format!(
                         "
-                        MATCH (group:GitlabGroup {{ group_id: \"{group_id}\" }})
+                        MERGE (group:GitlabGroup {{ group_id: \"{group_id}\" }})
+                        WITH group
                         UNWIND [{projects}] AS project_data
                         MERGE (project:GitlabProject {{ project_id: project_data.project_id }})
+                        with project, group
                         MERGE (project)-[r:IN_GROUP]->(group)
                         ",
                         group_id = link.resource_id
@@ -185,7 +189,7 @@ impl Actor for GitlabGroupConsumer {
                         //create a list of attribute sets
                         format!(r#"{{ 
                             runner_id: "{runner_id}",
-                            paused: "{paused}",
+                            paused: "{paused}"
                         }}"#,
                         runner_id = runner.id.0,
                         paused = runner.paused
@@ -196,9 +200,11 @@ impl Actor for GitlabGroupConsumer {
 
                     let cypher_query = format!(
                         "
-                        MATCH (group:GitlabGroup {{ group_id: \"{group_id}\" }})
+                        MERGE (group:GitlabGroup {{ group_id: \"{group_id}\" }})
+                        WITH group
                         UNWIND [{runners}] AS runner_data
                         MERGE (runner:GitlabRunner {{ project_id: runner_data.runner_id }})
+                        WITH runner, group
                         MERGE (runner)-[r:IN_GROUP]->(group)
                         ",
                         group_id = link.resource_id

diff --git a/src/agents/gitlab/consume/src/projects.rs b/src/agents/gitlab/consume/src/projects.rs
@@ -90,7 +90,6 @@ impl Actor for GitlabProjectConsumer {
                 // Here, we write a query that creates additional nodes for the group and namespace of the project
                 let cypher_query = format!(
                     "
-                    // Create projects
                     UNWIND [{project_array}] AS project_data
                     MERGE (project:GitlabProject {{ project_id: project_data.project_id }})
                     SET project.name = project_data.name,

diff --git a/src/agents/gitlab/consume/src/supervisor.rs b/src/agents/gitlab/consume/src/supervisor.rs
@@ -90,7 +90,7 @@ impl Actor for ConsumerSupervisor {
                             if let Err(e) = Actor::spawn_linked(Some(USER_CONSUMER_TOPIC.to_string()), GitlabUserConsumer, args.clone(), myself.clone().into()).await { warn!( "failed to start users consumer {e}") }
                             if let Err(e) = Actor::spawn_linked(Some(GROUPS_CONSUMER_TOPIC.to_string()), GitlabGroupConsumer, args.clone(), myself.clone().into()).await { warn!( "failed to start groups consumer {e}") }
                             if let Err(e) = Actor::spawn_linked(Some(RUNNERS_CONSUMER_TOPIC.to_string()), GitlabRunnerConsumer, args.clone(), myself.clone().into()).await { warn!( "failed to start runners consumer {e}") }
-                            // if let Err(e) = Actor::spawn_linked(Some(PROJECTS_CONSUMER_TOPIC.to_string()), GitlabProjectConsumer, args.clone(), myself.clone().into()).await { warn!( "failed to start projects consumer {e}") }
+                            if let Err(e) = Actor::spawn_linked(Some(PROJECTS_CONSUMER_TOPIC.to_string()), GitlabProjectConsumer, args.clone(), myself.clone().into()).await { warn!( "failed to start projects consumer {e}") }
 
                             break;
                         } else if attempts < state.max_registration_attempts {

diff --git a/src/agents/gitlab/observe/src/users.rs b/src/agents/gitlab/observe/src/users.rs
@@ -82,7 +82,7 @@ impl Actor for GitlabUserObserver {
             let op = MultiUserQuery::build( 
                 MultiUserQueryArguments{
                     after: None,
-                    admins: Some(true),
+                    admins: None,
                     active: Some(true),
                     ids: None,
                     usernames: None,