Skip to content

Commit

Permalink
Update libhimmelblau version
Browse files Browse the repository at this point in the history
This implements a fix for Graph startup. Now a
network connection isn't necessary at startup the
first time.

Signed-off-by: David Mulder <[email protected]>
  • Loading branch information
dmulder committed Dec 18, 2024
1 parent a6164e8 commit 8ac9870
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ tracing-subscriber = "^0.3.17"
tracing = "^0.1.37"
himmelblau_unix_common = { path = "src/common" }
kanidm_unix_common = { path = "src/glue" }
libhimmelblau = { version = "0.4.4" }
libhimmelblau = { version = "0.4.6" }
clap = { version = "^4.5", features = ["derive", "env"] }
clap_complete = "^4.4.1"
reqwest = { version = "^0.12.2", features = ["json"] }
Expand Down
9 changes: 6 additions & 3 deletions src/common/src/idprovider/himmelblau.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,11 @@ impl HimmelblauMultiProvider {
continue;
}
};
let authority_host = graph.authority_host();
let tenant_id = graph.tenant_id();
let authority_host = graph
.authority_host()
.await
.map_err(|e| anyhow!("{:?}", e))?;
let tenant_id = graph.tenant_id().await.map_err(|e| anyhow!("{:?}", e))?;
idmap_lk
.add_gen_domain(&domain, &tenant_id, range)
.map_err(|e| anyhow!("{:?}", e))?;
Expand Down Expand Up @@ -1617,7 +1620,7 @@ impl HimmelblauProvider {
"Setting domain {} config authority_host to {}",
self.domain, &self.authority_host
);
let graph_url = self.graph.graph_url();
let graph_url = self.graph.graph_url().await?;
config.set(&self.domain, "graph_url", &graph_url);
debug!(
"Setting domain {} config graph_url to {}",
Expand Down

0 comments on commit 8ac9870

Please sign in to comment.