Merge pull request #140 from zong-zhe/feat-add-diagnostic

feat: support flag when add oci ref
kcl-lang · Aug 28, 2024 · fb9366b · fb9366b
2 parents d174d9c + 90f64bd
commit fb9366b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 3 deletions.
diff --git a/cmd/kcl/commands/mod_add.go b/cmd/kcl/commands/mod_add.go
@@ -226,6 +226,10 @@ func parseAddOptions(cli *client.KpmClient, localPath string, args []string) (*o
 				regOpt.Git.Branch = branch
 			} else if regOpt.Oci != nil && len(tag) != 0 {
 				regOpt.Oci.Tag = tag
+			} else if regOpt.Registry != nil && len(tag) != 0 {
+				if regOpt.Registry.Tag == "" {
+					regOpt.Registry.Tag = tag
+				}
 			}
 
 			return &opt.AddOptions{

diff --git a/go.mod b/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/containerd/errdefs v0.1.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/containers/image/v5 v5.32.1 // indirect
+	github.com/containers/image/v5 v5.32.2 // indirect
 	github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
 	github.com/containers/ocicrypt v1.2.0 // indirect
 	github.com/containers/storage v1.55.0 // indirect

diff --git a/go.sum b/go.sum
@@ -304,8 +304,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
 github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
-github.com/containers/image/v5 v5.32.1 h1:fVa7GxRC4BCPGsfSRs4JY12WyeY26SUYQ0NuANaCFrI=
-github.com/containers/image/v5 v5.32.1/go.mod h1:v1l73VeMugfj/QtKI+jhYbwnwFCFnNGckvbST3rQ5Hk=
+github.com/containers/image/v5 v5.32.2 h1:SzNE2Y6sf9b1GJoC8qjCuMBXwQrACFp4p0RK15+4gmQ=
+github.com/containers/image/v5 v5.32.2/go.mod h1:v1l73VeMugfj/QtKI+jhYbwnwFCFnNGckvbST3rQ5Hk=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
 github.com/containers/ocicrypt v1.2.0 h1:X14EgRK3xNFvJEfI5O4Qn4T3E25ANudSOZz/sirVuPM=

diff --git a/test/e2e/test_suites/test_add_oci_ref_tag/input b/test/e2e/test_suites/test_add_oci_ref_tag/input
@@ -0,0 +1 @@
+kcl mod add helloworld --tag 0.1.1
diff --git a/test/e2e/test_suites/test_add_oci_ref_tag/stderr b/test/e2e/test_suites/test_add_oci_ref_tag/stderr
diff --git a/test/e2e/test_suites/test_add_oci_ref_tag/stdout b/test/e2e/test_suites/test_add_oci_ref_tag/stdout
@@ -0,0 +1 @@
+add dependency 'helloworld:0.1.1' successfully
diff --git a/test/e2e/test_suites/test_add_oci_ref_tag/test_space/kcl.mod b/test/e2e/test_suites/test_add_oci_ref_tag/test_space/kcl.mod
@@ -0,0 +1,6 @@
+[package]
+name = "test_space"
+edition = "v0.9.0"
+version = "0.0.1"
+
+
diff --git a/test/e2e/test_suites/test_add_oci_ref_tag/test_space/kcl.mod.lock b/test/e2e/test_suites/test_add_oci_ref_tag/test_space/kcl.mod.lock
diff --git a/test/e2e/test_suites/test_add_oci_ref_tag/test_space/main.k b/test/e2e/test_suites/test_add_oci_ref_tag/test_space/main.k
@@ -0,0 +1 @@
+The_first_kcl_program = 'Hello World!'