Skip to content

Commit 3d3e4df

Browse files
a-hilalya-hilaly
committed
Move pkg/generate.Generator to pkg/model.Model
This patch renames every `generate.Generator` mention to `model.Model`, also all the variables and parameters that were used to represent a generator (for example `g` for generator).
1 parent 1f3c922 commit 3d3e4df

33 files changed

+262
-286
lines changed

‎cmd/ack-generate/command/apis.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
generate "github.com/aws-controllers-k8s/code-generator/pkg/generate"
2524
ackgenerate "github.com/aws-controllers-k8s/code-generator/pkg/generate/ack"
26-
"github.com/aws-controllers-k8s/code-generator/pkg/model"
25+
ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
2726
"github.com/aws-controllers-k8s/code-generator/pkg/util"
2827
)
2928

@@ -94,7 +93,7 @@ func generateAPIs(cmd *cobra.Command, args []string) error {
9493
if err := ensureSDKRepo(optCacheDir, optRefreshCache); err != nil {
9594
return err
9695
}
97-
sdkHelper := model.NewSDKHelper(sdkDir)
96+
sdkHelper := ackmodel.NewSDKHelper(sdkDir)
9897
sdkAPI, err := sdkHelper.API(svcAlias)
9998
if err != nil {
10099
newSvcAlias, err := FallBackFindServiceID(sdkDir, svcAlias)
@@ -106,13 +105,13 @@ func generateAPIs(cmd *cobra.Command, args []string) error {
106105
return fmt.Errorf("service %s not found", svcAlias)
107106
}
108107
}
109-
g, err := generate.New(
108+
model, err := ackmodel.New(
110109
sdkAPI, optGenVersion, optGeneratorConfigPath, ackgenerate.DefaultConfig,
111110
)
112111
if err != nil {
113112
return err
114113
}
115-
ts, err := ackgenerate.APIs(g, optTemplateDirs)
114+
ts, err := ackgenerate.APIs(model, optTemplateDirs)
116115
if err != nil {
117116
return err
118117
}

‎cmd/ack-generate/command/controller.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"github.com/spf13/cobra"
2727
k8sversion "k8s.io/apimachinery/pkg/version"
2828

29-
"github.com/aws-controllers-k8s/code-generator/pkg/generate"
3029
ackgenerate "github.com/aws-controllers-k8s/code-generator/pkg/generate/ack"
3130
ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
3231
)
@@ -76,13 +75,13 @@ func generateController(cmd *cobra.Command, args []string) error {
7675
if err != nil {
7776
return err
7877
}
79-
g, err := generate.New(
78+
m, err := ackmodel.New(
8079
sdkAPI, latestAPIVersion, optGeneratorConfigPath, ackgenerate.DefaultConfig,
8180
)
8281
if err != nil {
8382
return err
8483
}
85-
ts, err := ackgenerate.Controller(g, optTemplateDirs)
84+
ts, err := ackgenerate.Controller(m, optTemplateDirs)
8685
if err != nil {
8786
return err
8887
}

‎cmd/ack-generate/command/crossplane.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"github.com/pkg/errors"
2525
"github.com/spf13/cobra"
2626

27-
"github.com/aws-controllers-k8s/code-generator/pkg/generate"
2827
cpgenerate "github.com/aws-controllers-k8s/code-generator/pkg/generate/crossplane"
2928
"github.com/aws-controllers-k8s/code-generator/pkg/model"
29+
ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
3030
)
3131

3232
// crossplaneCmd is the command that generates Crossplane API types
@@ -74,14 +74,14 @@ func generateCrossplane(_ *cobra.Command, args []string) error {
7474
if os.IsNotExist(err) {
7575
cfgPath = ""
7676
}
77-
g, err := generate.New(
77+
m, err := ackmodel.New(
7878
sdkAPI, optGenVersion, cfgPath, cpgenerate.DefaultConfig,
7979
)
8080
if err != nil {
8181
return err
8282
}
8383

84-
ts, err := cpgenerate.Crossplane(g, optTemplateDirs)
84+
ts, err := cpgenerate.Crossplane(m, optTemplateDirs)
8585
if err != nil {
8686
return err
8787
}

‎cmd/ack-generate/command/olm.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/ghodss/yaml"
2323
"github.com/spf13/cobra"
2424

25-
generate "github.com/aws-controllers-k8s/code-generator/pkg/generate"
2625
ackgenerate "github.com/aws-controllers-k8s/code-generator/pkg/generate/ack"
2726
olmgenerate "github.com/aws-controllers-k8s/code-generator/pkg/generate/olm"
2827
ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
@@ -101,7 +100,7 @@ func generateOLMAssets(cmd *cobra.Command, args []string) error {
101100
if err != nil {
102101
return err
103102
}
104-
g, err := generate.New(
103+
m, err := ackmodel.New(
105104
sdkAPI, latestAPIVersion, optGeneratorConfigPath, ackgenerate.DefaultConfig,
106105
)
107106
if err != nil {
@@ -138,7 +137,7 @@ func generateOLMAssets(cmd *cobra.Command, args []string) error {
138137
}
139138

140139
// generate templates
141-
ts, err := olmgenerate.BundleAssets(g, commonMeta, svcConf, version, optTemplateDirs)
140+
ts, err := olmgenerate.BundleAssets(m, commonMeta, svcConf, version, optTemplateDirs)
142141
if err != nil {
143142
return err
144143
}

‎cmd/ack-generate/command/release.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
"github.com/aws-controllers-k8s/code-generator/pkg/generate"
2524
ackgenerate "github.com/aws-controllers-k8s/code-generator/pkg/generate/ack"
2625
ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
2726
)
@@ -80,14 +79,14 @@ func generateRelease(cmd *cobra.Command, args []string) error {
8079
return fmt.Errorf("service %s not found", svcAlias)
8180
}
8281
}
83-
g, err := generate.New(
82+
m, err := ackmodel.New(
8483
sdkAPI, "", optGeneratorConfigPath, ackgenerate.DefaultConfig,
8584
)
8685
if err != nil {
8786
return err
8887
}
8988
ts, err := ackgenerate.Release(
90-
g, optTemplateDirs,
89+
m, optTemplateDirs,
9190
releaseVersion, optImageRepository, optServiceAccountName,
9291
)
9392
if err != nil {

‎pkg/generate/ack/apis.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"strings"
1919
ttpl "text/template"
2020

21-
"github.com/aws-controllers-k8s/code-generator/pkg/generate"
2221
"github.com/aws-controllers-k8s/code-generator/pkg/generate/templateset"
2322
ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
2423
"github.com/iancoleman/strcase"
@@ -45,18 +44,18 @@ var (
4544
// APIs returns a pointer to a TemplateSet containing all the templates for
4645
// generating ACK service controller's apis/ contents
4746
func APIs(
48-
g *generate.Generator,
47+
m *ackmodel.Model,
4948
templateBasePaths []string,
5049
) (*templateset.TemplateSet, error) {
51-
enumDefs, err := g.GetEnumDefs()
50+
enumDefs, err := m.GetEnumDefs()
5251
if err != nil {
5352
return nil, err
5453
}
55-
typeDefs, err := g.GetTypeDefs()
54+
typeDefs, err := m.GetTypeDefs()
5655
if err != nil {
5756
return nil, err
5857
}
59-
crds, err := g.GetCRDs()
58+
crds, err := m.GetCRDs()
6059
if err != nil {
6160
return nil, err
6261
}
@@ -68,7 +67,7 @@ func APIs(
6867
apisFuncMap,
6968
)
7069

71-
metaVars := g.MetaVars()
70+
metaVars := m.MetaVars()
7271
apiVars := &templateAPIVars{
7372
metaVars,
7473
enumDefs,

‎pkg/generate/ack/controller.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"strings"
1919
ttpl "text/template"
2020

21-
"github.com/aws-controllers-k8s/code-generator/pkg/generate"
2221
"github.com/aws-controllers-k8s/code-generator/pkg/generate/code"
2322
ackgenconfig "github.com/aws-controllers-k8s/code-generator/pkg/generate/config"
2423
"github.com/aws-controllers-k8s/code-generator/pkg/generate/templateset"
@@ -118,15 +117,15 @@ var (
118117
// Controller returns a pointer to a TemplateSet containing all the templates
119118
// for generating ACK service controller implementations
120119
func Controller(
121-
g *generate.Generator,
120+
m *ackmodel.Model,
122121
templateBasePaths []string,
123122
) (*templateset.TemplateSet, error) {
124-
crds, err := g.GetCRDs()
123+
crds, err := m.GetCRDs()
125124
if err != nil {
126125
return nil, err
127126
}
128127

129-
metaVars := g.MetaVars()
128+
metaVars := m.MetaVars()
130129

131130
// Hook code can reference a template path, and we can look up the template
132131
// in any of our base paths...
@@ -176,7 +175,7 @@ func Controller(
176175

177176
configVars := &templateConfigVars{
178177
metaVars,
179-
g.GetConfig(),
178+
m.GetConfig(),
180179
}
181180
if err = ts.Add("pkg/resource/registry.go", "pkg/resource/registry.go.tpl", configVars); err != nil {
182181
return nil, err

‎pkg/generate/ack/hook_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestResourceHookCodeInline(t *testing.T) {
3131
basePaths := []string{}
3232
hookID := "sdk_update_pre_build_request"
3333

34-
g := testutil.NewGeneratorForService(t, "mq")
34+
g := testutil.NewModelForService(t, "mq")
3535

3636
crd := testutil.GetCRDByName(t, g, "Broker")
3737
require.NotNil(crd)
@@ -52,7 +52,7 @@ func TestResourceHookCodeTemplatePath(t *testing.T) {
5252
}
5353
hookID := "sdk_delete_pre_build_request"
5454

55-
g := testutil.NewGeneratorForService(t, "mq")
55+
g := testutil.NewModelForService(t, "mq")
5656

5757
crd := testutil.GetCRDByName(t, g, "Broker")
5858
require.NotNil(crd)

‎pkg/generate/ack/release.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"strings"
1818
ttpl "text/template"
1919

20-
"github.com/aws-controllers-k8s/code-generator/pkg/generate"
2120
"github.com/aws-controllers-k8s/code-generator/pkg/generate/templateset"
21+
ackmodel "github.com/aws-controllers-k8s/code-generator/pkg/model"
2222
)
2323

2424
var (
@@ -47,7 +47,7 @@ var (
4747
// Release returns a pointer to a TemplateSet containing all the templates for
4848
// generating an ACK service controller release (Helm artifacts, etc)
4949
func Release(
50-
g *generate.Generator,
50+
m *ackmodel.Model,
5151
templateBasePaths []string,
5252
// releaseVersion is the SemVer string describing the release that the Helm
5353
// chart will install
@@ -66,7 +66,7 @@ func Release(
6666
releaseFuncMap,
6767
)
6868

69-
metaVars := g.MetaVars()
69+
metaVars := m.MetaVars()
7070
releaseVars := &templateReleaseVars{
7171
metaVars,
7272
releaseVersion,

‎pkg/generate/apigwv2_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestAPIGatewayV2_GetTypeDefs(t *testing.T) {
2626
assert := assert.New(t)
2727
require := require.New(t)
2828

29-
g := testutil.NewGeneratorForService(t, "apigatewayv2")
29+
g := testutil.NewModelForService(t, "apigatewayv2")
3030

3131
// There is an "Api" Shape that is a struct that is an element of the
3232
// GetApis Operation. Its name conflicts with the CRD called API and thus
@@ -43,7 +43,7 @@ func TestAPIGatewayV2_Api(t *testing.T) {
4343
assert := assert.New(t)
4444
require := require.New(t)
4545

46-
g := testutil.NewGeneratorForService(t, "apigatewayv2")
46+
g := testutil.NewModelForService(t, "apigatewayv2")
4747

4848
crds, err := g.GetCRDs()
4949
require.Nil(err)
@@ -71,7 +71,7 @@ func TestAPIGatewayV2_Route(t *testing.T) {
7171
assert := assert.New(t)
7272
require := require.New(t)
7373

74-
g := testutil.NewGeneratorForService(t, "apigatewayv2")
74+
g := testutil.NewModelForService(t, "apigatewayv2")
7575

7676
crds, err := g.GetCRDs()
7777
require.Nil(err)

0 commit comments

Comments
 (0)