Merge pull request #11 from yankeguo/feat-support-env-in-cron-expr

feat support env in cron expr
yankeguo · Jan 19, 2024 · 27cb85a · 27cb85a
2 parents 4ec9d41 + 8fbf567
commit 27cb85a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/pkg/munit/loader.go b/pkg/munit/loader.go
@@ -126,6 +126,11 @@ func (ld *Loader) Load(opts LoadOptions) (output []Unit, skipped []Unit, err err
 			continue
 		}
 
+		// eval cron
+		if unit.Cron != "" {
+			unit.Cron = os.ExpandEnv(unit.Cron)
+		}
+
 		// replicas
 		if unit.Count > 1 {
 			for i := 0; i < unit.Count; i++ {

diff --git a/pkg/munit/loader_test.go b/pkg/munit/loader_test.go
@@ -10,6 +10,7 @@ import (
 func TestNewLoader(t *testing.T) {
 	os.Setenv("MINIT_ENABLE", "@default")
 	os.Setenv("MINIT_DISABLE", "task-3,task-5")
+	os.Setenv("DEBUG_EVERY", "10s")
 	ld := NewLoader()
 	units, skipped, err := ld.Load(LoadOptions{
 		Dir: "testdata",
@@ -19,6 +20,7 @@ func TestNewLoader(t *testing.T) {
 	require.Len(t, units, 1)
 	require.Len(t, skipped, 4)
 	require.Equal(t, "task-4", units[0].Name)
+	require.Equal(t, "@every 10s", units[0].Cron)
 }
 
 func TestDupOrMakeMap(t *testing.T) {

diff --git a/pkg/munit/testdata/test2.yml b/pkg/munit/testdata/test2.yml
@@ -7,7 +7,7 @@ command:
 ---
 name: task-4
 kind: cron
-cron: "@every 10s"
+cron: "@every ${DEBUG_EVERY}"
 command:
   - echo
   - cron