global rename silo_settings -> silo_auth_settings

Author: david-crespo

nexus/db-model/src/lib.rs

@@ -69,7 +69,7 @@ mod project;
 mod rendezvous_debug_dataset;
 mod semver_version;
 mod serde_time_delta;
-mod silo_settings;
+mod silo_auth_settings;
 mod switch_interface;
 mod switch_port;
 mod target_release;
@@ -216,7 +216,7 @@ pub use semver_version::*;
 pub use service_kind::*;
 pub use silo::*;
 pub use silo_group::*;
-pub use silo_settings::*;
+pub use silo_auth_settings::*;
 pub use silo_user::*;
 pub use silo_user_password_hash::*;
 pub use sled::*;

nexus/db-model/src/silo_settings.rs nexus/db-model/src/silo_auth_settings.rsnexus/db-model/src/silo_settings.rs renamed to nexus/db-model/src/silo_auth_settings.rs

@@ -1,5 +1,5 @@
 use chrono::{DateTime, Utc};
-use nexus_db_schema::schema::silo_settings;
+use nexus_db_schema::schema::silo_auth_settings;
 use nexus_types::external_api::{params, views};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
@@ -14,7 +14,7 @@ use uuid::Uuid;
     Deserialize,
     AsChangeset,
 )]
-#[diesel(table_name = silo_settings)]
+#[diesel(table_name = silo_auth_settings)]
 pub struct SiloSettings {
     pub silo_id: Uuid,
     pub time_created: DateTime<Utc>,
@@ -37,18 +37,18 @@ impl SiloSettings {
 }
 
 impl From<SiloSettings> for views::SiloSettings {
-    fn from(silo_settings: SiloSettings) -> Self {
+    fn from(silo_auth_settings: SiloSettings) -> Self {
         Self {
-            silo_id: silo_settings.silo_id,
-            device_token_max_ttl_seconds: silo_settings
+            silo_id: silo_auth_settings.silo_id,
+            device_token_max_ttl_seconds: silo_auth_settings
                 .device_token_max_ttl_seconds,
         }
     }
 }
 
 // Describes a set of updates for the [`SiloSettings`] model.
 #[derive(AsChangeset)]
-#[diesel(table_name = silo_settings)]
+#[diesel(table_name = silo_auth_settings)]
 pub struct SiloSettingsUpdate {
     // Needs to be double Option so we can set a value of null in the DB by
     // passing Some(None). None by itself is ignored by Diesel.

nexus/db-queries/src/db/datastore/mod.rs

@@ -91,7 +91,7 @@ mod role;
 mod saga;
 mod silo;
 mod silo_group;
-mod silo_settings;
+mod silo_auth_settings;
 mod silo_user;
 mod sled;
 mod sled_instance;

nexus/db-queries/src/db/datastore/silo.rs

@@ -67,7 +67,7 @@ impl DataStore {
 
         use nexus_db_schema::schema::silo;
         use nexus_db_schema::schema::silo_quotas;
-        use nexus_db_schema::schema::silo_settings;
+        use nexus_db_schema::schema::silo_auth_settings;
         let conn = self.pool_connection_authorized(opctx).await?;
 
         let count = self
@@ -81,9 +81,9 @@ impl DataStore {
                     .do_nothing()
                     .execute_async(&conn)
                     .await?;
-                diesel::insert_into(silo_settings::table)
+                diesel::insert_into(silo_auth_settings::table)
                     .values(SiloSettings::new(DEFAULT_SILO.id()))
-                    .on_conflict(silo_settings::silo_id)
+                    .on_conflict(silo_auth_settings::silo_id)
                     .do_nothing()
                     .execute_async(&conn)
                     .await?;
@@ -308,7 +308,7 @@ impl DataStore {
                     ),
                 )
                 .await?;
-                self.silo_settings_create(
+                self.silo_auth_settings_create(
                     &conn,
                     &authz_silo,
                     SiloSettings::new(authz_silo.id()),
@@ -465,7 +465,7 @@ impl DataStore {
                 }
 
                 self.silo_quotas_delete(opctx, &conn, &authz_silo).await?;
-                self.silo_settings_delete(opctx, &conn, &authz_silo).await?;
+                self.silo_auth_settings_delete(opctx, &conn, &authz_silo).await?;
 
                 self.virtual_provisioning_collection_delete_on_connection(
                     &opctx.log, &conn, id,

…ueries/src/db/datastore/silo_settings.rs …s/src/db/datastore/silo_auth_settings.rsnexus/db-queries/src/db/datastore/silo_settings.rs renamed to nexus/db-queries/src/db/datastore/silo_auth_settings.rs nexus/db-queries/src/db/datastore/silo_settings.rs renamed to nexus/db-queries/src/db/datastore/silo_auth_settings.rs

@@ -23,16 +23,16 @@ impl DataStore {
     /// isn't complete and will lead to a db deadlock.
     ///
     /// See <https://github.com/oxidecomputer/omicron/blob/07eb7dafc20e35e44edf429fcbb759cbb33edd5f/nexus/db-queries/src/db/datastore/rack.rs#L407-L410>
-    pub async fn silo_settings_create(
+    pub async fn silo_auth_settings_create(
         &self,
         conn: &async_bb8_diesel::Connection<DbConnection>,
         authz_silo: &authz::Silo,
         settings: SiloSettings,
     ) -> Result<(), Error> {
         let silo_id = authz_silo.id();
-        use nexus_db_schema::schema::silo_settings;
+        use nexus_db_schema::schema::silo_auth_settings;
 
-        diesel::insert_into(silo_settings::table)
+        diesel::insert_into(silo_auth_settings::table)
             .values(settings)
             .execute_async(conn)
             .await
@@ -48,7 +48,7 @@ impl DataStore {
             .map(|_| ())
     }
 
-    pub async fn silo_settings_delete(
+    pub async fn silo_auth_settings_delete(
         &self,
         opctx: &OpContext,
         conn: &async_bb8_diesel::Connection<DbConnection>,
@@ -58,26 +58,26 @@ impl DataStore {
         // Silo we just check for delete permission on the silo itself.
         opctx.authorize(authz::Action::Delete, authz_silo).await?;
 
-        use nexus_db_schema::schema::silo_settings;
-        diesel::delete(silo_settings::table)
-            .filter(silo_settings::silo_id.eq(authz_silo.id()))
+        use nexus_db_schema::schema::silo_auth_settings;
+        diesel::delete(silo_auth_settings::table)
+            .filter(silo_auth_settings::silo_id.eq(authz_silo.id()))
             .execute_async(conn)
             .await
             .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))?;
 
         Ok(())
     }
 
-    pub async fn silo_settings_update(
+    pub async fn silo_auth_settings_update(
         &self,
         opctx: &OpContext,
         authz_silo: &authz::Silo,
         updates: SiloSettingsUpdate,
     ) -> UpdateResult<SiloSettings> {
         opctx.authorize(authz::Action::Modify, authz_silo).await?;
-        use nexus_db_schema::schema::silo_settings::dsl;
+        use nexus_db_schema::schema::silo_auth_settings::dsl;
         let silo_id = authz_silo.id();
-        diesel::update(dsl::silo_settings)
+        diesel::update(dsl::silo_auth_settings)
             .filter(dsl::silo_id.eq(silo_id))
             .set(updates)
             .returning(SiloSettings::as_returning())
@@ -94,7 +94,7 @@ impl DataStore {
             })
     }
 
-    pub async fn silo_settings_view(
+    pub async fn silo_auth_settings_view(
         &self,
         opctx: &OpContext,
         authz_silo: &authz::Silo,
@@ -104,8 +104,8 @@ impl DataStore {
         // read on all silos.
         opctx.authorize(authz::Action::Read, authz_silo).await?;
 
-        use nexus_db_schema::schema::silo_settings::dsl;
-        dsl::silo_settings
+        use nexus_db_schema::schema::silo_auth_settings::dsl;
+        dsl::silo_auth_settings
             .filter(dsl::silo_id.eq(authz_silo.id()))
             .first_async(&*self.pool_connection_authorized(opctx).await?)
             .await

nexus/db-schema/src/schema.rs

@@ -552,7 +552,7 @@ table! {
 }
 
 table! {
-    silo_settings(silo_id) {
+    silo_auth_settings(silo_id) {
         silo_id -> Uuid,
         time_created -> Timestamptz,
         time_modified -> Timestamptz,

nexus/src/app/device_auth.rs

@@ -108,8 +108,8 @@ impl super::Nexus {
                 .await?;
         assert_eq!(authz_user.id(), silo_user_id);
 
-        let silo_settings =
-            self.db_datastore.silo_settings_view(opctx, &authz_silo).await?;
+        let silo_auth_settings =
+            self.db_datastore.silo_auth_settings_view(opctx, &authz_silo).await?;
 
         // Create an access token record.
         let token = DeviceAccessToken::new(
@@ -119,7 +119,7 @@ impl super::Nexus {
             silo_user_id,
             // Token gets the max TTL for the silo (if there is one) until we
             // build a way for the user to ask for a different TTL
-            silo_settings
+            silo_auth_settings
                 .device_token_max_ttl_seconds
                 .map(|ttl| Utc::now() + Duration::seconds(ttl)),
         );

nexus/src/app/silo.rs

@@ -234,7 +234,7 @@ impl super::Nexus {
         // TODO: can everyone view this on their own silo? why not, right?
         let (.., authz_silo) =
             silo_lookup.lookup_for(authz::Action::Read).await?;
-        self.db_datastore.silo_settings_view(opctx, &authz_silo).await
+        self.db_datastore.silo_auth_settings_view(opctx, &authz_silo).await
     }
 
     pub(crate) async fn silo_update_settings(
@@ -248,7 +248,7 @@ impl super::Nexus {
         let (.., authz_silo) =
             silo_lookup.lookup_for(authz::Action::Modify).await?;
         self.db_datastore
-            .silo_settings_update(opctx, &authz_silo, settings.clone().into())
+            .silo_auth_settings_update(opctx, &authz_silo, settings.clone().into())
             .await
     }
 

schema/crdb/dbinit.sql

@@ -1065,7 +1065,7 @@ WHERE
 AND
     s.time_deleted IS NULL;
 
-CREATE TABLE IF NOT EXISTS omicron.public.silo_settings (
+CREATE TABLE IF NOT EXISTS omicron.public.silo_auth_settings (
     silo_id UUID PRIMARY KEY,
     time_created TIMESTAMPTZ NOT NULL,
     time_modified TIMESTAMPTZ NOT NULL,

schema/crdb/silo-settings-token-expiration/up01.sql

@@ -1,4 +1,4 @@
-CREATE TABLE IF NOT EXISTS omicron.public.silo_settings (
+CREATE TABLE IF NOT EXISTS omicron.public.silo_auth_settings (
     silo_id UUID PRIMARY KEY,
     time_created TIMESTAMPTZ NOT NULL,
     time_modified TIMESTAMPTZ NOT NULL,