fix: 'kpm run' will trigger the automatic download of the dependencies (#198)

Signed-off-by: zongz <zongzhe1024@163.com>

Author: zong-zhe

pkg/client/client.go

@@ -114,6 +114,13 @@ func (c *KpmClient) ResolvePkgDepsMetadata(kclPkg *pkg.KclPkg, update bool) erro
 		searchPath = c.homePath
 	}
 
+	// alian the dependencies between kcl.mod and kcl.mod.lock
+	for name, d := range kclPkg.ModFile.Dependencies.Deps {
+		if _, ok := kclPkg.Dependencies.Deps[name]; !ok {
+			kclPkg.Dependencies.Deps[name] = d
+		}
+	}
+
 	for name, d := range kclPkg.Dependencies.Deps {
 		searchFullPath := filepath.Join(searchPath, d.FullName)
 		if !update {
@@ -161,6 +168,11 @@ func (c *KpmClient) ResolvePkgDepsMetadata(kclPkg *pkg.KclPkg, update bool) erro
 		}
 	}
 
+	// update the kcl.mod and kcl.mod.lock.
+	err := kclPkg.UpdateModAndLockFile()
+	if err != nil {
+		return err
+	}
 	return nil
 }
 

pkg/client/client_test.go

@@ -296,6 +296,25 @@ func TestVendorDeps(t *testing.T) {
 	os.RemoveAll(filepath.Join(testDir, "my_kcl"))
 }
 
+func TestResolveDepsWithOnlyKclMod(t *testing.T) {
+	testDir := getTestDir("resolve_dep_with_kclmod")
+	assert.Equal(t, utils.DirExists(filepath.Join(testDir, "kcl.mod.lock")), false)
+	kclPkg, err := pkg.LoadKclPkg(testDir)
+	assert.Equal(t, err, nil)
+	kpmcli, err := NewKpmClient()
+	assert.Equal(t, err, nil)
+	depsMap, err := kpmcli.ResolveDepsIntoMap(kclPkg)
+	assert.Equal(t, err, nil)
+	assert.Equal(t, len(depsMap), 1)
+	assert.Equal(t, utils.DirExists(filepath.Join(testDir, "kcl.mod.lock")), true)
+	assert.Equal(t, depsMap["k8s"], filepath.Join(kpmcli.homePath, "k8s_1.17"))
+	assert.Equal(t, utils.DirExists(filepath.Join(kpmcli.homePath, "k8s_1.17")), true)
+	defer func() {
+		err := os.Remove(filepath.Join(testDir, "kcl.mod.lock"))
+		assert.Equal(t, err, nil)
+	}()
+}
+
 func TestResolveDepsVendorMode(t *testing.T) {
 	testDir := getTestDir("resolve_deps")
 	kpm_home := filepath.Join(testDir, "kpm_home")

pkg/client/test_data/resolve_dep_with_kclmod/kcl.mod

@@ -0,0 +1,7 @@
+[package]
+name = "resolve_dep_with_kclmod"
+edition = "0.0.1"
+version = "0.0.1"
+
+[dependencies]
+k8s = "1.17"

pkg/client/test_data/resolve_dep_with_kclmod/main.k

@@ -0,0 +1,10 @@
+import k8s.api.core.v1 as k8core
+
+k8core.Pod {
+    metadata.name = "web-app"
+    spec.containers = [{
+        name = "main-container"
+        image = "nginx"
+        ports = [{containerPort = 80}]
+    }]
+}

test/e2e/test_suites/kpm/kpm_run/test_kpm_run_with_only_kcl_mod/test_suite.env

@@ -0,0 +1,2 @@
+KPM_HOME=""
+KCLVM_VENDOR_HOME=""

test/e2e/test_suites/kpm/kpm_run/test_kpm_run_with_only_kcl_mod/test_suite.input

@@ -0,0 +1 @@
+kpm run

test/e2e/test_suites/kpm/kpm_run/test_kpm_run_with_only_kcl_mod/test_suite.stderr

@@ -0,0 +1,11 @@
+kpm: downloading 'test/k8s:1.27' from 'localhost:5001/test/k8s:1.27'.
+apiVersion: v1
+kind: Pod
+metadata:
+  name: web-app
+spec:
+  containers:
+  - image: nginx
+    name: main-container
+    ports:
+    - containerPort: 80

test/e2e/test_suites/kpm/kpm_run/test_kpm_run_with_only_kcl_mod/test_suite.stdout

@@ -0,0 +1,7 @@
+[package]
+name = "test_kpm_run_with_only_kcl_mod"
+edition = "0.0.1"
+version = "0.0.1"
+
+[dependencies]
+k8s = "1.27"

test/e2e/test_suites/test_data/test_kpm_run_with_only_kcl_mod/kcl.mod

@@ -0,0 +1,10 @@
+import k8s.api.core.v1 as k8core
+
+k8core.Pod {
+    metadata.name = "web-app"
+    spec.containers = [{
+        name = "main-container"
+        image = "nginx"
+        ports = [{containerPort = 80}]
+    }]
+}