Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PAY-3854] rm trpc server #11188

Merged
merged 5 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ jobs:
- ./packages/identity-service/node_modules
- ./packages/es-indexer/node_modules
- ./packages/ddex-entrypoint/node_modules
- ./packages/trpc-server/node_modules
- ./packages/create-audius-app/node_modules
- ./packages/dotenv-linter/bin

Expand Down
8 changes: 1 addition & 7 deletions .circleci/src/commands/@docker-commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@ docker-tag-images:
enum: ['prerelease', 'edge', 'current', '__version__']
service:
type: enum
enum:
[
'discovery-provider',
'identity-service',
'all'
]
enum: ['discovery-provider', 'identity-service', 'all']
steps:
- install-crane
- docker-login
Expand All @@ -54,7 +49,6 @@ docker-tag-images:
staking
crm
mri
trpc
verified-notifications
)
identity=(
Expand Down
1 change: 0 additions & 1 deletion .circleci/src/commands/@web-commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ web-distribute:
- ./packages/common/node_modules
- ./packages/libs/node_modules
- ./packages/sdk/node_modules
- ./packages/trpc-server/node_modules
- when:
condition: << parameters.install-license >>
steps:
Expand Down
2 changes: 0 additions & 2 deletions .circleci/src/jobs/@integration-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ integration-init:
- packages/libs/dist
- packages/sdk/node_modules
- packages/sdk/dist
- packages/trpc-server/node_modules
- packages/trpc-server/dist

integration-test:
machine: true
Expand Down
2 changes: 0 additions & 2 deletions .circleci/src/jobs/@web-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ web-init:
- packages/libs/dist
- packages/sdk/node_modules
- packages/sdk/dist
- packages/trpc-server/node_modules
- packages/trpc-server/dist

web-build-demo:
working_directory: ~/audius-protocol
Expand Down
8 changes: 0 additions & 8 deletions .circleci/src/workflows/discovery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,6 @@ jobs:
filters:
branches:
only: main
- push-docker-image:
name: push-trpc
context: [Vercel, dockerhub]
service: trpc
filters:
branches:
only: main

- lint-discovery-provider:
name: lint-discovery-provider
Expand Down Expand Up @@ -125,7 +118,6 @@ jobs:
- push-pedalboard-crm
- push-pedalboard-mri
- push-comms
- push-trpc

filters:
branches:
Expand Down
6 changes: 0 additions & 6 deletions .circleci/src/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ jobs:
context: [Vercel, dockerhub, slack-secrets]
service: es-indexer
notify_slack_on_failure: true
- push-docker-image:
name: push-trpc
context: [Vercel, dockerhub, slack-secrets]
service: trpc
notify_slack_on_failure: true
- commit-audius-docker-compose-and-notify:
context: [slack-secrets, github]
requires:
Expand All @@ -84,7 +79,6 @@ jobs:
- push-pedalboard-crm
- push-pedalboard-mri
- push-comms
- push-trpc

- deploy-foundation-nodes-trigger:
requires:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ For details on operating an Audius service, getting started with the Token and t
| [`spl`](./packages/spl) | Handles Solana instructions for the Audius programs |
| [`eth`](./packages/eth) | Handles interactions for the Audius Ethereum Governance & Staking Contracts |
| [`sql-ts`](./packages/sql-ts) | A typescript database client |
| [`trpc-server`](./packages/trpc-server) | tRPC server used for serving data |
| [`web`](./packages/web) | The Audius reference web and desktop application |

### Required Dependencies
Expand Down
1 change: 1 addition & 0 deletions dev-tools/audius-compose
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ def generate_env(
# generate config.env used by startup scripts
env_file = protocol_dir / "dev-tools/compose/.env"
env_file.touch()
os.chmod(env_file, 0o755)
env_file.write_text(
"# DO NOT EDIT THIS FILE\n# Instead edit dev-tools/config.json and dev-tools/audius-compose.py generate_env()\n"
)
Expand Down
9 changes: 2 additions & 7 deletions dev-tools/compose/docker-compose.discovery.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,14 @@ services:
file: docker-compose.discovery.prod.yml
service: es-indexer

trpc:
extends:
file: docker-compose.discovery.prod.yml
service: trpc

discovery-provider-elasticsearch:
extends:
file: docker-compose.discovery.prod.yml
service: discovery-provider-elasticsearch

discovery-provider-openresty:
image: busybox:1.31.1
entrypoint: ["sh", "-c", "exit 0"]
entrypoint: [ "sh", "-c", "exit 0" ]
profiles:
- noop

Expand All @@ -53,7 +48,7 @@ services:
dockerfile: ${PROJECT_ROOT}/packages/discovery-provider/Dockerfile.dev
volumes:
- ${PROJECT_ROOT}:/app

healthz:
extends:
file: docker-compose.discovery.prod.yml
Expand Down
28 changes: 3 additions & 25 deletions dev-tools/compose/docker-compose.discovery.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
image: redis:7.0
command: redis-server
healthcheck:
test: ['CMD', 'redis-cli', 'PING']
test: [ 'CMD', 'redis-cli', 'PING' ]
interval: 10s
timeout: 5s
deploy:
Expand Down Expand Up @@ -69,20 +69,6 @@ services:
profiles:
- comms

trpc:
build:
context: ${PROJECT_ROOT}/packages/trpc-server
dockerfile: Dockerfile
restart: unless-stopped
environment:
audius_elasticsearch_url: http://discovery-provider-elasticsearch:9200
audius_db_url: 'postgresql://postgres:postgres@db:5432/discovery_provider_1'
depends_on:
db:
condition: service_healthy
profiles:
- discovery

es-indexer:
build:
context: ${PROJECT_ROOT}/packages/es-indexer
Expand All @@ -107,11 +93,7 @@ services:
identity-service-redis:
condition: service_healthy
healthcheck:
test:
[
'CMD-SHELL',
'curl --fail http://localhost:9200/_cluster/health || exit 1'
]
test: [ 'CMD-SHELL', 'curl --fail http://localhost:9200/_cluster/health || exit 1' ]
interval: 10s
timeout: 5s
retries: 15
Expand Down Expand Up @@ -168,11 +150,7 @@ services:
- ${PROJECT_ROOT}/packages/discovery-provider/src:/audius-discovery-provider/src
- ${PROJECT_ROOT}/dev-tools:/tmp/dev-tools
healthcheck:
test:
[
'CMD-SHELL',
'pgrep pg_migrate || curl -f http://localhost:5000/health_check || exit 1'
]
test: [ 'CMD-SHELL', 'pgrep pg_migrate || curl -f http://localhost:5000/health_check || exit 1' ]
interval: 5s
timeout: 10s
retries: 180
Expand Down
7 changes: 0 additions & 7 deletions dev-tools/compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,6 @@ services:
service: comms
<<: *common

trpc:
# Used for pushing to docker hub in CI
extends:
file: docker-compose.discovery.${DOCKERCOMPOSE_ENV_TYPE:-dev}.yml
service: trpc
<<: *common

es-indexer:
# Used for pushing to docker hub in CI
extends:
Expand Down
7 changes: 0 additions & 7 deletions dev-tools/compose/nginx_ingress.conf
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,6 @@ server {
proxy_set_header Connection "upgrade";
}

location ~ ^/trpc(/.*)?$ {
resolver 127.0.0.11 valid=30s;
proxy_pass http://audius-protocol-trpc-1:2022$1$is_args$args;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}

location ~ ^/console(/.*)?$ {
resolver 127.0.0.11 valid=30s;
proxy_pass http://audiusd-1:26659/console$1;
Expand Down
Loading