fix: Remove the auto-updating for kcl.mod when using command metadata. (

#565)

* fix: remove kcl.mod autoupdating when kcl metadata

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

* fix: remote useless code changes

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

* fix: add test cases and fix offline mode

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

* fix: fix unit test cases

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

---------

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

pkg/client/client_test.go

@@ -819,10 +819,7 @@ func testResolveMetadataInJsonStr(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		expectedPath = strings.ReplaceAll(expectedPath, "\\", "\\\\")
 	}
-	expectedStr := fmt.Sprintf(
-		"{\"packages\":{\"flask_demo_kcl_manifests\":{\"name\":\"flask_demo_kcl_manifests\",\"manifest_path\":\"%s\"}}}",
-		expectedPath,
-	)
+	expectedStr := "{\"packages\":{\"flask_demo_kcl_manifests\":{\"name\":\"flask_demo_kcl_manifests\",\"manifest_path\":\"\"}}}"
 	assert.Equal(t, res, expectedStr)
 	defer func() {
 		if r := os.RemoveAll(expectedPath); r != nil {
@@ -1126,6 +1123,22 @@ func testUpdateWithKclModlock(t *testing.T, kpmcli *KpmClient) {
 	}()
 }
 
+func TestNoDownloadWithMetadataOffline(t *testing.T) {
+	testFunc := func(t *testing.T, kpmcli *KpmClient) {
+		testDir := getTestDir("test_no_download_with_metadata_offline")
+		kclPkg, err := pkg.LoadKclPkg(testDir)
+		assert.Equal(t, err, nil)
+		var buf bytes.Buffer
+		kpmcli.SetLogWriter(&buf)
+		res, err := kpmcli.ResolveDepsMetadataInJsonStr(kclPkg, false)
+		assert.Equal(t, err, nil)
+		assert.Equal(t, buf.String(), "")
+		assert.Equal(t, res, "{\"packages\":{\"kcl4\":{\"name\":\"kcl4\",\"manifest_path\":\"\"}}}")
+	}
+
+	RunTestWithGlobalLockAndKpmCli(t, []TestSuite{{Name: "test_no_download_with_metadata_offline", TestFunc: testFunc}})
+}
+
 func testMetadataOffline(t *testing.T) {
 	kpmcli, err := NewKpmClient()
 	assert.Equal(t, err, nil)
@@ -1156,6 +1169,7 @@ func testMetadataOffline(t *testing.T) {
 	assert.Equal(t, err, nil)
 	if runtime.GOOS == "windows" {
 		uglyContent = []byte(strings.ReplaceAll(string(uglyContent), "\r\n", "\n"))
+		content_after_metadata = []byte(strings.ReplaceAll(string(content_after_metadata), "\r\n", "\n"))
 	}
 	assert.Equal(t, string(content_after_metadata), string(uglyContent))
 

pkg/client/test_data/test_metadata_offline/ugly.kcl.mod

@@ -2,3 +2,6 @@
 name = "test_metadata_offline"
 edition = "0.0.1"
 version = "0.0.1"
+
+
+

pkg/client/test_data/test_no_download_with_metadata_offline/kcl.mod

@@ -0,0 +1,7 @@
+[package]
+name = "test_no_download_with_metadata_offline"
+edition = "v0.10.0"
+version = "0.0.1"
+
+[dependencies]
+kcl4 = { git = "test_url", tag = "v0.0.1" }

pkg/client/test_data/test_no_download_with_metadata_offline/kcl.mod.lock

@@ -0,0 +1,7 @@
+[dependencies]
+  [dependencies.kcl4]
+    name = "kcl4"
+    full_name = "kcl4_0.0.1"
+    version = "0.0.1"
+    url = "test_url"
+    git_tag = "v0.0.1"

pkg/client/test_data/test_no_download_with_metadata_offline/main.k

@@ -0,0 +1 @@
+The_first_kcl_program = 'Hello World!'

pkg/client/update.go

@@ -136,15 +136,18 @@ func (c *KpmClient) Update(options ...UpdateOption) (*pkg.KclPkg, error) {
 		resolver.WithResolveKclMod(kMod),
 		resolver.WithEnableCache(true),
 		resolver.WithCachePath(c.homePath),
+		resolver.WithOffline(opts.offline),
 	)
 
 	if err != nil {
 		return nil, err
 	}
 
-	err = kMod.UpdateModAndLockFile()
-	if err != nil {
-		return nil, err
+	if !opts.offline {
+		err = kMod.UpdateModAndLockFile()
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return kMod, nil

pkg/downloader/downloader.go

@@ -531,6 +531,10 @@ func (d *OciDownloader) Download(opts *DownloadOptions) error {
 
 	}
 
+	if opts.Offline && !utils.DirExists(filepath.Join(opts.LocalPath, constants.KCL_MOD)) {
+		return ErrNotFoundAndOffline
+	}
+
 	return err
 }
 
@@ -662,5 +666,12 @@ func (d *GitDownloader) Download(opts *DownloadOptions) error {
 			return err
 		}
 	}
+
+	if opts.Offline && !utils.DirExists(filepath.Join(opts.LocalPath, constants.KCL_MOD)) {
+		return ErrNotFoundAndOffline
+	}
+
 	return nil
 }
+
+var ErrNotFoundAndOffline = errors.New("not found and offline")

pkg/resolver/resolver.go

@@ -151,7 +151,7 @@ func (dr *DepsResolver) Resolve(options ...ResolveOption) error {
 				ModSpec: dep.Source.ModSpec,
 			}
 		} else {
-			depSource = &dep.Source
+				depSource = &dep.Source
 		}
 
 		depVisitor, err := visitorSelectorFunc(depSource)

pkg/visitor/visitor.go

@@ -1,6 +1,7 @@
 package visitor
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -249,9 +250,13 @@ func (rv *RemoteVisitor) Visit(s *downloader.Source, v visitFunc) error {
 		downloader.WithCachePath(cacheFullPath),
 		downloader.WithEnableCache(rv.EnableCache),
 		downloader.WithInsecureSkipTLSverify(rv.InsecureSkipTLSverify),
+		downloader.WithOffline(rv.Offline),
 	))
 
 	if err != nil {
+		if errors.Is(err, downloader.ErrNotFoundAndOffline) && rv.Offline {
+			return nil
+		}
 		return err
 	}
 	if !s.ModSpec.IsNil() {
@@ -266,6 +271,9 @@ func (rv *RemoteVisitor) Visit(s *downloader.Source, v visitFunc) error {
 		pkg.WithSettings(rv.Settings),
 	)
 	if err != nil {
+		if rv.Offline {
+			return nil
+		}
 		return err
 	}