From c2101a4fbbf9b2163c2fb8c5084e72b6bcd52b98 Mon Sep 17 00:00:00 2001 From: Jacob Elias Date: Tue, 11 Jun 2024 14:10:20 -0500 Subject: [PATCH] v1 circle-ci configs for proxyd --- .circleci/config.yml | 1 + .circleci/continue_config.yml | 27 +++++++++++++++++++ proxyd/{proxyd => }/.gitignore | 0 proxyd/{proxyd => }/CHANGELOG.md | 0 proxyd/{proxyd => }/Dockerfile | 0 proxyd/{proxyd => }/Dockerfile.ignore | 0 proxyd/{proxyd => }/Makefile | 0 proxyd/{proxyd => }/README.md | 0 proxyd/{proxyd => }/backend.go | 0 proxyd/{proxyd => }/backend_test.go | 0 proxyd/{proxyd => }/cache.go | 0 proxyd/{proxyd => }/cache_test.go | 0 proxyd/{proxyd => }/cmd/proxyd/main.go | 0 proxyd/{proxyd => }/config.go | 0 proxyd/{proxyd => }/consensus_poller.go | 0 proxyd/{proxyd => }/consensus_tracker.go | 0 proxyd/{proxyd => }/entrypoint.sh | 0 proxyd/{proxyd => }/errors.go | 0 proxyd/{proxyd => }/example.config.toml | 0 proxyd/{proxyd => }/frontend_rate_limiter.go | 0 .../frontend_rate_limiter_test.go | 0 proxyd/{proxyd => }/go.mod | 0 proxyd/{proxyd => }/go.sum | 0 .../integration_tests/batch_timeout_test.go | 0 .../integration_tests/batching_test.go | 0 .../integration_tests/caching_test.go | 0 .../integration_tests/consensus_test.go | 0 .../integration_tests/failover_test.go | 0 .../integration_tests/fallback_test.go | 0 .../integration_tests/max_rpc_conns_test.go | 0 .../integration_tests/mock_backend_test.go | 0 .../integration_tests/rate_limit_test.go | 0 .../sender_rate_limit_test.go | 0 .../integration_tests/smoke_test.go | 0 .../testdata/batch_timeout.toml | 0 .../integration_tests/testdata/batching.toml | 0 .../integration_tests/testdata/caching.toml | 0 .../integration_tests/testdata/consensus.toml | 0 .../testdata/consensus_responses.yml | 0 .../integration_tests/testdata/failover.toml | 0 .../integration_tests/testdata/fallback.toml | 0 .../testdata/frontend_rate_limit.toml | 0 .../testdata/max_rpc_conns.toml | 0 .../testdata/out_of_service_interval.toml | 0 .../integration_tests/testdata/retries.toml | 0 .../testdata/sender_rate_limit.toml | 0 .../testdata/size_limits.toml | 0 .../integration_tests/testdata/smoke.toml | 0 .../integration_tests/testdata/testdata.txt | 0 .../integration_tests/testdata/whitelist.toml | 0 .../integration_tests/testdata/ws.toml | 0 .../integration_tests/util_test.go | 0 .../integration_tests/validation_test.go | 0 .../{proxyd => }/integration_tests/ws_test.go | 0 proxyd/{proxyd => }/methods.go | 0 proxyd/{proxyd => }/metrics.go | 0 .../pkg/avg-sliding-window/sliding.go | 0 .../pkg/avg-sliding-window/sliding_test.go | 0 proxyd/{proxyd => }/proxyd.go | 0 proxyd/{proxyd => }/reader.go | 0 proxyd/{proxyd => }/reader_test.go | 0 proxyd/{proxyd => }/redis.go | 0 proxyd/{proxyd => }/rewriter.go | 0 proxyd/{proxyd => }/rewriter_test.go | 0 proxyd/{proxyd => }/rpc.go | 0 proxyd/{proxyd => }/rpc_test.go | 0 proxyd/{proxyd => }/server.go | 0 proxyd/{proxyd => }/string_set.go | 0 proxyd/{proxyd => }/tls.go | 0 .../tools/mockserver/handler/handler.go | 0 proxyd/{proxyd => }/tools/mockserver/main.go | 0 .../{proxyd => }/tools/mockserver/node1.yml | 0 .../{proxyd => }/tools/mockserver/node2.yml | 0 73 files changed, 28 insertions(+) rename proxyd/{proxyd => }/.gitignore (100%) rename proxyd/{proxyd => }/CHANGELOG.md (100%) rename proxyd/{proxyd => }/Dockerfile (100%) rename proxyd/{proxyd => }/Dockerfile.ignore (100%) rename proxyd/{proxyd => }/Makefile (100%) rename proxyd/{proxyd => }/README.md (100%) rename proxyd/{proxyd => }/backend.go (100%) rename proxyd/{proxyd => }/backend_test.go (100%) rename proxyd/{proxyd => }/cache.go (100%) rename proxyd/{proxyd => }/cache_test.go (100%) rename proxyd/{proxyd => }/cmd/proxyd/main.go (100%) rename proxyd/{proxyd => }/config.go (100%) rename proxyd/{proxyd => }/consensus_poller.go (100%) rename proxyd/{proxyd => }/consensus_tracker.go (100%) rename proxyd/{proxyd => }/entrypoint.sh (100%) rename proxyd/{proxyd => }/errors.go (100%) rename proxyd/{proxyd => }/example.config.toml (100%) rename proxyd/{proxyd => }/frontend_rate_limiter.go (100%) rename proxyd/{proxyd => }/frontend_rate_limiter_test.go (100%) rename proxyd/{proxyd => }/go.mod (100%) rename proxyd/{proxyd => }/go.sum (100%) rename proxyd/{proxyd => }/integration_tests/batch_timeout_test.go (100%) rename proxyd/{proxyd => }/integration_tests/batching_test.go (100%) rename proxyd/{proxyd => }/integration_tests/caching_test.go (100%) rename proxyd/{proxyd => }/integration_tests/consensus_test.go (100%) rename proxyd/{proxyd => }/integration_tests/failover_test.go (100%) rename proxyd/{proxyd => }/integration_tests/fallback_test.go (100%) rename proxyd/{proxyd => }/integration_tests/max_rpc_conns_test.go (100%) rename proxyd/{proxyd => }/integration_tests/mock_backend_test.go (100%) rename proxyd/{proxyd => }/integration_tests/rate_limit_test.go (100%) rename proxyd/{proxyd => }/integration_tests/sender_rate_limit_test.go (100%) rename proxyd/{proxyd => }/integration_tests/smoke_test.go (100%) rename proxyd/{proxyd => }/integration_tests/testdata/batch_timeout.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/batching.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/caching.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/consensus.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/consensus_responses.yml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/failover.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/fallback.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/frontend_rate_limit.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/max_rpc_conns.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/out_of_service_interval.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/retries.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/sender_rate_limit.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/size_limits.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/smoke.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/testdata.txt (100%) rename proxyd/{proxyd => }/integration_tests/testdata/whitelist.toml (100%) rename proxyd/{proxyd => }/integration_tests/testdata/ws.toml (100%) rename proxyd/{proxyd => }/integration_tests/util_test.go (100%) rename proxyd/{proxyd => }/integration_tests/validation_test.go (100%) rename proxyd/{proxyd => }/integration_tests/ws_test.go (100%) rename proxyd/{proxyd => }/methods.go (100%) rename proxyd/{proxyd => }/metrics.go (100%) rename proxyd/{proxyd => }/pkg/avg-sliding-window/sliding.go (100%) rename proxyd/{proxyd => }/pkg/avg-sliding-window/sliding_test.go (100%) rename proxyd/{proxyd => }/proxyd.go (100%) rename proxyd/{proxyd => }/reader.go (100%) rename proxyd/{proxyd => }/reader_test.go (100%) rename proxyd/{proxyd => }/redis.go (100%) rename proxyd/{proxyd => }/rewriter.go (100%) rename proxyd/{proxyd => }/rewriter_test.go (100%) rename proxyd/{proxyd => }/rpc.go (100%) rename proxyd/{proxyd => }/rpc_test.go (100%) rename proxyd/{proxyd => }/server.go (100%) rename proxyd/{proxyd => }/string_set.go (100%) rename proxyd/{proxyd => }/tls.go (100%) rename proxyd/{proxyd => }/tools/mockserver/handler/handler.go (100%) rename proxyd/{proxyd => }/tools/mockserver/main.go (100%) rename proxyd/{proxyd => }/tools/mockserver/node1.yml (100%) rename proxyd/{proxyd => }/tools/mockserver/node2.yml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ac83a4..6853d9d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,6 +17,7 @@ workflows: mapping: | op-conductor-mon/.* run-build-op-conductor-mon true op-ufm/.* run-build-op-ufm true + proxyd/.* run-build-proxyd true .circleci/.* run-all true .github/.* run-all true diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index adcc7af..1450834 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -13,6 +13,9 @@ parameters: run-build-op-ufm: type: boolean default: false + run-build-proxyd: + type: boolean + default: false run-all: type: boolean default: false @@ -388,3 +391,27 @@ workflows: - oplabs-gcr requires: - op-ufm-docker-build + op-proxyd: + when: + or: [<< pipeline.parameters.run-build-proxyd >>, << pipeline.parameters.run-all >>] + jobs: + - go-lint: + name: proxyd-lint + module: proxyd + - go-test: + name: proxyd-tests + module: proxyd + - docker-build: + name: proxyd-docker-build + docker_file: proxyd/Dockerfile + docker_name: proxyd + docker_tags: <>,<> + docker_context: . + - docker-publish: + name: proxyd-docker-publish + docker_name: proxyd + docker_tags: <>,<> + context: + - oplabs-gcr + requires: + - proxyd-docker-build diff --git a/proxyd/proxyd/.gitignore b/proxyd/.gitignore similarity index 100% rename from proxyd/proxyd/.gitignore rename to proxyd/.gitignore diff --git a/proxyd/proxyd/CHANGELOG.md b/proxyd/CHANGELOG.md similarity index 100% rename from proxyd/proxyd/CHANGELOG.md rename to proxyd/CHANGELOG.md diff --git a/proxyd/proxyd/Dockerfile b/proxyd/Dockerfile similarity index 100% rename from proxyd/proxyd/Dockerfile rename to proxyd/Dockerfile diff --git a/proxyd/proxyd/Dockerfile.ignore b/proxyd/Dockerfile.ignore similarity index 100% rename from proxyd/proxyd/Dockerfile.ignore rename to proxyd/Dockerfile.ignore diff --git a/proxyd/proxyd/Makefile b/proxyd/Makefile similarity index 100% rename from proxyd/proxyd/Makefile rename to proxyd/Makefile diff --git a/proxyd/proxyd/README.md b/proxyd/README.md similarity index 100% rename from proxyd/proxyd/README.md rename to proxyd/README.md diff --git a/proxyd/proxyd/backend.go b/proxyd/backend.go similarity index 100% rename from proxyd/proxyd/backend.go rename to proxyd/backend.go diff --git a/proxyd/proxyd/backend_test.go b/proxyd/backend_test.go similarity index 100% rename from proxyd/proxyd/backend_test.go rename to proxyd/backend_test.go diff --git a/proxyd/proxyd/cache.go b/proxyd/cache.go similarity index 100% rename from proxyd/proxyd/cache.go rename to proxyd/cache.go diff --git a/proxyd/proxyd/cache_test.go b/proxyd/cache_test.go similarity index 100% rename from proxyd/proxyd/cache_test.go rename to proxyd/cache_test.go diff --git a/proxyd/proxyd/cmd/proxyd/main.go b/proxyd/cmd/proxyd/main.go similarity index 100% rename from proxyd/proxyd/cmd/proxyd/main.go rename to proxyd/cmd/proxyd/main.go diff --git a/proxyd/proxyd/config.go b/proxyd/config.go similarity index 100% rename from proxyd/proxyd/config.go rename to proxyd/config.go diff --git a/proxyd/proxyd/consensus_poller.go b/proxyd/consensus_poller.go similarity index 100% rename from proxyd/proxyd/consensus_poller.go rename to proxyd/consensus_poller.go diff --git a/proxyd/proxyd/consensus_tracker.go b/proxyd/consensus_tracker.go similarity index 100% rename from proxyd/proxyd/consensus_tracker.go rename to proxyd/consensus_tracker.go diff --git a/proxyd/proxyd/entrypoint.sh b/proxyd/entrypoint.sh similarity index 100% rename from proxyd/proxyd/entrypoint.sh rename to proxyd/entrypoint.sh diff --git a/proxyd/proxyd/errors.go b/proxyd/errors.go similarity index 100% rename from proxyd/proxyd/errors.go rename to proxyd/errors.go diff --git a/proxyd/proxyd/example.config.toml b/proxyd/example.config.toml similarity index 100% rename from proxyd/proxyd/example.config.toml rename to proxyd/example.config.toml diff --git a/proxyd/proxyd/frontend_rate_limiter.go b/proxyd/frontend_rate_limiter.go similarity index 100% rename from proxyd/proxyd/frontend_rate_limiter.go rename to proxyd/frontend_rate_limiter.go diff --git a/proxyd/proxyd/frontend_rate_limiter_test.go b/proxyd/frontend_rate_limiter_test.go similarity index 100% rename from proxyd/proxyd/frontend_rate_limiter_test.go rename to proxyd/frontend_rate_limiter_test.go diff --git a/proxyd/proxyd/go.mod b/proxyd/go.mod similarity index 100% rename from proxyd/proxyd/go.mod rename to proxyd/go.mod diff --git a/proxyd/proxyd/go.sum b/proxyd/go.sum similarity index 100% rename from proxyd/proxyd/go.sum rename to proxyd/go.sum diff --git a/proxyd/proxyd/integration_tests/batch_timeout_test.go b/proxyd/integration_tests/batch_timeout_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/batch_timeout_test.go rename to proxyd/integration_tests/batch_timeout_test.go diff --git a/proxyd/proxyd/integration_tests/batching_test.go b/proxyd/integration_tests/batching_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/batching_test.go rename to proxyd/integration_tests/batching_test.go diff --git a/proxyd/proxyd/integration_tests/caching_test.go b/proxyd/integration_tests/caching_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/caching_test.go rename to proxyd/integration_tests/caching_test.go diff --git a/proxyd/proxyd/integration_tests/consensus_test.go b/proxyd/integration_tests/consensus_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/consensus_test.go rename to proxyd/integration_tests/consensus_test.go diff --git a/proxyd/proxyd/integration_tests/failover_test.go b/proxyd/integration_tests/failover_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/failover_test.go rename to proxyd/integration_tests/failover_test.go diff --git a/proxyd/proxyd/integration_tests/fallback_test.go b/proxyd/integration_tests/fallback_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/fallback_test.go rename to proxyd/integration_tests/fallback_test.go diff --git a/proxyd/proxyd/integration_tests/max_rpc_conns_test.go b/proxyd/integration_tests/max_rpc_conns_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/max_rpc_conns_test.go rename to proxyd/integration_tests/max_rpc_conns_test.go diff --git a/proxyd/proxyd/integration_tests/mock_backend_test.go b/proxyd/integration_tests/mock_backend_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/mock_backend_test.go rename to proxyd/integration_tests/mock_backend_test.go diff --git a/proxyd/proxyd/integration_tests/rate_limit_test.go b/proxyd/integration_tests/rate_limit_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/rate_limit_test.go rename to proxyd/integration_tests/rate_limit_test.go diff --git a/proxyd/proxyd/integration_tests/sender_rate_limit_test.go b/proxyd/integration_tests/sender_rate_limit_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/sender_rate_limit_test.go rename to proxyd/integration_tests/sender_rate_limit_test.go diff --git a/proxyd/proxyd/integration_tests/smoke_test.go b/proxyd/integration_tests/smoke_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/smoke_test.go rename to proxyd/integration_tests/smoke_test.go diff --git a/proxyd/proxyd/integration_tests/testdata/batch_timeout.toml b/proxyd/integration_tests/testdata/batch_timeout.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/batch_timeout.toml rename to proxyd/integration_tests/testdata/batch_timeout.toml diff --git a/proxyd/proxyd/integration_tests/testdata/batching.toml b/proxyd/integration_tests/testdata/batching.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/batching.toml rename to proxyd/integration_tests/testdata/batching.toml diff --git a/proxyd/proxyd/integration_tests/testdata/caching.toml b/proxyd/integration_tests/testdata/caching.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/caching.toml rename to proxyd/integration_tests/testdata/caching.toml diff --git a/proxyd/proxyd/integration_tests/testdata/consensus.toml b/proxyd/integration_tests/testdata/consensus.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/consensus.toml rename to proxyd/integration_tests/testdata/consensus.toml diff --git a/proxyd/proxyd/integration_tests/testdata/consensus_responses.yml b/proxyd/integration_tests/testdata/consensus_responses.yml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/consensus_responses.yml rename to proxyd/integration_tests/testdata/consensus_responses.yml diff --git a/proxyd/proxyd/integration_tests/testdata/failover.toml b/proxyd/integration_tests/testdata/failover.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/failover.toml rename to proxyd/integration_tests/testdata/failover.toml diff --git a/proxyd/proxyd/integration_tests/testdata/fallback.toml b/proxyd/integration_tests/testdata/fallback.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/fallback.toml rename to proxyd/integration_tests/testdata/fallback.toml diff --git a/proxyd/proxyd/integration_tests/testdata/frontend_rate_limit.toml b/proxyd/integration_tests/testdata/frontend_rate_limit.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/frontend_rate_limit.toml rename to proxyd/integration_tests/testdata/frontend_rate_limit.toml diff --git a/proxyd/proxyd/integration_tests/testdata/max_rpc_conns.toml b/proxyd/integration_tests/testdata/max_rpc_conns.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/max_rpc_conns.toml rename to proxyd/integration_tests/testdata/max_rpc_conns.toml diff --git a/proxyd/proxyd/integration_tests/testdata/out_of_service_interval.toml b/proxyd/integration_tests/testdata/out_of_service_interval.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/out_of_service_interval.toml rename to proxyd/integration_tests/testdata/out_of_service_interval.toml diff --git a/proxyd/proxyd/integration_tests/testdata/retries.toml b/proxyd/integration_tests/testdata/retries.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/retries.toml rename to proxyd/integration_tests/testdata/retries.toml diff --git a/proxyd/proxyd/integration_tests/testdata/sender_rate_limit.toml b/proxyd/integration_tests/testdata/sender_rate_limit.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/sender_rate_limit.toml rename to proxyd/integration_tests/testdata/sender_rate_limit.toml diff --git a/proxyd/proxyd/integration_tests/testdata/size_limits.toml b/proxyd/integration_tests/testdata/size_limits.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/size_limits.toml rename to proxyd/integration_tests/testdata/size_limits.toml diff --git a/proxyd/proxyd/integration_tests/testdata/smoke.toml b/proxyd/integration_tests/testdata/smoke.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/smoke.toml rename to proxyd/integration_tests/testdata/smoke.toml diff --git a/proxyd/proxyd/integration_tests/testdata/testdata.txt b/proxyd/integration_tests/testdata/testdata.txt similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/testdata.txt rename to proxyd/integration_tests/testdata/testdata.txt diff --git a/proxyd/proxyd/integration_tests/testdata/whitelist.toml b/proxyd/integration_tests/testdata/whitelist.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/whitelist.toml rename to proxyd/integration_tests/testdata/whitelist.toml diff --git a/proxyd/proxyd/integration_tests/testdata/ws.toml b/proxyd/integration_tests/testdata/ws.toml similarity index 100% rename from proxyd/proxyd/integration_tests/testdata/ws.toml rename to proxyd/integration_tests/testdata/ws.toml diff --git a/proxyd/proxyd/integration_tests/util_test.go b/proxyd/integration_tests/util_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/util_test.go rename to proxyd/integration_tests/util_test.go diff --git a/proxyd/proxyd/integration_tests/validation_test.go b/proxyd/integration_tests/validation_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/validation_test.go rename to proxyd/integration_tests/validation_test.go diff --git a/proxyd/proxyd/integration_tests/ws_test.go b/proxyd/integration_tests/ws_test.go similarity index 100% rename from proxyd/proxyd/integration_tests/ws_test.go rename to proxyd/integration_tests/ws_test.go diff --git a/proxyd/proxyd/methods.go b/proxyd/methods.go similarity index 100% rename from proxyd/proxyd/methods.go rename to proxyd/methods.go diff --git a/proxyd/proxyd/metrics.go b/proxyd/metrics.go similarity index 100% rename from proxyd/proxyd/metrics.go rename to proxyd/metrics.go diff --git a/proxyd/proxyd/pkg/avg-sliding-window/sliding.go b/proxyd/pkg/avg-sliding-window/sliding.go similarity index 100% rename from proxyd/proxyd/pkg/avg-sliding-window/sliding.go rename to proxyd/pkg/avg-sliding-window/sliding.go diff --git a/proxyd/proxyd/pkg/avg-sliding-window/sliding_test.go b/proxyd/pkg/avg-sliding-window/sliding_test.go similarity index 100% rename from proxyd/proxyd/pkg/avg-sliding-window/sliding_test.go rename to proxyd/pkg/avg-sliding-window/sliding_test.go diff --git a/proxyd/proxyd/proxyd.go b/proxyd/proxyd.go similarity index 100% rename from proxyd/proxyd/proxyd.go rename to proxyd/proxyd.go diff --git a/proxyd/proxyd/reader.go b/proxyd/reader.go similarity index 100% rename from proxyd/proxyd/reader.go rename to proxyd/reader.go diff --git a/proxyd/proxyd/reader_test.go b/proxyd/reader_test.go similarity index 100% rename from proxyd/proxyd/reader_test.go rename to proxyd/reader_test.go diff --git a/proxyd/proxyd/redis.go b/proxyd/redis.go similarity index 100% rename from proxyd/proxyd/redis.go rename to proxyd/redis.go diff --git a/proxyd/proxyd/rewriter.go b/proxyd/rewriter.go similarity index 100% rename from proxyd/proxyd/rewriter.go rename to proxyd/rewriter.go diff --git a/proxyd/proxyd/rewriter_test.go b/proxyd/rewriter_test.go similarity index 100% rename from proxyd/proxyd/rewriter_test.go rename to proxyd/rewriter_test.go diff --git a/proxyd/proxyd/rpc.go b/proxyd/rpc.go similarity index 100% rename from proxyd/proxyd/rpc.go rename to proxyd/rpc.go diff --git a/proxyd/proxyd/rpc_test.go b/proxyd/rpc_test.go similarity index 100% rename from proxyd/proxyd/rpc_test.go rename to proxyd/rpc_test.go diff --git a/proxyd/proxyd/server.go b/proxyd/server.go similarity index 100% rename from proxyd/proxyd/server.go rename to proxyd/server.go diff --git a/proxyd/proxyd/string_set.go b/proxyd/string_set.go similarity index 100% rename from proxyd/proxyd/string_set.go rename to proxyd/string_set.go diff --git a/proxyd/proxyd/tls.go b/proxyd/tls.go similarity index 100% rename from proxyd/proxyd/tls.go rename to proxyd/tls.go diff --git a/proxyd/proxyd/tools/mockserver/handler/handler.go b/proxyd/tools/mockserver/handler/handler.go similarity index 100% rename from proxyd/proxyd/tools/mockserver/handler/handler.go rename to proxyd/tools/mockserver/handler/handler.go diff --git a/proxyd/proxyd/tools/mockserver/main.go b/proxyd/tools/mockserver/main.go similarity index 100% rename from proxyd/proxyd/tools/mockserver/main.go rename to proxyd/tools/mockserver/main.go diff --git a/proxyd/proxyd/tools/mockserver/node1.yml b/proxyd/tools/mockserver/node1.yml similarity index 100% rename from proxyd/proxyd/tools/mockserver/node1.yml rename to proxyd/tools/mockserver/node1.yml diff --git a/proxyd/proxyd/tools/mockserver/node2.yml b/proxyd/tools/mockserver/node2.yml similarity index 100% rename from proxyd/proxyd/tools/mockserver/node2.yml rename to proxyd/tools/mockserver/node2.yml