diff --git a/cmd/clioptions/client.go b/clioptions/client.go similarity index 100% rename from cmd/clioptions/client.go rename to clioptions/client.go diff --git a/cmd/clioptions/logging.go b/clioptions/logging.go similarity index 100% rename from cmd/clioptions/logging.go rename to clioptions/logging.go diff --git a/cmd/clioptions/metrics.go b/clioptions/metrics.go similarity index 100% rename from cmd/clioptions/metrics.go rename to clioptions/metrics.go diff --git a/cmd/clioptions/metrics_test.go b/clioptions/metrics_test.go similarity index 100% rename from cmd/clioptions/metrics_test.go rename to clioptions/metrics_test.go diff --git a/cmd/clioptions/scenario.go b/clioptions/scenario.go similarity index 100% rename from cmd/clioptions/scenario.go rename to clioptions/scenario.go diff --git a/cmd/clioptions/sdk.go b/clioptions/sdk.go similarity index 100% rename from cmd/clioptions/sdk.go rename to clioptions/sdk.go diff --git a/cmd/clioptions/worker.go b/clioptions/worker.go similarity index 100% rename from cmd/clioptions/worker.go rename to clioptions/worker.go diff --git a/cmd/clioptions/zap_adapter.go b/clioptions/zap_adapter.go similarity index 100% rename from cmd/clioptions/zap_adapter.go rename to clioptions/zap_adapter.go diff --git a/cmd/cli/cleanup_scenario.go b/cmd/cli/cleanup_scenario.go index b4dc1b8b..dda49c47 100644 --- a/cmd/cli/cleanup_scenario.go +++ b/cmd/cli/cleanup_scenario.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/loadgen" "go.temporal.io/api/batch/v1" "go.temporal.io/api/enums/v1" diff --git a/cmd/cli/prepare_worker.go b/cmd/cli/prepare_worker.go index 8026ca61..1acc8274 100644 --- a/cmd/cli/prepare_worker.go +++ b/cmd/cli/prepare_worker.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/workers" ) diff --git a/cmd/cli/run_scenario.go b/cmd/cli/run_scenario.go index 7026c97e..a17d7784 100644 --- a/cmd/cli/run_scenario.go +++ b/cmd/cli/run_scenario.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/loadgen" "go.temporal.io/sdk/client" "go.uber.org/zap" diff --git a/cmd/cli/run_scenario_with_worker.go b/cmd/cli/run_scenario_with_worker.go index 98d8055b..d294d68c 100644 --- a/cmd/cli/run_scenario_with_worker.go +++ b/cmd/cli/run_scenario_with_worker.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/workers" ) diff --git a/cmd/dev/build_helper.go b/cmd/dev/build_helper.go index 9b426a64..4197a48b 100644 --- a/cmd/dev/build_helper.go +++ b/cmd/dev/build_helper.go @@ -9,7 +9,7 @@ import ( "time" "github.com/spf13/pflag" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "go.uber.org/zap" ) diff --git a/cmd/dev/build_worker_image.go b/cmd/dev/build_worker_image.go index bbdd0392..d3174521 100644 --- a/cmd/dev/build_worker_image.go +++ b/cmd/dev/build_worker_image.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "golang.org/x/mod/semver" ) diff --git a/dockerfiles/cli.Dockerfile b/dockerfiles/cli.Dockerfile index 93cbb4e3..6b0309c1 100644 --- a/dockerfiles/cli.Dockerfile +++ b/dockerfiles/cli.Dockerfile @@ -27,6 +27,7 @@ ENV PATH="$PATH:/root/.cargo/bin" # Copy CLI build dependencies COPY cmd ./cmd +COPY clioptions ./clioptions COPY loadgen ./loadgen COPY metrics ./metrics COPY scenarios ./scenarios diff --git a/dockerfiles/dotnet.Dockerfile b/dockerfiles/dotnet.Dockerfile index 307973dc..33ac5c02 100644 --- a/dockerfiles/dotnet.Dockerfile +++ b/dockerfiles/dotnet.Dockerfile @@ -24,6 +24,7 @@ WORKDIR /app # Copy CLI build dependencies COPY cmd ./cmd +COPY clioptions ./clioptions COPY loadgen ./loadgen COPY scenarios ./scenarios COPY metrics ./metrics diff --git a/dockerfiles/go.Dockerfile b/dockerfiles/go.Dockerfile index 76426a47..f08805f2 100644 --- a/dockerfiles/go.Dockerfile +++ b/dockerfiles/go.Dockerfile @@ -6,6 +6,7 @@ WORKDIR /app # Copy CLI build dependencies COPY cmd ./cmd +COPY clioptions ./clioptions COPY loadgen ./loadgen COPY scenarios ./scenarios COPY metrics ./metrics diff --git a/dockerfiles/java.Dockerfile b/dockerfiles/java.Dockerfile index 489d9bdb..223a0e99 100644 --- a/dockerfiles/java.Dockerfile +++ b/dockerfiles/java.Dockerfile @@ -17,6 +17,7 @@ WORKDIR /app # Copy CLI build dependencies COPY cmd ./cmd +COPY clioptions ./clioptions COPY loadgen ./loadgen COPY metrics ./metrics COPY scenarios ./scenarios diff --git a/dockerfiles/python.Dockerfile b/dockerfiles/python.Dockerfile index d0d90594..2a0848fa 100644 --- a/dockerfiles/python.Dockerfile +++ b/dockerfiles/python.Dockerfile @@ -27,6 +27,7 @@ WORKDIR /app # Copy CLI build dependencies COPY cmd ./cmd +COPY clioptions ./clioptions COPY loadgen ./loadgen COPY scenarios ./scenarios COPY metrics ./metrics diff --git a/dockerfiles/ruby.Dockerfile b/dockerfiles/ruby.Dockerfile index 1070870d..80da19cc 100644 --- a/dockerfiles/ruby.Dockerfile +++ b/dockerfiles/ruby.Dockerfile @@ -11,6 +11,7 @@ WORKDIR /app # Copy CLI build dependencies COPY cmd ./cmd +COPY clioptions ./clioptions COPY loadgen ./loadgen COPY scenarios ./scenarios COPY metrics ./metrics diff --git a/dockerfiles/typescript.Dockerfile b/dockerfiles/typescript.Dockerfile index 022e30ae..2b84512a 100644 --- a/dockerfiles/typescript.Dockerfile +++ b/dockerfiles/typescript.Dockerfile @@ -22,6 +22,7 @@ WORKDIR /app # Copy CLI build dependencies COPY cmd ./cmd +COPY clioptions ./clioptions COPY loadgen ./loadgen COPY scenarios ./scenarios COPY metrics ./metrics diff --git a/loadgen/kitchen_sink_executor_test.go b/loadgen/kitchen_sink_executor_test.go index 4d52a4bb..1cd528c4 100644 --- a/loadgen/kitchen_sink_executor_test.go +++ b/loadgen/kitchen_sink_executor_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" . "github.com/temporalio/omes/loadgen" . "github.com/temporalio/omes/loadgen/kitchensink" . "github.com/temporalio/omes/workers" diff --git a/loadgen/scenario.go b/loadgen/scenario.go index 4ba6bd5d..18b8abc5 100644 --- a/loadgen/scenario.go +++ b/loadgen/scenario.go @@ -22,7 +22,7 @@ import ( "go.temporal.io/sdk/temporal" "go.uber.org/zap" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/loadgen/kitchensink" ) diff --git a/scenarios/ebb_and_flow_test.go b/scenarios/ebb_and_flow_test.go index 443925af..b7977842 100644 --- a/scenarios/ebb_and_flow_test.go +++ b/scenarios/ebb_and_flow_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/loadgen" "github.com/temporalio/omes/workers" ) diff --git a/scenarios/project/build.go b/scenarios/project/build.go index c980cc16..a9277b6c 100644 --- a/scenarios/project/build.go +++ b/scenarios/project/build.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/temporalio/features/sdkbuild" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/workers" "go.uber.org/zap" ) diff --git a/scenarios/project/project.go b/scenarios/project/project.go index 3dadc876..414f192c 100644 --- a/scenarios/project/project.go +++ b/scenarios/project/project.go @@ -12,7 +12,7 @@ import ( "time" "github.com/temporalio/features/sdkbuild" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/loadgen" api "github.com/temporalio/omes/workers/go/harness/api" "go.uber.org/zap" diff --git a/scenarios/project/project_test.go b/scenarios/project/project_test.go index 8c89a429..54a12d8a 100644 --- a/scenarios/project/project_test.go +++ b/scenarios/project/project_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "github.com/temporalio/features/sdkbuild" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/devserver" "github.com/temporalio/omes/loadgen" "github.com/temporalio/omes/versions" diff --git a/scenarios/serverless_burst_test.go b/scenarios/serverless_burst_test.go index 6ce508fd..55ebe8c2 100644 --- a/scenarios/serverless_burst_test.go +++ b/scenarios/serverless_burst_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/loadgen" "github.com/temporalio/omes/workers" ) diff --git a/scenarios/throughput_stress_test.go b/scenarios/throughput_stress_test.go index 22894dbc..3c5c3440 100644 --- a/scenarios/throughput_stress_test.go +++ b/scenarios/throughput_stress_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/loadgen" "github.com/temporalio/omes/workers" ) diff --git a/workers/build.go b/workers/build.go index 9645125b..fb730eac 100644 --- a/workers/build.go +++ b/workers/build.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/temporalio/features/sdkbuild" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "go.uber.org/zap" ) diff --git a/workers/go/apps/lambda/worker.go b/workers/go/apps/lambda/worker.go index 9ce7bbb7..ad301d43 100644 --- a/workers/go/apps/lambda/worker.go +++ b/workers/go/apps/lambda/worker.go @@ -9,7 +9,7 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/secretsmanager" "github.com/nexus-rpc/sdk-go/nexus" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/workers/go/harness" "github.com/temporalio/omes/workers/go/workerlib/ebbandflow" "github.com/temporalio/omes/workers/go/workerlib/kitchensink" diff --git a/workers/go/apps/registry.go b/workers/go/apps/registry.go index 54121c73..6e01b26f 100644 --- a/workers/go/apps/registry.go +++ b/workers/go/apps/registry.go @@ -4,7 +4,7 @@ import ( "os" "github.com/spf13/pflag" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/workers/go/apps/lambda" "github.com/temporalio/omes/workers/go/apps/worker" "github.com/temporalio/omes/workers/go/harness" diff --git a/workers/go/apps/worker/worker.go b/workers/go/apps/worker/worker.go index 943b8395..ec6f5cc6 100644 --- a/workers/go/apps/worker/worker.go +++ b/workers/go/apps/worker/worker.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/nexus-rpc/sdk-go/nexus" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/workers/go/harness" "github.com/temporalio/omes/workers/go/workerlib/ebbandflow" "github.com/temporalio/omes/workers/go/workerlib/kitchensink" diff --git a/workers/go/harness/client.go b/workers/go/harness/client.go index ee8bd9d3..20881fc7 100644 --- a/workers/go/harness/client.go +++ b/workers/go/harness/client.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/metrics" sdkclient "go.temporal.io/sdk/client" "go.uber.org/zap" diff --git a/workers/go/harness/worker.go b/workers/go/harness/worker.go index dc76a188..bbf6de95 100644 --- a/workers/go/harness/worker.go +++ b/workers/go/harness/worker.go @@ -9,7 +9,7 @@ import ( "syscall" "github.com/spf13/pflag" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" sdkclient "go.temporal.io/sdk/client" sdkworker "go.temporal.io/sdk/worker" "go.temporal.io/sdk/workflow" diff --git a/workers/run.go b/workers/run.go index 07257b52..75758482 100644 --- a/workers/run.go +++ b/workers/run.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/pflag" "github.com/temporalio/features/sdkbuild" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "go.temporal.io/sdk/client" "go.temporal.io/sdk/testsuite" ) diff --git a/workers/test_env.go b/workers/test_env.go index 172e32dc..ab3fbadd 100644 --- a/workers/test_env.go +++ b/workers/test_env.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/devserver" "github.com/temporalio/omes/loadgen" "github.com/temporalio/omes/versions" diff --git a/workers/test_workers.go b/workers/test_workers.go index 9f4bdcfc..11c1e45d 100644 --- a/workers/test_workers.go +++ b/workers/test_workers.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/temporalio/omes/cmd/clioptions" + "github.com/temporalio/omes/clioptions" "github.com/temporalio/omes/loadgen" "go.uber.org/zap" )