Skip to content

Commit ecdc6f9

Browse files
authored
Refactor: move internal/pkg/log to pkg/util/log (#233)
Signed-off-by: Daniel Hu <[email protected]>
1 parent 6209566 commit ecdc6f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+105
-105
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ build-linux-amd64: ## Cross-platform build for linux/amd64
4747
fmt: ## Run 'go fmt' & goimports against code.
4848
go install golang.org/x/tools/cmd/goimports@latest
4949
goimports -local="github.com/merico-dev/stream" -d -w cmd
50+
goimports -local="github.com/merico-dev/stream" -d -w pkg
5051
goimports -local="github.com/merico-dev/stream" -d -w internal
5152
goimports -local="github.com/merico-dev/stream" -d -w test
5253
go fmt ./...

cmd/argocd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
"github.com/merico-dev/stream/internal/pkg/log"
54
"github.com/merico-dev/stream/internal/pkg/plugin/argocd"
5+
"github.com/merico-dev/stream/pkg/util/log"
66
)
77

88
// NAME is the name of this DevStream plugin.

cmd/argocdapp/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
"github.com/merico-dev/stream/internal/pkg/log"
54
"github.com/merico-dev/stream/internal/pkg/plugin/argocdapp"
5+
"github.com/merico-dev/stream/pkg/util/log"
66
)
77

88
// NAME is the name of this DevStream plugin.

cmd/devlake/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
"github.com/merico-dev/stream/internal/pkg/log"
54
"github.com/merico-dev/stream/internal/pkg/plugin/devlake"
5+
"github.com/merico-dev/stream/pkg/util/log"
66
)
77

88
// NAME is the name of this DevStream plugin.

cmd/devstream/apply.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"github.com/spf13/cobra"
77

8-
"github.com/merico-dev/stream/internal/pkg/log"
98
"github.com/merico-dev/stream/internal/pkg/pluginengine"
9+
"github.com/merico-dev/stream/pkg/util/log"
1010
)
1111

1212
var applyCMD = &cobra.Command{

cmd/devstream/delete.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ package main
33
import (
44
"os"
55

6-
"github.com/merico-dev/stream/internal/pkg/log"
7-
86
"github.com/spf13/cobra"
97

108
"github.com/merico-dev/stream/internal/pkg/pluginengine"
9+
"github.com/merico-dev/stream/pkg/util/log"
1110
)
1211

1312
var deleteCMD = &cobra.Command{

cmd/devstream/init.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package main
33
import (
44
"github.com/spf13/cobra"
55

6-
"github.com/merico-dev/stream/internal/pkg/log"
7-
86
"github.com/merico-dev/stream/internal/pkg/configloader"
97
"github.com/merico-dev/stream/internal/pkg/pluginmanager"
8+
"github.com/merico-dev/stream/pkg/util/log"
109
)
1110

1211
var initCMD = &cobra.Command{

cmd/devstream/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"github.com/spf13/cobra"
88
"github.com/spf13/viper"
99

10-
"github.com/merico-dev/stream/internal/pkg/log"
1110
"github.com/merico-dev/stream/internal/pkg/pluginengine"
11+
"github.com/merico-dev/stream/pkg/util/log"
1212
)
1313

1414
var (

cmd/devstream/verify.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ package main
33
import (
44
"github.com/spf13/cobra"
55

6-
"github.com/merico-dev/stream/internal/pkg/log"
7-
86
"github.com/merico-dev/stream/internal/pkg/pluginengine"
7+
"github.com/merico-dev/stream/pkg/util/log"
98
)
109

1110
var verifyCMD = &cobra.Command{

cmd/githubactions/golang/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
"github.com/merico-dev/stream/internal/pkg/log"
54
"github.com/merico-dev/stream/internal/pkg/plugin/githubactions/golang"
5+
"github.com/merico-dev/stream/pkg/util/log"
66
)
77

88
// NAME is the name of this DevStream plugin.

0 commit comments

Comments
 (0)