Make export of structs optional

hooklift · Jun 5, 2016 · b817f5c · b817f5c
1 parent 19a52ac
commit b817f5c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/cmd/gowsdl/main.go b/cmd/gowsdl/main.go
@@ -67,6 +67,7 @@ var vers = flag.Bool("v", false, "Shows gowsdl version")
 var pkg = flag.String("p", "myservice", "Package under which code will be generated")
 var outFile = flag.String("o", "myservice.go", "File where the generated code will be saved")
 var insecure = flag.Bool("i", false, "Skips TLS Verification")
+var makePublic = flag.Bool("make-public", true, "Make the generated types public/exported")
 
 func init() {
  log.SetFlags(0)
@@ -100,7 +101,7 @@ func main() {
  }
 
  // load wsdl
- gowsdl, err := gen.NewGoWSDL(wsdlPath, *pkg, *insecure)
+ gowsdl, err := gen.NewGoWSDL(wsdlPath, *pkg, *insecure, *makePublic)
  if err != nil {
  log.Fatalln(err)
  }

diff --git a/gowsdl.go b/gowsdl.go
@@ -30,6 +30,7 @@ const maxRecursion uint8 = 20
 type GoWSDL struct {
  file, pkg string
  ignoreTLS bool
+ makePublicFn func(string) string
  wsdl *WSDL
  resolvedXSDExternals map[string]bool
  currentRecursionLevel uint8
@@ -75,7 +76,7 @@ func downloadFile(url string, ignoreTLS bool) ([]byte, error) {
 }
 
 // NewGoWSDL initializes WSDL generator.
-func NewGoWSDL(file, pkg string, ignoreTLS bool) (*GoWSDL, error) {
+func NewGoWSDL(file, pkg string, ignoreTLS bool, exportAllTypes bool) (*GoWSDL, error) {
  file = strings.TrimSpace(file)
  if file == "" {
  return nil, errors.New("WSDL file is required to generate Go proxy")
@@ -85,11 +86,16 @@ func NewGoWSDL(file, pkg string, ignoreTLS bool) (*GoWSDL, error) {
  if pkg == "" {
  pkg = "myservice"
  }
+ makePublicFn := func(id string) string { return id }
+ if exportAllTypes {
+ makePublicFn = makePublic
+ }
 
  return &GoWSDL{
- file: file,
- pkg: pkg,
- ignoreTLS: ignoreTLS,
+ file: file,
+ pkg: pkg,
+ ignoreTLS: ignoreTLS,
+ makePublicFn: makePublicFn,
  }, nil
 }
 
@@ -233,7 +239,7 @@ func (g *GoWSDL) genTypes() ([]byte, error) {
  "toGoType": toGoType,
  "stripns": stripns,
  "replaceReservedWords": replaceReservedWords,
- "makePublic": makePublic,
+ "makePublic": g.makePublicFn,
  "comment": comment,
  "removeNS": removeNS,
  }
@@ -256,7 +262,7 @@ func (g *GoWSDL) genOperations() ([]byte, error) {
  "toGoType": toGoType,
  "stripns": stripns,
  "replaceReservedWords": replaceReservedWords,
- "makePublic": makePublic,
+ "makePublic": g.makePublicFn,
  "findType": g.findType,
  "findSOAPAction": g.findSOAPAction,
  "findServiceAddress": g.findServiceAddress,
@@ -277,7 +283,7 @@ func (g *GoWSDL) genHeader() ([]byte, error) {
  "toGoType": toGoType,
  "stripns": stripns,
  "replaceReservedWords": replaceReservedWords,
- "makePublic": makePublic,
+ "makePublic": g.makePublicFn,
  "findType": g.findType,
  "comment": comment,
  }

diff --git a/gowsdl_test.go b/gowsdl_test.go
@@ -14,8 +14,9 @@ import (
 
 func TestElementGenerationDoesntCommentOutStructProperty(t *testing.T) {
  g := GoWSDL{
- file: "fixtures/test.wsdl",
- pkg: "myservice",
+ file: "fixtures/test.wsdl",
+ pkg: "myservice",
+ makePublicFn: makePublic,
  }
 
  resp, err := g.Start()
@@ -37,8 +38,9 @@ func TestVboxGeneratesWithoutSyntaxErrors(t *testing.T) {
 
  for _, file := range files {
  g := GoWSDL{
- file: file,
- pkg: "myservice",
+ file: file,
+ pkg: "myservice",
+ makePublicFn: makePublic,
  }
 
  resp, err := g.Start()