diff --git a/internal/super/generator/generator.go b/internal/super/generator/generator.go index 9d71367d2..d74bc212f 100644 --- a/internal/super/generator/generator.go +++ b/internal/super/generator/generator.go @@ -45,13 +45,7 @@ type TemplateItem interface { UpdateState(state *flowkit.State) error } -//go:generate mockery --name Generator --case underscore -type Generator interface { - // Create generates files from the provided template items - Create(items ...TemplateItem) error -} - -type GeneratorImpl struct { +type Generator struct { directory string state *flowkit.State logger output.Logger @@ -65,8 +59,8 @@ func NewGenerator( logger output.Logger, disableLogs, saveState bool, -) *GeneratorImpl { - return &GeneratorImpl{ +) *Generator { + return &Generator{ directory: directory, state: state, logger: logger, @@ -75,7 +69,7 @@ func NewGenerator( } } -func (g *GeneratorImpl) Create(items ...TemplateItem) error { +func (g *Generator) Create(items ...TemplateItem) error { for _, item := range items { err := g.generate(item) if err != nil { @@ -86,7 +80,7 @@ func (g *GeneratorImpl) Create(items ...TemplateItem) error { return nil } -func (g *GeneratorImpl) generate(item TemplateItem) error { +func (g *Generator) generate(item TemplateItem) error { rootDir := g.directory targetRelativeToRoot := item.GetTargetPath() @@ -139,7 +133,7 @@ func (g *GeneratorImpl) generate(item TemplateItem) error { // processTemplate reads a template file from the embedded filesystem and processes it with the provided data // If you don't need to provide data, pass nil -func (g *GeneratorImpl) processTemplate(templatePath string, data map[string]interface{}) (string, error) { +func (g *Generator) processTemplate(templatePath string, data map[string]interface{}) (string, error) { templateData, err := templatesFS.ReadFile(filepath.Join("templates", templatePath)) if err != nil { return "", fmt.Errorf("failed to read template file: %w", err) diff --git a/internal/super/generator/mocks/generator.go b/internal/super/generator/mocks/generator.go deleted file mode 100644 index c4e4e4a6e..000000000 --- a/internal/super/generator/mocks/generator.go +++ /dev/null @@ -1,51 +0,0 @@ -// Code generated by mockery v2.40.3. DO NOT EDIT. - -package mocks - -import ( - generator "github.com/onflow/flow-cli/internal/super/generator" - mock "github.com/stretchr/testify/mock" -) - -// Generator is an autogenerated mock type for the Generator type -type Generator struct { - mock.Mock -} - -// Create provides a mock function with given fields: items -func (_m *Generator) Create(items ...generator.TemplateItem) error { - _va := make([]interface{}, len(items)) - for _i := range items { - _va[_i] = items[_i] - } - var _ca []interface{} - _ca = append(_ca, _va...) - ret := _m.Called(_ca...) - - if len(ret) == 0 { - panic("no return value specified for Create") - } - - var r0 error - if rf, ok := ret.Get(0).(func(...generator.TemplateItem) error); ok { - r0 = rf(items...) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// NewGenerator creates a new instance of Generator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -// The first argument is typically a *testing.T value. -func NewGenerator(t interface { - mock.TestingT - Cleanup(func()) -}) *Generator { - mock := &Generator{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -}