update after merging main

Author: hawkw

Diff for: nexus/db-model/src/webhook_delivery.rs

@@ -9,10 +9,10 @@ use crate::WebhookDeliveryState;
 use crate::WebhookDeliveryTrigger;
 use crate::WebhookEvent;
 use crate::WebhookEventClass;
-use crate::schema::{webhook_delivery, webhook_delivery_attempt};
 use crate::serde_time_delta::optional_time_delta;
 use crate::typed_uuid::DbTypedUuid;
 use chrono::{DateTime, TimeDelta, Utc};
+use nexus_db_schema::schema::{webhook_delivery, webhook_delivery_attempt};
 use nexus_types::external_api::views;
 use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::{

Diff for: nexus/db-model/src/webhook_delivery_attempt_result.rs

@@ -9,9 +9,7 @@ use serde::Serialize;
 use std::fmt;
 
 impl_enum_type!(
-    #[derive(SqlType, Debug, Clone)]
-    #[diesel(postgres_type(name = "webhook_delivery_attempt_result", schema = "public"))]
-    pub struct WebhookDeliveryAttemptResultEnum;
+    WebhookDeliveryAttemptResultEnum:
 
     #[derive(
         Copy,
@@ -24,7 +22,6 @@ impl_enum_type!(
         Deserialize,
         strum::VariantArray,
     )]
-    #[diesel(sql_type = WebhookDeliveryAttemptResultEnum)]
     pub enum WebhookDeliveryAttemptResult;
 
     FailedHttpError => b"failed_http_error"

Diff for: nexus/db-model/src/webhook_delivery_state.rs

@@ -9,9 +9,7 @@ use serde::Serialize;
 use std::fmt;
 
 impl_enum_type!(
-    #[derive(SqlType, Debug, Clone)]
-    #[diesel(postgres_type(name = "webhook_delivery_state", schema = "public"))]
-    pub struct WebhookDeliveryStateEnum;
+    WebhookDeliveryStateEnum:
 
     #[derive(
         Copy,
@@ -24,7 +22,6 @@ impl_enum_type!(
         FromSqlRow,
         strum::VariantArray,
     )]
-    #[diesel(sql_type = WebhookDeliveryStateEnum)]
     #[serde(rename_all = "snake_case")]
     pub enum WebhookDeliveryState;
 
@@ -60,8 +57,3 @@ impl From<views::WebhookDeliveryState> for WebhookDeliveryState {
         }
     }
 }
-
-impl diesel::query_builder::QueryId for WebhookDeliveryStateEnum {
-    type QueryId = ();
-    const HAS_STATIC_QUERY_ID: bool = false;
-}

Diff for: nexus/db-model/src/webhook_delivery_trigger.rs

@@ -9,9 +9,7 @@ use serde::Serialize;
 use std::fmt;
 
 impl_enum_type!(
-    #[derive(SqlType, Debug, Clone)]
-    #[diesel(postgres_type(name = "webhook_delivery_trigger", schema = "public"))]
-    pub struct WebhookDeliveryTriggerEnum;
+    WebhookDeliveryTriggerEnum:
 
     #[derive(
         Copy,
@@ -24,7 +22,6 @@ impl_enum_type!(
         FromSqlRow,
         strum::VariantArray,
     )]
-    #[diesel(sql_type = WebhookDeliveryTriggerEnum)]
     #[serde(rename_all = "snake_case")]
     pub enum WebhookDeliveryTrigger;
 
@@ -64,8 +61,3 @@ impl From<views::WebhookDeliveryTrigger> for WebhookDeliveryTrigger {
         }
     }
 }
-
-impl diesel::query_builder::QueryId for WebhookDeliveryTriggerEnum {
-    type QueryId = ();
-    const HAS_STATIC_QUERY_ID: bool = false;
-}

Diff for: nexus/db-model/src/webhook_event.rs

@@ -3,9 +3,9 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use crate::WebhookEventClass;
-use crate::schema::webhook_event;
 use chrono::{DateTime, Utc};
 use db_macros::Asset;
+use nexus_db_schema::schema::webhook_event;
 use serde::{Deserialize, Serialize};
 
 /// A webhook event.

Diff for: nexus/db-model/src/webhook_event_class.rs

@@ -9,9 +9,7 @@ use serde::ser::{Serialize, Serializer};
 use std::fmt;
 
 impl_enum_type!(
-    #[derive(SqlType, Debug, Clone)]
-    #[diesel(postgres_type(name = "webhook_event_class", schema = "public"))]
-    pub struct WebhookEventClassEnum;
+    WebhookEventClassEnum:
 
     #[derive(
         Copy,
@@ -24,7 +22,6 @@ impl_enum_type!(
         FromSqlRow,
         strum::VariantArray,
     )]
-    #[diesel(sql_type = WebhookEventClassEnum)]
     pub enum WebhookEventClass;
 
     Probe => b"probe"
@@ -113,11 +110,6 @@ impl<'de> Deserialize<'de> for WebhookEventClass {
     }
 }
 
