make SoapFault optional, don't include it in request

hooklift · Sep 2, 2014 · cf53c5c · cf53c5c
1 parent ae3c821
commit cf53c5c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/cli.go b/cli.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"runtime"
 
-	gen "github.com/cloudescape/gowsdl/generator"
+	gen "github.com/cloudscape/gowsdl/generator"
 	flags "github.com/jessevdk/go-flags"
 )
 

diff --git a/generator/header_tmpl.go b/generator/header_tmpl.go
@@ -7,7 +7,7 @@ package {{.}}
 // Copyright (c) 2014, Cloudescape. All rights reserved.
 import (
 	"time"
-	gowsdl "github.com/cloudescape/gowsdl/generator"
+	gowsdl "github.com/cloudscape/gowsdl/generator"
 	{{/*range .Imports*/}}
 		{{/*.*/}}
 	{{/*end*/}}

diff --git a/generator/soap.go b/generator/soap.go
@@ -19,7 +19,7 @@ func init() {
 type SoapEnvelope struct {
 	XMLName       xml.Name   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
 	EncodingStyle string     `xml:"http://schemas.xmlsoap.org/soap/encoding/ encodingStyle,attr"`
-	Header        SoapHeader `xml:"http://schemas.xmlsoap.org/soap/envelope/ Header"`
+	Header        SoapHeader `xml:"http://schemas.xmlsoap.org/soap/envelope/ Header,omitempty"`
 	Body          SoapBody   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Body"`
 }
 
@@ -29,7 +29,7 @@ type SoapHeader struct {
 
 type SoapBody struct {
 	Body  string    `xml:",innerxml"`
-	Fault SoapFault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault"`
+	Fault *SoapFault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
 }
 
 type SoapFault struct {
@@ -72,6 +72,10 @@ func (s *SoapClient) Call(soapAction string, request, response interface{}) erro
 	//encoder.Indent("  ", "    ")
 
 	err = encoder.Encode(envelope)
+	if err == nil {
+		err = encoder.Flush()
+	}
+	Log.Debug("encoded", "envelope", log15.Lazy{func() string { return buffer.String() }})
 	if err != nil {
 		return err
 	}