* Renamed fakeRepo to mockRepo * Changing around TODOs to capture current plans with the code. * Remove the repo interface and use a real DB for tests. * Fixed a few tests. * Adding checks for properly formatted identifiers. * Updating code to account for recent merges. Relaxing some restrictions on what an id can look like. * Added small comment explaining why RegisterGrpcGatewayer interface exists. * Move project service up a call level. Long term I think it would make sense to define these services even higher up the call stack, potentially at the initialization of the controller server, near where the DB is initialized. * Making these fields align with those in the resources under hosts/... * Hard code the service initialization in the handler registration code. * Regenerate project related code proto code. * Removing type field for project. * Adds basic project handling in CLI/SDK (#47) * Adds SDK for creating and reading projects * Reorganizes a bit * Adds CLI for creating and reading projects * Fixes some some generation bugs * Adds redirect support for default org ID * Fix protobuf import references being moved. * Update client test to look for "orgs" and "projects" instead of "org" and "project" * Update expected segments test * Fix setAddr handling when default organization is in use * Set client in target after create or read Co-authored-by: Jim Lambert <jimlambrt@Jims-MBP-3.home> Co-authored-by: Jim <jlambert@hashicorp.com> Co-authored-by: Michael Gaffney <mgaffney@users.noreply.github.com> Co-authored-by: Jeff Mitchell <jeffrey.mitchell@gmail.com>
140 lines
2.9 KiB
Go
140 lines
2.9 KiB
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
"text/template"
|
|
)
|
|
|
|
type templateType int
|
|
|
|
const (
|
|
templateTypeResource templateType = iota
|
|
templateTypeDetail
|
|
)
|
|
|
|
func writeStructTemplates() {
|
|
for _, inputStruct := range inputStructs {
|
|
outBuf := new(bytes.Buffer)
|
|
switch inputStruct.templateType {
|
|
case templateTypeResource:
|
|
structTemplate.Execute(outBuf, struct {
|
|
Name string
|
|
Package string
|
|
StructFields string
|
|
}{
|
|
Name: inputStruct.outName,
|
|
Package: inputStruct.outPkg,
|
|
StructFields: inputStruct.structFields,
|
|
})
|
|
|
|
case templateTypeDetail:
|
|
detailTemplate.Execute(outBuf, struct {
|
|
Package string
|
|
StructFields string
|
|
ParentName string
|
|
DetailName string
|
|
}{
|
|
Package: inputStruct.outPkg,
|
|
StructFields: inputStruct.structFields,
|
|
ParentName: inputStruct.parentName,
|
|
DetailName: inputStruct.detailName,
|
|
})
|
|
|
|
}
|
|
|
|
outFile, err := filepath.Abs(inputStruct.outFile)
|
|
if err != nil {
|
|
fmt.Printf("error opening file %q: %v\n", inputStruct.outFile, err)
|
|
os.Exit(1)
|
|
}
|
|
if err := ioutil.WriteFile(outFile, outBuf.Bytes(), 0644); err != nil {
|
|
fmt.Printf("error writing file %q: %v\n", outFile, err)
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
}
|
|
|
|
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 }}
|
|
}
|
|
|
|
func (s *{{ .Name }}) SetDefault(key string) {
|
|
s.defaultFields = strutil.AppendIfMissing(s.defaultFields, key)
|
|
}
|
|
|
|
func (s *{{ .Name }}) UnsetDefault(key string) {
|
|
s.defaultFields = strutil.StrListDelete(s.defaultFields, key)
|
|
}
|
|
|
|
func (s {{ .Name }}) MarshalJSON() ([]byte, error) {
|
|
m := structs.Map(s)
|
|
if m == nil {
|
|
m = make(map[string]interface{})
|
|
}
|
|
for _, k := range s.defaultFields {
|
|
m[k] = nil
|
|
}
|
|
return json.Marshal(m)
|
|
}
|
|
`))
|
|
|
|
var detailTemplate = template.Must(template.New("").Parse(
|
|
`// 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 }}
|
|
}
|
|
|
|
func (s {{ .ParentName }}) As{{ .DetailName }}() (*{{ .DetailName }}, error) {
|
|
out := &{{ .DetailName }}{
|
|
{{ .ParentName }}: &s,
|
|
}
|
|
decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
|
|
Result: out,
|
|
TagName: "json",
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error creating map decoder: %w", err)
|
|
}
|
|
|
|
if err := decoder.Decode(s.Attributes); err != nil {
|
|
return nil, fmt.Errorf("error decoding attributes map: %w", err)
|
|
}
|
|
|
|
return out, nil
|
|
}
|
|
`))
|