Skip to content

fix broken tests #1633

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

Merged
merged 4 commits into from
Aug 22, 2022
Merged

fix broken tests #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
238e4cc
add temporary exemption for Snapshot authz coverage
jmpesp Aug 22, 2022
1919ed6
remove temporary exemption for snapshot authz coverage
jmpesp Aug 22, 2022
4003d4e
use built in silo, that is where priv user has permissions
jmpesp Aug 22, 2022
dede1ac
remove unused imports
jmpesp Aug 22, 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
10 changes: 9 additions & 1 deletion nexus/src/authz/policy_test/resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,12 @@ async fn make_project(
Uuid::new_v4(),
LookupType::ByName(instance_name.clone()),
);

let disk_name = format!("{}-disk1", project_name);
builder.new_resource(authz::Disk::new(
project.clone(),
Uuid::new_v4(),
LookupType::ByName(format!("{}-disk1", project_name)),
LookupType::ByName(disk_name.clone()),
));
builder.new_resource(instance.clone());
builder.new_resource(authz::NetworkInterface::new(
Expand All @@ -201,6 +203,12 @@ async fn make_project(
Uuid::new_v4(),
LookupType::ByName(format!("{}-subnet1", vpc1_name)),
));

builder.new_resource(authz::Snapshot::new(
project.clone(),
Uuid::new_v4(),
LookupType::ByName(format!("{}-snapshot1", disk_name)),
));
}

/// Returns the set of authz classes exempted from the coverage test
Expand Down
23 changes: 3 additions & 20 deletions nexus/tests/integration_tests/snapshots.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use nexus_test_utils::http_testing::RequestBuilder;
use nexus_test_utils::resource_helpers::create_ip_pool;
use nexus_test_utils::resource_helpers::create_organization;
use nexus_test_utils::resource_helpers::create_project;
use nexus_test_utils::resource_helpers::create_silo;
use nexus_test_utils::resource_helpers::object_create;
use nexus_test_utils::resource_helpers::DiskTest;
use nexus_test_utils::ControlPlaneTestContext;
Expand All @@ -32,7 +31,6 @@ use omicron_nexus::db;
use omicron_nexus::db::identity::Resource;
use omicron_nexus::db::lookup::LookupPath;
use omicron_nexus::external_api::params;
use omicron_nexus::external_api::shared;
use omicron_nexus::external_api::views;
use uuid::Uuid;

