Skip to content

Commit f17d493

Browse files
amalavetamalavet
committed
save prog
1 parent cbc80f1 commit f17d493

7 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎codegen/cuekind/generators.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func ManifestGoGenerator(pkg string, includeSchemas bool, projectRepo, goGenPath
180180
},
181181
&jennies.ResourceClientJenny{
182182
GroupByKind: !groupKinds,
183-
}, &jennies.VersionedRouteClientJenny{})
183+
}, &jennies.GroupVersionClientJenny{})
184184
return g
185185
}
186186

‎codegen/jennies/goclients.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (r *ResourceClientJenny) Generate(appManifest codegen.AppManifest) (codejen
6161
KindName: exportField(kind.Kind),
6262
KindPrefix: prefix,
6363
Subresources: subresources,
64-
CustomRoutes: make([]templates.GoResourceClientCustomRoute, 0),
64+
CustomRoutes: make([]templates.GoClientCustomRoute, 0),
6565
}
6666
for cpath, methods := range kind.Routes {
6767
for method, route := range methods {
@@ -77,7 +77,7 @@ func (r *ResourceClientJenny) Generate(appManifest codegen.AppManifest) (codejen
7777
md.CustomRoutes = append(md.CustomRoutes, crmd)
7878
}
7979
}
80-
slices.SortFunc(md.CustomRoutes, func(a, b templates.GoResourceClientCustomRoute) int {
80+
slices.SortFunc(md.CustomRoutes, func(a, b templates.GoClientCustomRoute) int {
8181
return strings.Compare(a.TypeName, b.TypeName)
8282
})
8383

@@ -105,20 +105,20 @@ func (r *ResourceClientJenny) Generate(appManifest codegen.AppManifest) (codejen
105105
return files, nil
106106
}
107107

108-
func getCustomRouteInfo(customRoute codegen.CustomRoute) (templates.GoResourceClientCustomRoute, error) {
109-
md := templates.GoResourceClientCustomRoute{
108+
func getCustomRouteInfo(customRoute codegen.CustomRoute) (templates.GoClientCustomRoute, error) {
109+
md := templates.GoClientCustomRoute{
110110
TypeName: toExportedFieldName(customRoute.Name),
111111
HasParams: customRoute.Request.Query.Exists(),
112112
HasBody: customRoute.Request.Body.Exists(),
113113
}
114114
if md.HasParams {
115-
md.ParamValues = make([]templates.GoResourceClientParamValues, 0)
115+
md.ParamValues = make([]templates.GoCustomRouteParamValues, 0)
116116
it, err := customRoute.Request.Query.Fields()
117117
if err != nil {
118118
return md, err
119119
}
120120
for it.Next() {
121-
md.ParamValues = append(md.ParamValues, templates.GoResourceClientParamValues{
121+
md.ParamValues = append(md.ParamValues, templates.GoCustomRouteParamValues{
122122
Key: it.Selector().String(),
123123
FieldName: exportField(it.Selector().String()),
124124
})
@@ -127,20 +127,20 @@ func getCustomRouteInfo(customRoute codegen.CustomRoute) (templates.GoResourceCl
127127
return md, nil
128128
}
129129

130-
type VersionedRouteClientJenny struct{}
130+
type GroupVersionClientJenny struct{}
131131

132-
func (*VersionedRouteClientJenny) JennyName() string {
133-
return "VersionedRouteClientJenny"
132+
func (*GroupVersionClientJenny) JennyName() string {
133+
return "GroupVersionClientJenny"
134134
}
135135

136-
func (r *VersionedRouteClientJenny) Generate(appManifest codegen.AppManifest) (codejen.Files, error) {
136+
func (r *GroupVersionClientJenny) Generate(appManifest codegen.AppManifest) (codejen.Files, error) {
137137
files := make(codejen.Files, 0)
138138
for _, version := range appManifest.Versions() {
139-
md := templates.GoVersionedRouteClientMetadata{
139+
md := templates.GoGroupVersionClientMetadata{
140140
PackageName: ToPackageName(version.Name()),
141-
ClientName: "VersionRouteClient",
142-
NamespacedRoutes: make([]templates.GoResourceClientCustomRoute, 0),
143-
ClusterRoutes: make([]templates.GoResourceClientCustomRoute, 0),
141+
ClientName: "GroupVersionClient",
142+
NamespacedRoutes: make([]templates.GoClientCustomRoute, 0),
143+
ClusterRoutes: make([]templates.GoClientCustomRoute, 0),
144144
}
145145

146146
for cpath, methods := range version.Routes().Namespaced {
@@ -178,7 +178,7 @@ func (r *VersionedRouteClientJenny) Generate(appManifest codegen.AppManifest) (c
178178
}
179179

180180
b := bytes.Buffer{}
181-
err := templates.WriteGoVersionedRouteClient(md, &b)
181+
err := templates.WriteGroupVersionClient(md, &b)
182182
if err != nil {
183183
return nil, err
184184
}
@@ -193,7 +193,7 @@ func (r *VersionedRouteClientJenny) Generate(appManifest codegen.AppManifest) (c
193193
return nil, err
194194
}
195195
files = append(files, codejen.File{
196-
RelativePath: filepath.Join(ToPackageName(appManifest.Properties().Group), ToPackageName(version.Name()), "version_route_client_gen.go"),
196+
RelativePath: filepath.Join(ToPackageName(appManifest.Properties().Group), ToPackageName(version.Name()), "client_gen.go"),
197197
Data: formatted,
198198
From: []codejen.NamedJenny{r},
199199
})

codegen/templates/versionedrouteclient.tmpl renamed to codegen/templates/client.tmpl

File renamed without changes.

‎codegen/templates/templates.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var (
5050
templateTSType, _ = template.ParseFS(templates, "tstype.tmpl")
5151
templateConstants, _ = template.ParseFS(templates, "constants.tmpl")
5252
templateGoResourceClient, _ = template.ParseFS(templates, "resourceclient.tmpl")
53-
templateGoVersionedRouteClient, _ = template.ParseFS(templates, "versionedrouteclient.tmpl")
53+
templateGoVersionedRouteClient, _ = template.ParseFS(templates, "client.tmpl")
5454
templateRuntimeObject, _ = template.ParseFS(templates, "runtimeobject.tmpl")
5555

5656
templateBackendPluginRouter, _ = template.ParseFS(templates, "plugin/plugin.tmpl")
@@ -589,19 +589,19 @@ type GoResourceClientMetadata struct {
589589
KindName string
590590
KindPrefix string
591591
Subresources []GoResourceClientSubresource
592-
CustomRoutes []GoResourceClientCustomRoute
592+
CustomRoutes []GoClientCustomRoute
593593
}
594594

595-
type GoResourceClientCustomRoute struct {
595+
type GoClientCustomRoute struct {
596596
TypeName string
597597
Path string
598598
Method string
599599
HasParams bool
600600
HasBody bool
601-
ParamValues []GoResourceClientParamValues
601+
ParamValues []GoCustomRouteParamValues
602602
}
603603

604-
type GoResourceClientParamValues struct {
604+
type GoCustomRouteParamValues struct {
605605
Key string
606606
FieldName string
607607
}
@@ -616,38 +616,38 @@ func WriteGoResourceClient(metadata GoResourceClientMetadata, out io.Writer) err
616616
slices.SortFunc(metadata.Subresources, func(a, b GoResourceClientSubresource) int {
617617
return strings.Compare(a.Subresource, b.Subresource)
618618
})
619-
slices.SortFunc(metadata.CustomRoutes, func(a, b GoResourceClientCustomRoute) int {
619+
slices.SortFunc(metadata.CustomRoutes, func(a, b GoClientCustomRoute) int {
620620
return strings.Compare(fmt.Sprintf("%s|%s", a.Path, a.Method), fmt.Sprintf("%s|%s", b.Path, b.Method))
621621
})
622622
for i := 0; i < len(metadata.CustomRoutes); i++ {
623-
slices.SortFunc(metadata.CustomRoutes[i].ParamValues, func(a GoResourceClientParamValues, b GoResourceClientParamValues) int {
623+
slices.SortFunc(metadata.CustomRoutes[i].ParamValues, func(a GoCustomRouteParamValues, b GoCustomRouteParamValues) int {
624624
return strings.Compare(a.FieldName, b.FieldName)
625625
})
626626
}
627627
return templateGoResourceClient.Execute(out, metadata)
628628
}
629629

630-
type GoVersionedRouteClientMetadata struct {
630+
type GoGroupVersionClientMetadata struct {
631631
PackageName string
632632
ClientName string
633-
NamespacedRoutes []GoResourceClientCustomRoute
634-
ClusterRoutes []GoResourceClientCustomRoute
633+
NamespacedRoutes []GoClientCustomRoute
634+
ClusterRoutes []GoClientCustomRoute
635635
}
636636

637-
func WriteGoVersionedRouteClient(metadata GoVersionedRouteClientMetadata, out io.Writer) error {
638-
slices.SortFunc(metadata.NamespacedRoutes, func(a, b GoResourceClientCustomRoute) int {
637+
func WriteGroupVersionClient(metadata GoGroupVersionClientMetadata, out io.Writer) error {
638+
slices.SortFunc(metadata.NamespacedRoutes, func(a, b GoClientCustomRoute) int {
639639
return strings.Compare(fmt.Sprintf("%s|%s", a.Path, a.Method), fmt.Sprintf("%s|%s", b.Path, b.Method))
640640
})
641-
slices.SortFunc(metadata.ClusterRoutes, func(a, b GoResourceClientCustomRoute) int {
641+
slices.SortFunc(metadata.ClusterRoutes, func(a, b GoClientCustomRoute) int {
642642
return strings.Compare(fmt.Sprintf("%s|%s", a.Path, a.Method), fmt.Sprintf("%s|%s", b.Path, b.Method))
643643
})
644644
for i := 0; i < len(metadata.NamespacedRoutes); i++ {
645-
slices.SortFunc(metadata.NamespacedRoutes[i].ParamValues, func(a GoResourceClientParamValues, b GoResourceClientParamValues) int {
645+
slices.SortFunc(metadata.NamespacedRoutes[i].ParamValues, func(a GoCustomRouteParamValues, b GoCustomRouteParamValues) int {
646646
return strings.Compare(a.FieldName, b.FieldName)
647647
})
648648
}
649649
for i := 0; i < len(metadata.ClusterRoutes); i++ {
650-
slices.SortFunc(metadata.ClusterRoutes[i].ParamValues, func(a GoResourceClientParamValues, b GoResourceClientParamValues) int {
650+
slices.SortFunc(metadata.ClusterRoutes[i].ParamValues, func(a GoCustomRouteParamValues, b GoCustomRouteParamValues) int {
651651
return strings.Compare(a.FieldName, b.FieldName)
652652
})
653653
}

codegen/testing/golden_generated/go/groupbygroup/testapp/v3/version_route_client_gen.go.txt renamed to codegen/testing/golden_generated/go/groupbygroup/testapp/v3/client_gen.go.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,30 @@ import (
1111
"github.com/grafana/grafana-app-sdk/resource"
1212
)
1313

14-
type VersionRouteClient struct {
14+
type GroupVersionClient struct {
1515
client resource.GroupVersionClient
1616
}
1717

18-
func NewVersionRouteClient(client resource.GroupVersionClient) *VersionRouteClient {
19-
return &VersionRouteClient{
18+
func NewGroupVersionClient(client resource.GroupVersionClient) *GroupVersionClient {
19+
return &GroupVersionClient{
2020
client: client,
2121
}
2222
}
2323

24-
func NewVersionRouteClientFromGenerator(generator resource.ClientGenerator) (*VersionRouteClient, error) {
24+
func NewGroupVersionClientFromGenerator(generator resource.ClientGenerator) (*GroupVersionClient, error) {
2525
client, err := generator.ClientForGV(GroupVersion)
2626
if err != nil {
2727
return nil, err
2828
}
29-
return NewVersionRouteClient(client), nil
29+
return NewGroupVersionClient(client), nil
3030
}
3131

3232
type CreateFoobarRequest struct {
3333
Body CreateFoobarRequestBody
3434
Headers http.Header
3535
}
3636

37-
func (c *VersionRouteClient) CreateFoobar(ctx context.Context, namespace string, request CreateFoobarRequest) (*CreateFoobarResponse, error) {
37+
func (c *GroupVersionClient) CreateFoobar(ctx context.Context, namespace string, request CreateFoobarRequest) (*CreateFoobarResponse, error) {
3838
body, err := json.Marshal(request.Body)
3939
if err != nil {
4040
return nil, fmt.Errorf("unable to marshal body to JSON: %w", err)

examples/apiserver/apis/example/v1alpha1/version_route_client_gen.go renamed to examples/apiserver/apis/example/v1alpha1/client_gen.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ import (
1212
"github.com/grafana/grafana-app-sdk/resource"
1313
)
1414

15-
type VersionRouteClient struct {
15+
type GroupVersionClient struct {
1616
client resource.GroupVersionClient
1717
}
1818

19-
func NewVersionRouteClient(client resource.GroupVersionClient) *VersionRouteClient {
20-
return &VersionRouteClient{
19+
func NewGroupVersionClient(client resource.GroupVersionClient) *GroupVersionClient {
20+
return &GroupVersionClient{
2121
client: client,
2222
}
2323
}
2424

25-
func NewVersionRouteClientFromGenerator(generator resource.ClientGenerator) (*VersionRouteClient, error) {
25+
func NewGroupVersionClientFromGenerator(generator resource.ClientGenerator) (*GroupVersionClient, error) {
2626
client, err := generator.ClientForGV(GroupVersion)
2727
if err != nil {
2828
return nil, err
2929
}
30-
return NewVersionRouteClient(client), nil
30+
return NewGroupVersionClient(client), nil
3131
}
3232

3333
type GetFoobarRequest struct {
@@ -36,7 +36,7 @@ type GetFoobarRequest struct {
3636
Headers http.Header
3737
}
3838

39-
func (c *VersionRouteClient) GetFoobar(ctx context.Context, namespace string, request GetFoobarRequest) (*GetFoobarResponse, error) {
39+
func (c *GroupVersionClient) GetFoobar(ctx context.Context, namespace string, request GetFoobarRequest) (*GetFoobarResponse, error) {
4040
params := url.Values{}
4141
params.Set("foo", fmt.Sprintf("%v", request.Params.Foo))
4242
body, err := json.Marshal(request.Body)
@@ -65,7 +65,7 @@ type GetClusterFoobarRequest struct {
6565
Headers http.Header
6666
}
6767

68-
func (c *VersionRouteClient) GetClusterFoobar(ctx context.Context, request GetClusterFoobarRequest) (*GetClusterFoobarResponse, error) {
68+
func (c *GroupVersionClient) GetClusterFoobar(ctx context.Context, request GetClusterFoobarRequest) (*GetClusterFoobarResponse, error) {
6969
resp, err := c.client.CustomRouteRequest(ctx, "", "", "", resource.CustomRouteRequestOptions{
7070
Path: "/foobar",
7171
Verb: "GET",

examples/apiserver/apis/example/v2alpha1/version_route_client_gen.go renamed to examples/apiserver/apis/example/v2alpha1/client_gen.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@ import (
99
"github.com/grafana/grafana-app-sdk/resource"
1010
)
1111

12-
type VersionRouteClient struct {
12+
type GroupVersionClient struct {
1313
client resource.GroupVersionClient
1414
}
1515

16-
func NewVersionRouteClient(client resource.GroupVersionClient) *VersionRouteClient {
17-
return &VersionRouteClient{
16+
func NewGroupVersionClient(client resource.GroupVersionClient) *GroupVersionClient {
17+
return &GroupVersionClient{
1818
client: client,
1919
}
2020
}
2121

22-
func NewVersionRouteClientFromGenerator(generator resource.ClientGenerator) (*VersionRouteClient, error) {
22+
func NewGroupVersionClientFromGenerator(generator resource.ClientGenerator) (*GroupVersionClient, error) {
2323
client, err := generator.ClientForGV(GroupVersion)
2424
if err != nil {
2525
return nil, err
2626
}
27-
return NewVersionRouteClient(client), nil
27+
return NewGroupVersionClient(client), nil
2828
}
2929

3030
type GetExampleRequest struct {
3131
Headers http.Header
3232
}
3333

34-
func (c *VersionRouteClient) GetExample(ctx context.Context, namespace string, request GetExampleRequest) (*GetExampleResponse, error) {
34+
func (c *GroupVersionClient) GetExample(ctx context.Context, namespace string, request GetExampleRequest) (*GetExampleResponse, error) {
3535
resp, err := c.client.CustomRouteRequest(ctx, namespace, "", "", resource.CustomRouteRequestOptions{
3636
Path: "/example",
3737
Verb: "GET",

0 commit comments

Comments
 (0)