Merge pull request #294 from yohamta/feat/admin-web

Remove grep package
dagu-org · Aug 26, 2022 · 2713b23 · 2713b23
2 parents 312d972 + aa56d28
commit 2713b23
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 232 deletions.
diff --git a/go.mod b/go.mod
@@ -18,7 +18,10 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-require golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
+require (
+	github.com/yohamta/grep v1.0.0 // indirect
+	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
+)
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -43,6 +43,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
 github.com/urfave/cli/v2 v2.4.5 h1:AWCiaqBc+38MxX6nJfjRQyyd2Gq50sOan+AEyv/vFhM=
 github.com/urfave/cli/v2 v2.4.5/go.mod h1:oDzoM7pVwz6wHn5ogWgFUU1s4VJayeQS+aEZDqXIEJs=
+github.com/yohamta/grep v1.0.0 h1:gCz7u8+caSqLNnY7LehatRnMBMTKOd4iiLClznHNcJI=
+github.com/yohamta/grep v1.0.0/go.mod h1:WEl5AeArgNwJmGvsEHr0WC4pqm0YWaWz3UId0V5D0hs=
 golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
 golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
 golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=

diff --git a/internal/controller/controller.go b/internal/controller/controller.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/yohamta/dagu/internal/dag"
 	"github.com/yohamta/dagu/internal/database"
-	"github.com/yohamta/dagu/internal/grep"
 	"github.com/yohamta/dagu/internal/models"
 	"github.com/yohamta/dagu/internal/scheduler"
 	"github.com/yohamta/dagu/internal/sock"
 	"github.com/yohamta/dagu/internal/utils"
+	"github.com/yohamta/grep"
 )
 
 // Controller is the interface for working with DAGs.

diff --git a/internal/grep/grep.go b/internal/grep/grep.go
diff --git a/internal/grep/grep_test.go b/internal/grep/grep_test.go
diff --git a/internal/grep/testdata/test.txt b/internal/grep/testdata/test.txt