Expand Down Expand Up @@ -385,18 +383,13 @@ async fn test_reject_creating_disk_from_snapshot(
let nexus = &cptestctx.server.apictx.nexus;
let datastore = nexus.datastore();

const SILO_NAME: &str = "snapshot-silo";
let silo =
create_silo(&client, SILO_NAME, true, shared::UserProvisionType::Fixed)
.await;

let project_id = create_org_and_project(&client).await;

let opctx =
OpContext::for_tests(cptestctx.logctx.log.new(o!()), datastore.clone());

let (authz_silo, ..) = LookupPath::new(&opctx, &datastore)
.silo_id(silo.identity.id)
.silo_id(*db::fixed_data::silo::SILO_ID)
.fetch()
.await
.unwrap();
Expand Down Expand Up @@ -546,18 +539,13 @@ async fn test_reject_creating_disk_from_illegal_snapshot(
let nexus = &cptestctx.server.apictx.nexus;
let datastore = nexus.datastore();

const SILO_NAME: &str = "snapshot-silo";
let silo =
create_silo(&client, SILO_NAME, true, shared::UserProvisionType::Fixed)
.await;

let project_id = create_org_and_project(&client).await;

let opctx =
OpContext::for_tests(cptestctx.logctx.log.new(o!()), datastore.clone());

let (authz_silo, ..) = LookupPath::new(&opctx, &datastore)
.silo_id(silo.identity.id)
.silo_id(*db::fixed_data::silo::SILO_ID)
.fetch()
.await
.unwrap();
Expand Down Expand Up @@ -649,11 +637,6 @@ async fn test_create_snapshot_record_idempotent(
let nexus = &cptestctx.server.apictx.nexus;
let datastore = nexus.datastore();

const SILO_NAME: &str = "snapshot-silo";
let silo =
create_silo(&client, SILO_NAME, true, shared::UserProvisionType::Fixed)
.await;

let project_id = create_org_and_project(&client).await;

let snapshot = db::model::Snapshot {
Expand Down Expand Up @@ -683,7 +666,7 @@ async fn test_create_snapshot_record_idempotent(
OpContext::for_tests(cptestctx.logctx.log.new(o!()), datastore.clone());

let (authz_silo, ..) = LookupPath::new(&opctx, &datastore)
.silo_id(silo.identity.id)
.silo_id(*db::fixed_data::silo::SILO_ID)
.fetch()
.await
.unwrap();
Expand Down
68 changes: 68 additions & 0 deletions nexus/tests/output/authz-roles.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,23 @@ resource: VpcSubnet "silo1-org1-proj1-vpc1-subnet1"
silo1-org1-proj1-viewer ✘ ✔ ✔ ✔ ✘ ✘ ✘ ✘
unauthenticated ! ! ! ! ! ! ! !

resource: Snapshot "silo1-org1-proj1-disk1-snapshot1"

USER Q R LC RP M MP CC D
fleet-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
fleet-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
fleet-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-admin ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-collaborator ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-viewer ✘ ✔ ✔ ✔ ✘ ✘ ✘ ✘
silo1-org1-admin ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-org1-collaborator ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-org1-viewer ✘ ✔ ✔ ✔ ✘ ✘ ✘ ✘
silo1-org1-proj1-admin ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-org1-proj1-collaborator ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-org1-proj1-viewer ✘ ✔ ✔ ✔ ✘ ✘ ✘ ✘
unauthenticated ! ! ! ! ! ! ! !

resource: Project "silo1-org1-proj2"

USER Q R LC RP M MP CC D
Expand Down Expand Up @@ -355,6 +372,23 @@ resource: VpcSubnet "silo1-org1-proj2-vpc1-subnet1"
silo1-org1-proj1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
unauthenticated ! ! ! ! ! ! ! !

resource: Snapshot "silo1-org1-proj2-disk1-snapshot1"

USER Q R LC RP M MP CC D
fleet-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
fleet-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
fleet-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-admin ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-collaborator ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-viewer ✘ ✔ ✔ ✔ ✘ ✘ ✘ ✘
silo1-org1-admin ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-org1-collaborator ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-org1-viewer ✘ ✔ ✔ ✔ ✘ ✘ ✘ ✘
silo1-org1-proj1-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-proj1-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-proj1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
unauthenticated ! ! ! ! ! ! ! !

resource: Organization "silo1-org2"

USER Q R LC RP M MP CC D
Expand Down Expand Up @@ -474,6 +508,23 @@ resource: VpcSubnet "silo1-org2-proj1-vpc1-subnet1"
silo1-org1-proj1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
unauthenticated ! ! ! ! ! ! ! !

resource: Snapshot "silo1-org2-proj1-disk1-snapshot1"

USER Q R LC RP M MP CC D
fleet-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
fleet-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
fleet-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-admin ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-collaborator ✘ ✔ ✔ ✔ ✔ ✔ ✔ ✔
silo1-viewer ✘ ✔ ✔ ✔ ✘ ✘ ✘ ✘
silo1-org1-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-proj1-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-proj1-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-proj1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
unauthenticated ! ! ! ! ! ! ! !

resource: Silo "silo2"

USER Q R LC RP M MP CC D
Expand Down Expand Up @@ -627,6 +678,23 @@ resource: VpcSubnet "silo2-org1-proj1-vpc1-subnet1"
silo1-org1-proj1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
unauthenticated ! ! ! ! ! ! ! !

resource: Snapshot "silo2-org1-proj1-disk1-snapshot1"

USER Q R LC RP M MP CC D
fleet-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
fleet-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
fleet-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-proj1-admin ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-proj1-collaborator ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
silo1-org1-proj1-viewer ✘ ✘ ✘ ✘ ✘ ✘ ✘ ✘
unauthenticated ! ! ! ! ! ! ! !

resource: Rack id "c037e882-8b6d-c8b5-bef4-97e848eb0a50"

USER Q R LC RP M MP CC D
Expand Down