create: replace vfs with embed

This patch must be accepted after golang/go#43854 Closes #631
tarantool · Sep 23, 2021 · 0a41dd9 · 0a41dd9
1 parent cb29ae8
commit 0a41dd9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 56 deletions.
diff --git a/cli/codegen/generate_templates_vfs.go b/cli/codegen/generate_templates_vfs.go
diff --git a/cli/codegen/static/doc.go b/cli/codegen/static/doc.go
diff --git a/cli/codegen/static/static.go b/cli/codegen/static/static.go
diff --git a/cli/create/create.go b/cli/create/create.go
@@ -1,7 +1,9 @@
 package create
 
 import (
+	"embed"
 	"fmt"
+	"net/http"
 	"os"
 
 	"github.com/tarantool/cartridge-cli/cli/common"
@@ -13,6 +15,10 @@ import (
 	"github.com/tarantool/cartridge-cli/cli/create/templates"
 )
 
+// TODO: add flag when https://github.com/golang/go/issues/43854 is released.
+//go:embed templates/cartridge/*
+var createCartridgeTemplateFS embed.FS
+
 // Run creates a project in ctx.Project.Path
 func Run(ctx *context.Ctx) error {
 	common.CheckRecommendedBinaries("git")
@@ -37,7 +43,7 @@ func Run(ctx *context.Ctx) error {
 	if ctx.Create.From == "" {
 		switch ctx.Create.Template {
 		case "cartridge":
-			ctx.Create.TemplateFS = CreateCartridgeTemplateFS
+			ctx.Create.TemplateFS = http.FS(createCartridgeTemplateFS)
 		default:
 			return fmt.Errorf("Invalid template name: %s", ctx.Create.Template)
 		}