refactor: remove custom dagger logger (#166)

aweris · Oct 31, 2023 · d4fc8c4 · d4fc8c4
1 parent 6010726
commit d4fc8c4
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 257 deletions.
diff --git a/ghx/dagger.go b/ghx/dagger.go
diff --git a/ghx/executor_container.go b/ghx/executor_container.go
@@ -26,7 +26,7 @@ func NewContainerExecutorFromStepDocker(sd *StepDocker) *ContainerExecutor {
  return &ContainerExecutor{
  entrypoint: sd.Step.With["entrypoint"],
  args: []string{sd.Step.With["args"]},
- cp: NewEnvCommandsProcessor(),
+ cp: NewCommandProcessor(),
  container: sd.container,
  }
 }
@@ -35,7 +35,7 @@ func NewContainerExecutorFromStepAction(sa *StepAction, entrypoint string) *Cont
  return &ContainerExecutor{
  entrypoint: entrypoint,
  args: sa.Action.Meta.Runs.Args,
- cp: NewEnvCommandsProcessor(),
+ cp: NewCommandProcessor(),
  container: sa.container,
  }
 }

diff --git a/ghx/journal/entry.go b/ghx/journal/entry.go
diff --git a/ghx/journal/pipe.go b/ghx/journal/pipe.go
diff --git a/ghx/main.go b/ghx/main.go
@@ -5,14 +5,16 @@ import (
  "fmt"
  "os"
 
+ "dagger.io/dagger"
+
  "github.com/aweris/gale/common/fs"
  "github.com/aweris/gale/ghx/context"
 )
 
 func main() {
  stdctx := stdContext.Background()
 
- client, err := getDaggerClient(stdctx)
+ client, err := dagger.Connect(stdctx, dagger.WithLogOutput(os.Stdout))
  if err != nil {
  fmt.Printf("failed to get dagger client: %v", err)
  os.Exit(1)

diff --git a/ghx/workflow_commands.go b/ghx/workflow_commands.go
@@ -44,30 +44,6 @@ type CommandProcessor struct {
  exclude map[CommandName]bool // exclude is a map of command names to exclude from processing
 }
 
-// NewLoggingCommandProcessor creates a new command processor that processes logging commands.
-func NewLoggingCommandProcessor() *CommandProcessor {
- return NewCommandProcessor(
- CommandNameSetEnv,
- CommandNameSetOutput,
- CommandNameSaveState,
- CommandNameAddMask,
- CommandNameAddMatcher,
- CommandNameAddPath,
- )
-}
-
-// NewEnvCommandsProcessor returns a new command processor that processes commands that manipulate execution environment.
-func NewEnvCommandsProcessor() *CommandProcessor {
- return NewCommandProcessor(
- CommandNameGroup,
- CommandNameEndGroup,
- CommandNameDebug,
- CommandNameError,
- CommandNameWarning,
- CommandNameNotice,
- )
-}
-
 func NewCommandProcessor(excluded ...CommandName) *CommandProcessor {
  exclude := make(map[CommandName]bool, len(excluded))