darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #654 from bradrydzewski/master

Browse source 
returning error message text when fail to create repo
This commit is contained in:
Brad Rydzewski 2014-10-31 20:19:47 -07:00
commit 8a1c51f130
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugin/deploy/ssh.go
View file

@ -81,7 +81,7 @@ func (s *SSH) Write(f *buildfile.Buildfile) {
} }
if len(s.Cmd) > 0 { if len(s.Cmd) > 0 {
sshCmd := "ssh -o StrictHostKeyChecking=no -p %s %s \"%s\"" sshCmd := "ssh -o StrictHostKeyChecking=no -p %s %s %q"
f.WriteCmd(fmt.Sprintf(sshCmd, host[1], strings.SplitN(host[0], ":", 2)[0], s.Cmd)) f.WriteCmd(fmt.Sprintf(sshCmd, host[1], strings.SplitN(host[0], ":", 2)[0], s.Cmd))
} }
} }

10
server/handler/repo.go
View file

@ -91,7 +91,7 @@ func PostRepo(c web.C, w http.ResponseWriter, r *http.Request) {
if len(repo.PublicKey) == 0 || len(repo.PrivateKey) == 0 { if len(repo.PublicKey) == 0 || len(repo.PrivateKey) == 0 {
key, err := sshutil.GeneratePrivateKey() key, err := sshutil.GeneratePrivateKey()
if err != nil { if err != nil {
w.WriteHeader(http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
repo.PublicKey = sshutil.MarshalPublicKey(&key.PublicKey) repo.PublicKey = sshutil.MarshalPublicKey(&key.PublicKey)
@ -108,12 +108,12 @@ func PostRepo(c web.C, w http.ResponseWriter, r *http.Request) {
// if necessary, register the public key // if necessary, register the public key
var hook = fmt.Sprintf("%s/api/hook/%s/%s", httputil.GetURL(r), repo.Remote, repo.Token) var hook = fmt.Sprintf("%s/api/hook/%s/%s", httputil.GetURL(r), repo.Remote, repo.Token)
if err := remote.Activate(user, repo, hook); err != nil { if err := remote.Activate(user, repo, hook); err != nil {
w.WriteHeader(http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
if err := datastore.PutRepo(ctx, repo); err != nil { if err := datastore.PutRepo(ctx, repo); err != nil {
w.WriteHeader(http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
w.WriteHeader(http.StatusCreated) w.WriteHeader(http.StatusCreated)
@ -143,7 +143,7 @@ func PutRepo(c web.C, w http.ResponseWriter, r *http.Request) {
PrivateKey *string `json:"private_key"` PrivateKey *string `json:"private_key"`
}{} }{}
if err := json.NewDecoder(r.Body).Decode(&in); err != nil { if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
w.WriteHeader(http.StatusBadRequest) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
@ -167,7 +167,7 @@ func PutRepo(c web.C, w http.ResponseWriter, r *http.Request) {
repo.PrivateKey = *in.PrivateKey repo.PrivateKey = *in.PrivateKey
} }
if err := datastore.PutRepo(ctx, repo); err != nil { if err := datastore.PutRepo(ctx, repo); err != nil {
w.WriteHeader(http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
json.NewEncoder(w).Encode(repo) json.NewEncoder(w).Encode(repo)