Merge pull request #487 from kcl-lang/fix-add-bug

fix: fixed an issue where the 'full_name' in kcl.mod.lock changed when there was already a local dependency

pkg/client/client.go

@@ -1811,6 +1811,9 @@ func (c *KpmClient) dependencyExistsLocal(searchPath string, dep *pkg.Dependency
 			return nil, err
 		}
 		dep.FromKclPkg(depPkg)
+		// TODO: new local dependency structure will replace this
+		// issue: https://github.com/kcl-lang/kpm/issues/384
+		dep.FullName = dep.GenDepFullName()
 		return dep, nil
 	}
 	return nil, nil

pkg/client/test_data/add_with_git_commit/test_pkg/kcl.mod.lock.expect

@@ -1,7 +1,7 @@
 [dependencies]
   [dependencies.flask-demo-kcl-manifests]
     name = "flask-demo-kcl-manifests"
-    full_name = "flask_manifests_0.0.1"
+    full_name = "flask-demo-kcl-manifests_ade147b"
     version = "0.0.1"
     url = "https://github.com/kcl-lang/flask-demo-kcl-manifests.git"
     commit = "ade147b"

pkg/client/test_data/add_with_git_commit/test_pkg_win/kcl.mod.lock.expect

@@ -1,7 +1,7 @@
 [dependencies]
   [dependencies.flask-demo-kcl-manifests]
     name = "flask-demo-kcl-manifests"
-    full_name = "flask_manifests_0.0.1"
+    full_name = "flask-demo-kcl-manifests_ade147b"
     version = "0.0.1"
     url = "https://github.com/kcl-lang/flask-demo-kcl-manifests.git"
     commit = "ade147b"

pkg/client/test_data/test_mod_file_package/test_pkg/kcl.mod.lock

@@ -1,7 +1,7 @@
 [dependencies]
   [dependencies.cc]
     name = "cc"
-    full_name = "flask_manifests_0.0.1"
+    full_name = "flask-demo-kcl-manifests_8308200"
     version = "0.0.1"
     url = "https://github.com/kcl-lang/flask-demo-kcl-manifests.git"
     commit = "8308200"

pkg/package/modfile.go

@@ -315,32 +315,28 @@ func (dep *Dependency) FillDepInfo(homepath string) error {
 	if dep.Source.Local != nil {
 		dep.LocalFullPath = dep.Source.Local.Path
 	}
-	if dep.Source.Git != nil && dep.Source.Git.GetPackage() != "" {
-		name := utils.ParseRepoNameFromGitUrl(dep.Source.Git.Url)
-		if len(dep.Source.Git.Tag) != 0 {
-			dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, name, dep.Source.Git.Tag)
-		} else if len(dep.Source.Git.Commit) != 0 {
-			dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, name, dep.Source.Git.Commit)
-		} else {
-			dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, name, dep.Source.Git.Branch)
-		}
-	}
+
+	dep.FullName = dep.GenDepFullName()
+
 	return nil
 }
 
 // GenDepFullName will generate the full name of a dependency by its name and version
 // based on the '<package_name>_<package_tag>' format.
 func (dep *Dependency) GenDepFullName() string {
 	name := dep.Name
-	if dep.Source.Git != nil && dep.Source.Git.GetPackage() != "" {
-		url := dep.Source.Git.Url
-		if strings.HasSuffix(url, ".git") {
-			url = strings.TrimSuffix(url, ".git")
-			dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, filepath.Base(url), dep.Version)
-			return dep.FullName
+	if dep.Source.Git != nil {
+		name := utils.ParseRepoNameFromGitUrl(dep.Source.Git.Url)
+		if len(dep.Source.Git.Tag) != 0 {
+			dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, name, dep.Source.Git.Tag)
+		} else if len(dep.Source.Git.Commit) != 0 {
+			dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, name, dep.Source.Git.Commit)
+		} else {
+			dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, name, dep.Source.Git.Branch)
 		}
+	} else {
+		dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, name, dep.Version)
 	}
-	dep.FullName = fmt.Sprintf(PKG_NAME_PATTERN, name, dep.Version)
 	return dep.FullName
 }
 

pkg/package/modfile_test.go

@@ -188,7 +188,7 @@ func TestLoadModFile(t *testing.T) {
 	assert.Equal(t, modFile.Dependencies.Deps.GetOrDefault("name", TestPkgDependency).Name, "name")
 	assert.Equal(t, modFile.Dependencies.Deps.GetOrDefault("name", TestPkgDependency).Source.Git.Url, "test_url")
 	assert.Equal(t, modFile.Dependencies.Deps.GetOrDefault("name", TestPkgDependency).Source.Git.Tag, "test_tag")
-	assert.Equal(t, modFile.Dependencies.Deps.GetOrDefault("name", TestPkgDependency).FullName, "name_test_tag")
+	assert.Equal(t, modFile.Dependencies.Deps.GetOrDefault("name", TestPkgDependency).FullName, "test_url_test_tag")
 
 	assert.Equal(t, modFile.Dependencies.Deps.GetOrDefault("oci_name", TestPkgDependency).Name, "oci_name")
 	assert.Equal(t, modFile.Dependencies.Deps.GetOrDefault("oci_name", TestPkgDependency).Version, "oci_tag")