noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve import and export cli command error parsing

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2017-11-16 19:28:41 +00:00
parent 12c2ada091
commit cfa6452863
2 changed files with 46 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cli/export.go
View file

@ -20,6 +20,8 @@ import (
"net/http" "net/http"
"os" "os"
"io/ioutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/abcum/surreal/log" "github.com/abcum/surreal/log"
@ -63,7 +65,7 @@ var exportCmd = &cobra.Command{
// and specify the authentication header using // and specify the authentication header using
// basic auth for root login. // basic auth for root login.
url := fmt.Sprintf("http://%s@%s:%s/export", opts.Auth.Auth, opts.DB.Host, opts.DB.Port) url := fmt.Sprintf("https://%s@%s:%s/export", opts.Auth.Auth, opts.DB.Host, opts.DB.Port)
// Create a new http request object that we // Create a new http request object that we
// can use to connect to the export endpoint // can use to connect to the export endpoint
@ -89,12 +91,28 @@ var exportCmd = &cobra.Command{
return return
} }
// Ensure that we received a http 200 status // Ensure that we close the body, otherwise
// if the Body is not closed, the Client can
// not use the underlying transport again.
defer res.Body.Close()
// Ensure that we didn't receive a 401 status
// code back from the server, otherwise there // code back from the server, otherwise there
// was a problem with our authentication. // was a problem with our authentication.
if res.StatusCode == 401 {
log.Fatalln("Authentication failed - check the connection details and try again.")
return
}
// Ensure that we received a http 200 status
// code back from the server, otherwise there
// was a problem with our request.
if res.StatusCode != 200 { if res.StatusCode != 200 {
log.Fatalln("Connection failed - check the connection details and try again.") bdy, _ := ioutil.ReadAll(res.Body)
log.Fatalf("%s", bdy)
return return
} }
@ -115,7 +133,7 @@ var exportCmd = &cobra.Command{
func init() { func init() {
exportCmd.PersistentFlags().StringVar(&opts.Auth.Auth, "auth", "root:root", "Master authentication details to use when connecting.") exportCmd.PersistentFlags().StringVar(&opts.Auth.Auth, "auth", "root:root", "Master authentication details to use when connecting.")
exportCmd.PersistentFlags().StringVar(&opts.DB.Host, "host", "127.0.0.1", "Database server host to connect to.") exportCmd.PersistentFlags().StringVar(&opts.DB.Host, "host", "surreal.io", "Database server host to connect to.")
exportCmd.PersistentFlags().StringVar(&opts.DB.Port, "port", "8000", "Database server port to connect to.") exportCmd.PersistentFlags().StringVar(&opts.DB.Port, "port", "80", "Database server port to connect to.")
} }

28
cli/import.go
View file

@ -19,6 +19,8 @@ import (
"net/http" "net/http"
"os" "os"
"io/ioutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/abcum/surreal/log" "github.com/abcum/surreal/log"
@ -62,7 +64,7 @@ var importCmd = &cobra.Command{
// and specify the authentication header using // and specify the authentication header using
// basic auth for root login. // basic auth for root login.
url := fmt.Sprintf("http://%s@%s:%s/import", opts.Auth.Auth, opts.DB.Host, opts.DB.Port) url := fmt.Sprintf("https://%s@%s:%s/import", opts.Auth.Auth, opts.DB.Host, opts.DB.Port)
// Create a new http request object that we // Create a new http request object that we
// can use to connect to the import endpoint // can use to connect to the import endpoint
@ -88,12 +90,28 @@ var importCmd = &cobra.Command{
return return
} }
// Ensure that we received a http 200 status // Ensure that we close the body, otherwise
// if the Body is not closed, the Client can
// not use the underlying transport again.
defer res.Body.Close()
// Ensure that we didn't receive a 401 status
// code back from the server, otherwise there // code back from the server, otherwise there
// was a problem with our authentication. // was a problem with our authentication.
if res.StatusCode == 401 {
log.Fatalln("Authentication failed - check the connection details and try again.")
return
}
// Ensure that we received a http 200 status
// code back from the server, otherwise there
// was a problem with our request.
if res.StatusCode != 200 { if res.StatusCode != 200 {
log.Fatalln("Connection failed - check the connection details and try again.") bdy, _ := ioutil.ReadAll(res.Body)
log.Fatalf("%s", bdy)
return return
} }
@ -105,7 +123,7 @@ var importCmd = &cobra.Command{
func init() { func init() {
importCmd.PersistentFlags().StringVar(&opts.Auth.Auth, "auth", "root:root", "Master authentication details to use when connecting.") importCmd.PersistentFlags().StringVar(&opts.Auth.Auth, "auth", "root:root", "Master authentication details to use when connecting.")
importCmd.PersistentFlags().StringVar(&opts.DB.Host, "host", "127.0.0.1", "Database server host to connect to.") importCmd.PersistentFlags().StringVar(&opts.DB.Host, "host", "surreal.io", "Database server host to connect to.")
importCmd.PersistentFlags().StringVar(&opts.DB.Port, "port", "8000", "Database server port to connect to.") importCmd.PersistentFlags().StringVar(&opts.DB.Port, "port", "80", "Database server port to connect to.")
} }