-impl diesel::query_builder::QueryId for WebhookEventClassEnum {
-    type QueryId = ();
-    const HAS_STATIC_QUERY_ID: bool = false;
-}
-
 impl std::str::FromStr for WebhookEventClass {
     type Err = EventClassParseError;
     fn from_str(s: &str) -> Result<Self, Self::Err> {

Diff for: nexus/db-model/src/webhook_rx.rs

@@ -8,14 +8,14 @@ use crate::Name;
 use crate::SemverVersion;
 use crate::WebhookEventClass;
 use crate::collection::DatastoreCollectionConfig;
-use crate::schema::{
-    webhook_receiver, webhook_rx_event_glob, webhook_rx_subscription,
-    webhook_secret,
-};
 use crate::schema_versions;
 use crate::typed_uuid::DbTypedUuid;
 use chrono::{DateTime, Utc};
 use db_macros::{Asset, Resource};
+use nexus_db_schema::schema::{
+    webhook_receiver, webhook_rx_event_glob, webhook_rx_subscription,
+    webhook_secret,
+};
 use nexus_types::external_api::views;
 use nexus_types::identity::Resource;
 use omicron_common::api::external::Error;

Diff for: nexus/db-queries/src/db/datastore/webhook_delivery.rs

@@ -18,17 +18,17 @@ use crate::db::model::WebhookDeliveryTrigger;
 use crate::db::model::WebhookEvent;
 use crate::db::model::WebhookEventClass;
 use crate::db::pagination::paginated_multicolumn;
-use crate::db::schema;
-use crate::db::schema::webhook_delivery::dsl;
-use crate::db::schema::webhook_delivery_attempt::dsl as attempt_dsl;
-use crate::db::schema::webhook_event::dsl as event_dsl;
 use crate::db::update_and_check::UpdateAndCheck;
 use crate::db::update_and_check::UpdateAndQueryResult;
 use crate::db::update_and_check::UpdateStatus;
 use async_bb8_diesel::AsyncRunQueryDsl;
 use chrono::TimeDelta;
 use chrono::{DateTime, Utc};
 use diesel::prelude::*;
+use nexus_db_schema::schema;
+use nexus_db_schema::schema::webhook_delivery::dsl;
+use nexus_db_schema::schema::webhook_delivery_attempt::dsl as attempt_dsl;
+use nexus_db_schema::schema::webhook_event::dsl as event_dsl;
 use omicron_common::api::external::CreateResult;
 use omicron_common::api::external::DataPageParams;
 use omicron_common::api::external::Error;

Diff for: nexus/db-queries/src/db/datastore/webhook_event.rs

@@ -11,10 +11,10 @@ use crate::db::error::public_error_from_diesel;
 use crate::db::model::WebhookEvent;
 use crate::db::model::WebhookEventClass;
 use crate::db::model::WebhookEventIdentity;
-use crate::db::schema::webhook_event::dsl as event_dsl;
 use async_bb8_diesel::AsyncRunQueryDsl;
 use diesel::prelude::*;
 use diesel::result::OptionalExtension;
+use nexus_db_schema::schema::webhook_event::dsl as event_dsl;
 use omicron_common::api::external::CreateResult;
 use omicron_common::api::external::Error;
 use omicron_common::api::external::UpdateResult;

Diff for: nexus/db-queries/src/db/datastore/webhook_rx.rs

@@ -30,18 +30,18 @@ use crate::db::model::WebhookSubscriptionKind;
 use crate::db::pagination::paginated;
 use crate::db::pagination::paginated_multicolumn;
 use crate::db::pool::DbConnection;
-use crate::db::schema::webhook_delivery::dsl as delivery_dsl;
-use crate::db::schema::webhook_delivery_attempt::dsl as delivery_attempt_dsl;
-use crate::db::schema::webhook_event::dsl as event_dsl;
-use crate::db::schema::webhook_receiver::dsl as rx_dsl;
-use crate::db::schema::webhook_rx_event_glob::dsl as glob_dsl;
-use crate::db::schema::webhook_rx_subscription::dsl as subscription_dsl;
-use crate::db::schema::webhook_secret::dsl as secret_dsl;
 use crate::db::update_and_check::UpdateAndCheck;
 use crate::db::update_and_check::UpdateStatus;
 use crate::transaction_retry::OptionalError;
 use async_bb8_diesel::AsyncRunQueryDsl;
 use diesel::prelude::*;
+use nexus_db_schema::schema::webhook_delivery::dsl as delivery_dsl;
+use nexus_db_schema::schema::webhook_delivery_attempt::dsl as delivery_attempt_dsl;
+use nexus_db_schema::schema::webhook_event::dsl as event_dsl;
+use nexus_db_schema::schema::webhook_receiver::dsl as rx_dsl;
+use nexus_db_schema::schema::webhook_rx_event_glob::dsl as glob_dsl;
+use nexus_db_schema::schema::webhook_rx_subscription::dsl as subscription_dsl;
+use nexus_db_schema::schema::webhook_secret::dsl as secret_dsl;
 use nexus_types::external_api::params;
 use nexus_types::identity::Resource;
 use nexus_types::internal_api::background::WebhookGlobStatus;

Diff for: nexus/db-schema/src/enums.rs

@@ -83,5 +83,9 @@ define_enums! {
     VpcFirewallRuleProtocolEnum => "vpc_firewall_rule_protocol",
     VpcFirewallRuleStatusEnum => "vpc_firewall_rule_status",
     VpcRouterKindEnum => "vpc_router_kind",
+    WebhookEventClassEnum => "webhook_event_class",
+    WebhookDeliveryAttemptResultEnum => "webhook_delivery_attempt_result",
+    WebhookDeliveryTriggerEnum => "webhook_delivery_trigger",
+    WebhookDeliveryStateEnum => "webhook_delivery_state",
     ZoneTypeEnum => "zone_type",
 }

Diff for: nexus/db-schema/src/schema.rs

@@ -2209,7 +2209,7 @@ table! {
 table! {
     webhook_rx_subscription (rx_id, event_class) {
         rx_id -> Uuid,
-        event_class -> crate::WebhookEventClassEnum,
+        event_class -> crate::enums::WebhookEventClassEnum,
         glob -> Nullable<Text>,
         time_created -> Timestamptz,
     }
@@ -2241,7 +2241,7 @@ table! {
         id -> Uuid,
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
-        event_class -> crate::WebhookEventClassEnum,
+        event_class -> crate::enums::WebhookEventClassEnum,
         event -> Jsonb,
         time_dispatched -> Nullable<Timestamptz>,
         num_dispatched -> Int8,
@@ -2253,11 +2253,11 @@ table! {
         id -> Uuid,
         event_id -> Uuid,
         rx_id -> Uuid,
-        triggered_by -> crate::WebhookDeliveryTriggerEnum,
+        triggered_by -> crate::enums::WebhookDeliveryTriggerEnum,
         attempts -> Int2,
         time_created -> Timestamptz,
         time_completed -> Nullable<Timestamptz>,
-        state -> crate::WebhookDeliveryStateEnum,
+        state -> crate::enums::WebhookDeliveryStateEnum,
         deliverator_id -> Nullable<Uuid>,
         time_leased -> Nullable<Timestamptz>,
     }
@@ -2275,7 +2275,7 @@ table! {
         delivery_id -> Uuid,
         attempt -> Int2,
         rx_id -> Uuid,
-        result -> crate::WebhookDeliveryAttemptResultEnum,
+        result -> crate::enums::WebhookDeliveryAttemptResultEnum,
         response_status -> Nullable<Int4>,
         response_duration -> Nullable<Interval>,
         time_created -> Timestamptz,

Diff for: nexus/src/app/background/tasks/webhook_dispatcher.rs

@@ -364,9 +364,9 @@ mod test {
     // dispatching.
     #[nexus_test(server = crate::Server)]
     async fn test_glob_reprocessing(cptestctx: &ControlPlaneTestContext) {
-        use nexus_db_model::schema::webhook_receiver::dsl as rx_dsl;
-        use nexus_db_model::schema::webhook_rx_event_glob::dsl as glob_dsl;
-        use nexus_db_model::schema::webhook_rx_subscription::dsl as subscription_dsl;
+        use nexus_db_schema::schema::webhook_receiver::dsl as rx_dsl;
+        use nexus_db_schema::schema::webhook_rx_event_glob::dsl as glob_dsl;
+        use nexus_db_schema::schema::webhook_rx_subscription::dsl as subscription_dsl;
 
         let nexus = &cptestctx.server.server_context().nexus;
         let datastore = nexus.datastore();

Diff for: nexus/tests/integration_tests/schema.rs

@@ -2068,8 +2068,10 @@ fn after_136_0_0<'a>(ctx: &'a MigrationContext<'a>) -> BoxFuture<'a, ()> {
                 FROM webhook_event
                 WHERE time_dispatched IS NOT NULL
                 "#,
-            &[]).await
-                            .expect("loaded bp_omicron_zone rows");
+                &[],
+            )
+            .await
+            .expect("loaded bp_omicron_zone rows");
 
         let records = process_rows(&rows);
 
@@ -2093,7 +2095,7 @@ fn after_136_0_0<'a>(ctx: &'a MigrationContext<'a>) -> BoxFuture<'a, ()> {
             ],
             "singleton liveness probe webhook event record must have the \
              correct values",
-            );
+        );
     })
 }
 
@@ -2155,8 +2157,8 @@ fn get_migration_checks() -> BTreeMap<Version, DataMigrationFns> {
     );
     map.insert(
         Version::new(136, 0, 0),
-        DataMigrationFns::new().after(after_136_0_0)
-    )
+        DataMigrationFns::new().after(after_136_0_0),
+    );
 
     map
 }