khairul169/garage-webui
1
0
Fork 0
mirror of https://github.com/khairul169/garage-webui.git synced 2026-09-15 00:43:21 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: remove unused config struct key, fix local aliases parsing error

Browse Source
This commit is contained in:
khairul169
2024-10-04 17:13:47 +00:00
parent 5a90dd8377
commit 91c396dd68
8 changed files with 70 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/router/buckets.go
+4 -3
View File
@@ -34,13 +34,14 @@ func (b *Buckets) GetAll(w http.ResponseWriter, r *http.Request) {
return
}
var bucket schema.Bucket
if err := json.Unmarshal(body, &bucket); err != nil {
var data schema.Bucket
if err := json.Unmarshal(body, &data); err != nil {
ch <- schema.Bucket{ID: bucket.ID, GlobalAliases: bucket.GlobalAliases}
return
}
ch <- bucket
data.LocalAliases = bucket.LocalAliases
ch <- data
}()
}
backend/schema/bucket.go
+14 -8
View File
@@ -1,14 +1,15 @@
package schema
type GetBucketsRes struct {
ID string `json:"id"`
GlobalAliases []string `json:"globalAliases"`
LocalAliases []string `json:"localAliases"`
ID string `json:"id"`
GlobalAliases []string `json:"globalAliases"`
LocalAliases []LocalAlias `json:"localAliases"`
}
type Bucket struct {
ID string `json:"id"`
GlobalAliases []string `json:"globalAliases"`
LocalAliases []LocalAlias `json:"localAliases"`
WebsiteAccess bool `json:"websiteAccess"`
WebsiteConfig WebsiteConfig `json:"websiteConfig"`
Keys []KeyElement `json:"keys"`
@@ -21,12 +22,17 @@ type Bucket struct {
Quotas Quotas `json:"quotas"`
}
type LocalAlias struct {
AccessKeyID string `json:"accessKeyId"`
Alias string `json:"alias"`
}
type KeyElement struct {
AccessKeyID string `json:"accessKeyId"`
Name string `json:"name"`
Permissions Permissions `json:"permissions"`
BucketLocalAliases []interface{} `json:"bucketLocalAliases"`
SecretAccessKey string `json:"secretAccessKey"`
AccessKeyID string `json:"accessKeyId"`
Name string `json:"name"`
Permissions Permissions `json:"permissions"`
BucketLocalAliases []string `json:"bucketLocalAliases"`
SecretAccessKey string `json:"secretAccessKey"`
}
type Permissions struct {
backend/schema/config.go
+6 -12
View File
@@ -1,18 +1,12 @@
package schema
type Config struct {
CompressionLevel int64 `json:"compression_level" toml:"compression_level"`
DataDir string `json:"data_dir" toml:"data_dir"`
DBEngine string `json:"db_engine" toml:"db_engine"`
MetadataAutoSnapshotInterval string `json:"metadata_auto_snapshot_interval" toml:"metadata_auto_snapshot_interval"`
MetadataDir string `json:"metadata_dir" toml:"metadata_dir"`
ReplicationFactor int64 `json:"replication_factor" toml:"replication_factor"`
RPCBindAddr string `json:"rpc_bind_addr" toml:"rpc_bind_addr"`
RPCPublicAddr string `json:"rpc_public_addr" toml:"rpc_public_addr"`
RPCSecret string `json:"rpc_secret" toml:"rpc_secret"`
Admin Admin `json:"admin" toml:"admin"`
S3API S3API `json:"s3_api" toml:"s3_api"`
S3Web S3Web `json:"s3_web" toml:"s3_web"`
RPCBindAddr string `json:"rpc_bind_addr" toml:"rpc_bind_addr"`
RPCPublicAddr string `json:"rpc_public_addr" toml:"rpc_public_addr"`
RPCSecret string `json:"rpc_secret" toml:"rpc_secret"`
Admin Admin `json:"admin" toml:"admin"`
S3API S3API `json:"s3_api" toml:"s3_api"`
S3Web S3Web `json:"s3_web" toml:"s3_web"`
}
type Admin struct {