* 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>
117 lines
3.1 KiB
Go
117 lines
3.1 KiB
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
"strings"
|
|
"text/template"
|
|
)
|
|
|
|
type readInfo struct {
|
|
baseType string
|
|
targetType string
|
|
verb string
|
|
path string
|
|
}
|
|
|
|
var readFuncs = map[string][]*readInfo{
|
|
"scopes": {
|
|
{
|
|
"Organization",
|
|
"Project",
|
|
"GET",
|
|
"projects/%s",
|
|
},
|
|
},
|
|
}
|
|
|
|
func writeReadFuncs() {
|
|
for outPkg, funcs := range readFuncs {
|
|
outFile := os.Getenv("GEN_BASEPATH") + fmt.Sprintf("/api/%s/read.gen.go", outPkg)
|
|
outBuf := bytes.NewBuffer([]byte(fmt.Sprintf(
|
|
`// Code generated by "make api"; DO NOT EDIT.
|
|
package %s
|
|
`, outPkg)))
|
|
for _, readInfo := range funcs {
|
|
readFuncTemplate.Execute(outBuf, struct {
|
|
BaseType string
|
|
TargetType string
|
|
LowerTargetType string
|
|
Verb string
|
|
Path string
|
|
}{
|
|
BaseType: readInfo.baseType,
|
|
TargetType: readInfo.targetType,
|
|
LowerTargetType: strings.ToLower(readInfo.targetType),
|
|
Verb: readInfo.verb,
|
|
Path: readInfo.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 readFuncTemplate = template.Must(template.New("").Parse(
|
|
`
|
|
func (s {{ .BaseType }}) Read{{ .TargetType }}(ctx context.Context, {{ .LowerTargetType }} *{{ .TargetType }}) (*{{ .TargetType }}, *api.Error, error) {
|
|
if s.Client == nil {
|
|
return nil, nil, fmt.Errorf("nil client in Read{{ .TargetType }} request")
|
|
}
|
|
if s.Id == "" {
|
|
{{ if (eq .BaseType "Organization") }}
|
|
// Assume the client has been configured with organization already and
|
|
// move on
|
|
{{ else if (eq .BaseType "Project") }}
|
|
// Assume the client has been configured with project already and move
|
|
// on
|
|
{{ else }}
|
|
return nil, nil, fmt.Errorf("missing {{ .BaseType }} ID in Read{{ .TargetType }} request")
|
|
{{ end }}
|
|
} else {
|
|
// If it's explicitly set here, override anything that might be in the
|
|
// client
|
|
{{ if (eq .BaseType "Organization") }}
|
|
ctx = context.WithValue(ctx, "org", s.Id)
|
|
{{ else if (eq .BaseType "Project") }}
|
|
ctx = context.WithValue(ctx, "project", s.Id)
|
|
{{ end }}
|
|
}
|
|
if {{ .LowerTargetType }}.Id == "" {
|
|
return nil, nil, fmt.Errorf("empty {{ .LowerTargetType }} ID field in Read{{ .TargetType }} request")
|
|
}
|
|
|
|
req, err := s.Client.NewRequest(ctx, "{{ .Verb }}", fmt.Sprintf("{{ .Path }}", {{ .LowerTargetType }}.Id), {{ .LowerTargetType }})
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("error creating Read{{ .TargetType }} request: %w", err)
|
|
}
|
|
|
|
resp, err := s.Client.Do(req)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("error performing client request during Read{{ .TargetType }} call: %w", err)
|
|
}
|
|
|
|
target := new({{ .TargetType }})
|
|
apiErr, err := resp.Decode(target)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("error decoding Read{{ .TargetType }} repsonse: %w", err)
|
|
}
|
|
|
|
{{ if (eq .TargetType "Organization") }}
|
|
target.Client = s.Client.Clone()
|
|
target.Client.SetOrgnization(target.Id)
|
|
{{ else if (eq .TargetType "Project") }}
|
|
target.Client = s.Client.Clone()
|
|
target.Client.SetProject(target.Id)
|
|
{{ else }}
|
|
target.Client = s.Client
|
|
{{ end }}
|
|
|
|
return target, apiErr, nil
|
|
}
|
|
`))
|