Merge pull request #94 from Peefy/fix-dependencies-features

fix: dependencies features
kcl-lang · Sep 6, 2024 · 343c33c · 343c33c
2 parents 3d5d384 + f03266b
commit 343c33c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -151,8 +151,9 @@ metadata:
   name: my-kcl-fn
   namespace: foo
 spec:
-  dependencies:
+  dependencies: |
     helloworld = {oci = "oci://ghcr.io/kcl-lang/helloworld", "tag" = "0.1.0"}
+    k8s = "1.26"
   source: |
     import helloworld
 
@@ -176,7 +177,7 @@ spec:
 				assert.NoError(t, err)
 				resultYaml, err := yaml.Parse(tc.expectResult)
 				assert.NoError(t, err)
-				assert.Equal(t, result[0], resultYaml)
+				assert.Equal(t, result[0].MustString(), resultYaml.MustString())
 			} else {
 				assert.Error(t, err)
 				assert.Contains(t, err.Error(), tc.expectErrMsg)

diff --git a/pkg/edit/opts.go b/pkg/edit/opts.go
@@ -8,7 +8,6 @@ import (
 
 	"kcl-lang.io/cli/pkg/options"
 	"kcl-lang.io/kpm/pkg/client"
-	pkg "kcl-lang.io/kpm/pkg/package"
 	"kcl-lang.io/krm-kcl/pkg/api"
 	"sigs.k8s.io/kustomize/kyaml/errors"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -35,7 +34,7 @@ func LoadDepListFromConfig(cli *client.KpmClient, dependencies string) ([]string
 	if err != nil {
 		return nil, errors.Wrap(err)
 	}
-	pkg, err := pkg.LoadKclPkg(tmpDir)
+	pkg, err := cli.LoadPkgFromPath(tmpDir)
 	if err != nil {
 		return nil, err
 	}