fix: fix panic error when 'kpm run <oci_url>'

Signed-off-by: zongz <[email protected]>

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/urfave/cli/v2 v2.25.0
 	gotest.tools/v3 v3.4.0
-	kcl-lang.io/kcl-go v0.6.0
+	kcl-lang.io/kcl-go v0.6.1
 )
 
 require (

go.sum

@@ -765,8 +765,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 kcl-lang.io/kcl-artifact-go v0.6.0 h1:J/1FKzgGRqzFDkq0amBWxCdXXRMrtg5oT3IGtoo9sgU=
 kcl-lang.io/kcl-artifact-go v0.6.0/go.mod h1:c07mqi9Hu2UjPW7lYfHhAAWOlZiB7lo7Vkr4jL5ov/M=
-kcl-lang.io/kcl-go v0.6.0 h1:gmbTZ5VfLxL2I2lGnVG2Tpin750YMHTFQeINfj7jKBk=
-kcl-lang.io/kcl-go v0.6.0/go.mod h1:1/xEscOhVGNabr9+rYC5peFDIjphbthYqk8UyHzaPRk=
+kcl-lang.io/kcl-go v0.6.1 h1:we/e3qvllsOoQj0YQht+yNxI+QFLWEmYn4FQ3zAvv9E=
+kcl-lang.io/kcl-go v0.6.1/go.mod h1:1/xEscOhVGNabr9+rYC5peFDIjphbthYqk8UyHzaPRk=
 oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY=
 oras.land/oras-go v1.2.3/go.mod h1:M/uaPdYklze0Vf3AakfarnpoEckvw0ESbRdN8Z1vdJg=
 oras.land/oras-go/v2 v2.3.0 h1:lqX1aXdN+DAmDTKjiDyvq85cIaI4RkIKp/PghWlAGIU=

pkg/client/client.go

@@ -344,9 +344,9 @@ func (c *KpmClient) CompileOciPkg(ociSource, version string, opts *opt.CompileOp
 	localPath := ociOpts.AddStoragePathSuffix(tmpDir)
 
 	// 2. Pull the tar.
-	err = oci.Pull(localPath, ociOpts.Reg, ociOpts.Repo, ociOpts.Tag, c.GetSettings())
+	err = c.pullTarFromOci(localPath, ociOpts)
 
-	if err != (*reporter.KpmEvent)(nil) {
+	if err != nil {
 		return nil, err
 	}
 
@@ -1012,10 +1012,11 @@ func (c *KpmClient) pullTarFromOci(localPath string, ociOpts *opt.OciOptions) er
 		tagSelected = ociOpts.Tag
 	}
 
+	full_repo := utils.JoinPath(ociOpts.Reg, ociOpts.Repo)
 	reporter.ReportEventTo(
 		reporter.NewEvent(
 			reporter.Pulling,
-			fmt.Sprintf("pulling '%s'.", ociCli.GetReference()),
+			fmt.Sprintf("pulling '%s:%s' from '%s'.", ociOpts.Repo, tagSelected, full_repo),
 		),
 		c.logWriter,
 	)

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_pull_with_oci_url/test_suite.stdout

@@ -1,4 +1,4 @@
 kpm: start to pull 'oci://localhost:5001/test/k8s'.
 kpm: the lastest version '1.27' will be pulled.
-kpm: pulling 'localhost:5001/test/k8s'.
+kpm: pulling '/test/k8s:1.27' from 'localhost:5001/test/k8s'.
 kpm: pulled 'oci://localhost:5001/test/k8s' in '<workspace>/localhost:5001/test/k8s' successfully.

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_pull_with_oci_url_tag/test_suite.stdout

@@ -1,3 +1,3 @@
 kpm: start to pull 'oci://localhost:5001/test/k8s' with tag '1.14'.
-kpm: pulling 'localhost:5001/test/k8s'.
+kpm: pulling '/test/k8s:1.14' from 'localhost:5001/test/k8s'.
 kpm: pulled 'oci://localhost:5001/test/k8s' in '<workspace>/localhost:5001/test/k8s/1.14' successfully.

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_pull_with_pkg_name/test_suite.stdout

@@ -1,4 +1,4 @@
 kpm: start to pull 'k8s'.
 kpm: the lastest version '1.27' will be pulled.
-kpm: pulling 'localhost:5001/test/k8s'.
+kpm: pulling 'test/k8s:1.27' from 'localhost:5001/test/k8s'.
 kpm: pulled 'k8s' in '<workspace>/localhost:5001/test/k8s' successfully.

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_pull_with_pkg_name_tag/test_suite.stdout

@@ -1,3 +1,3 @@
 kpm: start to pull 'k8s:1.27'.
-kpm: pulling 'localhost:5001/test/k8s'.
+kpm: pulling 'test/k8s:1.27' from 'localhost:5001/test/k8s'.
 kpm: pulled 'k8s:1.27' in '<workspace>/localhost:5001/test/k8s/1.27' successfully.

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_run_oci_url/test_suite.env

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

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_run_oci_url/test_suite.input

@@ -0,0 +1 @@
+kpm run oci://localhost:5001/test/kcl1

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_run_oci_url/test_suite.stdout

@@ -0,0 +1,3 @@
+kpm: the lastest version '0.0.1' will be pulled.
+kpm: pulling '/test/kcl1:0.0.1' from 'localhost:5001/test/kcl1'.
+The_first_kcl_program: Hello World!

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_run_oci_url_quiet/test_suite.env

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

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_run_oci_url_quiet/test_suite.input

@@ -0,0 +1 @@
+kpm run oci://localhost:5001/test/kcl1

test/e2e/test_suites/kpm/exec_outside_pkg/kpm_run_oci_url_quiet/test_suite.stdout

@@ -0,0 +1 @@
+The_first_kcl_program: Hello World!