Merge pull request #236 from yohamta/develop

Allow DAGs to be loaded without specifying an extension `.yaml`

cmd/start_test.go

@@ -18,6 +18,10 @@ func Test_startCommand(t *testing.T) {
 			args: []string{"", "start", "--params=x y", testConfig("cmd_start_with_params_2.yaml")}, errored: false,
 			output: []string{"params are x and y"},
 		},
+		{
+			args: []string{"", "start", testConfig("cmd_start_success")}, errored: false,
+			output: []string{"1 finished"},
+		},
 	}
 
 	for _, v := range tests {

examples/calling_subdag_main.yaml

@@ -0,0 +1,3 @@
+steps:
+  - name: step1
+    command: dagu start calling_subdag_sub

examples/calling_subdag_sub.yaml

@@ -0,0 +1,3 @@
+steps:
+  - name: step1
+    command: echo hello

internal/config/loader.go

@@ -109,6 +109,9 @@ func (cl *Loader) loadConfig(f string, opts *BuildConfigOptions) (*Config, error
 	if f == "" {
 		return nil, fmt.Errorf("config file was not specified")
 	}
+	if !strings.HasSuffix(f, ".yaml") && !strings.HasSuffix(f, ".yml") {
+		f = fmt.Sprintf("%s.yaml", f)
+	}
 	file, err := filepath.Abs(f)
 	if err != nil {
 		return nil, err

internal/config/loader_test.go

@@ -15,6 +15,11 @@ func TestLoadConfig(t *testing.T) {
 	}
 	_, err := l.Load(testConfig, "")
 	require.NoError(t, err)
+
+	// without .yaml
+	s := path.Join(testDir, "config_load")
+	_, err = l.Load(s, "")
+	require.NoError(t, err)
 }
 
 func TestLoadGlobalConfig(t *testing.T) {

tests/testdata/cmd_start_success.yaml

@@ -0,0 +1,3 @@
+steps:
+  - name: "1"
+    command: "true"