Add create function template and fix some minor template bugs (#23)

api/error.go

@@ -1,10 +1,11 @@
-// Code generated by go generate; DO NOT EDIT.
+// Code generated by "make api"; DO NOT EDIT.
 package api
 
 import (
 	"encoding/json"
 
 	"github.com/fatih/structs"
+
 	"github.com/hashicorp/watchtower/api/internal/strutil"
 )
 

api/error_details.go

@@ -1,10 +1,11 @@
-// Code generated by go generate; DO NOT EDIT.
+// Code generated by "make api"; DO NOT EDIT.
 package api
 
 import (
 	"encoding/json"
 
 	"github.com/fatih/structs"
+
 	"github.com/hashicorp/watchtower/api/internal/strutil"
 )
 

api/hosts/awsec2_host_catalog.go

@@ -1,4 +1,4 @@
-// Code generated by go generate; DO NOT EDIT.
+// Code generated by "make api"; DO NOT EDIT.
 package hosts
 
 import (

api/hosts/create.go

@@ -0,0 +1,63 @@
+// Code generated by "make api"; DO NOT EDIT.
+package hosts
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/watchtower/api"
+)
+
+func (s HostCatalog) CreateHost(ctx context.Context, host *Host) (*Host, *api.Error, error) {
+	if s.Client == nil {
+		return nil, nil, fmt.Errorf("nil client in CreateHost request")
+	}
+	if s.Id == nil || *s.Id == "" {
+		return nil, nil, fmt.Errorf("missing catalog ID in CreateHost request")
+	}
+
+	req, err := s.Client.NewRequest(ctx, "PUT", fmt.Sprintf("host-catalogs/%s/hosts", *s.Id), host)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error creating CreateHost request: %w", err)
+	}
+
+	resp, err := s.Client.Do(req)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error performing client request during CreateHost call: %w", err)
+	}
+
+	target := new(Host)
+	apiErr, err := resp.Decode(target)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error decoding CreateHost repsonse: %w", err)
+	}
+
+	return target, apiErr, nil
+}
+
+func (s HostCatalog) CreateHostSet(ctx context.Context, hostset *HostSet) (*HostSet, *api.Error, error) {
+	if s.Client == nil {
+		return nil, nil, fmt.Errorf("nil client in CreateHostSet request")
+	}
+	if s.Id == nil || *s.Id == "" {
+		return nil, nil, fmt.Errorf("missing catalog ID in CreateHostSet request")
+	}
+
+	req, err := s.Client.NewRequest(ctx, "PUT", fmt.Sprintf("host-catalogs/%s/host-sets", *s.Id), hostset)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error creating CreateHostSet request: %w", err)
+	}
+
+	resp, err := s.Client.Do(req)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error performing client request during CreateHostSet call: %w", err)
+	}
+
+	target := new(HostSet)
+	apiErr, err := resp.Decode(target)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error decoding CreateHostSet repsonse: %w", err)
+	}
+
+	return target, apiErr, nil
+}

api/hosts/host.go

