Merge pull request #290 from kcl-lang/fix-oci-source-with-settings

fix: oci source with settings files

pkg/client/client.go

@@ -409,9 +409,15 @@ func (c *KpmClient) CompileWithOpts(opts *opt.CompileOptions) (*kcl.KCLResultLis
 				opts.Merge(kcl.WithKFilenames(filepath.Join(opts.PkgPath(), entry)))
 			}
 		}
-	} else if len(kclPkg.GetEntryKclFilesFromModFile()) == 0 && !opts.HasSettingsYaml() {
-		// no entry
-		opts.Merge(kcl.WithKFilenames(opts.PkgPath()))
+	} else if len(kclPkg.GetEntryKclFilesFromModFile()) == 0 {
+		// No entries profile in kcl.mod and no file settings in the settings file
+		if !opts.HasSettingsYaml() {
+			// No settings file.
+			opts.Merge(kcl.WithKFilenames(opts.PkgPath()))
+		} else if opts.HasSettingsYaml() && len(opts.KFilenameList) == 0 {
+			// Has settings file but no file config in the settings files.
+			opts.Merge(kcl.WithKFilenames(opts.PkgPath()))
+		}
 	}
 	opts.Merge(kcl.WithWorkDir(opts.PkgPath()))
 

pkg/client/client_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/dominikbraun/graph"
 	"github.com/otiai10/copy"
 	"github.com/stretchr/testify/assert"
+	"kcl-lang.io/kcl-go/pkg/kcl"
 	"kcl-lang.io/kpm/pkg/env"
 	"kcl-lang.io/kpm/pkg/git"
 	"kcl-lang.io/kpm/pkg/opt"
@@ -1367,3 +1368,15 @@ func TestAddWithLocalPath(t *testing.T) {
 	assert.Equal(t, gotpkg.Dependencies.Deps["dep_pkg"].LocalFullPath, filepath.Join(tmppath, "dep_pkg"))
 	assert.Equal(t, gotpkg.Dependencies.Deps["dep_pkg"].Source.Local.Path, "../dep_pkg")
 }
+
+func TestRunOciWithSettingsFile(t *testing.T) {
+	kpmcli, err := NewKpmClient()
+	assert.Equal(t, err, nil)
+	kpmcli.SetLogWriter(nil)
+	opts := opt.DefaultCompileOptions()
+	opts.SetEntries([]string{})
+	opts.Merge(kcl.WithSettings(filepath.Join(".", "test_data", "test_run_oci_with_settings", "kcl.yaml")))
+	opts.SetHasSettingsYaml(true)
+	_, err = kpmcli.CompileOciPkg("oci://ghcr.io/kcl-lang/helloworld", "", opts)
+	assert.Equal(t, err, nil)
+}

pkg/client/test_data/test_run_oci_with_settings/kcl.yaml

@@ -0,0 +1 @@
+kcl_cli_configs: