mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use target implementation on config api (#81)

Browse Source 
Co-authored-by: Cesar Nieto <ces.nietor@gmail.com>
This commit is contained in:
Daniel Valdivia
2020-04-29 10:54:59 -07:00
committed by GitHub
parent 0f52136fd2
commit c32df86c76
4 changed files with 559 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
restapi/admin_config.go
View File

@@ -26,6 +26,7 @@ import (
"github.com/go-openapi/swag"
"github.com/minio/mcs/models"
"github.com/minio/mcs/restapi/operations"
madmin "github.com/minio/minio/pkg/madmin"
"github.com/minio/mcs/restapi/operations/admin_api"
)
@@ -103,25 +104,29 @@ func getListConfigResponse(sessionID string) (*models.ListConfigResponse, error)
// getConfig gets the key values for a defined configuration
func getConfig(client MinioAdmin, name string) ([]*models.ConfigurationKV, error) {
ctx := context.Background()
// getConfigKV comes as []byte
configBytes, err := client.getConfigKV(ctx, name)
configKeysHelp, err := client.helpConfigKV(ctx, name, "", false)
if err != nil {
return nil, err
}
configBytes, err := client.getConfigKV(ctx, name)
if err != nil {
log.Println("error on getConfigKV")
return nil, err
}
// if len(config) > 0 {
// // return Key Values, first element contains info
// var confkv []*models.ConfigurationKV
// for _, kv := range config[0].KVS {
// confkv = append(confkv, &models.ConfigurationKV{Key: kv.Key, Value: kv.Value})
// }
// return confkv, nil
// }
// TODO: Provisional until function to get key values is done
var confkv []*models.ConfigurationKV
confkv = append(confkv, &models.ConfigurationKV{Key: "configuration", Value: string(configBytes)})
return confkv, nil
target, err := madmin.ParseSubSysTarget(configBytes, configKeysHelp)
if err != nil {
return nil, err
}
if len(target.KVS) > 0 {
// return Key Values, first element contains info
var confkv []*models.ConfigurationKV
for _, kv := range target.KVS {
confkv = append(confkv, &models.ConfigurationKV{Key: kv.Key, Value: kv.Value})
}
return confkv, nil
}
return nil, fmt.Errorf("error retrieving configuration for: %s", name)
}
// getConfigResponse performs getConfig() and serializes it to the handler's output