First implementation of the CLI

src/garage/admin_rpc.rs

@@ -156,38 +156,29 @@ impl AdminRpcHandler {
 				)))
 			}
 			BucketOperation::Website(query) => {
-				let bucket = self.get_existing_bucket(&query.bucket).await?;
+				let mut bucket = self.get_existing_bucket(&query.bucket).await?;
-				if query.allow && query.deny {
+
-					return Err(Error::Message(format!("Website can not be both allowed and denied on a bucket")));
+				if !(query.allow ^ query.deny) {
+					return Err(Error::Message(format!(
+						"You must specify exactly one flag, either --allow or --deny"
+					)));
 				}
-        /*
+
-				if query.allow || query.deny {
-					let exposed = query.allow;
 				if let BucketState::Present(state) = bucket.state.get_mut() {
-						let ak = state.authorized_keys;
+					state.website.update(query.allow);
-						let old_ak = ak.take_and_clear();
+					let msg = if query.allow {
-						ak.merge(&old_ak.update_mutator(
+						format!("Website access allowed for {}", &query.bucket)
-							key_id.to_string(),
+					} else {
-							PermissionSet {
+						format!("Website access denied for {}", &query.bucket)
-								allow_read,
+					};
-								allow_write,
+
-							},
+					Ok(AdminRPC::Ok(msg.to_string()))
-						));
 				} else {
 					return Err(Error::Message(format!(
 						"Bucket is deleted in update_bucket_key"
 					)));
 				}
 			}
-
-				let msg = if bucket.exposed {
-					"Bucket is exposed as a website."
-				} else {
-					"Bucket is not exposed."
-				};*/
-
-				Ok(AdminRPC::Ok(/*msg*/"".to_string()))
-			}
 		}
 	}
 

src/model/bucket_table.rs

@@ -45,7 +45,7 @@ impl CRDT for BucketState {
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct BucketParams {
 	pub authorized_keys: crdt::LWWMap<String, PermissionSet>,
-	pub website: crdt::LWW<bool>
+	pub website: crdt::LWW<bool>,
 }
 
 impl CRDT for BucketParams {
@@ -59,7 +59,7 @@ impl BucketParams {
 	pub fn new() -> Self {
 		BucketParams {
 			authorized_keys: crdt::LWWMap::new(),
-			website: crdt::LWW::new(false)
+			website: crdt::LWW::new(false),
 		}
 	}
 }
@@ -137,7 +137,7 @@ impl TableSchema for BucketTable {
 
 			let params = BucketParams {
 				authorized_keys: keys,
-				website: crdt::LWW::new(false)
+				website: crdt::LWW::new(false),
 			};
 
 			Some(Bucket {