fixed the code style with goimports

This commit is contained in:
Mebus 2017-11-25 19:42:48 +01:00 committed by Zlatko Čalušić
parent 6c846f856c
commit 75578acd66
4 changed files with 25 additions and 25 deletions

View file

@ -2,14 +2,15 @@ package main
import (
"errors"
restserver "github.com/restic/rest-server"
"github.com/spf13/cobra"
"log"
"net/http"
"os"
"path/filepath"
"runtime"
"runtime/pprof"
restserver "github.com/restic/rest-server"
"github.com/spf13/cobra"
)
// cmdRoot is the base command when no other command has been specified.

View file

@ -1,8 +1,9 @@
package main
import (
restserver "github.com/restic/rest-server"
"testing"
restserver "github.com/restic/rest-server"
)
func TestTLSSettings(t *testing.T) {

View file

@ -142,7 +142,7 @@ func CheckConfig(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
@ -172,7 +172,7 @@ func GetConfig(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
@ -202,7 +202,7 @@ func SaveConfig(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
@ -238,7 +238,7 @@ func DeleteConfig(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
@ -275,7 +275,7 @@ func ListBlobs(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
@ -336,7 +336,7 @@ func CheckBlob(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
@ -366,7 +366,7 @@ func GetBlob(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
@ -408,7 +408,7 @@ func SaveBlob(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
@ -483,12 +483,11 @@ func DeleteBlob(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
if Config.AppendOnly && pat.Param(r, "type") != "locks" {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
@ -534,12 +533,11 @@ func CreateRepo(w http.ResponseWriter, r *http.Request) {
}
// private repos
if (Config.PrivateRepos && (getUser(r) != getRepo(r))) {
if Config.PrivateRepos && (getUser(r) != getRepo(r)) {
http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
return
}
repo, err := join(Config.Path, getRepo(r))
if err != nil {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)

20
mux.go
View file

@ -14,17 +14,17 @@ import (
// Config struct holds program configuration.
var Config = struct {
Path string
Listen string
Log string
CPUProfile string
TLSKey string
TLSCert string
TLS bool
AppendOnly bool
Path string
Listen string
Log string
CPUProfile string
TLS bool
TLSKey string
TLSCert string
AppendOnly bool
PrivateRepos bool
Prometheus bool
Debug bool
Prometheus bool
Debug bool
}{
Path: "/tmp/restic",
Listen: ":8000",