diff --git a/cmd/omes/prepare_worker.go b/cmd/omes/prepare_worker.go index bbebe27e..38017626 100644 --- a/cmd/omes/prepare_worker.go +++ b/cmd/omes/prepare_worker.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/temporalio/omes/clioptions" - "github.com/temporalio/omes/workers" + "github.com/temporalio/omes/internal/workerctl" ) func prepareWorkerCmd() *cobra.Command { @@ -22,7 +22,7 @@ func prepareWorkerCmd() *cobra.Command { if err != nil { b.Logger.Fatal(fmt.Errorf("failed to get root directory: %w", err)) } - baseDir := workers.BaseDir(repoDir, b.SdkOptions.Language) + baseDir := workerctl.BaseDir(repoDir, b.SdkOptions.Language) if _, err := b.Build(cmd.Context(), baseDir); err != nil { b.Logger.Fatal(err) } @@ -35,7 +35,7 @@ func prepareWorkerCmd() *cobra.Command { } type workerBuilder struct { - workers.Builder + workerctl.Builder loggingOptions clioptions.LoggingOptions } diff --git a/cmd/omes/run_scenario_with_worker.go b/cmd/omes/run_scenario_with_worker.go index 9628c229..6d4891b3 100644 --- a/cmd/omes/run_scenario_with_worker.go +++ b/cmd/omes/run_scenario_with_worker.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/temporalio/omes/clioptions" - "github.com/temporalio/omes/workers" + "github.com/temporalio/omes/internal/workerctl" ) func runScenarioWithWorkerCmd() *cobra.Command { @@ -61,7 +61,7 @@ func (r *workerWithScenarioRunner) run(ctx context.Context) error { workerErrCh <- fmt.Errorf("failed to get root directory: %w", err) return } - workerErrCh <- r.Run(ctx, workers.BaseDir(repoDir, r.SdkOptions.Language)) + workerErrCh <- r.Run(ctx, workerctl.BaseDir(repoDir, r.SdkOptions.Language)) }() select { case err := <-workerErrCh: diff --git a/cmd/omes/run_worker.go b/cmd/omes/run_worker.go index eb6ce8e9..d228dd8b 100644 --- a/cmd/omes/run_worker.go +++ b/cmd/omes/run_worker.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" + "github.com/temporalio/omes/internal/workerctl" "github.com/temporalio/omes/loadgen" - "github.com/temporalio/omes/workers" ) func runWorkerCmd() *cobra.Command { @@ -41,7 +41,7 @@ func runWorkerCmd() *cobra.Command { } type workerRunner struct { - workers.Runner + workerctl.Runner builder workerBuilder } @@ -73,7 +73,7 @@ func (r *workerRunner) run(ctx context.Context) error { if err != nil { return fmt.Errorf("failed to get root directory: %w", err) } - return r.Run(ctx, workers.BaseDir(repoDir, r.SdkOptions.Language)) + return r.Run(ctx, workerctl.BaseDir(repoDir, r.SdkOptions.Language)) } func withCancelOnInterrupt(ctx context.Context) (context.Context, context.CancelFunc) { diff --git a/dockerfiles/cli.Dockerfile b/dockerfiles/cli.Dockerfile index 876dbe90..00ed921b 100644 --- a/dockerfiles/cli.Dockerfile +++ b/dockerfiles/cli.Dockerfile @@ -31,6 +31,7 @@ COPY clioptions ./clioptions COPY loadgen ./loadgen COPY metrics ./metrics COPY scenarios ./scenarios +COPY internal ./internal COPY devserver ./devserver COPY versions ./versions COPY workers ./workers/ diff --git a/dockerfiles/dotnet.Dockerfile b/dockerfiles/dotnet.Dockerfile index b7927779..41439af7 100644 --- a/dockerfiles/dotnet.Dockerfile +++ b/dockerfiles/dotnet.Dockerfile @@ -30,7 +30,7 @@ COPY scenarios ./scenarios COPY metrics ./metrics COPY devserver ./devserver COPY versions ./versions -COPY workers/*.go ./workers/ +COPY internal ./internal COPY workers/go/harness/api ./workers/go/harness/api COPY workers/proto/harness ./workers/proto/harness COPY go.mod go.sum ./ diff --git a/dockerfiles/go.Dockerfile b/dockerfiles/go.Dockerfile index d07f1d0d..228fd59d 100644 --- a/dockerfiles/go.Dockerfile +++ b/dockerfiles/go.Dockerfile @@ -12,7 +12,7 @@ COPY scenarios ./scenarios COPY metrics ./metrics COPY devserver ./devserver COPY versions ./versions -COPY workers/*.go ./workers/ +COPY internal ./internal COPY workers/go/harness/api ./workers/go/harness/api COPY go.mod go.sum ./ diff --git a/dockerfiles/java.Dockerfile b/dockerfiles/java.Dockerfile index bc94ae8c..434e42ba 100644 --- a/dockerfiles/java.Dockerfile +++ b/dockerfiles/java.Dockerfile @@ -23,7 +23,7 @@ COPY metrics ./metrics COPY scenarios ./scenarios COPY devserver ./devserver COPY versions ./versions -COPY workers/*.go ./workers/ +COPY internal ./internal COPY workers/go/harness/api ./workers/go/harness/api COPY go.mod go.sum ./ diff --git a/dockerfiles/python.Dockerfile b/dockerfiles/python.Dockerfile index f74d132c..deb69d1d 100644 --- a/dockerfiles/python.Dockerfile +++ b/dockerfiles/python.Dockerfile @@ -33,7 +33,7 @@ COPY scenarios ./scenarios COPY metrics ./metrics COPY devserver ./devserver COPY versions ./versions -COPY workers/*.go ./workers/ +COPY internal ./internal COPY workers/go/harness/api ./workers/go/harness/api COPY go.mod go.sum ./ diff --git a/dockerfiles/ruby.Dockerfile b/dockerfiles/ruby.Dockerfile index 4cfb3deb..c5657230 100644 --- a/dockerfiles/ruby.Dockerfile +++ b/dockerfiles/ruby.Dockerfile @@ -17,7 +17,7 @@ COPY scenarios ./scenarios COPY metrics ./metrics COPY devserver ./devserver COPY versions ./versions -COPY workers/*.go ./workers/ +COPY internal ./internal COPY workers/go/harness/api ./workers/go/harness/api COPY go.mod go.sum ./ diff --git a/dockerfiles/typescript.Dockerfile b/dockerfiles/typescript.Dockerfile index 65a586b5..12d8d291 100644 --- a/dockerfiles/typescript.Dockerfile +++ b/dockerfiles/typescript.Dockerfile @@ -28,7 +28,7 @@ COPY scenarios ./scenarios COPY metrics ./metrics COPY devserver ./devserver COPY versions ./versions -COPY workers/*.go ./workers/ +COPY internal ./internal COPY workers/go/harness/api ./workers/go/harness/api COPY go.mod go.sum versions.env ./ diff --git a/workers/build.go b/internal/workerctl/build.go similarity index 99% rename from workers/build.go rename to internal/workerctl/build.go index 7390539a..18e21e3d 100644 --- a/workers/build.go +++ b/internal/workerctl/build.go @@ -1,4 +1,4 @@ -package workers +package workerctl import ( "context" diff --git a/workers/log.go b/internal/workerctl/log.go similarity index 97% rename from workers/log.go rename to internal/workerctl/log.go index 7feea5d3..b83e149e 100644 --- a/workers/log.go +++ b/internal/workerctl/log.go @@ -1,4 +1,4 @@ -package workers +package workerctl import ( "bytes" diff --git a/workers/run.go b/internal/workerctl/run.go similarity index 99% rename from workers/run.go rename to internal/workerctl/run.go index 4d523da1..6a1ba41d 100644 --- a/workers/run.go +++ b/internal/workerctl/run.go @@ -1,4 +1,4 @@ -package workers +package workerctl import ( "context" diff --git a/internal/workertest/env.go b/internal/workertest/env.go index 5d0a1bc5..0d921fed 100644 --- a/internal/workertest/env.go +++ b/internal/workertest/env.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/devserver" + "github.com/temporalio/omes/internal/workerctl" "github.com/temporalio/omes/loadgen" "github.com/temporalio/omes/versions" - "github.com/temporalio/omes/workers" "go.temporal.io/api/nexus/v1" "go.temporal.io/api/operatorservice/v1" "go.temporal.io/sdk/client" @@ -108,7 +108,7 @@ func SetupTestEnvironment(t *testing.T, opts ...TestEnvOption) *TestEnvironment Ref: serverRef, Namespace: testNamespace, DynamicConfigValues: cfg.dynamicConfig, - Output: workers.NewLogWriter(serverLogger), + Output: workerctl.NewLogWriter(serverLogger), Logger: serverLogger, }) require.NoError(t, err, "Failed to start dev server") diff --git a/internal/workertest/workerpool.go b/internal/workertest/workerpool.go index f27a087c..eccb37b7 100644 --- a/internal/workertest/workerpool.go +++ b/internal/workertest/workerpool.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/temporalio/omes/clioptions" + "github.com/temporalio/omes/internal/workerctl" "github.com/temporalio/omes/loadgen" - "github.com/temporalio/omes/workers" "go.uber.org/zap" ) @@ -53,7 +53,7 @@ func (w *workerPool) ensureWorkerBuilt( w.mutex.Unlock() once.Do(func() { - baseDir := workers.BaseDir(w.env.repoDir, sdk) + baseDir := workerctl.BaseDir(w.env.repoDir, sdk) buildDir := filepath.Join(baseDir, w.env.buildDirName()) w.mutex.Lock() @@ -64,7 +64,7 @@ func (w *workerPool) ensureWorkerBuilt( }) w.mutex.Unlock() - builder := workers.Builder{ + builder := workerctl.Builder{ DirName: w.env.buildDirName(), SdkOptions: clioptions.SdkOptions{Language: sdk}, Logger: logger.Named(fmt.Sprintf("%s-builder", sdk)), @@ -98,9 +98,9 @@ func (w *workerPool) startWorker( go func() { defer close(workerDone) - baseDir := workers.BaseDir(w.env.repoDir, sdk) - runner := &workers.Runner{ - Builder: workers.Builder{ + baseDir := workerctl.BaseDir(w.env.repoDir, sdk) + runner := &workerctl.Runner{ + Builder: workerctl.Builder{ DirName: w.env.buildDirName(), SdkOptions: clioptions.SdkOptions{Language: sdk}, Logger: logger.Named(fmt.Sprintf("%s-worker-builder", sdk)), diff --git a/scenarios/project/build.go b/scenarios/project/build.go index e4852e4a..b24d2da5 100644 --- a/scenarios/project/build.go +++ b/scenarios/project/build.go @@ -6,19 +6,19 @@ import ( "github.com/temporalio/features/sdkbuild" "github.com/temporalio/omes/clioptions" - "github.com/temporalio/omes/workers" + "github.com/temporalio/omes/internal/workerctl" "go.uber.org/zap" ) // buildProject builds a project test program for the given language. func buildProject(ctx context.Context, repoRoot string, p projectScenarioOptions, logger *zap.SugaredLogger) (sdkbuild.Program, error) { - b := workers.Builder{ + b := workerctl.Builder{ DirName: fmt.Sprintf("project-build-runner-%s", p.projectName), SdkOptions: p.sdkOpts, Logger: logger, } - baseDir := workers.BaseDir(repoRoot, p.sdkOpts.Language) + baseDir := workerctl.BaseDir(repoRoot, p.sdkOpts.Language) switch p.sdkOpts.Language { case clioptions.LangPython: return b.Build(ctx, baseDir) diff --git a/scenarios/project/project_test.go b/scenarios/project/project_test.go index ee86728d..8686174e 100644 --- a/scenarios/project/project_test.go +++ b/scenarios/project/project_test.go @@ -12,9 +12,9 @@ import ( "github.com/temporalio/features/sdkbuild" "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/devserver" + "github.com/temporalio/omes/internal/workerctl" "github.com/temporalio/omes/loadgen" "github.com/temporalio/omes/versions" - "github.com/temporalio/omes/workers" sdkclient "go.temporal.io/sdk/client" "go.uber.org/zap/zaptest" ) @@ -192,7 +192,7 @@ func startProjectWorker( t.Helper() require.NotEmpty(t, opts.projectName) - builder := workers.Builder{ + builder := workerctl.Builder{ SdkOptions: opts.sdkOpts, Logger: info.Logger.Named(fmt.Sprintf("%s-worker-builder", opts.sdkOpts.Language)), } @@ -203,7 +203,7 @@ func startProjectWorker( builder.DirName = filepath.Base(prog.Dir()) } - runner := &workers.Runner{ + runner := &workerctl.Runner{ Builder: builder, AppName: opts.projectName, TaskQueueName: loadgen.TaskQueueForRun(info.RunID), @@ -222,7 +222,7 @@ func startProjectWorker( workerErrCh := make(chan error, 1) go func() { defer close(workerErrCh) - workerErrCh <- runner.Run(ctx, workers.BaseDir(info.RootPath, opts.sdkOpts.Language)) + workerErrCh <- runner.Run(ctx, workerctl.BaseDir(info.RootPath, opts.sdkOpts.Language)) }() return workerErrCh }