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.

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

(3/5) [nexus] Add CRUD implementations for Affinity/Anti-Affinity Groups #7445

Merged
merged 45 commits into from
Feb 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c9fb7a6
[nexus] Add Affinity/Anti-Affinity Groups to API (unimplemented)
smklein Jan 30, 2025
4020517
[nexus] Add Affinity/Anti-Affinity groups to database
smklein Jan 30, 2025
8f1d37c
[nexus] Add CRUD implementations for Affinity/Anti-Affinity Groups
smklein Jan 30, 2025
161f9d6
fix policy tests
smklein Jan 30, 2025
8dc0825
fmt
smklein Jan 30, 2025
e3113ff
Merge branch 'affinity-api' into affinity-db-model
smklein Jan 30, 2025
789bc97
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Jan 30, 2025
4e9cebc
tags
smklein Jan 30, 2025
6cfca2d
doc comments
smklein Jan 31, 2025
a1c97d4
Merge branch 'affinity-api' into affinity-db-model
smklein Jan 31, 2025
050b4c5
Merge branch 'main' into affinity-api
smklein Jan 31, 2025
4b08032
typed UUID
smklein Jan 31, 2025
8bc8f0c
Merge branch 'affinity-api' into affinity-db-model
smklein Jan 31, 2025
900f09c
Typed UUID
smklein Jan 31, 2025
195e167
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Jan 31, 2025
f2ebe31
Typed UUID
smklein Jan 31, 2025
aba9596
comments
smklein Jan 31, 2025
a271f1d
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Jan 31, 2025
1ad0101
review feedback
smklein Feb 1, 2025
4d26262
comment
smklein Feb 1, 2025
6ae1910
clippy
smklein Feb 1, 2025
e21125f
Merge branch 'main' into affinity-api
smklein Feb 4, 2025
bd95b03
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 4, 2025
76b0af9
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 4, 2025
45b993a
Merge branch 'main' into affinity-api
smklein Feb 18, 2025
05c8b60
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 18, 2025
eee1d6f
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 18, 2025
393a925
Merge branch 'main' into affinity-api
smklein Feb 19, 2025
7a99a96
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 19, 2025
ee657cc
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 19, 2025
c18449c
Merge branch 'main' into affinity-api
smklein Feb 19, 2025
4bf0e48
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 19, 2025
1a7e7e0
Merge branch 'main' into affinity-api
smklein Feb 19, 2025
01b8f03
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 19, 2025
a35a33c
Merge branch 'main' into affinity-api
smklein Feb 20, 2025
eb9682f
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 20, 2025
0e6eaf2
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 20, 2025
4a00ddd
Merge branch 'main' into affinity-api
smklein Feb 21, 2025
7a8da16
Merge branch 'affinity-api' into affinity-db-model (schema)
smklein Feb 21, 2025
081e8b4
Merge branch 'main' into affinity-api
smklein Feb 21, 2025
7733054
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 21, 2025
e9cc19c
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 21, 2025
565ffc8
Merge branch 'main' into affinity-api
smklein Feb 21, 2025
e15460c
Merge branch 'affinity-api' into affinity-db-model
smklein Feb 21, 2025
9190d80
Merge branch 'affinity-db-model' into affinity-db-crud
smklein Feb 21, 2025
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
6 changes: 6 additions & 0 deletions common/src/api/external/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@ impl<'a> From<&'a Name> for &'a str {
}
}

impl From<Name> for String {
fn from(name: Name) -> Self {
name.0
}
}

/// `Name` instances are comparable like Strings, primarily so that they can
/// be used as keys in trees.
impl<S> PartialEq<S> for Name
Expand Down
16 changes: 16 additions & 0 deletions nexus/auth/src/authz/api_resources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,22 @@ authz_resource! {
polar_snippet = InProject,
}

authz_resource! {
name = "AffinityGroup",
parent = "Project",
primary_key = Uuid,
roles_allowed = false,
polar_snippet = InProject,
}

authz_resource! {
name = "AntiAffinityGroup",
parent = "Project",
primary_key = Uuid,
roles_allowed = false,
polar_snippet = InProject,
}

authz_resource! {
name = "InstanceNetworkInterface",
parent = "Instance",
Expand Down
2 changes: 2 additions & 0 deletions nexus/auth/src/authz/oso_generic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ pub fn make_omicron_oso(log: &slog::Logger) -> Result<OsoInit, anyhow::Error> {
Disk::init(),
Snapshot::init(),
ProjectImage::init(),
AffinityGroup::init(),
AntiAffinityGroup::init(),
Instance::init(),
IpPool::init(),
InstanceNetworkInterface::init(),
Expand Down
Loading
Loading