Deuxfleurs
/
guichet
23
3
Fork 1
Code Issues 44 Pull Requests 1 Projects 2 Releases Wiki Activity

reformat code
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
Quentin 2023-04-19 15:07:46 +02:00
parent 27efd5384b
commit 83ed187dbc
Signed by: quentin
GPG Key ID: E9602264D639FF68
2 changed files with 182 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
garage.go
View File

@ -1,15 +1,15 @@
package main
import (
"errors"
"log"
"net/http"
"context"
"errors"
"fmt"
"strings"
garage "git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang"
"github.com/go-ldap/ldap/v3"
"github.com/gorilla/mux"
garage "git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang"
"log"
"net/http"
"strings"
)
func gadmin() (*garage.APIClient, context.Context) {
@ -25,7 +25,6 @@ func gadmin() (*garage.APIClient, context.Context) {
return client, ctx
}
func grgCreateKey(name string) (*garage.KeyInfo, error) {
client, ctx := gadmin()
@ -110,7 +109,6 @@ func grgGetBucket(bid string) (*garage.BucketInfo, error) {
}
func checkLoginAndS3(w http.ResponseWriter, r *http.Request) (*LoginStatus, *garage.KeyInfo, error) {
login := checkLogin(w, r)
if login == nil {
@ -159,6 +157,7 @@ type webListView struct {
Status *LoginStatus
Key *garage.KeyInfo
}
func handleGarageWebsiteList(w http.ResponseWriter, r *http.Request) {
login, s3key, err := checkLoginAndS3(w, r)
if err != nil {
@ -202,7 +201,7 @@ func handleGarageWebsiteNew(w http.ResponseWriter, r *http.Request) {
return
}
http.Redirect(w, r, "/garage/website/b/" + *binfo.Id, http.StatusFound)
http.Redirect(w, r, "/garage/website/b/"+*binfo.Id, http.StatusFound)
return
}
@ -219,6 +218,7 @@ type webInspectView struct {
MaxSize int64
UsedSizePct float64
}
func handleGarageWebsiteInspect(w http.ResponseWriter, r *http.Request) {
login, s3key, err := checkLoginAndS3(w, r)
if err != nil {
@ -236,7 +236,7 @@ func handleGarageWebsiteInspect(w http.ResponseWriter, r *http.Request) {
wc := binfo.GetWebsiteConfig()
q := binfo.GetQuotas()
view := webInspectView {
view := webInspectView{
Status: login,
Key: s3key,
Bucket: binfo,

2
main.go
View File

@ -105,7 +105,7 @@ func readConfig() ConfigFile {
}
func getTemplate(name string) *template.Template {
return template.Must(template.New("layout.html").Funcs(template.FuncMap {
return template.Must(template.New("layout.html").Funcs(template.FuncMap{
"contains": strings.Contains,
}).ParseFiles(
templatePath+"/layout.html",