@@ -1,4 +1,4 @@
-// Code generated by go generate; DO NOT EDIT.
+// Code generated by "make api"; DO NOT EDIT.
 package hosts
 
 import (
@@ -6,15 +6,19 @@ import (
 	"time"
 
 	"github.com/fatih/structs"
+
+	"github.com/hashicorp/watchtower/api"
 	"github.com/hashicorp/watchtower/api/internal/strutil"
 )
 
 type Host struct {
+	Client *api.Client `json:"-"`
+
 	defaultFields []string
 
-	// Canonical path of the resource from the API's base URI
+	// The ID of the host
 	// Output only.
-	Path *string `json:"path,omitempty"`
+	Id *string `json:"id,omitempty"`
 	// The type of the resource, to help differentiate schemas
 	Type *string `json:"type,omitempty"`
 	// Friendly name, if set

api/hosts/host_catalog.go

@@ -1,4 +1,4 @@
-// Code generated by go generate; DO NOT EDIT.
+// Code generated by "make api"; DO NOT EDIT.
 package hosts
 
 import (
@@ -6,15 +6,19 @@ import (
 	"time"
 
 	"github.com/fatih/structs"
+
+	"github.com/hashicorp/watchtower/api"
 	"github.com/hashicorp/watchtower/api/internal/strutil"
 )
 
 type HostCatalog struct {
+	Client *api.Client `json:"-"`
+
 	defaultFields []string
 
-	// Canonical path of the resource from the API's base URI
+	// The ID of the host
 	// Output only.
-	Path *string `json:"path,omitempty"`
+	Id *string `json:"id,omitempty"`
 	// The type of the resource, to help differentiate schemas
 	Type *string `json:"type,omitempty"`
 	// Friendly name, if set

api/hosts/host_set.go

@@ -1,4 +1,4 @@
-// Code generated by go generate; DO NOT EDIT.
+// Code generated by "make api"; DO NOT EDIT.
 package hosts
 
 import (
@@ -6,15 +6,19 @@ import (
 	"time"
 
 	"github.com/fatih/structs"
+
+	"github.com/hashicorp/watchtower/api"
 	"github.com/hashicorp/watchtower/api/internal/strutil"
 )
 
 type HostSet struct {
+	Client *api.Client `json:"-"`
+
 	defaultFields []string
 
-	// Canonical path of the resource from the API's base URI
+	// The ID of the host
 	// Output only.
-	Path *string `json:"path,omitempty"`
+	Id *string `json:"id,omitempty"`
 	// The type of the resource, to help differentiate schemas
 	Type *string `json:"type,omitempty"`
 	// Friendly name, if set

api/hosts/static_host_catalog.go

@@ -1,4 +1,4 @@
-// Code generated by go generate; DO NOT EDIT.
+// Code generated by "make api"; DO NOT EDIT.
 package hosts
 
 import (

api/internal/genapi/create.go

@@ -0,0 +1,95 @@
+// +build genapi
+
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"strings"
+	"text/template"
+)
+
+type createInfo struct {
+	baseType   string
+	targetType string
+	verb       string
+	path       string
+}
+
+var createFuncs = map[string][]*createInfo{
+	"hosts": {
+		{
+			"HostCatalog",
+			"Host",
+			"PUT",
+			"host-catalogs/%s/hosts",
+		},
+		{
+			"HostCatalog",
+			"HostSet",
+			"PUT",
+			"host-catalogs/%s/host-sets",
+		},
+	},
+}
+
+func writeCreateFuncs() {
+	for outPkg, funcs := range createFuncs {
+		outFile := os.Getenv("APIGEN_BASEPATH") + fmt.Sprintf("/api/%s/create.go", outPkg)
+		outBuf := bytes.NewBuffer([]byte(fmt.Sprintf(
+			`// Code generated by "make api"; DO NOT EDIT.
+package %s
+`, outPkg)))
+		for _, createInfo := range funcs {
+			createFuncTemplate.Execute(outBuf, struct {
+				BaseType        string
+				TargetType      string
+				LowerTargetType string
+				Verb            string
+				Path            string
+			}{
+				BaseType:        createInfo.baseType,
+				TargetType:      createInfo.targetType,
+				LowerTargetType: strings.ToLower(createInfo.targetType),
+				Verb:            createInfo.verb,
+				Path:            createInfo.path,
+			})
+		}
+		if err := ioutil.WriteFile(outFile, outBuf.Bytes(), 0644); err != nil {
+			fmt.Printf("error writing file %q: %v\n", outFile, err)
+			os.Exit(1)
+		}
+	}
+}
+
+var createFuncTemplate = template.Must(template.New("").Parse(
+	`
+func (s {{ .BaseType }}) Create{{ .TargetType }}(ctx context.Context, {{ .LowerTargetType }} *{{ .TargetType }}) (*{{ .TargetType }}, *api.Error, error) {
+	if s.Client == nil {
+		return nil, nil, fmt.Errorf("nil client in Create{{ .TargetType }} request")
+	}
+	if s.Id == nil || *s.Id == "" {
+		return nil, nil, fmt.Errorf("missing catalog ID in Create{{ .TargetType }} request")
+	}
+
+	req, err := s.Client.NewRequest(ctx, "{{ .Verb }}", fmt.Sprintf("{{ .Path }}", *s.Id), {{ .LowerTargetType }})
+	if err != nil {
+		return nil, nil, fmt.Errorf("error creating Create{{ .TargetType }} request: %w", err)
+	}
+
+	resp, err := s.Client.Do(req)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error performing client request during Create{{ .TargetType }} call: %w", err)
+	}
+
+	target := new({{ .TargetType }})
+	apiErr, err := resp.Decode(target)
+	if err != nil {
+		return nil, nil, fmt.Errorf("error decoding Create{{ .TargetType }} repsonse: %w", err)
+	}
+
+	return target, apiErr, nil
+}
+	`))

api/internal/genapi/input.go

@@ -4,7 +4,7 @@ package main
 
 import "os"
 
-type generateInfo struct {
+type structInfo struct {
 	inFile       string
 	inName       string
 	outFile      string
@@ -16,7 +16,7 @@ type generateInfo struct {
 	templateType templateType
 }
 
-var inputStructs = []*generateInfo{
+var inputStructs = []*structInfo{
 	{
 		os.Getenv("APIGEN_BASEPATH") + "/internal/gen/controller/api/error.pb.go",
 		"Error",

api/internal/genapi/main.go

@@ -4,5 +4,6 @@ package main
 
 func main() {
 	parsePBs()
-	writeTemplates()
+	writeStructTemplates()
+	writeCreateFuncs()
 }

api/internal/genapi/templates.go

@@ -9,7 +9,6 @@ import (
 	"os"
 	"path/filepath"
 	"text/template"
-	"time"
 )
 
 type templateType int
@@ -19,13 +18,12 @@ const (
 	templateTypeDetail
 )
 
-func writeTemplates() {
+func writeStructTemplates() {
 	for _, inputStruct := range inputStructs {
 		outBuf := new(bytes.Buffer)
 		switch inputStruct.templateType {
 		case templateTypeResource:
-			utilFuncsTemplate.Execute(outBuf, struct {
-				Timestamp    time.Time
+			structTemplate.Execute(outBuf, struct {
 				Name         string
 				Package      string
 				StructFields string
@@ -37,7 +35,6 @@ func writeTemplates() {
 
 		case templateTypeDetail:
 			detailTemplate.Execute(outBuf, struct {
-				Timestamp    time.Time
 				Package      string
 				StructFields string
 				ParentName   string
@@ -63,18 +60,25 @@ func writeTemplates() {
 	}
 }
 
-var utilFuncsTemplate = template.Must(template.New("").Parse(
-	`// Code generated by go generate; DO NOT EDIT.
+var structTemplate = template.Must(template.New("").Parse(
+	`// Code generated by "make api"; DO NOT EDIT.
 package {{ .Package }} 
 
 import (
+	"context"
 	"encoding/json"
 
 	"github.com/fatih/structs"
+
+	"github.com/hashicorp/watchtower/api"
 	"github.com/hashicorp/watchtower/api/internal/strutil"
 )
 
 type {{ .Name }} struct {
+	{{ if (not (eq .Package "api")) }}
+	Client *api.Client ` + "`json:\"-\"`" + `
+	{{ end }}
+
 	{{ .StructFields }}
 }
 
@@ -99,17 +103,20 @@ func (s {{ .Name }}) MarshalJSON() ([]byte, error) {
 `))
 
 var detailTemplate = template.Must(template.New("").Parse(
-	`// Code generated by go generate; DO NOT EDIT.
+	`// Code generated by "make api"; DO NOT EDIT.
 package {{ .Package }}
 
 import (
 	"fmt"
 
 	"github.com/mitchellh/mapstructure"
+
+	"github.com/hashicorp/watchtower/api"
 )
 
 type {{ .DetailName }} struct {
 	*{{ .ParentName }}
+
 	{{ .StructFields }}
 }