Fix tests

Created using spr 1.3.5
oxidecomputer · Jan 17, 2024 · c012765 · c012765
1 parent 51c64a9
commit c012765
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 101 deletions.
diff --git a/common/src/api/external/mod.rs b/common/src/api/external/mod.rs
@@ -764,11 +764,6 @@ pub enum ResourceType {
     TufRepo,
     TufArtifact,
     SwitchPort,
-    SystemUpdate,
-    ComponentUpdate,
-    SystemUpdateComponentUpdate,
-    UpdateDeployment,
-    UpdateableComponent,
     UserBuiltin,
     Zpool,
     Vmm,

diff --git a/nexus/db-queries/src/authz/api_resources.rs b/nexus/db-queries/src/authz/api_resources.rs
@@ -1031,22 +1031,6 @@ authz_resource! {
     polar_snippet = Custom,
 }
 
-authz_resource! {
-    name = "SystemUpdate",
-    parent = "Fleet",
-    primary_key = Uuid,
-    roles_allowed = false,
-    polar_snippet = FleetChild,
-}
-
-authz_resource! {
-    name = "UpdateDeployment",
-    parent = "Fleet",
-    primary_key = Uuid,
-    roles_allowed = false,
-    polar_snippet = FleetChild,
-}
-
 authz_resource! {
     name = "IpPool",
     parent = "Fleet",

diff --git a/nexus/db-queries/src/authz/oso_generic.rs b/nexus/db-queries/src/authz/oso_generic.rs
@@ -157,8 +157,6 @@ pub fn make_omicron_oso(log: &slog::Logger) -> Result<OsoInit, anyhow::Error> {
         Zpool::init(),
         Service::init(),
         UserBuiltin::init(),
-        SystemUpdate::init(),
-        UpdateDeployment::init(),
     ];
 
     for init in generated_inits {

diff --git a/nexus/db-queries/src/authz/policy_test/resources.rs b/nexus/db-queries/src/authz/policy_test/resources.rs
@@ -139,22 +139,6 @@ pub async fn make_resources(
         LookupType::ByCompositeId(artifact_id_desc),
     ));
 
-    let system_update_id =
-        "9c86d713-1bc2-4927-9892-ada3eb6f5f62".parse().unwrap();
-    builder.new_resource(authz::SystemUpdate::new(
-        authz::FLEET,
-        system_update_id,
-        LookupType::ById(system_update_id),
-    ));
-
-    let update_deployment_id =
-        "c617a035-7c42-49ff-a36a-5dfeee382832".parse().unwrap();
-    builder.new_resource(authz::UpdateDeployment::new(
-        authz::FLEET,
-        update_deployment_id,
-        LookupType::ById(update_deployment_id),
-    ));
-
     let address_lot_id =
         "43259fdc-c5c0-4a21-8b1d-2f673ad00d93".parse().unwrap();
     builder.new_resource(authz::AddressLot::new(

diff --git a/nexus/db-queries/tests/output/authz-roles.out b/nexus/db-queries/tests/output/authz-roles.out
@@ -922,7 +922,7 @@ resource: DeviceAccessToken "a-device-access-token"
   silo1-proj1-viewer               ✘  ✘  ✘  ✘  ✘  ✘  ✘  ✘
   unauthenticated                  !  !  !  !  !  !  !  !
 
-resource: SystemUpdate id "9c86d713-1bc2-4927-9892-ada3eb6f5f62"
+resource: TufRepo id "3c52d72f-cbf7-4951-a62f-a4154e74da87"
 
   USER                             Q  R LC RP  M MP CC  D
   fleet-admin                      ✘  ✔  ✔  ✔  ✔  ✔  ✔  ✔
@@ -936,7 +936,7 @@ resource: SystemUpdate id "9c86d713-1bc2-4927-9892-ada3eb6f5f62"
   silo1-proj1-viewer               ✘  ✘  ✘  ✘  ✘  ✘  ✘  ✘
   unauthenticated                  !  !  !  !  !  !  !  !
 
-resource: UpdateDeployment id "c617a035-7c42-49ff-a36a-5dfeee382832"
+resource: TufArtifact id "a v1.0.0 (b)"
 
   USER                             Q  R LC RP  M MP CC  D
   fleet-admin                      ✘  ✔  ✔  ✔  ✔  ✔  ✔  ✔

diff --git a/nexus/types/src/external_api/views.rs b/nexus/types/src/external_api/views.rs
@@ -13,7 +13,7 @@ use chrono::DateTime;
 use chrono::Utc;
 use omicron_common::api::external::{
     ByteCount, Digest, IdentityMetadata, InstanceState, Ipv4Net, Ipv6Net, Name,
-    ObjectIdentity, RoleName, SemverVersion, SimpleIdentity,
+    ObjectIdentity, RoleName, SimpleIdentity,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -559,65 +559,6 @@ pub enum DeviceAccessTokenType {
     Bearer,
 }
 
-// SYSTEM UPDATES
-
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
-pub struct VersionRange {
-    pub low: SemverVersion,
-    pub high: SemverVersion,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
-#[serde(tag = "status", rename_all = "snake_case")]
-pub enum UpdateStatus {
-    Updating,
-    Steady,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
-pub struct SystemVersion {
-    pub version_range: VersionRange,
-    pub status: UpdateStatus,
-    // TODO: time_released? time_last_applied? I got a fever and the only
-    // prescription is more timestamps
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
-pub struct SystemUpdate {
-    #[serde(flatten)]
-    pub identity: AssetIdentityMetadata,
-    pub version: SemverVersion,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
-pub struct ComponentUpdate {
-    #[serde(flatten)]
-    pub identity: AssetIdentityMetadata,
-
-    pub component_type: shared::UpdateableComponentType,
-    pub version: SemverVersion,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
-pub struct UpdateableComponent {
-    #[serde(flatten)]
-    pub identity: AssetIdentityMetadata,
-
-    pub device_id: String,
-    pub component_type: shared::UpdateableComponentType,
-    pub version: SemverVersion,
-    pub system_version: SemverVersion,
-    pub status: UpdateStatus,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
-pub struct UpdateDeployment {
-    #[serde(flatten)]
-    pub identity: AssetIdentityMetadata,
-    pub version: SemverVersion,
-    pub status: UpdateStatus,
-}
-
 // SYSTEM HEALTH
 
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]