asgardius/s3manager-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify REST API

Browse source
This commit is contained in:
Lena Fuhrimann 2017-03-05 14:34:26 +01:00
parent 9f1cb3e925
commit 0883ea59e5
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
api-handlers.go
View file

@ -4,7 +4,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"github.com/gorilla/mux" "github.com/gorilla/mux"
@ -22,14 +21,8 @@ type CopyObjectInfo struct {
// createBucketHandler creates a new bucket // createBucketHandler creates a new bucket
func createBucketHandler(w http.ResponseWriter, r *http.Request) { func createBucketHandler(w http.ResponseWriter, r *http.Request) {
var bucket minio.BucketInfo var bucket minio.BucketInfo
body, err := ioutil.ReadAll(io.LimitReader(r.Body, 1048576))
if err != nil { err := json.NewDecoder(r.Body).Decode(&bucket)
panic(err)
}
if err = r.Body.Close(); err != nil {
panic(err)
}
err = json.Unmarshal(body, &bucket)
if err != nil { if err != nil {
w.WriteHeader(http.StatusUnprocessableEntity) w.WriteHeader(http.StatusUnprocessableEntity)
return return
@ -45,7 +38,8 @@ func createBucketHandler(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)
err = json.NewEncoder(w).Encode(bucket) err = json.NewEncoder(w).Encode(bucket)
if err != nil { if err != nil {
panic(err) w.WriteHeader(http.StatusInternalServerError)
return
} }
} }
@ -55,7 +49,8 @@ func deleteBucketHandler(w http.ResponseWriter, r *http.Request) {
err := minioClient.RemoveBucket(vars["bucketName"]) err := minioClient.RemoveBucket(vars["bucketName"])
if err != nil { if err != nil {
panic(err) w.WriteHeader(http.StatusInternalServerError)
return
} }
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
@ -88,14 +83,8 @@ func createObjectHandler(w http.ResponseWriter, r *http.Request) {
if r.Header.Get("Content-Type") == "application/json" { if r.Header.Get("Content-Type") == "application/json" {
var copy CopyObjectInfo var copy CopyObjectInfo
body, err := ioutil.ReadAll(io.LimitReader(r.Body, 1048576))
if err != nil { err := json.NewDecoder(r.Body).Decode(&copy)
panic(err)
}
if err = r.Body.Close(); err != nil {
panic(err)
}
err = json.Unmarshal(body, &copy)
if err != nil { if err != nil {
w.WriteHeader(http.StatusUnprocessableEntity) w.WriteHeader(http.StatusUnprocessableEntity)
return return
@ -120,7 +109,8 @@ func createObjectHandler(w http.ResponseWriter, r *http.Request) {
} else { } else {
err := r.ParseMultipartForm(32 << 20) err := r.ParseMultipartForm(32 << 20)
if err != nil { if err != nil {
panic(err) w.WriteHeader(http.StatusUnprocessableEntity)
return
} }
file, handler, err := r.FormFile("file") file, handler, err := r.FormFile("file")
@ -132,7 +122,8 @@ func createObjectHandler(w http.ResponseWriter, r *http.Request) {
_, err = minioClient.PutObject(vars["bucketName"], handler.Filename, file, "application/octet-stream") _, err = minioClient.PutObject(vars["bucketName"], handler.Filename, file, "application/octet-stream")
if err != nil { if err != nil {
panic(err) w.WriteHeader(http.StatusUnprocessableEntity)
return
} }
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)