mirror of
https://github.com/kubevela/kubevela.git
synced 2026-08-27 16:17:34 +00:00
fix module import
Signed-off-by: Qiaozp <qiaozhongpei.qzp@alibaba-inc.com>
This commit is contained in:
@@ -13,7 +13,7 @@ require (
|
||||
sigs.k8s.io/yaml v1.3.0
|
||||
|
||||
// for sub-module
|
||||
github.com/kubevela/vela-go-sdk v0.0.0-20230310062146-e5d4070da6b4
|
||||
github.com/kubevela/vela-go-sdk v0.0.0-20230309022604-cd431bb25a9a
|
||||
)
|
||||
|
||||
require (
|
||||
|
||||
@@ -115,11 +115,11 @@ func (meta *GenMeta) Init(c common.Args, flags *pflag.FlagSet) (err error) {
|
||||
if flags != nil {
|
||||
switch meta.Lang {
|
||||
case "go":
|
||||
if goargs, err := flags.GetStringSlice("go-args"); err != nil {
|
||||
goargs, err := flags.GetStringSlice("go-args")
|
||||
if err != nil {
|
||||
return err
|
||||
} else {
|
||||
meta.GoArgs.parse(goargs)
|
||||
}
|
||||
meta.GoArgs.parse(goargs)
|
||||
}
|
||||
}
|
||||
packageFuncs := map[string]byteHandler{
|
||||
@@ -302,6 +302,7 @@ func (meta *GenMeta) Run() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetDefinition sets definition name and kind
|
||||
func (meta *GenMeta) SetDefinition(defName, defKind string) {
|
||||
meta.name = defName
|
||||
meta.kind = defKind
|
||||
|
||||
@@ -83,6 +83,7 @@ type GoDefModifier struct {
|
||||
defStructPointer *j.Statement
|
||||
}
|
||||
|
||||
// GoModuleModifier is the Modifier for golang, modify code for each module
|
||||
type GoModuleModifier struct {
|
||||
*GenMeta
|
||||
*goArgs
|
||||
@@ -133,11 +134,7 @@ func (m *GoModuleModifier) Modify() error {
|
||||
|
||||
func (m *GoModuleModifier) init() error {
|
||||
m.goArgs = &goArgs{}
|
||||
err := m.goArgs.init(m.GenMeta)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
return m.goArgs.init(m.GenMeta)
|
||||
}
|
||||
|
||||
func (m *GoModuleModifier) Name() string {
|
||||
@@ -220,7 +217,8 @@ func (m *GoModuleModifier) addSubGoMod() error {
|
||||
return errors.Wrap(err, "read "+src)
|
||||
}
|
||||
subModuleName := strings.TrimSuffix(fmt.Sprintf("%s/%s", m.Package, m.APIDirectory), "/")
|
||||
srcContent = bytes.ReplaceAll(srcContent, []byte(DefaultPackage), []byte(subModuleName))
|
||||
srcContent = bytes.ReplaceAll(srcContent, []byte("module "+DefaultPackage), []byte("module "+subModuleName))
|
||||
srcContent = bytes.ReplaceAll(srcContent, []byte(DefaultPackage), []byte(m.Package))
|
||||
|
||||
err = os.WriteFile(path.Join(m.apiDir, dst), srcContent, 0644)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user