Added FS storage profile

README.md

@@ -66,7 +66,6 @@ S3_BUCKET=
 S3_ALLOW_HTTP=
 
 # Iceberg Catalog settings
-USE_FILE_SYSTEM_INSTEAD_OF_CLOUD=true
 CONTROL_PLANE_URL=http://127.0.0.1:3000
 
 # Dialect

bin/bucketd/src/cli.rs

@@ -108,9 +108,6 @@ pub struct IceBucketOpts {
         help = "CORS Allow Origin"
     )]
     pub cors_allow_origin: Option<String>,
-
-    #[arg(long, default_value = "true")]
-    use_fs: Option<bool>,
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
@@ -123,12 +120,6 @@ enum StoreBackend {
 impl IceBucketOpts {
     #[allow(clippy::unwrap_used, clippy::as_conversions)]
     pub fn object_store_backend(self) -> ObjectStoreResult<Box<dyn ObjectStore>> {
-        // TODO: Hacky workaround for now, need to figure out a better way to pass this
-        // TODO: Really, seriously remove this. This is a hack.
-        unsafe {
-            let use_fs = self.use_fs.unwrap_or(false);
-            std::env::set_var("USE_FILE_SYSTEM_INSTEAD_OF_CLOUD", use_fs.to_string());
-        }
         match self.backend {
             StoreBackend::S3 => {
                 let s3_allow_http = self.allow_http.unwrap_or(false);

crates/control_plane/src/error.rs

@@ -73,6 +73,9 @@ pub enum ControlPlaneError {
     #[snafu(display("Unspported Authentication method: {method}"))]
     UnsupportedAuthenticationMethod { method: String },
 
+    #[snafu(display("Invalid or missing credentials"))]
+    CredentialsValidationFailed,
+
     #[snafu(display("Invalid TLS configuration: {source}"))]
     InvalidTLSConfiguration {
         source: rusoto_core::request::TlsError,

crates/control_plane/src/models/error.rs

@@ -28,6 +28,9 @@ pub enum ControlPlaneModelError {
     #[snafu(display("Role-based credentials aren't supported"))]
     RoleBasedCredentialsNotSupported,
 
+    #[snafu(display("Missing credentials for {profile_type} profile type"))]
+    MissingCredentials { profile_type: String },
+
     #[snafu(display("Missing environment variable `{var}`"))]
     MissingEnvironmentVariable {
         source: std::env::VarError,