From 4cec29abee57437e590b8dd4b8eed32742619eca Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Fri, 21 Apr 2023 16:40:58 -0400 Subject: [PATCH 01/10] Ignorer fichiers .env --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1377554..200bf3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.swp +.env From 28cc97dcee12f78e887b5a9708cf6283544ac59f Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Fri, 21 Apr 2023 16:41:50 -0400 Subject: [PATCH 02/10] Mise en marche de base de /v1/health avec pkg data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajouter data/ Ajouter data/ à Dockerfile Ajouter flags pour server.port et server.documents.* Ajouter viper Ajouter example de config à examples/config/ Exécuter serveur sur port custom (8080 par défaut) Retirer copyright notice de main.go Cleanup dependencies (go get, go mod tidy) Ajouter /v1/health Ajouter container minio à docker-compose --- Dockerfile | 2 + cmd/server.go | 67 ++++++++++++++++++++++++++++++++- data/data.go | 48 +++++++++++++++++++++++ docker-compose.yaml | 27 ++++++++++++- examples/config/agecem-org.yaml | 10 +++++ go.mod | 20 ++++++++-- go.sum | 47 +++++++++++++++++++---- main.go | 4 -- 8 files changed, 206 insertions(+), 19 deletions(-) create mode 100644 data/data.go create mode 100644 examples/config/agecem-org.yaml diff --git a/Dockerfile b/Dockerfile index 0e98d5c..6b6f422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ ADD public/ public/ ADD cmd/ cmd/ +ADD data/ data/ + RUN CGO_ENABLED=0 go build -a -installsuffix cgo -o agecem-org . # Alpine diff --git a/cmd/server.go b/cmd/server.go index f34d0a0..a1856c9 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -13,7 +13,9 @@ import ( "sort" "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" @@ -37,6 +39,34 @@ var serverCmd = &cobra.Command{ func init() { rootCmd.AddCommand(serverCmd) embedFS = public.GetEmbedFS() + + // server.port - --server-port + serverCmd.Flags().Int("server-port", 8080, "Port to run the webserver on (config: server.port)") + viper.BindPFlag("server.port", serverCmd.Flags().Lookup("server-port")) + + // server.documents.location - --server-documents-location + serverCmd.Flags().String("server-documents-location", "us-east", "Storage bucket location (config: server.documents.location)") + viper.BindPFlag("server.documents.location", serverCmd.Flags().Lookup("server-documents-location")) + + // server.documents.endpoint - --server-documents-endpoint + serverCmd.Flags().String("server-documents-endpoint", "minio:9000", "Storage server endpoint (config: server.documents.endpoint)") + viper.BindPFlag("server.documents.endpoint", serverCmd.Flags().Lookup("server-documents-endpoint")) + + // server.documents.access_key_id - --server-documents-access-key-id + serverCmd.Flags().String("server-documents-access-key-id", "", "Storage server access key id (config: server.documents.access_key_id)") + viper.BindPFlag("documents.accessKeyID", serverCmd.Flags().Lookup("documents-access-key-id")) + + // server.documents.secret_access_key - --server-documents-secret-access-key + serverCmd.Flags().String("server-documents-secret-access-key", "", "Storage server secret access key (config: server.documents.secret_access_key)") + viper.BindPFlag("server.documents.secret_access_key", serverCmd.Flags().Lookup("server-documents-secret-access-key")) + + // server.documents.use_ssl - --server-documents-use-ssl + serverCmd.Flags().Bool("server-documents-use-ssl", true, "Storage server SSL status (config: server.documents.use_ssl)") + viper.BindPFlag("server.documents.use_ssl", serverCmd.Flags().Lookup("server-documents-use-ssl")) + + // server.documents.buckets - --server-documents-buckets + serverCmd.Flags().StringSlice("server-documents-buckets", nil, "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")) } func RunServer() { @@ -54,6 +84,8 @@ func RunServer() { e.GET("/v1", handleV1) + e.GET("/v1/health", handleV1Health) + // Static Routes e.GET("/static/general.css", handleStaticCSSGeneral) @@ -78,7 +110,8 @@ func RunServer() { e.GET("/formulaires", handleFormulaires) - e.Logger.Fatal(e.Start(":8080")) + e.Logger.Fatal(e.Start( + fmt.Sprintf(":%d", viper.GetInt("server.port")))) } func (t *Template) Render(w io.Writer, name string, data interface{}, c echo.Context) error { @@ -95,6 +128,38 @@ func handleV1(c echo.Context) error { return c.JSON(http.StatusOK, routes) } +// handleV1Health affiche l'état de connexion à la base de données +func handleV1Health(c echo.Context) error { + documents_buckets := viper.GetStringSlice("server.documents.buckets") + + documents_endpoint := viper.GetString("server.documents.endpoint") + documents_access_key_id := viper.GetString("server.documents.access_key_id") + 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) + if err != nil { + return c.JSON(http.StatusInternalServerError, err) + } + + if len(documents_buckets) == 0 { + return c.JSON(http.StatusOK, nil) + } + + message := make(map[string]interface{}, len(documents_buckets)) + + for _, bucket := range documents_buckets { + + exists, err := client.BucketExists(bucket) + if err != nil { + return c.JSON(http.StatusInternalServerError, err) + } + message[bucket] = exists + } + + return c.JSON(http.StatusOK, message) +} + // HTML Handlers func handleIndex(c echo.Context) error { diff --git a/data/data.go b/data/data.go new file mode 100644 index 0000000..8d29b9a --- /dev/null +++ b/data/data.go @@ -0,0 +1,48 @@ +// Package data provides database interactions to the app +package data + +import ( + "context" + + "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" +) + +type Client struct { + Endpoint, AccessKeyID, SecretAccessKey string + UseSSL bool + MongoClient *minio.Client + Context context.Context +} + +func NewClient(buckets []string, endpoint, accessKeyID, secretAccessKey string, useSSL bool) (*Client, error) { + c := Client{ + Endpoint: endpoint, + AccessKeyID: accessKeyID, + SecretAccessKey: secretAccessKey, + UseSSL: useSSL, + Context: context.Background(), + } + + // Initialize minio client object + mongo_client, err := minio.New(endpoint, &minio.Options{ + Creds: credentials.NewStaticV4(accessKeyID, secretAccessKey, ""), + Secure: useSSL, + }) + if err != nil { + return &c, err + } + + c.MongoClient = mongo_client + + return &c, nil +} + +func (c *Client) BucketExists(bucketName string) (bool, error) { + result, err := c.MongoClient.BucketExists(c.Context, bucketName) + if err != nil { + return false, err + } + + return result, nil +} diff --git a/docker-compose.yaml b/docker-compose.yaml index f6f91d7..5462be6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,30 @@ services: + minio: + image: 'quay.io/minio/minio:latest' + environment: + - "MINIO_ROOT_USER=${MINIO_ROOT_USER}" + - "MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}" + volumes: + - 'minio-data:/data' + + # test + ports: + - "9000:9000" + - "9001:9001" + + command: 'server /data --console-address ":9001"' server: + depends_on: + - 'minio' + restart: unless-stopped build: . image: agecem/agecem-org:latest ports: - - "8080:8080" - restart: unless-stopped + - '8080:8080' + volumes: + - 'server-config:/config' + command: ['agecem-org', 'server', '--config', '/config/.agecem-org.yaml'] + +volumes: + minio-data: + server-config: diff --git a/examples/config/agecem-org.yaml b/examples/config/agecem-org.yaml new file mode 100644 index 0000000..d3e4757 --- /dev/null +++ b/examples/config/agecem-org.yaml @@ -0,0 +1,10 @@ +server: + port: 8080 + documents: + endpoint: 'minio:9000' + use_ssl: false + access_key_id: 'grevegreve' + secret_access_key: 'grevegreve' + buckets: + - 'proces-verbaux' + - 'politiques-et-reglements' diff --git a/go.mod b/go.mod index 3a60f78..07d9b53 100644 --- a/go.mod +++ b/go.mod @@ -4,21 +4,33 @@ go 1.19 require ( github.com/labstack/echo/v4 v4.10.0 + github.com/minio/minio-go/v7 v7.0.52 github.com/spf13/cobra v1.6.1 github.com/spf13/viper v1.15.0 ) require ( + github.com/dustin/go-humanize v1.0.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect + github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/labstack/gommon v0.4.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.16 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/sha256-simd v1.0.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect + github.com/rs/xid v1.4.0 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -26,10 +38,10 @@ require ( github.com/subosito/gotenv v1.4.2 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.2.0 // indirect - golang.org/x/net v0.4.0 // indirect - golang.org/x/sys v0.3.0 // indirect - golang.org/x/text v0.5.0 // indirect + golang.org/x/crypto v0.6.0 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect golang.org/x/time v0.2.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index ba90637..6793237 100644 --- a/go.sum +++ b/go.sum @@ -50,6 +50,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -101,6 +103,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -116,6 +119,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= @@ -127,9 +132,17 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= +github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= +github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= @@ -148,8 +161,19 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= +github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v7 v7.0.52 h1:8XhG36F6oKQUDDSuz6dY3rioMzovKjW40W6ANuN0Dps= +github.com/minio/minio-go/v7 v7.0.52/go.mod h1:IbbodHyjUAguneyucUaahv+VMNs/EOTV9du7A7/Z3HU= +github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= +github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -159,7 +183,11 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= @@ -176,6 +204,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -207,8 +236,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.2.0 h1:BRXPfhNivWL5Yq0BGQ39a2sW6t44aODpfxkWjYdzewE= -golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -273,8 +302,8 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= -golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -331,10 +360,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -342,8 +373,8 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/main.go b/main.go index afa881b..51a4077 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,3 @@ -/* -Copyright © 2023 AGECEM - -*/ package main import "git.agecem.com/agecem/agecem-org/cmd" From a3287768adf03e8e09c1e29a8b1547bf3f1a3e13 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Fri, 21 Apr 2023 17:11:06 -0400 Subject: [PATCH 03/10] Replace MongoClient with MinioClient (was typo) Use bucket_name instead of bucket in handleV1Health --- cmd/server.go | 7 +++---- data/data.go | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmd/server.go b/cmd/server.go index a1856c9..f7e323c 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -148,13 +148,12 @@ func handleV1Health(c echo.Context) error { message := make(map[string]interface{}, len(documents_buckets)) - for _, bucket := range documents_buckets { - - exists, err := client.BucketExists(bucket) + for _, bucket_name := range documents_buckets { + exists, err := client.BucketExists(bucket_name) if err != nil { return c.JSON(http.StatusInternalServerError, err) } - message[bucket] = exists + message[bucket_name] = exists } return c.JSON(http.StatusOK, message) diff --git a/data/data.go b/data/data.go index 8d29b9a..4c6fd2e 100644 --- a/data/data.go +++ b/data/data.go @@ -11,7 +11,7 @@ import ( type Client struct { Endpoint, AccessKeyID, SecretAccessKey string UseSSL bool - MongoClient *minio.Client + MinioClient *minio.Client Context context.Context } @@ -25,7 +25,7 @@ func NewClient(buckets []string, endpoint, accessKeyID, secretAccessKey string, } // Initialize minio client object - mongo_client, err := minio.New(endpoint, &minio.Options{ + minio_client, err := minio.New(endpoint, &minio.Options{ Creds: credentials.NewStaticV4(accessKeyID, secretAccessKey, ""), Secure: useSSL, }) @@ -33,13 +33,13 @@ func NewClient(buckets []string, endpoint, accessKeyID, secretAccessKey string, return &c, err } - c.MongoClient = mongo_client + c.MinioClient = minio_client return &c, nil } func (c *Client) BucketExists(bucketName string) (bool, error) { - result, err := c.MongoClient.BucketExists(c.Context, bucketName) + result, err := c.MinioClient.BucketExists(c.Context, bucketName) if err != nil { return false, err } From 128bbbb355f5b31fc03c394ed954ad699440131f Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Fri, 21 Apr 2023 17:50:29 -0400 Subject: [PATCH 04/10] Retirer exposition de port pour minio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Minio ne devrait être rejoint que par l'application serveur, surtout si `server.documents.use_ssl` est à false. --- docker-compose.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 5462be6..3284b36 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,12 +6,6 @@ services: - "MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}" volumes: - 'minio-data:/data' - - # test - ports: - - "9000:9000" - - "9001:9001" - command: 'server /data --console-address ":9001"' server: depends_on: From 8f5d3794f481db5e7b76a99ebe70a20089d9fdca Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Fri, 21 Apr 2023 18:36:20 -0400 Subject: [PATCH 05/10] Remplacer /v1/health par /v1/bucket /v1/health pourra revenir plus tard, pour l'instant le healthcheck ne fonctionne pas bien. Ajouter listing de buckets valides par `GET /v1/bucket` --- cmd/server.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/cmd/server.go b/cmd/server.go index f7e323c..90e2aac 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -84,7 +84,7 @@ func RunServer() { e.GET("/v1", handleV1) - e.GET("/v1/health", handleV1Health) + e.GET("/v1/bucket", handleV1Bucket) // Static Routes @@ -128,10 +128,9 @@ func handleV1(c echo.Context) error { return c.JSON(http.StatusOK, routes) } -// handleV1Health affiche l'état de connexion à la base de données -func handleV1Health(c echo.Context) error { +// handleV1Bucket affiche les buckets permis par server.documents.buckets, qui existent. +func handleV1Bucket(c echo.Context) error { documents_buckets := viper.GetStringSlice("server.documents.buckets") - documents_endpoint := viper.GetString("server.documents.endpoint") documents_access_key_id := viper.GetString("server.documents.access_key_id") documents_secret_access_key := viper.GetString("server.documents.secret_access_key") @@ -142,21 +141,20 @@ func handleV1Health(c echo.Context) error { return c.JSON(http.StatusInternalServerError, err) } - if len(documents_buckets) == 0 { - return c.JSON(http.StatusOK, nil) - } - - message := make(map[string]interface{}, len(documents_buckets)) + var buckets []string for _, bucket_name := range documents_buckets { exists, err := client.BucketExists(bucket_name) if err != nil { return c.JSON(http.StatusInternalServerError, err) } - message[bucket_name] = exists + + if exists { + buckets = append(buckets, bucket_name) + } } - return c.JSON(http.StatusOK, message) + return c.JSON(http.StatusOK, buckets) } // HTML Handlers From d5b9b5202c776da90a08b92e567abf84e256344d Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Fri, 21 Apr 2023 18:51:20 -0400 Subject: [PATCH 06/10] Retirer package data/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- Dockerfile | 2 -- cmd/server.go | 18 +++++++++++++----- data/data.go | 48 ------------------------------------------------ 3 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 data/data.go diff --git a/Dockerfile b/Dockerfile index 6b6f422..0e98d5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,6 @@ ADD public/ public/ ADD cmd/ cmd/ -ADD data/ data/ - RUN CGO_ENABLED=0 go build -a -installsuffix cgo -o agecem-org . # Alpine diff --git a/cmd/server.go b/cmd/server.go index 90e2aac..8c85c28 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -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 { diff --git a/data/data.go b/data/data.go deleted file mode 100644 index 4c6fd2e..0000000 --- a/data/data.go +++ /dev/null @@ -1,48 +0,0 @@ -// Package data provides database interactions to the app -package data - -import ( - "context" - - "github.com/minio/minio-go/v7" - "github.com/minio/minio-go/v7/pkg/credentials" -) - -type Client struct { - Endpoint, AccessKeyID, SecretAccessKey string - UseSSL bool - MinioClient *minio.Client - Context context.Context -} - -func NewClient(buckets []string, endpoint, accessKeyID, secretAccessKey string, useSSL bool) (*Client, error) { - c := Client{ - Endpoint: endpoint, - AccessKeyID: accessKeyID, - SecretAccessKey: secretAccessKey, - UseSSL: useSSL, - Context: context.Background(), - } - - // Initialize minio client object - minio_client, err := minio.New(endpoint, &minio.Options{ - Creds: credentials.NewStaticV4(accessKeyID, secretAccessKey, ""), - Secure: useSSL, - }) - if err != nil { - return &c, err - } - - c.MinioClient = minio_client - - return &c, nil -} - -func (c *Client) BucketExists(bucketName string) (bool, error) { - result, err := c.MinioClient.BucketExists(c.Context, bucketName) - if err != nil { - return false, err - } - - return result, nil -} From 0314d7a8eb1f1c5a1e55d73d3e96365cac10e6cb Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Fri, 21 Apr 2023 21:32:02 -0400 Subject: [PATCH 07/10] Generaliser config d'exemple --- examples/config/agecem-org.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/config/agecem-org.yaml b/examples/config/agecem-org.yaml index d3e4757..d8985b8 100644 --- a/examples/config/agecem-org.yaml +++ b/examples/config/agecem-org.yaml @@ -3,8 +3,12 @@ server: documents: endpoint: 'minio:9000' use_ssl: false - access_key_id: 'grevegreve' - secret_access_key: 'grevegreve' + access_key_id: 'agecem-org' + secret_access_key: 'agecem-org' buckets: - 'proces-verbaux' - 'politiques-et-reglements' + api: + # necessary for production use + auth: true + key: 'agecem-org' From 9bbeb4b7ee7db166d1387ef4dacf8a147d95f684 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Fri, 21 Apr 2023 21:34:18 -0400 Subject: [PATCH 08/10] =?UTF-8?q?Ajouter=20key-auth=20=C3=A0=20/v1=20et=20?= =?UTF-8?q?quelques=20routes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajouter route POST /v1/seed pour seeder minio avec server.documents.buckets Ajouter route GET /v1/bucket/:bucket pour lire les objects d'un bucket Renommer handleV1Bucket -> handleV1BucketList --- cmd/server.go | 121 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 4 deletions(-) diff --git a/cmd/server.go b/cmd/server.go index 8c85c28..fb4669c 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -5,7 +5,9 @@ package cmd import ( "context" + "crypto/subtle" "fmt" + "log" "embed" "html/template" @@ -69,6 +71,14 @@ func init() { // server.documents.buckets - --server-documents-buckets serverCmd.Flags().StringSlice("server-documents-buckets", nil, "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")) + + // server.api.auth - --server-api-auth + serverCmd.Flags().Bool("server-api-auth", false, "Enable to allow key authentication for /v1 routes (config: server.api.auth)") + viper.BindPFlag("server.api.auth", serverCmd.Flags().Lookup("server-api-auth")) + + // server.api.key - --server-api-key + serverCmd.Flags().String("server-api-key", "", "Key to use for authenticating to /v1 routes") + viper.BindPFlag("server.api.key", serverCmd.Flags().Lookup("server-api-key")) } func RunServer() { @@ -82,11 +92,29 @@ func RunServer() { e.Pre(middleware.RemoveTrailingSlash()) + groupV1 := e.Group("/v1") + + groupV1.Use(middleware.AddTrailingSlash()) + + if viper.GetBool("server.api.auth") { + if len(viper.GetString("server.api.key")) < 10 { + log.Fatal("server.api.auth is enabled, but server.api.key is too small (needs at least 10 characters)") + } + + groupV1.Use(middleware.KeyAuth(func(key string, c echo.Context) (bool, error) { + return subtle.ConstantTimeCompare([]byte(key), []byte(viper.GetString("server.api.key"))) == 1, nil + })) + } + // API Routes - e.GET("/v1", handleV1) + groupV1.GET("", handleV1) - e.GET("/v1/bucket", handleV1Bucket) + groupV1.POST("/seed", handleV1Seed) + + groupV1.GET("/bucket", handleV1BucketList) + + groupV1.GET("/bucket/:bucket", handleV1BucketRead) // Static Routes @@ -130,8 +158,45 @@ func handleV1(c echo.Context) error { return c.JSON(http.StatusOK, routes) } -// handleV1Bucket affiche les buckets permis par server.documents.buckets, qui existent. -func handleV1Bucket(c echo.Context) error { +// handleV1Seed créé des buckets dans minio selon la liste de buckets dans server.documents.buckets +// Les buckets sont créés avec paramètres par défaut, et sont ensuite visible dans /v1/bucket. +func handleV1Seed(c echo.Context) error { + documents_buckets := viper.GetStringSlice("server.documents.buckets") + documents_endpoint := viper.GetString("server.documents.endpoint") + documents_access_key_id := viper.GetString("server.documents.access_key_id") + documents_secret_access_key := viper.GetString("server.documents.secret_access_key") + documents_use_ssl := viper.GetBool("server.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, map[string]string{ + "message": "Error during minio#New", + }) + } + + var new_buckets []string + + for _, bucket := range documents_buckets { + if err = client.MakeBucket(context.Background(), bucket, minio.MakeBucketOptions{}); err != nil { + return c.JSON(http.StatusInternalServerError, map[string]string{ + "message": "Error during minio#MakeBucket", + }) + } + new_buckets = append(new_buckets, bucket) + } + + return c.JSON(http.StatusOK, map[string]interface{}{ + "message": "Buckets successfully created", + "buckets": new_buckets, + }) +} + +// handleV1BucketList affiche les buckets permis par server.documents.buckets, qui existent. +func handleV1BucketList(c echo.Context) error { documents_buckets := viper.GetStringSlice("server.documents.buckets") documents_endpoint := viper.GetString("server.documents.endpoint") documents_access_key_id := viper.GetString("server.documents.access_key_id") @@ -165,6 +230,54 @@ func handleV1Bucket(c echo.Context) error { return c.JSON(http.StatusOK, buckets) } +func handleV1BucketRead(c echo.Context) error { + documents_endpoint := viper.GetString("server.documents.endpoint") + documents_access_key_id := viper.GetString("server.documents.access_key_id") + documents_secret_access_key := viper.GetString("server.documents.secret_access_key") + documents_use_ssl := viper.GetBool("server.documents.use_ssl") + + bucket := c.Param("bucket") + + ctx, cancel := context.WithCancel(context.Background()) + + defer cancel() + + // 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, map[string]string{ + "message": "Error during minio#New", + }) + } + + exists, err := client.BucketExists(ctx, bucket) + if err != nil { + return c.JSON(http.StatusInternalServerError, "Error during minio#BucketExists") + } + + if !exists { + return c.JSON(http.StatusNotFound, map[string]string{"message": "Not found"}) + } + + var keys []string + + objectCh := client.ListObjects(ctx, bucket, minio.ListObjectsOptions{}) + for object := range objectCh { + if object.Err != nil { + return c.JSON(http.StatusInternalServerError, map[string]string{ + "message": "Error during minio#ListObjects", + }) + } + + keys = append(keys, object.Key) + } + + return c.JSON(http.StatusOK, keys) +} + // HTML Handlers func handleIndex(c echo.Context) error { From 7accc596c75050fa28fc0670686108233af5e502 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Mon, 24 Apr 2023 16:29:24 -0400 Subject: [PATCH 09/10] =?UTF-8?q?V=C3=A9rifier=20existence=20de=20buckets?= =?UTF-8?q?=20avant=20de=20seed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Continue silencieusement si tout existe déjà --- cmd/server.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/server.go b/cmd/server.go index fb4669c..4e7d2ad 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -181,6 +181,17 @@ func handleV1Seed(c echo.Context) error { var new_buckets []string for _, bucket := range documents_buckets { + exists, err := client.BucketExists(context.Background(), bucket) + if err != nil { + return c.JSON(http.StatusInternalServerError, map[string]string{ + "message": "Error during minio#BucketExists", + }) + } + + if exists { + continue + } + if err = client.MakeBucket(context.Background(), bucket, minio.MakeBucketOptions{}); err != nil { return c.JSON(http.StatusInternalServerError, map[string]string{ "message": "Error during minio#MakeBucket", From 6cc6d75afd7e04e4fc9861fbe2bfb10f5f3a51a9 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Mon, 24 Apr 2023 16:30:06 -0400 Subject: [PATCH 10/10] Ajuster message de /v1/seed selon len(new_buckets) --- cmd/server.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/server.go b/cmd/server.go index 4e7d2ad..3a01df0 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -199,9 +199,16 @@ func handleV1Seed(c echo.Context) error { } new_buckets = append(new_buckets, bucket) } + var message string + if len(new_buckets) == 0 { + message = "All buckets already exist" + + } else { + message = "Buckets successfully created" + } return c.JSON(http.StatusOK, map[string]interface{}{ - "message": "Buckets successfully created", + "message": message, "buckets": new_buckets, }) }