agecem/agecem-org
4
1
Fork 0
Code Issues 31 Pull requests 2 Activity

[BREAKING] Changer Config.Server.Buckets à un map[string]string #98

Merged
vlbeaudoin merged 4 commits from feature/config-bucket-displayname into main 2023-08-15 16:02:10 -04:00
Conversation 0 Commits 4 Files changed 6 +25 -16
3 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 789af54121 - Show all commits

13
cmd/server.go
View file

@ -96,7 +96,12 @@ func init() {
viper.BindPFlag("server.documents.use_ssl", serverCmd.Flags().Lookup("server-documents-use-ssl")) viper.BindPFlag("server.documents.use_ssl", serverCmd.Flags().Lookup("server-documents-use-ssl"))
// server.documents.buckets - --server-documents-buckets // server.documents.buckets - --server-documents-buckets
serverCmd.Flags().StringSlice("server-documents-buckets", []string{"proces-verbaux", "politiques-et-reglements"}, "Buckets that are allowed to be accessed by the API (config: server.documents.buckets)") serverCmd.Flags().StringToString("server-documents-buckets", map[string]string{
"proces-verbaux": "Procès-verbaux",
"politiques": "Politiques",
"reglements": "Règlements",
"formulaires": "Formulaires",
}, "Buckets that are allowed to be accessed by the API (config: server.documents.buckets)")
viper.BindPFlag("server.documents.buckets", serverCmd.Flags().Lookup("server-documents-buckets")) viper.BindPFlag("server.documents.buckets", serverCmd.Flags().Lookup("server-documents-buckets"))
// server.api.auth - --server-api-auth // server.api.auth - --server-api-auth
@ -293,7 +298,7 @@ func handleDocumentation(c echo.Context) error {
return c.Render(http.StatusInternalServerError, "documentation-html", nil) return c.Render(http.StatusInternalServerError, "documentation-html", nil)
} }
var buckets []string var buckets map[string]string
err = json.Unmarshal(result, &buckets) err = json.Unmarshal(result, &buckets)
if err != nil { if err != nil {
@ -302,12 +307,13 @@ func handleDocumentation(c echo.Context) error {
type Bucket struct { type Bucket struct {
Name string Name string
DisplayName string
Documents []string Documents []string
} }
var data []Bucket var data []Bucket
for _, bucket := range buckets { for bucket, displayName := range buckets {
content, err := client.Call(http.MethodGet, fmt.Sprintf("/v1/bucket/%s", bucket)) content, err := client.Call(http.MethodGet, fmt.Sprintf("/v1/bucket/%s", bucket))
if err != nil { if err != nil {
return c.Render(http.StatusInternalServerError, "documentation-html", nil) return c.Render(http.StatusInternalServerError, "documentation-html", nil)
@ -340,6 +346,7 @@ func handleDocumentation(c echo.Context) error {
data = append(data, Bucket{ data = append(data, Bucket{
Name: bucket, Name: bucket,
DisplayName: displayName,
Documents: documents, Documents: documents,
}) })
} }

2
config/config.go
View file

@ -29,7 +29,7 @@ type Config struct {
} `mapstructure:"api"` } `mapstructure:"api"`
Documents struct { Documents struct {
AccessKeyId string `mapstructure:"access_key_id"` AccessKeyId string `mapstructure:"access_key_id"`
Buckets []string `mapstructure:"buckets"` Buckets map[string]string `mapstructure:"buckets"`
Endpoint string `mapstructure:"endpoint"` Endpoint string `mapstructure:"endpoint"`
SecretAccessKey string `mapstructure:"secret_access_key"` SecretAccessKey string `mapstructure:"secret_access_key"`
UseSSL bool `mapstructure:"use_ssl"` UseSSL bool `mapstructure:"use_ssl"`

6
examples/config/agecem-org.yaml
View file

@ -35,8 +35,10 @@ server:
# #
# Also used to specify which buckets are to be created on receiving a POST request on /v1/seed # Also used to specify which buckets are to be created on receiving a POST request on /v1/seed
buckets: buckets:
- 'proces-verbaux' 'proces-verbaux': 'Procès-verbaux'
- 'politiques-et-reglements' 'politiques': 'Politiques'
'reglements': 'Règlements'
'formulaires': 'Formulaires'
api: api:
# Enable or disable key auth on /v1 routes # Enable or disable key auth on /v1 routes