std::string uid_str;
bool fetch_stats;
+ bool sync_stats;
RESTArgs::get_string(s, "uid", uid_str, &uid_str);
RESTArgs::get_bool(s, "stats", false, &fetch_stats);
+ RESTArgs::get_bool(s, "sync", false, &sync_stats);
+
op_state.set_user_id(uid);
op_state.set_fetch_stats(fetch_stats);
+ op_state.set_sync_stats(sync_stats);
http_ret = RGWUserAdminOp_User::info(store, op_state, flusher);
}
std::string secret_key;
std::string key_type_str;
std::string caps;
+ std::string tenant_name;
bool gen_key;
bool suspended;
RESTArgs::get_string(s, "secret-key", secret_key, &secret_key);
RESTArgs::get_string(s, "key-type", key_type_str, &key_type_str);
RESTArgs::get_string(s, "user-caps", caps, &caps);
+ RESTArgs::get_string(s, "tenant", tenant_name, &tenant_name);
RESTArgs::get_bool(s, "generate-key", true, &gen_key);
RESTArgs::get_bool(s, "suspended", false, &suspended);
RESTArgs::get_int32(s, "max-buckets", default_max_buckets, &max_buckets);
return;
}
+ if (!tenant_name.empty()) {
+ uid.tenant = tenant_name;
+ }
+
// TODO: validate required args are passed in. (for eg. uid and display_name here)
op_state.set_user_id(uid);
op_state.set_display_name(display_name);
bool suspended;
bool system;
+ bool quota_set;
int32_t max_buckets;
RGWUserAdminOpState op_state;
RESTArgs::get_string(s, "user-caps", caps, &caps);
RESTArgs::get_bool(s, "generate-key", false, &gen_key);
RESTArgs::get_bool(s, "suspended", false, &suspended);
- RESTArgs::get_int32(s, "max-buckets", RGW_DEFAULT_MAX_BUCKETS, &max_buckets);
+ RESTArgs::get_int32(s, "max-buckets", RGW_DEFAULT_MAX_BUCKETS, &max_buckets, "a_set);
RESTArgs::get_string(s, "key-type", key_type_str, &key_type_str);
RESTArgs::get_bool(s, "system", false, &system);
op_state.set_access_key(access_key);
op_state.set_secret_key(secret_key);
- if (max_buckets != RGW_DEFAULT_MAX_BUCKETS)
+ if (quota_set)
op_state.set_max_buckets(max_buckets);
if (gen_key)
op_state.set_user_id(uid);
op_state.set_subuser(subuser);
- op_state.set_secret_key(secret_key);
- op_state.set_gen_secret();
+
+ if (!secret_key.empty())
+ op_state.set_secret_key(secret_key);
+
+ if (gen_secret)
+ op_state.set_gen_secret();
if (!key_type_str.empty()) {
if (key_type_str.compare("swift") == 0)