[dubboctl] Optimize content and complete repo logic (#559)

fix package

dubboctl/cmd/repo.go

@@ -32,6 +32,7 @@ func RepoCmd(_ cli.Context, cmd *cobra.Command, clientFactory ClientFactory) *co
   dubboctl repo remove [name]
 `,
 	}
+
 	cluster.AddFlags(rc, rootArgs)
 	addRepoFlags(rc, rArgs)
 	rc.AddCommand(ad)
@@ -52,7 +53,7 @@ func addCmd(cmd *cobra.Command, clientFactory ClientFactory) *cobra.Command {
 	return ac
 }
 
-func runAdd(_ *cobra.Command, args []string, clientFactory ClientFactory) (err error) {
+func runAdd(cmd *cobra.Command, args []string, clientFactory ClientFactory) (err error) {
 	if err = util.CreatePath(); err != nil {
 		return
 	}
@@ -96,7 +97,7 @@ func listCmd(cmd *cobra.Command, clientFactory ClientFactory) *cobra.Command {
 	return lc
 }
 
-func runList(_ *cobra.Command, args []string, clientFactory ClientFactory) (err error) {
+func runList(cmd *cobra.Command, args []string, clientFactory ClientFactory) (err error) {
 	client, done := clientFactory()
 	defer done()
 
@@ -124,7 +125,7 @@ func removeCmd(cmd *cobra.Command, clientFactory ClientFactory) *cobra.Command {
 	return rc
 }
 
-func runRemove(_ *cobra.Command, args []string, clientFactory ClientFactory) (err error) {
+func runRemove(cmd *cobra.Command, args []string, clientFactory ClientFactory) (err error) {
 	client, done := clientFactory()
 	defer done()
 
@@ -141,6 +142,6 @@ func runRemove(_ *cobra.Command, args []string, clientFactory ClientFactory) (er
 		return
 	}
 
-	fmt.Printf("%s Repositories removed", p.name)
+	fmt.Printf("%s Repositories removed.\n", p.name)
 	return
 }

dubboctl/cmd/root.go

@@ -19,6 +19,7 @@ import (
 	"flag"
 	"github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
 	"github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk"
+	"github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
 	"github.com/apache/dubbo-kubernetes/dubboctl/pkg/validate"
 	"github.com/apache/dubbo-kubernetes/dubboctl/pkg/version"
 	"github.com/apache/dubbo-kubernetes/operator/cmd/cluster"
@@ -33,7 +34,9 @@ type ClientFactory func(...sdk.Option) (*sdk.Client, func())
 
 func NewClientFactory(options ...sdk.Option) (*sdk.Client, func()) {
 	var (
-		o = []sdk.Option{}
+		o = []sdk.Option{
+			sdk.WithRepositoriesPath(util.RepositoriesPath()),
+		}
 	)
 	client := sdk.New(append(o, options...)...)
 

dubboctl/pkg/sdk/client.go

@@ -83,7 +83,7 @@ func (c *Client) Initialize(dcfg *dubbo.DubboConfig, initialized bool, cmd *cobr
 	// TODO remove initiallized
 	f := dubbo.NewDubboConfigWithTemplate(dcfg, initialized)
 
-	if err = RunDataDir(f.Root); err != nil {
+	if err = runDataDir(f.Root); err != nil {
 		return f, err
 	}
 
@@ -181,7 +181,7 @@ func isEffectivelyEmpty(dir string) (bool, error) {
 	return true, nil
 }
 
-func RunDataDir(root string) error {
+func runDataDir(root string) error {
 	if err := os.MkdirAll(filepath.Join(root, dubbo.DataDir), os.ModePerm); err != nil {
 		return err
 	}
@@ -224,3 +224,9 @@ func RunDataDir(root string) error {
 	}
 	return nil
 }
+
+func WithRepositoriesPath(path string) Option {
+	return func(c *Client) {
+		c.repositoriesPath = path
+	}
+}

dubboctl/pkg/sdk/templates_embedded.go

@@ -3,12 +3,12 @@ package sdk
 import (
 	"archive/zip"
 	"bytes"
-	"github.com/apache/dubbo-kubernetes/dubboctl/pkg/generate"
+	"github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/tpl"
 	"github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
 )
 
 func newEmbeddedTemplatesFS() util.Filesystem {
-	archive, err := zip.NewReader(bytes.NewReader(generate.TemplatesZip), int64(len(generate.TemplatesZip)))
+	archive, err := zip.NewReader(bytes.NewReader(tpl.TemplatesZip), int64(len(tpl.TemplatesZip)))
 	if err != nil {
 		panic(err)
 	}

dubboctl/pkg/generate/template/main.go → dubboctl/pkg/sdk/tpl/filesystem.go

@@ -1,4 +1,4 @@
-package main
+package tpl
 
 import (
 	"archive/zip"
@@ -11,10 +11,13 @@ import (
 	"path/filepath"
 )
 
-const templatesPath = "./template"
+const (
+	templatesPath = "dubboctl/pkg/sdk/tpl/default"
+	generatePath  = "dubboctl/pkg/sdk/tpl/zz_filesystem_generated.go"
+)
 
 func main() {
-	f, err := os.OpenFile("../zz_filesystem_generated.go", os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0o644)
+	f, err := os.OpenFile(generatePath, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		log.Fatal(err)
 	}