diff options
Diffstat (limited to 'website.go')
| -rw-r--r-- | website.go | 19 |
1 files changed, 16 insertions, 3 deletions
@@ -81,16 +81,29 @@ func NewWebsiteController(user *LoggedUser) (*WebsiteController, error) { } type WebsiteDescribe struct { - AllowedWebsites *QuotaStat `json:"quota"` + AccessKeyId string `json:"access_key_id"` + SecretAccessKey string `json:"secret_access_key"` + AllowedWebsites *QuotaStat `json:"quota_website_count"` + BurstBucketQuotaSize string `json:"burst_bucket_quota_size"` Websites []*WebsiteId `json:"vhosts"` } -func (w *WebsiteController) Describe() *WebsiteDescribe { +func (w *WebsiteController) Describe() (*WebsiteDescribe, error) { + s3key, err := w.User.S3KeyInfo() + if err != nil { + return nil, err + } + r := make([]*WebsiteId, 0, len(w.PrettyList)) for _, k := range w.PrettyList { r = append(r, w.WebsiteIdx[k]) } - return &WebsiteDescribe { &w.WebsiteCount, r } + return &WebsiteDescribe { + *s3key.AccessKeyId, + *s3key.SecretAccessKey, + &w.WebsiteCount, + w.User.Quota.WebsiteSizeBurstedPretty(), + r }, nil } func (w *WebsiteController) Inspect(pretty string) (*WebsiteView, error) { |