agecem/agecem-org
4
1
Fork 0
Code Issues 8 Pull requests 1 Packages 1 Activity

Retirer package data/

Browse source 
Utiliser client minio-go directement dans les handlers.

Un package api/ pourra être ajouté pour avoir un client API de
agecem-org, mais dédoubler un minio-go#Client dans un object data#Client
est simplement redondant.
This commit is contained in:
Victor Lacasse-Beaudoin 2023-04-21 18:51:20 -04:00
parent 8f5d3794f4
commit d5b9b5202c
3 changed files with 13 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cmd/server.go
View file

@ -4,6 +4,7 @@ Copyright © 2023 AGECEM
package cmd
import (
"context"
"fmt"
"embed"
@ -12,10 +13,11 @@ import (
"net/http"
"sort"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"git.agecem.com/agecem/agecem-org/data"
"git.agecem.com/agecem/agecem-org/public"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
@ -136,17 +138,23 @@ func handleV1Bucket(c echo.Context) error {
documents_secret_access_key := viper.GetString("server.documents.secret_access_key")
documents_use_ssl := viper.GetBool("server.documents.use_ssl")
client, err := data.NewClient(documents_buckets, documents_endpoint, documents_access_key_id, documents_secret_access_key, documents_use_ssl)
// Initialize minio client object
client, err := minio.New(documents_endpoint, &minio.Options{
Creds: credentials.NewStaticV4(documents_access_key_id, documents_secret_access_key, ""),
Secure: documents_use_ssl,
})
if err != nil {
return c.JSON(http.StatusInternalServerError, err)
return c.JSON(http.StatusInternalServerError, map[string]string{
"message": "Error during minio#New",
})
}
var buckets []string
for _, bucket_name := range documents_buckets {
exists, err := client.BucketExists(bucket_name)
exists, err := client.BucketExists(context.Background(), bucket_name)
if err != nil {
return c.JSON(http.StatusInternalServerError, err)
return c.JSON(http.StatusInternalServerError, "Error during minio#BucketExists")
}
if exists {