From 4757a4c4aaaa95431d38bff71dffacb662c4df04 Mon Sep 17 00:00:00 2001 From: bryan newbold Date: Thu, 10 Apr 2025 19:33:47 -0700 Subject: [PATCH] rename yet again (rerelay to relay) --- cmd/{rerelay => relay}/Dockerfile | 12 +++++----- cmd/{rerelay => relay}/README.md | 22 +++++++++---------- cmd/{rerelay => relay}/handlers.go | 6 ++--- cmd/{rerelay => relay}/handlers_admin.go | 4 ++-- cmd/{rerelay => relay}/main.go | 8 +++---- cmd/{rerelay => relay}/otel.go | 4 ++-- .../relay-admin-ui/.gitignore | 0 .../relay-admin-ui/index.html | 0 .../relay-admin-ui/package.json | 0 .../relay-admin-ui/postcss.config.js | 0 .../relay-admin-ui/public/vite.svg | 0 .../relay-admin-ui/src/App.css | 0 .../relay-admin-ui/src/App.tsx | 0 .../relay-admin-ui/src/assets/react.svg | 0 .../src/components/Consumers/Consumers.tsx | 0 .../src/components/Dash/ConfirmModal.tsx | 0 .../src/components/Dash/Dash.tsx | 0 .../Domains/ConfirmDomainBanModal.tsx | 0 .../src/components/Domains/Domains.tsx | 0 .../src/components/Login/Login.tsx | 0 .../src/components/Logout/Logout.tsx | 0 .../components/NewPDS/ConfirmNewPDSModal.tsx | 0 .../src/components/NewPDS/NewPDS.tsx | 0 .../components/Notification/Notification.tsx | 0 .../Repos/ConfirmRepoTakedownModal.tsx | 0 .../src/components/Repos/Repos.tsx | 0 .../relay-admin-ui/src/constants.ts | 0 .../relay-admin-ui/src/index.css | 0 .../relay-admin-ui/src/main.tsx | 0 .../relay-admin-ui/src/models/consumer.ts | 0 .../relay-admin-ui/src/models/pds.ts | 0 .../relay-admin-ui/src/vite-env.d.ts | 0 .../relay-admin-ui/tailwind.config.js | 0 .../relay-admin-ui/tsconfig.json | 0 .../relay-admin-ui/tsconfig.node.json | 0 .../relay-admin-ui/vite.config.ts | 0 .../relay-admin-ui/yarn.lock | 0 cmd/{rerelay => relay}/relay/account.go | 2 +- cmd/{rerelay => relay}/relay/broadcast.go | 2 +- cmd/{rerelay => relay}/relay/crawl.go | 2 +- cmd/{rerelay => relay}/relay/domain_ban.go | 2 +- cmd/{rerelay => relay}/relay/errors.go | 0 cmd/{rerelay => relay}/relay/host.go | 2 +- cmd/{rerelay => relay}/relay/host_checker.go | 0 .../relay/host_checker_test.go | 0 cmd/{rerelay => relay}/relay/host_test.go | 0 cmd/{rerelay => relay}/relay/ingest.go | 4 ++-- cmd/{rerelay => relay}/relay/metrics.go | 0 .../relay/metrics_slurper.go | 0 .../relay/metrics_validator.go | 0 .../relay/models/methods.go | 0 .../relay/models/methods_test.go | 0 cmd/{rerelay => relay}/relay/models/models.go | 0 cmd/{rerelay => relay}/relay/rate_limits.go | 0 cmd/{rerelay => relay}/relay/relay.go | 6 ++--- cmd/{rerelay => relay}/relay/slurper.go | 6 ++--- cmd/{rerelay => relay}/relay/verify.go | 2 +- cmd/{rerelay => relay}/service.go | 2 +- cmd/{rerelay => relay}/stream/cbor_gen.go | 0 cmd/{rerelay => relay}/stream/consumer.go | 0 .../stream/eventmgr/errors.go | 0 .../stream/eventmgr/event_manager.go | 4 ++-- .../stream/eventmgr/metrics.go | 0 .../stream/eventmgr/subscriber.go | 2 +- cmd/{rerelay => relay}/stream/events.go | 0 cmd/{rerelay => relay}/stream/metrics.go | 0 .../stream/persist/diskpersist/diskpersist.go | 4 ++-- .../stream/persist/persist.go | 2 +- cmd/{rerelay => relay}/stream/scheduler.go | 0 .../stream/schedulers/metrics.go | 0 .../stream/schedulers/parallel/parallel.go | 4 ++-- .../stream/schedulers/scheduler.go | 0 .../schedulers/sequential/sequential.go | 4 ++-- cmd/{rerelay => relay}/stubs.go | 2 +- cmd/{rerelay => relay}/testing/consumer.go | 4 ++-- .../testing/framework_test.go | 2 +- cmd/{rerelay => relay}/testing/producer.go | 2 +- cmd/{rerelay => relay}/testing/runner.go | 10 ++++----- cmd/{rerelay => relay}/testing/scenario.go | 2 +- cmd/{rerelay => relay}/testing/sync_test.go | 0 .../testing/testdata/basic.json | 0 .../testing/testdata/deactivation.json | 0 .../testing/testdata/post_lifecycle.json | 0 83 files changed, 64 insertions(+), 64 deletions(-) rename cmd/{rerelay => relay}/Dockerfile (80%) rename cmd/{rerelay => relay}/README.md (93%) rename cmd/{rerelay => relay}/handlers.go (98%) rename cmd/{rerelay => relay}/handlers_admin.go (99%) rename cmd/{rerelay => relay}/main.go (97%) rename cmd/{rerelay => relay}/otel.go (96%) rename cmd/{rerelay => relay}/relay-admin-ui/.gitignore (100%) rename cmd/{rerelay => relay}/relay-admin-ui/index.html (100%) rename cmd/{rerelay => relay}/relay-admin-ui/package.json (100%) rename cmd/{rerelay => relay}/relay-admin-ui/postcss.config.js (100%) rename cmd/{rerelay => relay}/relay-admin-ui/public/vite.svg (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/App.css (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/App.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/assets/react.svg (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Consumers/Consumers.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Dash/ConfirmModal.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Dash/Dash.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Domains/ConfirmDomainBanModal.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Domains/Domains.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Login/Login.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Logout/Logout.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/NewPDS/ConfirmNewPDSModal.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/NewPDS/NewPDS.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Notification/Notification.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Repos/ConfirmRepoTakedownModal.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/components/Repos/Repos.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/constants.ts (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/index.css (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/main.tsx (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/models/consumer.ts (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/models/pds.ts (100%) rename cmd/{rerelay => relay}/relay-admin-ui/src/vite-env.d.ts (100%) rename cmd/{rerelay => relay}/relay-admin-ui/tailwind.config.js (100%) rename cmd/{rerelay => relay}/relay-admin-ui/tsconfig.json (100%) rename cmd/{rerelay => relay}/relay-admin-ui/tsconfig.node.json (100%) rename cmd/{rerelay => relay}/relay-admin-ui/vite.config.ts (100%) rename cmd/{rerelay => relay}/relay-admin-ui/yarn.lock (100%) rename cmd/{rerelay => relay}/relay/account.go (99%) rename cmd/{rerelay => relay}/relay/broadcast.go (98%) rename cmd/{rerelay => relay}/relay/crawl.go (97%) rename cmd/{rerelay => relay}/relay/domain_ban.go (96%) rename cmd/{rerelay => relay}/relay/errors.go (100%) rename cmd/{rerelay => relay}/relay/host.go (98%) rename cmd/{rerelay => relay}/relay/host_checker.go (100%) rename cmd/{rerelay => relay}/relay/host_checker_test.go (100%) rename cmd/{rerelay => relay}/relay/host_test.go (100%) rename cmd/{rerelay => relay}/relay/ingest.go (98%) rename cmd/{rerelay => relay}/relay/metrics.go (100%) rename cmd/{rerelay => relay}/relay/metrics_slurper.go (100%) rename cmd/{rerelay => relay}/relay/metrics_validator.go (100%) rename cmd/{rerelay => relay}/relay/models/methods.go (100%) rename cmd/{rerelay => relay}/relay/models/methods_test.go (100%) rename cmd/{rerelay => relay}/relay/models/models.go (100%) rename cmd/{rerelay => relay}/relay/rate_limits.go (100%) rename cmd/{rerelay => relay}/relay/relay.go (94%) rename cmd/{rerelay => relay}/relay/slurper.go (98%) rename cmd/{rerelay => relay}/relay/verify.go (99%) rename cmd/{rerelay => relay}/service.go (99%) rename cmd/{rerelay => relay}/stream/cbor_gen.go (100%) rename cmd/{rerelay => relay}/stream/consumer.go (100%) rename cmd/{rerelay => relay}/stream/eventmgr/errors.go (100%) rename cmd/{rerelay => relay}/stream/eventmgr/event_manager.go (98%) rename cmd/{rerelay => relay}/stream/eventmgr/metrics.go (100%) rename cmd/{rerelay => relay}/stream/eventmgr/subscriber.go (87%) rename cmd/{rerelay => relay}/stream/events.go (100%) rename cmd/{rerelay => relay}/stream/metrics.go (100%) rename cmd/{rerelay => relay}/stream/persist/diskpersist/diskpersist.go (99%) rename cmd/{rerelay => relay}/stream/persist/persist.go (90%) rename cmd/{rerelay => relay}/stream/scheduler.go (100%) rename cmd/{rerelay => relay}/stream/schedulers/metrics.go (100%) rename cmd/{rerelay => relay}/stream/schedulers/parallel/parallel.go (96%) rename cmd/{rerelay => relay}/stream/schedulers/scheduler.go (100%) rename cmd/{rerelay => relay}/stream/schedulers/sequential/sequential.go (91%) rename cmd/{rerelay => relay}/stubs.go (99%) rename cmd/{rerelay => relay}/testing/consumer.go (96%) rename cmd/{rerelay => relay}/testing/framework_test.go (97%) rename cmd/{rerelay => relay}/testing/producer.go (98%) rename cmd/{rerelay => relay}/testing/runner.go (94%) rename cmd/{rerelay => relay}/testing/scenario.go (97%) rename cmd/{rerelay => relay}/testing/sync_test.go (100%) rename cmd/{rerelay => relay}/testing/testdata/basic.json (100%) rename cmd/{rerelay => relay}/testing/testdata/deactivation.json (100%) rename cmd/{rerelay => relay}/testing/testdata/post_lifecycle.json (100%) diff --git a/cmd/rerelay/Dockerfile b/cmd/relay/Dockerfile similarity index 80% rename from cmd/rerelay/Dockerfile rename to cmd/relay/Dockerfile index 7105eb79..a48e5b83 100644 --- a/cmd/rerelay/Dockerfile +++ b/cmd/relay/Dockerfile @@ -1,6 +1,6 @@ # Run this dockerfile from the top level of the indigo git repository like: # -# podman build -f ./cmd/rerelay/Dockerfile -t rerelay . +# podman build -f ./cmd/relay/Dockerfile -t relay . ### Compile stage FROM golang:1.23-alpine3.20 AS build-env @@ -12,14 +12,14 @@ WORKDIR /dockerbuild # timezone data for alpine builds ENV GOEXPERIMENT=loopvar RUN GIT_VERSION=$(git describe --tags --long --always) && \ - go build -tags timetzdata -o /rerelay ./cmd/rerelay + go build -tags timetzdata -o /relay ./cmd/relay ### Build Frontend stage FROM node:18-alpine as web-builder WORKDIR /app -COPY cmd/rerelay/relay-admin-ui /app/ +COPY cmd/relay/relay-admin-ui /app/ RUN yarn install --frozen-lockfile @@ -32,8 +32,8 @@ RUN apk add --no-cache --update dumb-init ca-certificates runit ENTRYPOINT ["dumb-init", "--"] WORKDIR / -RUN mkdir -p data/rerelay -COPY --from=build-env /rerelay / +RUN mkdir -p data/relay +COPY --from=build-env /relay / COPY --from=web-builder /app/dist/ public/ # small things to make golang binaries work well under alpine @@ -42,7 +42,7 @@ ENV TZ=Etc/UTC EXPOSE 2470 -CMD ["/rerelay", "serve"] +CMD ["/relay", "serve"] LABEL org.opencontainers.image.source=https://github.com/bluesky-social/indigo LABEL org.opencontainers.image.description="atproto Relay" diff --git a/cmd/rerelay/README.md b/cmd/relay/README.md similarity index 93% rename from cmd/rerelay/README.md rename to cmd/relay/README.md index 0c1a6a82..44fea32b 100644 --- a/cmd/rerelay/README.md +++ b/cmd/relay/README.md @@ -1,6 +1,6 @@ -rerelay: an atproto relay -=========================== +`relay`: atproto relay reference implementation +=============================================== *NOTE: "relays" used to be called "Big Graph Servers", or "BGS", or "bigsky". Many variables and packages still reference "bgs"* @@ -35,20 +35,20 @@ To re-build and run the relay locally: You can re-build and run the command directly to get a list of configuration flags and env vars; env vars will be loaded from `.env` if that file exists: - RELAY_ADMIN_KEY=localdev go run ./cmd/rerelay/ --help + RELAY_ADMIN_KEY=localdev go run ./cmd/relay/ --help -By default, the daemon will use sqlite for databases (in the directory `./data/rerelay/`) and the HTTP API will be bound to localhost port 2470. +By default, the daemon will use sqlite for databases (in the directory `./data/relay/`) and the HTTP API will be bound to localhost port 2470. When the daemon isn't running, sqlite database files can be inspected with: - sqlite3 data/rerelay/rerelay.sqlite + sqlite3 data/relay/relay.sqlite [...] sqlite> .schema Wipe all local data: # careful! double-check this destructive command - rm -rf ./data/rerelay/* + rm -rf ./data/relay/* There is a basic web dashboard, though it will not be included unless built and copied to a local directory `./public/`. Run `make build-relay-ui`, and then when running the daemon the dashboard will be available at: . Paste in the admin key, eg `localdev`. @@ -65,8 +65,8 @@ Request crawl of an individual PDS instance like: One way to deploy is running a docker image. You can pull and/or run a specific version of relay, referenced by git commit, from the Bluesky Github container registry. For example: - docker pull ghcr.io/bluesky-social/indigo:rerelay-fd66f93ce1412a3678a1dd3e6d53320b725978a6 - docker run ghcr.io/bluesky-social/indigo:rerelay-fd66f93ce1412a3678a1dd3e6d53320b725978a6 + docker pull ghcr.io/bluesky-social/indigo:relay-fd66f93ce1412a3678a1dd3e6d53320b725978a6 + docker run ghcr.io/bluesky-social/indigo:relay-fd66f93ce1412a3678a1dd3e6d53320b725978a6 There is a Dockerfile in this directory, which can be used to build customized/patched versions of the relay as a container, republish them, run locally, deploy to servers, deploy to an orchestrated cluster, etc. See docs and guides for docker and cluster management systems for details. @@ -77,10 +77,10 @@ PostgreSQL and Sqlite are both supported. Database configuration is passed via t For PostgreSQL, the user and database must already be configured. Some example SQL commands are: - CREATE DATABASE rerelay; + CREATE DATABASE relay; CREATE USER ${username} WITH PASSWORD '${password}'; - GRANT ALL PRIVILEGES ON DATABASE rerelay TO ${username}; + GRANT ALL PRIVILEGES ON DATABASE relay TO ${username}; This service currently uses `gorm` to automatically run database migrations as the regular user. There is no concept of running a separate set of migrations under more privileged database user. @@ -131,7 +131,7 @@ The relay has a number of admin HTTP API endpoints. Given a relay setup listenin ``` RELAY_ADMIN_PASSWORD=$(openssl rand --hex 16) -rerelay --api-listen :2470 --admin-key ${RELAY_ADMIN_PASSWORD} ... +relay --api-listen :2470 --admin-key ${RELAY_ADMIN_PASSWORD} ... ``` One can, for example, begin compaction of all repos diff --git a/cmd/rerelay/handlers.go b/cmd/relay/handlers.go similarity index 98% rename from cmd/rerelay/handlers.go rename to cmd/relay/handlers.go index ea7771e9..aa1748c4 100644 --- a/cmd/rerelay/handlers.go +++ b/cmd/relay/handlers.go @@ -8,8 +8,8 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/syntax" - "github.com/bluesky-social/indigo/cmd/rerelay/relay" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/relay" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" "github.com/bluesky-social/indigo/xrpc" "github.com/labstack/echo/v4" @@ -279,7 +279,7 @@ var homeMessage string = ` .##....##..##.......##.......##.....##....##... .##.....##.########.########.##.....##....##... -This is an atproto [https://atproto.com] relay instance, running the 'rerelay' codebase [https://github.com/bluesky-social/indigo] +This is an atproto [https://atproto.com] relay instance, running the 'relay' codebase [https://github.com/bluesky-social/indigo] The firehose WebSocket path is at: /xrpc/com.atproto.sync.subscribeRepos ` diff --git a/cmd/rerelay/handlers_admin.go b/cmd/relay/handlers_admin.go similarity index 99% rename from cmd/rerelay/handlers_admin.go rename to cmd/relay/handlers_admin.go index 35a8c023..98092d88 100644 --- a/cmd/rerelay/handlers_admin.go +++ b/cmd/relay/handlers_admin.go @@ -10,8 +10,8 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/syntax" - "github.com/bluesky-social/indigo/cmd/rerelay/relay" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/relay" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" "github.com/labstack/echo/v4" dto "github.com/prometheus/client_model/go" diff --git a/cmd/rerelay/main.go b/cmd/relay/main.go similarity index 97% rename from cmd/rerelay/main.go rename to cmd/relay/main.go index e057dd12..ba4c975b 100644 --- a/cmd/rerelay/main.go +++ b/cmd/relay/main.go @@ -17,9 +17,9 @@ import ( _ "net/http/pprof" "github.com/bluesky-social/indigo/atproto/identity" - "github.com/bluesky-social/indigo/cmd/rerelay/relay" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/eventmgr" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/persist/diskpersist" + "github.com/bluesky-social/indigo/cmd/relay/relay" + "github.com/bluesky-social/indigo/cmd/relay/stream/eventmgr" + "github.com/bluesky-social/indigo/cmd/relay/stream/persist/diskpersist" "github.com/bluesky-social/indigo/util/cliutil" "github.com/carlmjohnson/versioninfo" @@ -37,7 +37,7 @@ func main() { func run(args []string) error { app := cli.App{ - Name: "rerelay", + Name: "relay", Usage: "atproto relay daemon", Version: versioninfo.Short(), } diff --git a/cmd/rerelay/otel.go b/cmd/relay/otel.go similarity index 96% rename from cmd/rerelay/otel.go rename to cmd/relay/otel.go index 4debbb39..4a4ad1e1 100644 --- a/cmd/rerelay/otel.go +++ b/cmd/relay/otel.go @@ -35,7 +35,7 @@ func setupOTEL(cctx *cli.Context) error { // Record information about this application in a Resource. tracesdk.WithResource(resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("rerelay"), + semconv.ServiceNameKey.String("relay"), attribute.String("env", env), // DataDog attribute.String("environment", env), // Others attribute.Int64("ID", 1), @@ -73,7 +73,7 @@ func setupOTEL(cctx *cli.Context) error { tracesdk.WithBatcher(exp), tracesdk.WithResource(resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("rerelay"), + semconv.ServiceNameKey.String("relay"), attribute.String("env", env), // DataDog attribute.String("environment", env), // Others attribute.Int64("ID", 1), diff --git a/cmd/rerelay/relay-admin-ui/.gitignore b/cmd/relay/relay-admin-ui/.gitignore similarity index 100% rename from cmd/rerelay/relay-admin-ui/.gitignore rename to cmd/relay/relay-admin-ui/.gitignore diff --git a/cmd/rerelay/relay-admin-ui/index.html b/cmd/relay/relay-admin-ui/index.html similarity index 100% rename from cmd/rerelay/relay-admin-ui/index.html rename to cmd/relay/relay-admin-ui/index.html diff --git a/cmd/rerelay/relay-admin-ui/package.json b/cmd/relay/relay-admin-ui/package.json similarity index 100% rename from cmd/rerelay/relay-admin-ui/package.json rename to cmd/relay/relay-admin-ui/package.json diff --git a/cmd/rerelay/relay-admin-ui/postcss.config.js b/cmd/relay/relay-admin-ui/postcss.config.js similarity index 100% rename from cmd/rerelay/relay-admin-ui/postcss.config.js rename to cmd/relay/relay-admin-ui/postcss.config.js diff --git a/cmd/rerelay/relay-admin-ui/public/vite.svg b/cmd/relay/relay-admin-ui/public/vite.svg similarity index 100% rename from cmd/rerelay/relay-admin-ui/public/vite.svg rename to cmd/relay/relay-admin-ui/public/vite.svg diff --git a/cmd/rerelay/relay-admin-ui/src/App.css b/cmd/relay/relay-admin-ui/src/App.css similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/App.css rename to cmd/relay/relay-admin-ui/src/App.css diff --git a/cmd/rerelay/relay-admin-ui/src/App.tsx b/cmd/relay/relay-admin-ui/src/App.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/App.tsx rename to cmd/relay/relay-admin-ui/src/App.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/assets/react.svg b/cmd/relay/relay-admin-ui/src/assets/react.svg similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/assets/react.svg rename to cmd/relay/relay-admin-ui/src/assets/react.svg diff --git a/cmd/rerelay/relay-admin-ui/src/components/Consumers/Consumers.tsx b/cmd/relay/relay-admin-ui/src/components/Consumers/Consumers.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Consumers/Consumers.tsx rename to cmd/relay/relay-admin-ui/src/components/Consumers/Consumers.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Dash/ConfirmModal.tsx b/cmd/relay/relay-admin-ui/src/components/Dash/ConfirmModal.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Dash/ConfirmModal.tsx rename to cmd/relay/relay-admin-ui/src/components/Dash/ConfirmModal.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Dash/Dash.tsx b/cmd/relay/relay-admin-ui/src/components/Dash/Dash.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Dash/Dash.tsx rename to cmd/relay/relay-admin-ui/src/components/Dash/Dash.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Domains/ConfirmDomainBanModal.tsx b/cmd/relay/relay-admin-ui/src/components/Domains/ConfirmDomainBanModal.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Domains/ConfirmDomainBanModal.tsx rename to cmd/relay/relay-admin-ui/src/components/Domains/ConfirmDomainBanModal.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Domains/Domains.tsx b/cmd/relay/relay-admin-ui/src/components/Domains/Domains.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Domains/Domains.tsx rename to cmd/relay/relay-admin-ui/src/components/Domains/Domains.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Login/Login.tsx b/cmd/relay/relay-admin-ui/src/components/Login/Login.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Login/Login.tsx rename to cmd/relay/relay-admin-ui/src/components/Login/Login.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Logout/Logout.tsx b/cmd/relay/relay-admin-ui/src/components/Logout/Logout.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Logout/Logout.tsx rename to cmd/relay/relay-admin-ui/src/components/Logout/Logout.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/NewPDS/ConfirmNewPDSModal.tsx b/cmd/relay/relay-admin-ui/src/components/NewPDS/ConfirmNewPDSModal.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/NewPDS/ConfirmNewPDSModal.tsx rename to cmd/relay/relay-admin-ui/src/components/NewPDS/ConfirmNewPDSModal.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/NewPDS/NewPDS.tsx b/cmd/relay/relay-admin-ui/src/components/NewPDS/NewPDS.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/NewPDS/NewPDS.tsx rename to cmd/relay/relay-admin-ui/src/components/NewPDS/NewPDS.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Notification/Notification.tsx b/cmd/relay/relay-admin-ui/src/components/Notification/Notification.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Notification/Notification.tsx rename to cmd/relay/relay-admin-ui/src/components/Notification/Notification.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Repos/ConfirmRepoTakedownModal.tsx b/cmd/relay/relay-admin-ui/src/components/Repos/ConfirmRepoTakedownModal.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Repos/ConfirmRepoTakedownModal.tsx rename to cmd/relay/relay-admin-ui/src/components/Repos/ConfirmRepoTakedownModal.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/components/Repos/Repos.tsx b/cmd/relay/relay-admin-ui/src/components/Repos/Repos.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/components/Repos/Repos.tsx rename to cmd/relay/relay-admin-ui/src/components/Repos/Repos.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/constants.ts b/cmd/relay/relay-admin-ui/src/constants.ts similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/constants.ts rename to cmd/relay/relay-admin-ui/src/constants.ts diff --git a/cmd/rerelay/relay-admin-ui/src/index.css b/cmd/relay/relay-admin-ui/src/index.css similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/index.css rename to cmd/relay/relay-admin-ui/src/index.css diff --git a/cmd/rerelay/relay-admin-ui/src/main.tsx b/cmd/relay/relay-admin-ui/src/main.tsx similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/main.tsx rename to cmd/relay/relay-admin-ui/src/main.tsx diff --git a/cmd/rerelay/relay-admin-ui/src/models/consumer.ts b/cmd/relay/relay-admin-ui/src/models/consumer.ts similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/models/consumer.ts rename to cmd/relay/relay-admin-ui/src/models/consumer.ts diff --git a/cmd/rerelay/relay-admin-ui/src/models/pds.ts b/cmd/relay/relay-admin-ui/src/models/pds.ts similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/models/pds.ts rename to cmd/relay/relay-admin-ui/src/models/pds.ts diff --git a/cmd/rerelay/relay-admin-ui/src/vite-env.d.ts b/cmd/relay/relay-admin-ui/src/vite-env.d.ts similarity index 100% rename from cmd/rerelay/relay-admin-ui/src/vite-env.d.ts rename to cmd/relay/relay-admin-ui/src/vite-env.d.ts diff --git a/cmd/rerelay/relay-admin-ui/tailwind.config.js b/cmd/relay/relay-admin-ui/tailwind.config.js similarity index 100% rename from cmd/rerelay/relay-admin-ui/tailwind.config.js rename to cmd/relay/relay-admin-ui/tailwind.config.js diff --git a/cmd/rerelay/relay-admin-ui/tsconfig.json b/cmd/relay/relay-admin-ui/tsconfig.json similarity index 100% rename from cmd/rerelay/relay-admin-ui/tsconfig.json rename to cmd/relay/relay-admin-ui/tsconfig.json diff --git a/cmd/rerelay/relay-admin-ui/tsconfig.node.json b/cmd/relay/relay-admin-ui/tsconfig.node.json similarity index 100% rename from cmd/rerelay/relay-admin-ui/tsconfig.node.json rename to cmd/relay/relay-admin-ui/tsconfig.node.json diff --git a/cmd/rerelay/relay-admin-ui/vite.config.ts b/cmd/relay/relay-admin-ui/vite.config.ts similarity index 100% rename from cmd/rerelay/relay-admin-ui/vite.config.ts rename to cmd/relay/relay-admin-ui/vite.config.ts diff --git a/cmd/rerelay/relay-admin-ui/yarn.lock b/cmd/relay/relay-admin-ui/yarn.lock similarity index 100% rename from cmd/rerelay/relay-admin-ui/yarn.lock rename to cmd/relay/relay-admin-ui/yarn.lock diff --git a/cmd/rerelay/relay/account.go b/cmd/relay/relay/account.go similarity index 99% rename from cmd/rerelay/relay/account.go rename to cmd/relay/relay/account.go index abefd057..54cfa289 100644 --- a/cmd/rerelay/relay/account.go +++ b/cmd/relay/relay/account.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/bluesky-social/indigo/atproto/syntax" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" "gorm.io/gorm" ) diff --git a/cmd/rerelay/relay/broadcast.go b/cmd/relay/relay/broadcast.go similarity index 98% rename from cmd/rerelay/relay/broadcast.go rename to cmd/relay/relay/broadcast.go index c55bb99d..90da3b83 100644 --- a/cmd/rerelay/relay/broadcast.go +++ b/cmd/relay/relay/broadcast.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream" "github.com/gorilla/websocket" promclient "github.com/prometheus/client_golang/prometheus" diff --git a/cmd/rerelay/relay/crawl.go b/cmd/relay/relay/crawl.go similarity index 97% rename from cmd/rerelay/relay/crawl.go rename to cmd/relay/relay/crawl.go index 8e02c49c..24889fad 100644 --- a/cmd/rerelay/relay/crawl.go +++ b/cmd/relay/relay/crawl.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" ) // Checks whether a host is allowed to be subscribed to diff --git a/cmd/rerelay/relay/domain_ban.go b/cmd/relay/relay/domain_ban.go similarity index 96% rename from cmd/rerelay/relay/domain_ban.go rename to cmd/relay/relay/domain_ban.go index edc6271a..b9616f05 100644 --- a/cmd/rerelay/relay/domain_ban.go +++ b/cmd/relay/relay/domain_ban.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" "gorm.io/gorm" ) diff --git a/cmd/rerelay/relay/errors.go b/cmd/relay/relay/errors.go similarity index 100% rename from cmd/rerelay/relay/errors.go rename to cmd/relay/relay/errors.go diff --git a/cmd/rerelay/relay/host.go b/cmd/relay/relay/host.go similarity index 98% rename from cmd/rerelay/relay/host.go rename to cmd/relay/relay/host.go index 0ad40abe..bf12d360 100644 --- a/cmd/rerelay/relay/host.go +++ b/cmd/relay/relay/host.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/bluesky-social/indigo/atproto/syntax" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" "gorm.io/gorm" ) diff --git a/cmd/rerelay/relay/host_checker.go b/cmd/relay/relay/host_checker.go similarity index 100% rename from cmd/rerelay/relay/host_checker.go rename to cmd/relay/relay/host_checker.go diff --git a/cmd/rerelay/relay/host_checker_test.go b/cmd/relay/relay/host_checker_test.go similarity index 100% rename from cmd/rerelay/relay/host_checker_test.go rename to cmd/relay/relay/host_checker_test.go diff --git a/cmd/rerelay/relay/host_test.go b/cmd/relay/relay/host_test.go similarity index 100% rename from cmd/rerelay/relay/host_test.go rename to cmd/relay/relay/host_test.go diff --git a/cmd/rerelay/relay/ingest.go b/cmd/relay/relay/ingest.go similarity index 98% rename from cmd/rerelay/relay/ingest.go rename to cmd/relay/relay/ingest.go index bdc9f46c..0b35ff31 100644 --- a/cmd/rerelay/relay/ingest.go +++ b/cmd/relay/relay/ingest.go @@ -10,8 +10,8 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/identity" "github.com/bluesky-social/indigo/atproto/syntax" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/stream" "go.opentelemetry.io/otel/attribute" ) diff --git a/cmd/rerelay/relay/metrics.go b/cmd/relay/relay/metrics.go similarity index 100% rename from cmd/rerelay/relay/metrics.go rename to cmd/relay/relay/metrics.go diff --git a/cmd/rerelay/relay/metrics_slurper.go b/cmd/relay/relay/metrics_slurper.go similarity index 100% rename from cmd/rerelay/relay/metrics_slurper.go rename to cmd/relay/relay/metrics_slurper.go diff --git a/cmd/rerelay/relay/metrics_validator.go b/cmd/relay/relay/metrics_validator.go similarity index 100% rename from cmd/rerelay/relay/metrics_validator.go rename to cmd/relay/relay/metrics_validator.go diff --git a/cmd/rerelay/relay/models/methods.go b/cmd/relay/relay/models/methods.go similarity index 100% rename from cmd/rerelay/relay/models/methods.go rename to cmd/relay/relay/models/methods.go diff --git a/cmd/rerelay/relay/models/methods_test.go b/cmd/relay/relay/models/methods_test.go similarity index 100% rename from cmd/rerelay/relay/models/methods_test.go rename to cmd/relay/relay/models/methods_test.go diff --git a/cmd/rerelay/relay/models/models.go b/cmd/relay/relay/models/models.go similarity index 100% rename from cmd/rerelay/relay/models/models.go rename to cmd/relay/relay/models/models.go diff --git a/cmd/rerelay/relay/rate_limits.go b/cmd/relay/relay/rate_limits.go similarity index 100% rename from cmd/rerelay/relay/rate_limits.go rename to cmd/relay/relay/rate_limits.go diff --git a/cmd/rerelay/relay/relay.go b/cmd/relay/relay/relay.go similarity index 94% rename from cmd/rerelay/relay/relay.go rename to cmd/relay/relay/relay.go index fc411474..ff366227 100644 --- a/cmd/rerelay/relay/relay.go +++ b/cmd/relay/relay/relay.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/bluesky-social/indigo/atproto/identity" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/eventmgr" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/stream/eventmgr" "github.com/hashicorp/golang-lru/v2" "go.opentelemetry.io/otel" @@ -69,7 +69,7 @@ func NewRelay(db *gorm.DB, evtman *eventmgr.EventManager, dir identity.Directory uc, _ := lru.New[string, *models.Account](2_000_000) - hc := NewHostClient("rerelay") // TODO: pass-through a user-agent from config? + hc := NewHostClient("relay") // TODO: pass-through a user-agent from config? r := &Relay{ db: db, diff --git a/cmd/rerelay/relay/slurper.go b/cmd/relay/relay/slurper.go similarity index 98% rename from cmd/rerelay/relay/slurper.go rename to cmd/relay/relay/slurper.go index a26bd50b..c62470c0 100644 --- a/cmd/rerelay/relay/slurper.go +++ b/cmd/relay/relay/slurper.go @@ -11,9 +11,9 @@ import ( "time" comatproto "github.com/bluesky-social/indigo/api/atproto" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/schedulers/parallel" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream/schedulers/parallel" "github.com/RussellLuo/slidingwindow" "github.com/gorilla/websocket" diff --git a/cmd/rerelay/relay/verify.go b/cmd/relay/relay/verify.go similarity index 99% rename from cmd/rerelay/relay/verify.go rename to cmd/relay/relay/verify.go index 757d5f40..92b6ad53 100644 --- a/cmd/rerelay/relay/verify.go +++ b/cmd/relay/relay/verify.go @@ -11,7 +11,7 @@ import ( "github.com/bluesky-social/indigo/atproto/identity" "github.com/bluesky-social/indigo/atproto/repo" "github.com/bluesky-social/indigo/atproto/syntax" - "github.com/bluesky-social/indigo/cmd/rerelay/relay/models" + "github.com/bluesky-social/indigo/cmd/relay/relay/models" ) var ( diff --git a/cmd/rerelay/service.go b/cmd/relay/service.go similarity index 99% rename from cmd/rerelay/service.go rename to cmd/relay/service.go index 6423bf78..b22285da 100644 --- a/cmd/rerelay/service.go +++ b/cmd/relay/service.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/bluesky-social/indigo/cmd/rerelay/relay" + "github.com/bluesky-social/indigo/cmd/relay/relay" "github.com/bluesky-social/indigo/util/svcutil" "github.com/labstack/echo/v4" diff --git a/cmd/rerelay/stream/cbor_gen.go b/cmd/relay/stream/cbor_gen.go similarity index 100% rename from cmd/rerelay/stream/cbor_gen.go rename to cmd/relay/stream/cbor_gen.go diff --git a/cmd/rerelay/stream/consumer.go b/cmd/relay/stream/consumer.go similarity index 100% rename from cmd/rerelay/stream/consumer.go rename to cmd/relay/stream/consumer.go diff --git a/cmd/rerelay/stream/eventmgr/errors.go b/cmd/relay/stream/eventmgr/errors.go similarity index 100% rename from cmd/rerelay/stream/eventmgr/errors.go rename to cmd/relay/stream/eventmgr/errors.go diff --git a/cmd/rerelay/stream/eventmgr/event_manager.go b/cmd/relay/stream/eventmgr/event_manager.go similarity index 98% rename from cmd/rerelay/stream/eventmgr/event_manager.go rename to cmd/relay/stream/eventmgr/event_manager.go index 340e5bf0..b25fd129 100644 --- a/cmd/rerelay/stream/eventmgr/event_manager.go +++ b/cmd/relay/stream/eventmgr/event_manager.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/persist" + "github.com/bluesky-social/indigo/cmd/relay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream/persist" "go.opentelemetry.io/otel" ) diff --git a/cmd/rerelay/stream/eventmgr/metrics.go b/cmd/relay/stream/eventmgr/metrics.go similarity index 100% rename from cmd/rerelay/stream/eventmgr/metrics.go rename to cmd/relay/stream/eventmgr/metrics.go diff --git a/cmd/rerelay/stream/eventmgr/subscriber.go b/cmd/relay/stream/eventmgr/subscriber.go similarity index 87% rename from cmd/rerelay/stream/eventmgr/subscriber.go rename to cmd/relay/stream/eventmgr/subscriber.go index d21eab1b..80f0c941 100644 --- a/cmd/rerelay/stream/eventmgr/subscriber.go +++ b/cmd/relay/stream/eventmgr/subscriber.go @@ -3,7 +3,7 @@ package eventmgr import ( "sync" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream" "github.com/prometheus/client_golang/prometheus" ) diff --git a/cmd/rerelay/stream/events.go b/cmd/relay/stream/events.go similarity index 100% rename from cmd/rerelay/stream/events.go rename to cmd/relay/stream/events.go diff --git a/cmd/rerelay/stream/metrics.go b/cmd/relay/stream/metrics.go similarity index 100% rename from cmd/rerelay/stream/metrics.go rename to cmd/relay/stream/metrics.go diff --git a/cmd/rerelay/stream/persist/diskpersist/diskpersist.go b/cmd/relay/stream/persist/diskpersist/diskpersist.go similarity index 99% rename from cmd/rerelay/stream/persist/diskpersist/diskpersist.go rename to cmd/relay/stream/persist/diskpersist/diskpersist.go index 2d044ee0..a6664597 100644 --- a/cmd/rerelay/stream/persist/diskpersist/diskpersist.go +++ b/cmd/relay/stream/persist/diskpersist/diskpersist.go @@ -15,8 +15,8 @@ import ( "time" "github.com/bluesky-social/indigo/api/atproto" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/persist" + "github.com/bluesky-social/indigo/cmd/relay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream/persist" arc "github.com/hashicorp/golang-lru/arc/v2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/cmd/rerelay/stream/persist/persist.go b/cmd/relay/stream/persist/persist.go similarity index 90% rename from cmd/rerelay/stream/persist/persist.go rename to cmd/relay/stream/persist/persist.go index 51ccb57a..ab7d0562 100644 --- a/cmd/rerelay/stream/persist/persist.go +++ b/cmd/relay/stream/persist/persist.go @@ -3,7 +3,7 @@ package persist import ( "context" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream" ) // Note that this interface looks generic, but some persisters might only work with RepoAppend or LabelLabels diff --git a/cmd/rerelay/stream/scheduler.go b/cmd/relay/stream/scheduler.go similarity index 100% rename from cmd/rerelay/stream/scheduler.go rename to cmd/relay/stream/scheduler.go diff --git a/cmd/rerelay/stream/schedulers/metrics.go b/cmd/relay/stream/schedulers/metrics.go similarity index 100% rename from cmd/rerelay/stream/schedulers/metrics.go rename to cmd/relay/stream/schedulers/metrics.go diff --git a/cmd/rerelay/stream/schedulers/parallel/parallel.go b/cmd/relay/stream/schedulers/parallel/parallel.go similarity index 96% rename from cmd/rerelay/stream/schedulers/parallel/parallel.go rename to cmd/relay/stream/schedulers/parallel/parallel.go index b94f43fe..3763267a 100644 --- a/cmd/rerelay/stream/schedulers/parallel/parallel.go +++ b/cmd/relay/stream/schedulers/parallel/parallel.go @@ -5,8 +5,8 @@ import ( "log/slog" "sync" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/schedulers" + "github.com/bluesky-social/indigo/cmd/relay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream/schedulers" "github.com/prometheus/client_golang/prometheus" ) diff --git a/cmd/rerelay/stream/schedulers/scheduler.go b/cmd/relay/stream/schedulers/scheduler.go similarity index 100% rename from cmd/rerelay/stream/schedulers/scheduler.go rename to cmd/relay/stream/schedulers/scheduler.go diff --git a/cmd/rerelay/stream/schedulers/sequential/sequential.go b/cmd/relay/stream/schedulers/sequential/sequential.go similarity index 91% rename from cmd/rerelay/stream/schedulers/sequential/sequential.go rename to cmd/relay/stream/schedulers/sequential/sequential.go index ee5e705c..cfd73580 100644 --- a/cmd/rerelay/stream/schedulers/sequential/sequential.go +++ b/cmd/relay/stream/schedulers/sequential/sequential.go @@ -3,8 +3,8 @@ package sequential import ( "context" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/schedulers" + "github.com/bluesky-social/indigo/cmd/relay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream/schedulers" "github.com/prometheus/client_golang/prometheus" ) diff --git a/cmd/rerelay/stubs.go b/cmd/relay/stubs.go similarity index 99% rename from cmd/rerelay/stubs.go rename to cmd/relay/stubs.go index df4d5b48..83eb34e6 100644 --- a/cmd/rerelay/stubs.go +++ b/cmd/relay/stubs.go @@ -7,7 +7,7 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/syntax" - "github.com/bluesky-social/indigo/cmd/rerelay/relay" + "github.com/bluesky-social/indigo/cmd/relay/relay" "github.com/bluesky-social/indigo/xrpc" "github.com/labstack/echo/v4" diff --git a/cmd/rerelay/testing/consumer.go b/cmd/relay/testing/consumer.go similarity index 96% rename from cmd/rerelay/testing/consumer.go rename to cmd/relay/testing/consumer.go index a1437292..78fe8dc2 100644 --- a/cmd/rerelay/testing/consumer.go +++ b/cmd/relay/testing/consumer.go @@ -8,8 +8,8 @@ import ( "time" comatproto "github.com/bluesky-social/indigo/api/atproto" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/schedulers/sequential" + "github.com/bluesky-social/indigo/cmd/relay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream/schedulers/sequential" "github.com/gorilla/websocket" ) diff --git a/cmd/rerelay/testing/framework_test.go b/cmd/relay/testing/framework_test.go similarity index 97% rename from cmd/rerelay/testing/framework_test.go rename to cmd/relay/testing/framework_test.go index 5d9c2dac..a9608630 100644 --- a/cmd/rerelay/testing/framework_test.go +++ b/cmd/relay/testing/framework_test.go @@ -9,7 +9,7 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/syntax" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" + "github.com/bluesky-social/indigo/cmd/elay/stream" "github.com/stretchr/testify/assert" ) diff --git a/cmd/rerelay/testing/producer.go b/cmd/relay/testing/producer.go similarity index 98% rename from cmd/rerelay/testing/producer.go rename to cmd/relay/testing/producer.go index d32dfbbd..92629cc6 100644 --- a/cmd/rerelay/testing/producer.go +++ b/cmd/relay/testing/producer.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream" "github.com/gorilla/websocket" ) diff --git a/cmd/rerelay/testing/runner.go b/cmd/relay/testing/runner.go similarity index 94% rename from cmd/rerelay/testing/runner.go rename to cmd/relay/testing/runner.go index 0df1ee84..64590a6d 100644 --- a/cmd/rerelay/testing/runner.go +++ b/cmd/relay/testing/runner.go @@ -11,10 +11,10 @@ import ( "reflect" "github.com/bluesky-social/indigo/atproto/identity" - "github.com/bluesky-social/indigo/cmd/rerelay/relay" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/eventmgr" - "github.com/bluesky-social/indigo/cmd/rerelay/stream/persist/diskpersist" + "github.com/bluesky-social/indigo/cmd/relay/relay" + "github.com/bluesky-social/indigo/cmd/relay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream/eventmgr" + "github.com/bluesky-social/indigo/cmd/relay/stream/persist/diskpersist" "github.com/bluesky-social/indigo/util/cliutil" ) @@ -117,7 +117,7 @@ func RunScenario(ctx context.Context, s *Scenario) error { dir.Insert(acc.Identity) } - tmpd, err := os.MkdirTemp("", "rerelay-test-") + tmpd, err := os.MkdirTemp("", "relay-test-") if err != nil { return err } diff --git a/cmd/rerelay/testing/scenario.go b/cmd/relay/testing/scenario.go similarity index 97% rename from cmd/rerelay/testing/scenario.go rename to cmd/relay/testing/scenario.go index 680c3e0a..75d1fde2 100644 --- a/cmd/rerelay/testing/scenario.go +++ b/cmd/relay/testing/scenario.go @@ -6,7 +6,7 @@ import ( comatproto "github.com/bluesky-social/indigo/api/atproto" "github.com/bluesky-social/indigo/atproto/identity" - "github.com/bluesky-social/indigo/cmd/rerelay/stream" + "github.com/bluesky-social/indigo/cmd/relay/stream" ) // represents an entire test case diff --git a/cmd/rerelay/testing/sync_test.go b/cmd/relay/testing/sync_test.go similarity index 100% rename from cmd/rerelay/testing/sync_test.go rename to cmd/relay/testing/sync_test.go diff --git a/cmd/rerelay/testing/testdata/basic.json b/cmd/relay/testing/testdata/basic.json similarity index 100% rename from cmd/rerelay/testing/testdata/basic.json rename to cmd/relay/testing/testdata/basic.json diff --git a/cmd/rerelay/testing/testdata/deactivation.json b/cmd/relay/testing/testdata/deactivation.json similarity index 100% rename from cmd/rerelay/testing/testdata/deactivation.json rename to cmd/relay/testing/testdata/deactivation.json diff --git a/cmd/rerelay/testing/testdata/post_lifecycle.json b/cmd/relay/testing/testdata/post_lifecycle.json similarity index 100% rename from cmd/rerelay/testing/testdata/post_lifecycle.json rename to cmd/relay/testing/testdata/post_lifecycle.json -- 2.51.2