Merge branch 'refs/heads/render-service' into e2e-example

pkg/generate/generator.go

@@ -119,6 +119,7 @@ func (c *Creator) createFile(filePath string) (*os.File, error) {
 func (c *Creator) parseTemplate(templateName string) (*template.Template, error) {
 	templatePath := filepath.Join(c.TemplatesDir, templateName)
 	funcMap := template.FuncMap{
+		"renderImports":             translate.RenderImports,
 		"packageName":               translate.PackageName,
 		"locationType":              translate.LocationType,
 		"specParamType":             translate.SpecParamType,

pkg/translate/imports.go

@@ -0,0 +1,31 @@
+package translate
+
+import "github.com/paloaltonetworks/pan-os-codegen/pkg/imports"
+
+func RenderImports(templateType string) (string, error) {
+	manager := imports.NewManager()
+
+	switch templateType {
+	case "entry":
+		manager.AddStandardImport("encoding/xml", "")
+		manager.AddStandardImport("fmt", "")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/filtering", "filtering")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/generic", "generic")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/util", "util")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/version", "version")
+	case "location":
+		manager.AddStandardImport("fmt", "")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/errors", "errors")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/util", "util")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/version", "version")
+	case "service":
+		manager.AddStandardImport("context", "")
+		manager.AddStandardImport("fmt", "")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/errors", "errors")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/filtering", "filtering")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/util", "util")
+		manager.AddSdkImport("github.com/PaloAltoNetworks/pango/xmlapi", "xmlapi")
+	}
+
+	return manager.RenderImports()
+}

pkg/translate/imports_test.go

@@ -0,0 +1,25 @@
+package translate
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestRenderImports(t *testing.T) {
+	// given
+	expectedImports := `
+import (
+    "fmt"
+
+    errors "github.com/PaloAltoNetworks/pango/errors"
+    util "github.com/PaloAltoNetworks/pango/util"
+    version "github.com/PaloAltoNetworks/pango/version"
+)`
+
+	// when
+	actualImports, _ := RenderImports("location")
+
+	// then
+	assert.NotNil(t, actualImports)
+	assert.Equal(t, expectedImports, actualImports)
+}

templates/sdk/entry.tmpl

@@ -1,15 +1,7 @@
 {{- if .Entry}}
     package {{packageName .GoSdkPath}}
 
-    import (
-    "encoding/xml"
-    "fmt"
-
-    "github.com/PaloAltoNetworks/pango/filtering"
-    "github.com/PaloAltoNetworks/pango/generic"
-    "github.com/PaloAltoNetworks/pango/util"
-    "github.com/PaloAltoNetworks/pango/version"
-    )
+    {{renderImports "entry"}}
 
     var (
     _ filtering.Fielder = &Entry{}

templates/sdk/location.tmpl

@@ -1,12 +1,6 @@
 package {{packageName .GoSdkPath}}
 
-import (
-"fmt"
-
-"github.com/PaloAltoNetworks/pango/errors"
-"github.com/PaloAltoNetworks/pango/util"
-"github.com/PaloAltoNetworks/pango/version"
-)
+{{renderImports "location"}}
 
 type Location struct {
 {{range $key, $location := .Locations}}

templates/sdk/service.tmpl

@@ -1,14 +1,6 @@
 package {{packageName .GoSdkPath}}
 {{- if .Entry}}
-    import (
-    "context"
-    "fmt"
-
-    "github.com/PaloAltoNetworks/pango/errors"
-    "github.com/PaloAltoNetworks/pango/filtering"
-    "github.com/PaloAltoNetworks/pango/util"
-    "github.com/PaloAltoNetworks/pango/xmlapi"
-    )
+    {{renderImports "service"}}
 
     type Service struct {
     client util.PangoClient
@@ -155,6 +147,7 @@ package {{packageName .GoSdkPath}}
     Action:  "rename",
     Xpath:   util.AsXpath(path),
     NewName: entry.Name,
+    Target:  s.client.GetTarget(),
     })
     } else {
     old, err = s.Read(ctx, loc, entry.Name, "get")
@@ -178,6 +171,7 @@ package {{packageName .GoSdkPath}}
     Action:  "edit",
     Xpath:   util.AsXpath(path),
     Element: updateSpec,
+    Target:  s.client.GetTarget(),
     })
     }
 
@@ -357,6 +351,7 @@ package {{packageName .GoSdkPath}}
     Action:  "edit",
     Xpath:   util.AsXpath(path),
     Element: elm,
+    Target:  s.client.GetTarget(),
     })
     }
     break
@@ -378,6 +373,7 @@ package {{packageName .GoSdkPath}}
     Action:  "set",
     Xpath:   util.AsXpath(path),
     Element: elm,
+    Target:  s.client.GetTarget(),
     })
     }
     }