diff --git a/README.md b/README.md index 010b709..a8e0866 100644 --- a/README.md +++ b/README.md @@ -57,13 +57,18 @@ atomctl new project # 在已有 go.mod 的项目中就地初始化 - 功能：创建 Provider 脚手架到 `providers/` - 参数： - - ``：必填，provider 名称（例如 `cache`、`email`） + - ``：可选。省略名称时会列出可用的内置预置 providers 供选择 - 选项：继承 `--dry-run`、`--dir` +- 行为： + - 若 `` 与内置 `templates/providers/` 目录同名，则渲染该目录 + - 否则回退渲染 `templates/providers/default` 到 `providers/` 示例： ``` -atomctl new provider email +atomctl new provider # 列出可用预置 providers +atomctl new provider redis # 渲染 providers/redis 预置 +atomctl new provider email # 未命中预置，回退 default 渲染到 providers/email atomctl new --dry-run --dir ./demo provider cache ``` @@ -78,7 +83,7 @@ atomctl new --dry-run --dir ./demo provider cache - 行为说明： - 生成 publisher 到 `app/events/publishers/.go` - 生成 subscriber 到 `app/events/subscribers/.go` - - 追加常量到 `app/events/topics.go`：`const Topic{Name} = ""`（避免重复） + - 追加常量到 `app/events/topics.go`：`const Topic{Name} = "event:"`（避免重复） 示例： @@ -89,15 +94,18 @@ atomctl new event UserCreated --only=publisher ### new job -- 功能：生成任务模板到 `app/jobs/.go` +- 功能：生成任务模板文件；支持可选的定时任务模板 - 参数： - ``：必填，任务名 -- 选项：继承 `--dry-run`、`--dir` +- 选项： + - 继承 `--dry-run`、`--dir` + - `--cron`：除生成 `app/jobs/.go` 外，额外生成 `app/jobs/cron_.go` 示例： ``` -atomctl new job SendDailyReport +atomctl new job SendDailyReport # 生成 app/jobs/send_daily_report.go +atomctl new job SendDailyReport --cron # 同时生成 cron 版本 app/jobs/cron_send_daily_report.go ``` > 说明：代码中已存在 `new module` 实现，但当前未注册到 `new` 子命令中（处于弃用状态）。 diff --git a/cmd/new_provider.go b/cmd/new_provider.go index 12f8b85..ce6db9e 100644 --- a/cmd/new_provider.go +++ b/cmd/new_provider.go @@ -1,43 +1,67 @@ package cmd import ( - "errors" - "fmt" - "io/fs" - "os" - "path/filepath" - "strings" - "text/template" + "errors" + "fmt" + "io/fs" + "os" + "path/filepath" + "sort" + "strings" + "text/template" - "github.com/iancoleman/strcase" - "github.com/spf13/cobra" - "go.ipao.vip/atomctl/v2/templates" + "github.com/iancoleman/strcase" + "github.com/spf13/cobra" + "go.ipao.vip/atomctl/v2/templates" ) // CommandNewProvider 注册 new_provider 命令 func CommandNewProvider(root *cobra.Command) { - cmd := &cobra.Command{ - Use: "provider", - Short: "创建新的 provider", - Long: `在 providers/ 目录下渲染创建 Provider 模板。 + cmd := &cobra.Command{ + Use: "provider", + Short: "创建新的 provider", + Long: `在 providers/ 目录下渲染创建 Provider 模板。 行为： -- 从内置模板 templates/provider 渲染相关文件 +- 当 name 与内置预置目录同名时，渲染该目录；否则回退渲染 providers/default +- 从内置模板 templates/providers 渲染相关文件 - 使用 name 的 CamelCase 作为导出名 - --dry-run 仅打印渲染与写入动作；--dir 指定输出基目录（默认 .） +不带名称直接运行时，将列出可用预置 provider 列表供选择。 + 示例： atomctl new provider email atomctl new --dry-run --dir ./demo provider cache`, - Args: cobra.ExactArgs(1), - RunE: commandNewProviderE, - } + Args: cobra.MaximumNArgs(1), + RunE: commandNewProviderE, + } root.AddCommand(cmd) } func commandNewProviderE(cmd *cobra.Command, args []string) error { - providerName := args[0] + // no-arg: list available preset providers + if len(args) == 0 { + entries, err := templates.Providers.ReadDir("providers") + if err != nil { + return err + } + var names []string + for _, e := range entries { + if e.IsDir() { + names = append(names, e.Name()) + } + } + sort.Strings(names) + fmt.Println("可用预置 providers:") + for _, n := range names { + fmt.Printf(" - %s\n", n) + } + return nil + } + + providerName := args[0] // shared flags dryRun, _ := cmd.Flags().GetBool("dry-run") baseDir, _ := cmd.Flags().GetString("dir") @@ -56,32 +80,38 @@ func commandNewProviderE(cmd *cobra.Command, args []string) error { } } - err := fs.WalkDir(templates.Provider, "provider", func(path string, d fs.DirEntry, err error) error { - if err != nil { - return err - } - if d.IsDir() { - return nil - } + // choose template source: providers/ or providers/default + srcDir := filepath.Join("providers", providerName) + if _, err := templates.Providers.ReadDir(srcDir); err != nil { + srcDir = filepath.Join("providers", "default") + } - relPath, err := filepath.Rel("provider", path) - if err != nil { - return err - } + err := fs.WalkDir(templates.Providers, srcDir, func(path string, d fs.DirEntry, err error) error { + if err != nil { + return err + } + if d.IsDir() { + return nil + } - destPath := filepath.Join(targetPath, strings.TrimSuffix(relPath, ".tpl")) - if dryRun { - fmt.Printf("[dry-run] mkdir -p %s\n", filepath.Dir(destPath)) - } else { - if err := os.MkdirAll(filepath.Dir(destPath), os.ModePerm); err != nil { - return err - } - } + relPath, err := filepath.Rel(srcDir, path) + if err != nil { + return err + } - tmpl, err := template.ParseFS(templates.Provider, path) - if err != nil { - return err - } + destPath := filepath.Join(targetPath, strings.TrimSuffix(relPath, ".tpl")) + if dryRun { + fmt.Printf("[dry-run] mkdir -p %s\n", filepath.Dir(destPath)) + } else { + if err := os.MkdirAll(filepath.Dir(destPath), os.ModePerm); err != nil { + return err + } + } + + tmpl, err := template.ParseFS(templates.Providers, path) + if err != nil { + return err + } if dryRun { fmt.Printf("[dry-run] render > %s\n", destPath) diff --git a/templates/project/.clinerules.raw b/templates/project/.clinerules.raw deleted file mode 100644 index 525a868..0000000 --- a/templates/project/.clinerules.raw +++ /dev/null @@ -1,301 +0,0 @@ -# 全局指令 - -我的主语言是简体中文，所以请用简体中文回答我，与我交流。 - -# 角色定义 - -您是一名高级 Go 程序员，具有丰富的后端开发经验，偏好干净的编程和设计模式。 - -# 基本原则 - -- 所有代码和文档使用中文。 -- 遵循 Go 的官方规范和最佳实践。 -- 使用 `gofumpt -w -l -extra .` 格式化代码。 -- 错误处理优先使用 errors.New 和 fmt.Errorf。 -- 业务返回的错误需要在 `app/errorx` 包中定义。 -- 在错误处理时，使用适当的上下文信息提供更多错误细节。 - -# 命名规范 - -- 包名使用小写单词。 -- 文件名使用小写下划线。 -- 环境变量使用大写。 -- 常量使用驼峰命名。 -- 导出的标识符必须以大写字母开头。 -- 缩写规则： -- i、j 用于循环 -- err 用于错误 -- ctx 用于上下文 -- req、res 用于请求响应 - -# 函数设计 - -- 函数应该短小精悍，单一职责。 -- 参数数量控制在 5 个以内。 -- 使用多值返回处理错误。 -- 优先使用命名返回值。 -- 避免嵌套超过 3 层。 -- 使用 defer 处理资源清理。 - -# 错误处理 - -- 总是检查错误返回。 -- 使用自定义错误类型。 -- 错误应该携带上下文信息。 -- 使用 errors.Is 和 errors.As 进行错误比较。 - -# 并发处理 - -- 使用 channel 通信而非共享内存。 -- 谨慎使用 goroutine。 -- 使用 context 控制超时和取消。 -- 使用 sync 包进行同步。 - -# 测试规范 - -- 编写单元测试和基准测试。 -- 使用表驱动测试。 -- 测试文件以 _test.go 结尾。 -- 使用 `stretchr/testify` `github.com/agiledragon/gomonkey/v2` 测试框架。 - -# 项目技术栈 - -- github.com/uber-go/dig 依赖注入 -- github.com/go-jet/jet 数据库查询构建器 -- github.com/ThreeDotsLabs/watermill 即时Event消息队列 -- github.com/riverqueue/river Job队列 -- github.com/gofiber/fiber/v3 HTTP框架 -- github.com/swaggo/swag 自动生成API文档, 在controller的方法上使用注解即可 - -# Atomctl 工具使用 - -## 生成命令 - -- gen model：从数据库生成模型 -- gen provider：生成依赖注入提供者 -- gen route：生成路由定义 - -## 数据库命令 - -- migrate：执行数据库迁移 -- migrate up/down：迁移或回滚，up 命令执行成功即表示数据库操作完成，无需其它确认操作。 -- migrate status：查看迁移状态 -- migrate create：创建迁移文件，迁移文件的命名需要使用动词名词的结合方式，如 create_users_table, 创建完成后文件会存在于 `database/migrations` 目录下 - -## 最佳实践 - -- migration 创建后需要执行 `atomctl migrate up` 执行数据库表迁移 -- 使用 gen model 前确保已migrate完成，并配置好 database/transform.yaml -- 对model中需要转换的数据结构声明在目录 `database/fields` 中，文件名与model名一致 -- provider 生成时使用适当的注解标记 -- 遵循目录结构约定 - -# 项目结构 - -## 标准目录 - -- main.go：主程序入口 -- providers/：依赖注入提供者, 通过 atomctl gen provider 生成, 但是你不可以对其中的内容进行修改 -- database/fields：数据库模型字段定义 -- database/schemas：数据库自动生成的模型文件，不可以进行任何修改！！ -- database/migrations: 数据库迁移文件，通过 atomctl migrate create 创建，你不可以手工创建，只可以使用脚手架工具进行创建 -- configs.toml：配置文件 -- proto/： gRPC proto 定义 -- pkg/atom: 为依赖注入框架的核心代码，你不可以进行修改 -- fixtures/：测试文件 -- app/errorx: 业务错误定义 -- app/http: HTTP 服务 -- app/grpc: gRPC 服务 -- app/jobs: 后台任务定义 -- app/middlewares: HTTP 中间件 -- app/services: 服务启动逻辑，不可以进行任何修改 - -# 开发示例 - -## migration 定义 - -migration 文件示例. -``` --- +goose Up --- +goose StatementBegin - -CREATE TABLE tenants ( -id BIGSERIAL PRIMARY KEY, -created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP, -updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP, -deleted_at TIMESTAMP WITH TIME ZONE DEFAULT NULL, -) ; - -COMMENT ON COLUMN tenants.created_at IS '创建时间'; -COMMENT ON COLUMN tenants.updated_at IS '更新时间'; -COMMENT ON COLUMN tenants.deleted_at IS '删除时间'; - --- +goose StatementEnd - ------------------------------------------------------------------------------------------------------- - --- +goose Down --- +goose StatementBegin - -DROP TABLE IF EXISTS tenants ; - --- +goose StatementEnd - -``` - -## http module - -1. 创建一个新的 http module `atomctl new module [users]` -2. 在 `app/http` 目录下创建相关的处理程序。 -3. 定义用户相关的路由。 -4. 实现相关逻辑操作 -5. module 名称需要使用复数形式，支持多层级目录，如 `atomctl new module [users.orders]` - -## controller - -- controller 的定义 -```go -// @provider -type PayController struct { - svc *Service - log *log.Entry `inject:"false"` -} - -func (c *PayController) Prepare() error { - c.log = log.WithField("module", "orders.Controller") - return nil -} - -// actions ... -} -``` -- controller 文件定义完成后运行 `atomctl gen provider` 来生成 provider - -- 一个 action 方法的定义， **@Router**不再使用swago的定义方式，替换为下面的定义方式，参数做用@Bind来进行声明，会自动注入，不需要业务内获取参数 -```go -// Orders show user orders -// @swagger definitions -// @Router /api/v1/orders/:channel [get] -// @Bind channel path -// @Bind claim local -// @Bind pagination query -// @Bind filter query -func (c *OrderController) List(ctx fiber.Ctx, claim *jwt.Claims,channel string, pagination *requests.Pagination, filter *UserOrderFilter) (*requests.Pager, error) { - pagination.Format() - pager := &requests.Pager{ - Pagination: *pagination, - } - - filter.UserID = claim.UserID - orders, total, err := c.svc.GetOrders(ctx.Context(), pagination, filter) - if err != nil { - return nil, err - } - pager.Total = total - - pager.Items = lo.FilterMap(orders, func(item model.Orders, _ int) (UserOrder, bool) { - var o UserOrder - if err := copier.Copy(&o, item) ; err != nil { - return o, false - } - return o, true - }) - - return pager, nil -} -``` -- 你需要把第二行的 `@swagger definitions` 替换成你的swagger定义 -- @Bind 参数会有几个位置 path/query/body/header/cookie/local/file 会分别从 url/get query/post body/header/cookie/fiber.Local/file/中取出所需要的数据绑定到方法的请求参数中去。 -- controller 只负责数据的接收返回及相关数据装饰，具体的复杂逻辑实现需要在service文件中定义。 -- action 文件内容完成运行 `atomctl gen route` 来生成路由 - -## service - -- service 的定义 -```go -// @provider -type Service struct { - db *sql.DB - log *log.Entry `inject:"false"` -} - -func (svc *Service) Prepare() error { - svc.log = log.WithField("module", "orders.service") - _ = Int(1) - return nil -} -``` -- service 文件定义完成后运行 `atomctl gen provider` 来生成 provider - -- service 中 model 数据查询的示例，需要注意table需要定义为一个短小的tblXXX以便代码展示简洁 -```go -// GetUserOrderByOrderID -func (svc *Service) Get(ctx context.Context, orderID string, userID int64) (*model.Orders, error) { - _, span := otel.Start(ctx, "users.service.GetUserOrderByOrderID") - defer span.End() - span.SetAttributes( - attribute.String("order.id", orderID), - attribute.Int64("user.id", userID), - ) - - tbl := table.Orders - stmt := tbl.SELECT(tbl.AllColumns).WHERE(tbl.OrderSerial.EQ(String(orderID)).AND(tbl.UserID.EQ(Int64(userID)))) - span.SetAttributes(semconv.DBStatementKey.String(stmt.DebugSql())) - - var order model.Orders - if err := stmt.QueryContext(ctx, svc.db, &order) ; err != nil { -span.RecordError(err) - return nil, err - } - return &order, nil -} - -// UpdateStage -func (svc *Service) Update(ctx context.Context, tenantID, userID, postID int64, stage fields.PostStage) error { - _, span := otel.Start(ctx, "users.service.UpdateStage") - defer span.End() - span.SetAttributes( - attribute.Int64("tenant.id", tenantID), - attribute.Int64("user.id", userID), - attribute.Int64("post.id", postID), - ) - - tbl := table.Posts - stmt := tbl. - UPDATE(tbl.UpdatedAt, tbl.Stage). - SET( - tbl.UpdatedAt.SET(TimestampT(time.Now())), - tbl.Stage.SET(Int16(int16(stage))), - ). - WHERE( - tbl.ID.EQ(Int64(postID)).AND( - tbl.TenantID.EQ(Int64(tenantID)).AND( - tbl.UserID.EQ(Int64(userID)), - ), - ), - ) - span.SetAttributes(semconv.DBStatementKey.String(stmt.DebugSql())) - - if _, err := stmt.ExecContext(ctx, svc.db) ; err != nil { - span.RecordError(err) - return err - } - - return svc.Update(ctx, tenantID, userID, postID, post) -} -``` - -# 本项目说明 - -- 设计一个支持多租户的用户系统，一个用户可以同时属于多个租户 -- 每一个租户有一个租户管理员角色，这个角色可以在后台由系统管理员指定，或者用户在申请创建租户申请时自动指定。 -- 除系统管理员外，一个普通用户只可以是一个租户的管理员，不能同时管理多个租户。 - -**重要提示：** -- `database/schemas` 目录下所有为件为 `atomctl gen model` 自动生成，不能进行任何修改！ -- migration SQL 中不要使用 `FOREIGN KEY` 约束，而是在业务中使用代码逻辑进行约束。 -- 数据库表需要按需要添加 `created_at` `updated_at` `deleted_at` 字段，并且这三个时间字段(`created_at` `updated_at` `deleted_at`)需要**直接**位于 id 字段后面, **中间不可以包含其它任何字段声明**。 -- ID 使用 `bigserial` 类型，数字类的使用 `int8`类型 -- 所有表不使用 `FOREIGN KEY` 约束，而是在业务中使用代码逻辑进行约束。 -- 所有字段需要添加中文字段 `comment` -- 执行 `migrate up` 命令完成后你不需要再使用 `psql` 来验证是否创建成功 diff --git a/templates/provider/config.go.tpl b/templates/providers/default/config.go.tpl similarity index 100% rename from templates/provider/config.go.tpl rename to templates/providers/default/config.go.tpl diff --git a/templates/provider/provider.go.tpl b/templates/providers/default/provider.go.tpl similarity index 100% rename from templates/provider/provider.go.tpl rename to templates/providers/default/provider.go.tpl diff --git a/templates/project/providers/hashids/config.go.tpl b/templates/providers/hashids/config.go.tpl similarity index 100% rename from templates/project/providers/hashids/config.go.tpl rename to templates/providers/hashids/config.go.tpl diff --git a/templates/project/providers/hashids/hashids.go.tpl b/templates/providers/hashids/hashids.go.tpl similarity index 100% rename from templates/project/providers/hashids/hashids.go.tpl rename to templates/providers/hashids/hashids.go.tpl diff --git a/templates/project/providers/otel/README.md.raw b/templates/providers/otel/README.md.raw similarity index 100% rename from templates/project/providers/otel/README.md.raw rename to templates/providers/otel/README.md.raw diff --git a/templates/project/providers/otel/config.go.tpl b/templates/providers/otel/config.go.tpl similarity index 100% rename from templates/project/providers/otel/config.go.tpl rename to templates/providers/otel/config.go.tpl diff --git a/templates/project/providers/otel/docker/-env.raw b/templates/providers/otel/docker/-env.raw similarity index 100% rename from templates/project/providers/otel/docker/-env.raw rename to templates/providers/otel/docker/-env.raw diff --git a/templates/project/providers/otel/docker/docker-compose.yaml.raw b/templates/providers/otel/docker/docker-compose.yaml.raw similarity index 100% rename from templates/project/providers/otel/docker/docker-compose.yaml.raw rename to templates/providers/otel/docker/docker-compose.yaml.raw diff --git a/templates/project/providers/otel/docker/grafana/grafana.ini.raw b/templates/providers/otel/docker/grafana/grafana.ini.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/grafana.ini.raw rename to templates/providers/otel/docker/grafana/grafana.ini.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo.yaml.raw b/templates/providers/otel/docker/grafana/provisioning/dashboards/demo.yaml.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo.yaml.raw rename to templates/providers/otel/docker/grafana/provisioning/dashboards/demo.yaml.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/demo-dashboard.json.raw b/templates/providers/otel/docker/grafana/provisioning/dashboards/demo/demo-dashboard.json.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/demo-dashboard.json.raw rename to templates/providers/otel/docker/grafana/provisioning/dashboards/demo/demo-dashboard.json.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/exemplars-dashboard.json.raw b/templates/providers/otel/docker/grafana/provisioning/dashboards/demo/exemplars-dashboard.json.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/exemplars-dashboard.json.raw rename to templates/providers/otel/docker/grafana/provisioning/dashboards/demo/exemplars-dashboard.json.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/opentelemetry-collector-data-flow.json.raw b/templates/providers/otel/docker/grafana/provisioning/dashboards/demo/opentelemetry-collector-data-flow.json.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/opentelemetry-collector-data-flow.json.raw rename to templates/providers/otel/docker/grafana/provisioning/dashboards/demo/opentelemetry-collector-data-flow.json.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/opentelemetry-collector.json.raw b/templates/providers/otel/docker/grafana/provisioning/dashboards/demo/opentelemetry-collector.json.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/opentelemetry-collector.json.raw rename to templates/providers/otel/docker/grafana/provisioning/dashboards/demo/opentelemetry-collector.json.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/spanmetrics-dashboard.json.raw b/templates/providers/otel/docker/grafana/provisioning/dashboards/demo/spanmetrics-dashboard.json.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/dashboards/demo/spanmetrics-dashboard.json.raw rename to templates/providers/otel/docker/grafana/provisioning/dashboards/demo/spanmetrics-dashboard.json.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/datasources/default.yaml.raw b/templates/providers/otel/docker/grafana/provisioning/datasources/default.yaml.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/datasources/default.yaml.raw rename to templates/providers/otel/docker/grafana/provisioning/datasources/default.yaml.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/datasources/jaeger.yaml.raw b/templates/providers/otel/docker/grafana/provisioning/datasources/jaeger.yaml.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/datasources/jaeger.yaml.raw rename to templates/providers/otel/docker/grafana/provisioning/datasources/jaeger.yaml.raw diff --git a/templates/project/providers/otel/docker/grafana/provisioning/datasources/opensearch.yaml.raw b/templates/providers/otel/docker/grafana/provisioning/datasources/opensearch.yaml.raw similarity index 100% rename from templates/project/providers/otel/docker/grafana/provisioning/datasources/opensearch.yaml.raw rename to templates/providers/otel/docker/grafana/provisioning/datasources/opensearch.yaml.raw diff --git a/templates/project/providers/otel/docker/otel-collector/otelcol-config-extras.yml.raw b/templates/providers/otel/docker/otel-collector/otelcol-config-extras.yml.raw similarity index 100% rename from templates/project/providers/otel/docker/otel-collector/otelcol-config-extras.yml.raw rename to templates/providers/otel/docker/otel-collector/otelcol-config-extras.yml.raw diff --git a/templates/project/providers/otel/docker/otel-collector/otelcol-config.yml.raw b/templates/providers/otel/docker/otel-collector/otelcol-config.yml.raw similarity index 100% rename from templates/project/providers/otel/docker/otel-collector/otelcol-config.yml.raw rename to templates/providers/otel/docker/otel-collector/otelcol-config.yml.raw diff --git a/templates/project/providers/otel/docker/prometheus/prometheus-config.yaml.raw b/templates/providers/otel/docker/prometheus/prometheus-config.yaml.raw similarity index 100% rename from templates/project/providers/otel/docker/prometheus/prometheus-config.yaml.raw rename to templates/providers/otel/docker/prometheus/prometheus-config.yaml.raw diff --git a/templates/project/providers/otel/funcs.go.tpl b/templates/providers/otel/funcs.go.tpl similarity index 100% rename from templates/project/providers/otel/funcs.go.tpl rename to templates/providers/otel/funcs.go.tpl diff --git a/templates/project/providers/otel/provider.go.tpl b/templates/providers/otel/provider.go.tpl similarity index 100% rename from templates/project/providers/otel/provider.go.tpl rename to templates/providers/otel/provider.go.tpl diff --git a/templates/project/providers/redis/config.go.tpl b/templates/providers/redis/config.go.tpl similarity index 100% rename from templates/project/providers/redis/config.go.tpl rename to templates/providers/redis/config.go.tpl diff --git a/templates/project/providers/redis/provider.go.tpl b/templates/providers/redis/provider.go.tpl similarity index 100% rename from templates/project/providers/redis/provider.go.tpl rename to templates/providers/redis/provider.go.tpl diff --git a/templates/project/providers/req/client.go.tpl b/templates/providers/req/client.go.tpl similarity index 100% rename from templates/project/providers/req/client.go.tpl rename to templates/providers/req/client.go.tpl diff --git a/templates/project/providers/req/config.go.tpl b/templates/providers/req/config.go.tpl similarity index 100% rename from templates/project/providers/req/config.go.tpl rename to templates/providers/req/config.go.tpl diff --git a/templates/project/providers/req/cookiejar/jar.go.tpl b/templates/providers/req/cookiejar/jar.go.tpl similarity index 100% rename from templates/project/providers/req/cookiejar/jar.go.tpl rename to templates/providers/req/cookiejar/jar.go.tpl diff --git a/templates/project/providers/req/cookiejar/punycode.go.tpl b/templates/providers/req/cookiejar/punycode.go.tpl similarity index 100% rename from templates/project/providers/req/cookiejar/punycode.go.tpl rename to templates/providers/req/cookiejar/punycode.go.tpl diff --git a/templates/project/providers/req/cookiejar/serialize.go.tpl b/templates/providers/req/cookiejar/serialize.go.tpl similarity index 100% rename from templates/project/providers/req/cookiejar/serialize.go.tpl rename to templates/providers/req/cookiejar/serialize.go.tpl diff --git a/templates/project/providers/tracing/README.md.raw b/templates/providers/tracing/README.md.raw similarity index 100% rename from templates/project/providers/tracing/README.md.raw rename to templates/providers/tracing/README.md.raw diff --git a/templates/project/providers/tracing/config.go.tpl b/templates/providers/tracing/config.go.tpl similarity index 100% rename from templates/project/providers/tracing/config.go.tpl rename to templates/providers/tracing/config.go.tpl diff --git a/templates/project/providers/tracing/provider.go.tpl b/templates/providers/tracing/provider.go.tpl similarity index 100% rename from templates/project/providers/tracing/provider.go.tpl rename to templates/providers/tracing/provider.go.tpl diff --git a/templates/templates.go b/templates/templates.go index 7c04ed7..f4cb3e2 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -8,9 +8,6 @@ var Project embed.FS //go:embed module var Module embed.FS -//go:embed provider -var Provider embed.FS - //go:embed events var Events embed.FS @@ -19,3 +16,6 @@ var Jobs embed.FS //go:embed services var Services embed.FS + +//go:embed providers/* +var Providers embed.FS