From bb80a8906a0a47cce9f73ec0be201af0c2609c4b Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 20 Nov 2023 07:19:15 -0800 Subject: [PATCH] Move protos to sdk-core-protos Nix sandboxes builds such that they cannot escape their manifest directory. By moving the `protos` into `sdk-core-protos`, Nix will be able to build crates that depend on `sdk-core-protos`. Otherwise, the build script will fail: Error: Custom { kind: Other, error: "protoc failed: Could not make proto path relative: ../protos/local/temporal/sdk/core/core_interface.proto: No such file or directory\n" } --- README.md | 6 +++--- client/src/raw.rs | 8 ++++---- sdk-core-protos/build.rs | 20 +++++++++---------- .../api_upstream/.buildkite/Dockerfile | 0 .../.buildkite/docker-compose.yml | 0 .../api_upstream/.buildkite/pipeline.yml | 0 .../protos}/api_upstream/.github/CODEOWNERS | 0 .../.github/PULL_REQUEST_TEMPLATE.md | 0 .../.github/workflows/publish-docs.yml | 0 .../workflows/trigger-api-go-update.yml | 0 .../protos}/api_upstream/.gitignore | 0 .../protos}/api_upstream/LICENSE | 0 .../protos}/api_upstream/Makefile | 0 .../protos}/api_upstream/README.md | 0 .../protos}/api_upstream/api-linter.yaml | 0 .../protos}/api_upstream/buf.yaml | 0 .../protos}/api_upstream/build/go.mod | 0 .../protos}/api_upstream/build/go.sum | 0 .../protos}/api_upstream/build/tools.go | 0 .../dependencies/gogoproto/gogo.proto | 0 .../protos}/api_upstream/go.mod | 0 .../temporal/api/batch/v1/message.proto | 0 .../temporal/api/command/v1/message.proto | 0 .../temporal/api/common/v1/message.proto | 0 .../api/enums/v1/batch_operation.proto | 0 .../temporal/api/enums/v1/command_type.proto | 0 .../temporal/api/enums/v1/common.proto | 0 .../temporal/api/enums/v1/event_type.proto | 0 .../temporal/api/enums/v1/failed_cause.proto | 0 .../temporal/api/enums/v1/namespace.proto | 0 .../temporal/api/enums/v1/query.proto | 0 .../temporal/api/enums/v1/reset.proto | 0 .../temporal/api/enums/v1/schedule.proto | 0 .../temporal/api/enums/v1/task_queue.proto | 0 .../temporal/api/enums/v1/update.proto | 0 .../temporal/api/enums/v1/workflow.proto | 0 .../api/errordetails/v1/message.proto | 0 .../temporal/api/failure/v1/message.proto | 0 .../temporal/api/filter/v1/message.proto | 0 .../temporal/api/history/v1/message.proto | 0 .../temporal/api/namespace/v1/message.proto | 0 .../operatorservice/v1/request_response.proto | 0 .../api/operatorservice/v1/service.proto | 0 .../temporal/api/protocol/v1/message.proto | 0 .../temporal/api/query/v1/message.proto | 0 .../temporal/api/replication/v1/message.proto | 0 .../temporal/api/schedule/v1/message.proto | 0 .../api/sdk/v1/task_complete_metadata.proto | 0 .../temporal/api/taskqueue/v1/message.proto | 0 .../temporal/api/update/v1/message.proto | 0 .../temporal/api/version/v1/message.proto | 0 .../temporal/api/workflow/v1/message.proto | 0 .../workflowservice/v1/request_response.proto | 0 .../api/workflowservice/v1/service.proto | 0 .../protos}/google/rpc/status.proto | 0 .../protos}/grpc/health/v1/health.proto | 0 .../activity_result/activity_result.proto | 0 .../core/activity_task/activity_task.proto | 0 .../core/child_workflow/child_workflow.proto | 0 .../temporal/sdk/core/common/common.proto | 0 .../temporal/sdk/core/core_interface.proto | 0 .../core/external_data/external_data.proto | 0 .../workflow_activation.proto | 0 .../workflow_commands/workflow_commands.proto | 0 .../workflow_completion.proto | 0 .../protos}/testsrv_upstream/Makefile | 0 .../protos}/testsrv_upstream/api-linter.yaml | 0 .../protos}/testsrv_upstream/buf.yaml | 0 .../dependencies/gogoproto/gogo.proto | 0 .../api/testservice/v1/request_response.proto | 0 .../temporal/api/testservice/v1/service.proto | 0 71 files changed, 17 insertions(+), 17 deletions(-) rename {protos => sdk-core-protos/protos}/api_upstream/.buildkite/Dockerfile (100%) rename {protos => sdk-core-protos/protos}/api_upstream/.buildkite/docker-compose.yml (100%) rename {protos => sdk-core-protos/protos}/api_upstream/.buildkite/pipeline.yml (100%) rename {protos => sdk-core-protos/protos}/api_upstream/.github/CODEOWNERS (100%) rename {protos => sdk-core-protos/protos}/api_upstream/.github/PULL_REQUEST_TEMPLATE.md (100%) rename {protos => sdk-core-protos/protos}/api_upstream/.github/workflows/publish-docs.yml (100%) rename {protos => sdk-core-protos/protos}/api_upstream/.github/workflows/trigger-api-go-update.yml (100%) rename {protos => sdk-core-protos/protos}/api_upstream/.gitignore (100%) rename {protos => sdk-core-protos/protos}/api_upstream/LICENSE (100%) rename {protos => sdk-core-protos/protos}/api_upstream/Makefile (100%) rename {protos => sdk-core-protos/protos}/api_upstream/README.md (100%) rename {protos => sdk-core-protos/protos}/api_upstream/api-linter.yaml (100%) rename {protos => sdk-core-protos/protos}/api_upstream/buf.yaml (100%) rename {protos => sdk-core-protos/protos}/api_upstream/build/go.mod (100%) rename {protos => sdk-core-protos/protos}/api_upstream/build/go.sum (100%) rename {protos => sdk-core-protos/protos}/api_upstream/build/tools.go (100%) rename {protos => sdk-core-protos/protos}/api_upstream/dependencies/gogoproto/gogo.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/go.mod (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/batch/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/command/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/common/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/batch_operation.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/command_type.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/common.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/event_type.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/failed_cause.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/namespace.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/query.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/reset.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/schedule.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/task_queue.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/update.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/enums/v1/workflow.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/errordetails/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/failure/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/filter/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/history/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/namespace/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/operatorservice/v1/request_response.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/operatorservice/v1/service.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/protocol/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/query/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/replication/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/schedule/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/sdk/v1/task_complete_metadata.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/taskqueue/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/update/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/version/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/workflow/v1/message.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/workflowservice/v1/request_response.proto (100%) rename {protos => sdk-core-protos/protos}/api_upstream/temporal/api/workflowservice/v1/service.proto (100%) rename {protos => sdk-core-protos/protos}/google/rpc/status.proto (100%) rename {protos => sdk-core-protos/protos}/grpc/health/v1/health.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/activity_result/activity_result.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/activity_task/activity_task.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/child_workflow/child_workflow.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/common/common.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/core_interface.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/external_data/external_data.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/workflow_activation/workflow_activation.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/workflow_commands/workflow_commands.proto (100%) rename {protos => sdk-core-protos/protos}/local/temporal/sdk/core/workflow_completion/workflow_completion.proto (100%) rename {protos => sdk-core-protos/protos}/testsrv_upstream/Makefile (100%) rename {protos => sdk-core-protos/protos}/testsrv_upstream/api-linter.yaml (100%) rename {protos => sdk-core-protos/protos}/testsrv_upstream/buf.yaml (100%) rename {protos => sdk-core-protos/protos}/testsrv_upstream/dependencies/gogoproto/gogo.proto (100%) rename {protos => sdk-core-protos/protos}/testsrv_upstream/temporal/api/testservice/v1/request_response.proto (100%) rename {protos => sdk-core-protos/protos}/testsrv_upstream/temporal/api/testservice/v1/service.proto (100%) diff --git a/README.md b/README.md index 636e94cb3..23d3265a7 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ equivalent. ## Proto files -This repo uses a subtree for upstream protobuf files. The path `protos/api_upstream` is a +This repo uses a subtree for upstream protobuf files. The path `sdk-core-protos/protos/api_upstream` is a subtree. To update it, use: `git pull --squash -s subtree ssh://git@github.com/temporalio/api.git master --allow-unrelated-histories` @@ -100,9 +100,9 @@ subdirectory of that repo, we just copy the files with read-tree: # add sdk-java as a remote if you have not already git remote add -f -t master --no-tags testsrv-protos git@github.com:temporalio/sdk-java.git # delete existing protos -git rm -rf protos/testsrv_upstream +git rm -rf sdk-core-protos/protos/testsrv_upstream # pull from upstream & commit -git read-tree --prefix protos/testsrv_upstream -u testsrv-protos/master:temporal-test-server/src/main/proto +git read-tree --prefix sdk-core-protos/protos/testsrv_upstream -u testsrv-protos/master:temporal-test-server/src/main/proto git commit ``` diff --git a/client/src/raw.rs b/client/src/raw.rs index 0874c8e2c..e8b37dc47 100644 --- a/client/src/raw.rs +++ b/client/src/raw.rs @@ -1070,27 +1070,27 @@ mod tests { fn verify_all_workflow_service_methods_implemented() { // This is less work than trying to hook into the codegen process let proto_def = - include_str!("../../protos/api_upstream/temporal/api/workflowservice/v1/service.proto"); + include_str!("../../sdk-core-protos/protos/api_upstream/temporal/api/workflowservice/v1/service.proto"); verify_methods(proto_def, ALL_IMPLEMENTED_WORKFLOW_SERVICE_RPCS); } #[test] fn verify_all_operator_service_methods_implemented() { let proto_def = - include_str!("../../protos/api_upstream/temporal/api/operatorservice/v1/service.proto"); + include_str!("../../sdk-core-protos/protos/api_upstream/temporal/api/operatorservice/v1/service.proto"); verify_methods(proto_def, ALL_IMPLEMENTED_OPERATOR_SERVICE_RPCS); } #[test] fn verify_all_test_service_methods_implemented() { let proto_def = - include_str!("../../protos/testsrv_upstream/temporal/api/testservice/v1/service.proto"); + include_str!("../../sdk-core-protos/protos/testsrv_upstream/temporal/api/testservice/v1/service.proto"); verify_methods(proto_def, ALL_IMPLEMENTED_TEST_SERVICE_RPCS); } #[test] fn verify_all_health_service_methods_implemented() { - let proto_def = include_str!("../../protos/grpc/health/v1/health.proto"); + let proto_def = include_str!("../../sdk-core-protos/protos/grpc/health/v1/health.proto"); verify_methods(proto_def, ALL_IMPLEMENTED_HEALTH_SERVICE_RPCS); } } diff --git a/sdk-core-protos/build.rs b/sdk-core-protos/build.rs index 037c155d1..1c9310864 100644 --- a/sdk-core-protos/build.rs +++ b/sdk-core-protos/build.rs @@ -4,7 +4,7 @@ static ALWAYS_SERDE: &str = "#[cfg_attr(not(feature = \"serde_serialize\"), \ derive(::serde::Serialize, ::serde::Deserialize))]"; fn main() -> Result<(), Box> { - println!("cargo:rerun-if-changed=../protos"); + println!("cargo:rerun-if-changed=./protos"); let out = PathBuf::from(env::var("OUT_DIR").unwrap()); let descriptor_file = out.join("descriptors.bin"); tonic_build::configure() @@ -115,17 +115,17 @@ fn main() -> Result<(), Box> { .file_descriptor_set_path(#[allow(clippy::needless_borrow)] &descriptor_file) .compile( &[ - "../protos/local/temporal/sdk/core/core_interface.proto", - "../protos/api_upstream/temporal/api/workflowservice/v1/service.proto", - "../protos/api_upstream/temporal/api/operatorservice/v1/service.proto", - "../protos/testsrv_upstream/temporal/api/testservice/v1/service.proto", - "../protos/grpc/health/v1/health.proto", + "./protos/local/temporal/sdk/core/core_interface.proto", + "./protos/api_upstream/temporal/api/workflowservice/v1/service.proto", + "./protos/api_upstream/temporal/api/operatorservice/v1/service.proto", + "./protos/testsrv_upstream/temporal/api/testservice/v1/service.proto", + "./protos/grpc/health/v1/health.proto", ], &[ - "../protos/api_upstream", - "../protos/local", - "../protos/testsrv_upstream", - "../protos/grpc", + "./protos/api_upstream", + "./protos/local", + "./protos/testsrv_upstream", + "./protos/grpc", ], )?; diff --git a/protos/api_upstream/.buildkite/Dockerfile b/sdk-core-protos/protos/api_upstream/.buildkite/Dockerfile similarity index 100% rename from protos/api_upstream/.buildkite/Dockerfile rename to sdk-core-protos/protos/api_upstream/.buildkite/Dockerfile diff --git a/protos/api_upstream/.buildkite/docker-compose.yml b/sdk-core-protos/protos/api_upstream/.buildkite/docker-compose.yml similarity index 100% rename from protos/api_upstream/.buildkite/docker-compose.yml rename to sdk-core-protos/protos/api_upstream/.buildkite/docker-compose.yml diff --git a/protos/api_upstream/.buildkite/pipeline.yml b/sdk-core-protos/protos/api_upstream/.buildkite/pipeline.yml similarity index 100% rename from protos/api_upstream/.buildkite/pipeline.yml rename to sdk-core-protos/protos/api_upstream/.buildkite/pipeline.yml diff --git a/protos/api_upstream/.github/CODEOWNERS b/sdk-core-protos/protos/api_upstream/.github/CODEOWNERS similarity index 100% rename from protos/api_upstream/.github/CODEOWNERS rename to sdk-core-protos/protos/api_upstream/.github/CODEOWNERS diff --git a/protos/api_upstream/.github/PULL_REQUEST_TEMPLATE.md b/sdk-core-protos/protos/api_upstream/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from protos/api_upstream/.github/PULL_REQUEST_TEMPLATE.md rename to sdk-core-protos/protos/api_upstream/.github/PULL_REQUEST_TEMPLATE.md diff --git a/protos/api_upstream/.github/workflows/publish-docs.yml b/sdk-core-protos/protos/api_upstream/.github/workflows/publish-docs.yml similarity index 100% rename from protos/api_upstream/.github/workflows/publish-docs.yml rename to sdk-core-protos/protos/api_upstream/.github/workflows/publish-docs.yml diff --git a/protos/api_upstream/.github/workflows/trigger-api-go-update.yml b/sdk-core-protos/protos/api_upstream/.github/workflows/trigger-api-go-update.yml similarity index 100% rename from protos/api_upstream/.github/workflows/trigger-api-go-update.yml rename to sdk-core-protos/protos/api_upstream/.github/workflows/trigger-api-go-update.yml diff --git a/protos/api_upstream/.gitignore b/sdk-core-protos/protos/api_upstream/.gitignore similarity index 100% rename from protos/api_upstream/.gitignore rename to sdk-core-protos/protos/api_upstream/.gitignore diff --git a/protos/api_upstream/LICENSE b/sdk-core-protos/protos/api_upstream/LICENSE similarity index 100% rename from protos/api_upstream/LICENSE rename to sdk-core-protos/protos/api_upstream/LICENSE diff --git a/protos/api_upstream/Makefile b/sdk-core-protos/protos/api_upstream/Makefile similarity index 100% rename from protos/api_upstream/Makefile rename to sdk-core-protos/protos/api_upstream/Makefile diff --git a/protos/api_upstream/README.md b/sdk-core-protos/protos/api_upstream/README.md similarity index 100% rename from protos/api_upstream/README.md rename to sdk-core-protos/protos/api_upstream/README.md diff --git a/protos/api_upstream/api-linter.yaml b/sdk-core-protos/protos/api_upstream/api-linter.yaml similarity index 100% rename from protos/api_upstream/api-linter.yaml rename to sdk-core-protos/protos/api_upstream/api-linter.yaml diff --git a/protos/api_upstream/buf.yaml b/sdk-core-protos/protos/api_upstream/buf.yaml similarity index 100% rename from protos/api_upstream/buf.yaml rename to sdk-core-protos/protos/api_upstream/buf.yaml diff --git a/protos/api_upstream/build/go.mod b/sdk-core-protos/protos/api_upstream/build/go.mod similarity index 100% rename from protos/api_upstream/build/go.mod rename to sdk-core-protos/protos/api_upstream/build/go.mod diff --git a/protos/api_upstream/build/go.sum b/sdk-core-protos/protos/api_upstream/build/go.sum similarity index 100% rename from protos/api_upstream/build/go.sum rename to sdk-core-protos/protos/api_upstream/build/go.sum diff --git a/protos/api_upstream/build/tools.go b/sdk-core-protos/protos/api_upstream/build/tools.go similarity index 100% rename from protos/api_upstream/build/tools.go rename to sdk-core-protos/protos/api_upstream/build/tools.go diff --git a/protos/api_upstream/dependencies/gogoproto/gogo.proto b/sdk-core-protos/protos/api_upstream/dependencies/gogoproto/gogo.proto similarity index 100% rename from protos/api_upstream/dependencies/gogoproto/gogo.proto rename to sdk-core-protos/protos/api_upstream/dependencies/gogoproto/gogo.proto diff --git a/protos/api_upstream/go.mod b/sdk-core-protos/protos/api_upstream/go.mod similarity index 100% rename from protos/api_upstream/go.mod rename to sdk-core-protos/protos/api_upstream/go.mod diff --git a/protos/api_upstream/temporal/api/batch/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/batch/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/batch/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/batch/v1/message.proto diff --git a/protos/api_upstream/temporal/api/command/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/command/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/command/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/command/v1/message.proto diff --git a/protos/api_upstream/temporal/api/common/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/common/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/common/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/common/v1/message.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/batch_operation.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/batch_operation.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/batch_operation.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/batch_operation.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/command_type.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/command_type.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/command_type.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/command_type.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/common.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/common.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/common.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/common.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/event_type.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/event_type.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/event_type.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/event_type.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/failed_cause.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/failed_cause.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/failed_cause.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/failed_cause.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/namespace.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/namespace.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/namespace.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/namespace.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/query.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/query.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/query.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/query.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/reset.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/reset.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/reset.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/reset.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/schedule.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/schedule.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/schedule.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/schedule.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/task_queue.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/task_queue.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/task_queue.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/task_queue.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/update.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/update.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/update.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/update.proto diff --git a/protos/api_upstream/temporal/api/enums/v1/workflow.proto b/sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/workflow.proto similarity index 100% rename from protos/api_upstream/temporal/api/enums/v1/workflow.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/enums/v1/workflow.proto diff --git a/protos/api_upstream/temporal/api/errordetails/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/errordetails/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/errordetails/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/errordetails/v1/message.proto diff --git a/protos/api_upstream/temporal/api/failure/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/failure/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/failure/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/failure/v1/message.proto diff --git a/protos/api_upstream/temporal/api/filter/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/filter/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/filter/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/filter/v1/message.proto diff --git a/protos/api_upstream/temporal/api/history/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/history/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/history/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/history/v1/message.proto diff --git a/protos/api_upstream/temporal/api/namespace/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/namespace/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/namespace/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/namespace/v1/message.proto diff --git a/protos/api_upstream/temporal/api/operatorservice/v1/request_response.proto b/sdk-core-protos/protos/api_upstream/temporal/api/operatorservice/v1/request_response.proto similarity index 100% rename from protos/api_upstream/temporal/api/operatorservice/v1/request_response.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/operatorservice/v1/request_response.proto diff --git a/protos/api_upstream/temporal/api/operatorservice/v1/service.proto b/sdk-core-protos/protos/api_upstream/temporal/api/operatorservice/v1/service.proto similarity index 100% rename from protos/api_upstream/temporal/api/operatorservice/v1/service.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/operatorservice/v1/service.proto diff --git a/protos/api_upstream/temporal/api/protocol/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/protocol/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/protocol/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/protocol/v1/message.proto diff --git a/protos/api_upstream/temporal/api/query/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/query/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/query/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/query/v1/message.proto diff --git a/protos/api_upstream/temporal/api/replication/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/replication/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/replication/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/replication/v1/message.proto diff --git a/protos/api_upstream/temporal/api/schedule/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/schedule/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/schedule/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/schedule/v1/message.proto diff --git a/protos/api_upstream/temporal/api/sdk/v1/task_complete_metadata.proto b/sdk-core-protos/protos/api_upstream/temporal/api/sdk/v1/task_complete_metadata.proto similarity index 100% rename from protos/api_upstream/temporal/api/sdk/v1/task_complete_metadata.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/sdk/v1/task_complete_metadata.proto diff --git a/protos/api_upstream/temporal/api/taskqueue/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/taskqueue/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/taskqueue/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/taskqueue/v1/message.proto diff --git a/protos/api_upstream/temporal/api/update/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/update/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/update/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/update/v1/message.proto diff --git a/protos/api_upstream/temporal/api/version/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/version/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/version/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/version/v1/message.proto diff --git a/protos/api_upstream/temporal/api/workflow/v1/message.proto b/sdk-core-protos/protos/api_upstream/temporal/api/workflow/v1/message.proto similarity index 100% rename from protos/api_upstream/temporal/api/workflow/v1/message.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/workflow/v1/message.proto diff --git a/protos/api_upstream/temporal/api/workflowservice/v1/request_response.proto b/sdk-core-protos/protos/api_upstream/temporal/api/workflowservice/v1/request_response.proto similarity index 100% rename from protos/api_upstream/temporal/api/workflowservice/v1/request_response.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/workflowservice/v1/request_response.proto diff --git a/protos/api_upstream/temporal/api/workflowservice/v1/service.proto b/sdk-core-protos/protos/api_upstream/temporal/api/workflowservice/v1/service.proto similarity index 100% rename from protos/api_upstream/temporal/api/workflowservice/v1/service.proto rename to sdk-core-protos/protos/api_upstream/temporal/api/workflowservice/v1/service.proto diff --git a/protos/google/rpc/status.proto b/sdk-core-protos/protos/google/rpc/status.proto similarity index 100% rename from protos/google/rpc/status.proto rename to sdk-core-protos/protos/google/rpc/status.proto diff --git a/protos/grpc/health/v1/health.proto b/sdk-core-protos/protos/grpc/health/v1/health.proto similarity index 100% rename from protos/grpc/health/v1/health.proto rename to sdk-core-protos/protos/grpc/health/v1/health.proto diff --git a/protos/local/temporal/sdk/core/activity_result/activity_result.proto b/sdk-core-protos/protos/local/temporal/sdk/core/activity_result/activity_result.proto similarity index 100% rename from protos/local/temporal/sdk/core/activity_result/activity_result.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/activity_result/activity_result.proto diff --git a/protos/local/temporal/sdk/core/activity_task/activity_task.proto b/sdk-core-protos/protos/local/temporal/sdk/core/activity_task/activity_task.proto similarity index 100% rename from protos/local/temporal/sdk/core/activity_task/activity_task.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/activity_task/activity_task.proto diff --git a/protos/local/temporal/sdk/core/child_workflow/child_workflow.proto b/sdk-core-protos/protos/local/temporal/sdk/core/child_workflow/child_workflow.proto similarity index 100% rename from protos/local/temporal/sdk/core/child_workflow/child_workflow.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/child_workflow/child_workflow.proto diff --git a/protos/local/temporal/sdk/core/common/common.proto b/sdk-core-protos/protos/local/temporal/sdk/core/common/common.proto similarity index 100% rename from protos/local/temporal/sdk/core/common/common.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/common/common.proto diff --git a/protos/local/temporal/sdk/core/core_interface.proto b/sdk-core-protos/protos/local/temporal/sdk/core/core_interface.proto similarity index 100% rename from protos/local/temporal/sdk/core/core_interface.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/core_interface.proto diff --git a/protos/local/temporal/sdk/core/external_data/external_data.proto b/sdk-core-protos/protos/local/temporal/sdk/core/external_data/external_data.proto similarity index 100% rename from protos/local/temporal/sdk/core/external_data/external_data.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/external_data/external_data.proto diff --git a/protos/local/temporal/sdk/core/workflow_activation/workflow_activation.proto b/sdk-core-protos/protos/local/temporal/sdk/core/workflow_activation/workflow_activation.proto similarity index 100% rename from protos/local/temporal/sdk/core/workflow_activation/workflow_activation.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/workflow_activation/workflow_activation.proto diff --git a/protos/local/temporal/sdk/core/workflow_commands/workflow_commands.proto b/sdk-core-protos/protos/local/temporal/sdk/core/workflow_commands/workflow_commands.proto similarity index 100% rename from protos/local/temporal/sdk/core/workflow_commands/workflow_commands.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/workflow_commands/workflow_commands.proto diff --git a/protos/local/temporal/sdk/core/workflow_completion/workflow_completion.proto b/sdk-core-protos/protos/local/temporal/sdk/core/workflow_completion/workflow_completion.proto similarity index 100% rename from protos/local/temporal/sdk/core/workflow_completion/workflow_completion.proto rename to sdk-core-protos/protos/local/temporal/sdk/core/workflow_completion/workflow_completion.proto diff --git a/protos/testsrv_upstream/Makefile b/sdk-core-protos/protos/testsrv_upstream/Makefile similarity index 100% rename from protos/testsrv_upstream/Makefile rename to sdk-core-protos/protos/testsrv_upstream/Makefile diff --git a/protos/testsrv_upstream/api-linter.yaml b/sdk-core-protos/protos/testsrv_upstream/api-linter.yaml similarity index 100% rename from protos/testsrv_upstream/api-linter.yaml rename to sdk-core-protos/protos/testsrv_upstream/api-linter.yaml diff --git a/protos/testsrv_upstream/buf.yaml b/sdk-core-protos/protos/testsrv_upstream/buf.yaml similarity index 100% rename from protos/testsrv_upstream/buf.yaml rename to sdk-core-protos/protos/testsrv_upstream/buf.yaml diff --git a/protos/testsrv_upstream/dependencies/gogoproto/gogo.proto b/sdk-core-protos/protos/testsrv_upstream/dependencies/gogoproto/gogo.proto similarity index 100% rename from protos/testsrv_upstream/dependencies/gogoproto/gogo.proto rename to sdk-core-protos/protos/testsrv_upstream/dependencies/gogoproto/gogo.proto diff --git a/protos/testsrv_upstream/temporal/api/testservice/v1/request_response.proto b/sdk-core-protos/protos/testsrv_upstream/temporal/api/testservice/v1/request_response.proto similarity index 100% rename from protos/testsrv_upstream/temporal/api/testservice/v1/request_response.proto rename to sdk-core-protos/protos/testsrv_upstream/temporal/api/testservice/v1/request_response.proto diff --git a/protos/testsrv_upstream/temporal/api/testservice/v1/service.proto b/sdk-core-protos/protos/testsrv_upstream/temporal/api/testservice/v1/service.proto similarity index 100% rename from protos/testsrv_upstream/temporal/api/testservice/v1/service.proto rename to sdk-core-protos/protos/testsrv_upstream/temporal/api/testservice/v1/service.proto