Move workflow pkg

tinkerbell · Jun 30, 2023 · a4e98b0 · a4e98b0
1 parent f20a793
commit a4e98b0
Show file tree

Hide file tree

Showing 24 changed files with 20 additions and 16 deletions.
diff --git a/internal/agent/agent.go b/internal/agent/agent.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/tinkerbell/tink/internal/agent/event"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
+	"github.com/tinkerbell/tink/internal/workflow"
 )
 
 // Agent is the core data structure for handling workflow execution on target nodes. It leverages

diff --git a/internal/agent/agent_test.go b/internal/agent/agent_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/tinkerbell/tink/internal/agent/failure"
 	"github.com/tinkerbell/tink/internal/agent/runtime"
 	"github.com/tinkerbell/tink/internal/agent/transport"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
+	"github.com/tinkerbell/tink/internal/workflow"
 	"go.uber.org/zap"
 )
 

diff --git a/internal/agent/mock.go b/internal/agent/mock.go
diff --git a/internal/agent/run.go b/internal/agent/run.go
@@ -7,9 +7,10 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
+
 	"github.com/tinkerbell/tink/internal/agent/event"
 	"github.com/tinkerbell/tink/internal/agent/failure"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
+	"github.com/tinkerbell/tink/internal/workflow"
 )
 
 // ReasonRuntimeError is the default reason used when no reason is provided by the runtime.

diff --git a/internal/agent/runtime.go b/internal/agent/runtime.go
@@ -3,7 +3,7 @@ package agent
 import (
 	"context"
 
-	"github.com/tinkerbell/tink/internal/agent/workflow"
+	"github.com/tinkerbell/tink/internal/workflow"
 )
 
 // ContainerRuntime is a runtime capable of executing workflow actions.

diff --git a/internal/agent/runtime/docker.go b/internal/agent/runtime/docker.go
@@ -12,11 +12,12 @@ import (
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/client"
 	"github.com/go-logr/logr"
+	"k8s.io/apimachinery/pkg/util/rand"
+
 	"github.com/tinkerbell/tink/internal/agent"
 	"github.com/tinkerbell/tink/internal/agent/runtime/internal"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
 	"github.com/tinkerbell/tink/internal/ptr"
-	"k8s.io/apimachinery/pkg/util/rand"
+	"github.com/tinkerbell/tink/internal/workflow"
 )
 
 var _ agent.ContainerRuntime = &Docker{}

diff --git a/internal/agent/runtime/docker_test.go b/internal/agent/runtime/docker_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/tinkerbell/tink/internal/agent/failure"
 	"github.com/tinkerbell/tink/internal/agent/runtime"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
+	"github.com/tinkerbell/tink/internal/workflow"
 	"go.uber.org/multierr"
 
 	"github.com/docker/docker/api/types"

diff --git a/internal/agent/runtime/fake.go b/internal/agent/runtime/fake.go
@@ -4,8 +4,9 @@ import (
 	"context"
 
 	"github.com/go-logr/logr"
+
 	"github.com/tinkerbell/tink/internal/agent"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
+	"github.com/tinkerbell/tink/internal/workflow"
 )
 
 var _ agent.ContainerRuntime = Fake{}

diff --git a/internal/agent/transport/fake.go b/internal/agent/transport/fake.go
@@ -4,8 +4,9 @@ import (
 	"context"
 
 	"github.com/go-logr/logr"
+
 	"github.com/tinkerbell/tink/internal/agent/event"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
+	"github.com/tinkerbell/tink/internal/workflow"
 )
 
 func Noop() Fake {

diff --git a/internal/agent/transport/grpc.go b/internal/agent/transport/grpc.go
@@ -8,8 +8,8 @@ import (
 	"github.com/avast/retry-go"
 	"github.com/go-logr/logr"
 	"github.com/tinkerbell/tink/internal/agent/event"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
 	workflowproto "github.com/tinkerbell/tink/internal/proto/workflow/v2"
+	"github.com/tinkerbell/tink/internal/workflow"
 )
 
 var _ event.Recorder = &GRPC{}

diff --git a/internal/agent/transport/grpc_test.go b/internal/agent/transport/grpc_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/tinkerbell/tink/internal/agent/event"
 	"github.com/tinkerbell/tink/internal/agent/transport"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
 	workflowproto "github.com/tinkerbell/tink/internal/proto/workflow/v2"
+	"github.com/tinkerbell/tink/internal/workflow"
 	"google.golang.org/grpc"
 )
 

diff --git a/internal/agent/transport/handler.go b/internal/agent/transport/handler.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/tinkerbell/tink/internal/agent/event"
-	"github.com/tinkerbell/tink/internal/agent/workflow"
+	"github.com/tinkerbell/tink/internal/workflow"
 )
 
 // WorkflowHandler is responsible for workflow execution.

diff --git a/internal/agent/transport/mock.go b/internal/agent/transport/mock.go
diff --git a/internal/controller/manager.go b/internal/controller/manager.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/tinkerbell/tink/api/v1alpha1"
-	"github.com/tinkerbell/tink/internal/workflow"
+	"github.com/tinkerbell/tink/internal/obsolete/workflow"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"

diff --git a/internal/workflow/convert.go → internal/obsolete/workflow/convert.go b/internal/workflow/convert.go → internal/obsolete/workflow/convert.go
diff --git a/internal/workflow/convert_test.go → internal/obsolete/workflow/convert_test.go b/internal/workflow/convert_test.go → internal/obsolete/workflow/convert_test.go
diff --git a/internal/workflow/reconciler.go → internal/obsolete/workflow/reconciler.go b/internal/workflow/reconciler.go → internal/obsolete/workflow/reconciler.go
diff --git a/internal/workflow/reconciler_test.go → ...rnal/obsolete/workflow/reconciler_test.go b/internal/workflow/reconciler_test.go → ...rnal/obsolete/workflow/reconciler_test.go
diff --git a/internal/workflow/template_funcs.go → internal/obsolete/workflow/template_funcs.go b/internal/workflow/template_funcs.go → internal/obsolete/workflow/template_funcs.go
diff --git a/internal/workflow/template_validator.go → ...l/obsolete/workflow/template_validator.go b/internal/workflow/template_validator.go → ...l/obsolete/workflow/template_validator.go
diff --git a/internal/workflow/template_validator_test.go → ...olete/workflow/template_validator_test.go b/internal/workflow/template_validator_test.go → ...olete/workflow/template_validator_test.go
diff --git a/internal/workflow/types.go → internal/obsolete/workflow/types.go b/internal/workflow/types.go → internal/obsolete/workflow/types.go
diff --git a/internal/server/kubernetes_api_workflow.go b/internal/server/kubernetes_api_workflow.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/tinkerbell/tink/api/v1alpha1"
+	"github.com/tinkerbell/tink/internal/obsolete/workflow"
 	"github.com/tinkerbell/tink/internal/proto"
-	"github.com/tinkerbell/tink/internal/workflow"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/internal/agent/workflow/workflow.go → internal/workflow/workflow.go b/internal/agent/workflow/workflow.go → internal/workflow/workflow.go