Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

authz: silo endpoints (take two) #947

Merged
merged 3 commits into from
Apr 19, 2022
Merged

authz: silo endpoints (take two) #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
debd309
Revert "authz: silo endpoints (#936)"
davepacheco Apr 19, 2022
4d1cf37
authz: silo endpoints (take two)
davepacheco Apr 19, 2022
8eca0ce
fix tests
davepacheco Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions nexus/tests/integration_tests/endpoints.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ use omicron_common::api::external::RouterRouteCreateParams;
use omicron_common::api::external::RouterRouteUpdateParams;
use omicron_common::api::external::VpcFirewallRuleUpdateParams;
use omicron_nexus::authn;
use omicron_nexus::db::fixed_data::silo::DEFAULT_SILO;
use omicron_nexus::db::identity::Resource;
use omicron_nexus::external_api::params;
use std::net::IpAddr;
use std::net::Ipv4Addr;
Expand All @@ -36,13 +34,13 @@ lazy_static! {
format!("/hardware/sleds/{}", SLED_AGENT_UUID);

// Silo used for testing
pub static ref DEFAULT_SILO_NAME: &'static Name = &DEFAULT_SILO.name().0;
pub static ref DEFAULT_SILO_URL: String =
format!("/silos/{}", *DEFAULT_SILO_NAME);
pub static ref DEMO_SILO_NAME: Name = "demo-silo".parse().unwrap();
pub static ref DEMO_SILO_URL: String =
format!("/silos/{}", *DEMO_SILO_NAME);
pub static ref DEMO_SILO_CREATE: params::SiloCreate =
params::SiloCreate {
identity: IdentityMetadataCreateParams {
name: DEFAULT_SILO_NAME.clone(),
name: DEMO_SILO_NAME.clone(),
description: String::from(""),
},
discoverable: true,
Expand Down Expand Up @@ -376,7 +374,7 @@ lazy_static! {
],
},
VerifyEndpoint {
url: &*DEFAULT_SILO_URL,
url: &*DEMO_SILO_URL,
visibility: Visibility::Protected,
allowed_methods: vec![
AllowedMethod::Get,
Expand Down
5 changes: 5 additions & 0 deletions nexus/tests/integration_tests/unauthorized.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ struct SetupReq {
lazy_static! {
/// List of requests to execute at setup time
static ref SETUP_REQUESTS: Vec<SetupReq> = vec![
// Create a separate Silo (not used for anything else)
SetupReq {
url: "/silos",
body: serde_json::to_value(&*DEMO_SILO_CREATE).unwrap(),
},
// Create an Organization
SetupReq {
url: "/organizations",
Expand Down