From 829cc796b3224e299802c3daa167972ac8f6c868 Mon Sep 17 00:00:00 2001 From: peefy Date: Wed, 14 Aug 2024 11:44:07 +0800 Subject: [PATCH] fix: crd groupby logic Signed-off-by: peefy --- pkg/import/crd/groupby.go | 3 ++- pkg/options/import.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/import/crd/groupby.go b/pkg/import/crd/groupby.go index c608275..b02b70b 100644 --- a/pkg/import/crd/groupby.go +++ b/pkg/import/crd/groupby.go @@ -33,7 +33,8 @@ const unknownVersion = "unknown" // // Parameters: // - baseDir: The base directory to search for files. -func GroupByKclFiles(baseDir string) error { +func GroupByKclFiles(target string, packageName string) error { + baseDir := filepath.Join(target, packageName) entries, err := os.ReadDir(baseDir) if err != nil { return err diff --git a/pkg/options/import.go b/pkg/options/import.go index 009562f..68569c4 100644 --- a/pkg/options/import.go +++ b/pkg/options/import.go @@ -95,7 +95,7 @@ func (o *ImportOptions) Run() error { } // Group by the api version if mode == Crd { - err := crd.GroupByKclFiles(opts.ModelPackage) + err := crd.GroupByKclFiles(opts.Target, opts.ModelPackage) if err != nil { return err }