rename default to is_default to work around possible progenitor bug

Author: david-crespo

nexus/db-model/src/ip_pool.rs

@@ -49,14 +49,14 @@ pub struct IpPool {
     /// Project, if IP pool is associated with a particular project
     pub project_id: Option<Uuid>,
 
-    pub default: bool,
+    pub is_default: bool,
 }
 
 impl IpPool {
     pub fn new(
         pool_identity: &external::IdentityMetadataCreateParams,
         silo_id: Option<Uuid>,
-        default: bool,
+        is_default: bool,
     ) -> Self {
         Self {
             identity: IpPoolIdentity::new(
@@ -66,7 +66,7 @@ impl IpPool {
             rcgen: 0,
             silo_id,
             project_id: None,
-            default,
+            is_default,
         }
     }
 }

nexus/db-model/src/schema.rs

@@ -455,7 +455,7 @@ table! {
         rcgen -> Int8,
         silo_id -> Nullable<Uuid>,
         project_id -> Nullable<Uuid>,
-        default -> Bool,
+        is_default -> Bool,
     }
 }
 

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

@@ -91,7 +91,7 @@ impl DataStore {
             .filter(
                 dsl::project_id.eq(project_id).or(dsl::project_id.is_null()),
             )
-            .filter(dsl::default.eq(true))
+            .filter(dsl::is_default.eq(true))
             .filter(dsl::time_deleted.is_null())
             // this will sort by most specific first, i.e.,
             //
@@ -479,7 +479,7 @@ mod test {
             .unwrap();
 
         assert_eq!(fleet_default_pool.identity.name.as_str(), "default");
-        assert!(fleet_default_pool.default);
+        assert!(fleet_default_pool.is_default);
         assert_eq!(fleet_default_pool.silo_id, None);
         assert_eq!(fleet_default_pool.project_id, None);
 

nexus/src/app/ip_pool.rs

@@ -69,7 +69,7 @@ impl super::Nexus {
         let pool = db::model::IpPool::new(
             &pool_params.identity,
             silo_id,
-            pool_params.default,
+            pool_params.is_default,
         );
         self.db_datastore.ip_pool_create(opctx, pool).await
     }

nexus/test-utils/src/resource_helpers.rs

@@ -141,7 +141,7 @@ pub async fn create_ip_pool(
                 description: String::from("an ip pool"),
             },
             silo: None,
-            default: false,
+            is_default: false,
         },
     )
     .await;

nexus/tests/integration_tests/endpoints.rs

@@ -456,7 +456,7 @@ lazy_static! {
             },
             silo: None,
             // TODO: this might error due to the unique index
-            default: true,
+            is_default: true,
         };
     pub static ref DEMO_IP_POOL_PROJ_URL: String =
         format!("/v1/ip-pools/{}?project={}", *DEMO_IP_POOL_NAME, *DEMO_PROJECT_NAME);

nexus/tests/integration_tests/ip_pools.rs

@@ -104,7 +104,7 @@ async fn test_ip_pool_basic_crud(cptestctx: &ControlPlaneTestContext) {
             description: String::from(description),
         },
         silo: None,
-        default: false,
+        is_default: false,
     };
     let created_pool: IpPool =
         NexusRequest::objects_post(client, ip_pools_url, &params)
@@ -284,7 +284,7 @@ async fn test_ip_pool_with_silo(cptestctx: &ControlPlaneTestContext) {
             description: String::from(""),
         },
         silo: Some(NameOrId::Name(cptestctx.silo_name.clone())),
-        default: false,
+        is_default: false,
     };
     let created_pool = create_pool(client, &params).await;
     assert_eq!(created_pool.identity.name, "p0");
@@ -299,7 +299,7 @@ async fn test_ip_pool_with_silo(cptestctx: &ControlPlaneTestContext) {
             description: String::from(""),
         },
         silo: Some(NameOrId::Id(silo_id)),
-        default: false,
+        is_default: false,
     };
     let created_pool = create_pool(client, &params).await;
     assert_eq!(created_pool.identity.name, "p1");
@@ -314,7 +314,7 @@ async fn test_ip_pool_with_silo(cptestctx: &ControlPlaneTestContext) {
         silo: Some(NameOrId::Name(
             String::from("not-a-thing").parse().unwrap(),
         )),
-        default: false,
+        is_default: false,
     };
     let error: HttpErrorResponseBody = NexusRequest::new(
         RequestBuilder::new(client, Method::POST, "/v1/system/ip-pools")
@@ -373,7 +373,7 @@ async fn test_ip_pool_range_overlapping_ranges_fails(
             description: String::from(description),
         },
         silo: None,
-        default: false,
+        is_default: false,
     };
     let created_pool: IpPool =
         NexusRequest::objects_post(client, ip_pools_url, &params)
@@ -556,7 +556,7 @@ async fn test_ip_pool_range_pagination(cptestctx: &ControlPlaneTestContext) {
             description: String::from(description),
         },
         silo: None,
-        default: false,
+        is_default: false,
     };
     let created_pool: IpPool =
         NexusRequest::objects_post(client, ip_pools_url, &params)
@@ -694,7 +694,7 @@ async fn test_ip_pool_list_usable_by_project(
             description: String::from("right on cue"),
         },
         silo: None,
-        default: false,
+        is_default: false,
     };
     NexusRequest::objects_post(client, ip_pools_url, &params)
         .authn_as(AuthnMode::PrivilegedUser)

nexus/types/src/external_api/params.rs

@@ -736,7 +736,8 @@ pub struct IpPoolCreate {
     /// silo can draw from that pool.
     pub silo: Option<NameOrId>,
 
-    pub default: bool,
+    #[serde(default)]
+    pub is_default: bool,
 }
 
 /// Parameters for updating an IP Pool

openapi/nexus.json

@@ -10169,12 +10169,13 @@
         "description": "Create-time parameters for an `IpPool`",
         "type": "object",
         "properties": {
-          "default": {
-            "type": "boolean"
-          },
           "description": {
             "type": "string"
           },
+          "is_default": {
+            "default": false,
+            "type": "boolean"
+          },
           "name": {
             "$ref": "#/components/schemas/Name"
           },
@@ -10189,7 +10190,6 @@
           }
         },
         "required": [
-          "default",
           "description",
           "name"
         ]

schema/crdb/3.0.0/up.sql

@@ -12,7 +12,7 @@ SELECT CAST(
 );
 
 ALTER TABLE omicron.public.ip_pool
-    ADD COLUMN IF NOT EXISTS "default" BOOLEAN NOT NULL DEFAULT FALSE,
+    ADD COLUMN IF NOT EXISTS is_default BOOLEAN NOT NULL DEFAULT FALSE,
 
     ADD COLUMN IF NOT EXISTS silo_ID UUID,
     ADD COLUMN IF NOT EXISTS project_id UUID,
@@ -42,6 +42,6 @@ CREATE UNIQUE INDEX IF NOT EXISTS one_default_pool_per_scope ON omicron.public.i
     COALESCE(silo_id, '00000000-0000-0000-0000-000000000000'::uuid), 
     COALESCE(project_id, '00000000-0000-0000-0000-000000000000'::uuid) 
 ) WHERE
-    "default" = true AND time_deleted IS NULL;
+    is_default = true AND time_deleted IS NULL;
 
 COMMIT;