remove the tokens service; use the same strategy for target access tokens (bentocache) as with organization access tokens

.vscode/terminals.json

@@ -30,13 +30,6 @@
       "cwd": "packages/web/app",
       "command": "pnpm dev"
     },
-    {
-      "name": "tokens:dev",
-      "description": "Run tokens service",
-      "open": true,
-      "cwd": "packages/services/tokens",
-      "command": "pnpm dev"
-    },
     {
       "name": "schema:dev",
       "description": "Run schema service",

deployment/index.ts

@@ -24,7 +24,6 @@ import { deployS3, deployS3AuditLog, deployS3Mirror } from './services/s3';
 import { deploySchema } from './services/schema';
 import { configureSentry } from './services/sentry';
 import { configureSlackApp } from './services/slack-app';
-import { deployTokens } from './services/tokens';
 import { deployUsage } from './services/usage';
 import { deployUsageIngestor } from './services/usage-ingestor';
 import { deployWorkflows, PostmarkSecret } from './services/workflows';
@@ -123,18 +122,6 @@ const dbMigrations = deployDbMigrations({
   dependencies: [databaseCleanupJob].filter(isDefined),
 });
 
-const tokens = deployTokens({
-  image: docker.factory.getImageId('tokens', imagesTag),
-  environment,
-  dbMigrations,
-  docker,
-  postgres,
-  redis,
-  heartbeat: heartbeatsConfig.get('tokens'),
-  sentry,
-  observability,
-});
-
 const commerce = deployCommerce({
   image: docker.factory.getImageId('commerce', imagesTag),
   docker,
@@ -150,7 +137,6 @@ const usage = deployUsage({
   image: docker.factory.getImageId('usage', imagesTag),
   docker,
   environment,
-  tokens,
   redis,
   postgres,
   kafka,
@@ -213,7 +199,6 @@ const graphql = deployGraphQL({
   clickhouse,
   image: docker.factory.getImageId('server', imagesTag),
   docker,
-  tokens,
   schema,
   schemaPolicy,
   dbMigrations,
@@ -340,7 +325,6 @@ deployCloudFlareSecurityTransform({
 export const graphqlApiServiceId = graphql.service.id;
 export const usageApiServiceId = usage.service.id;
 export const usageIngestorApiServiceId = usageIngestor.service.id;
-export const tokensApiServiceId = tokens.service.id;
 export const schemaApiServiceId = schema.service.id;
 
 export const appId = app.deployment.id;

deployment/services/graphql.ts

@@ -16,7 +16,6 @@ import { Redis } from './redis';
 import { S3 } from './s3';
 import { Schema } from './schema';
 import { Sentry } from './sentry';
-import { Tokens } from './tokens';
 import { Usage } from './usage';
 import { Zendesk } from './zendesk';
 
@@ -31,7 +30,6 @@ export function deployGraphQL({
   clickhouse,
   image,
   environment,
-  tokens,
   schema,
   schemaPolicy,
   cdn,
@@ -55,7 +53,6 @@ export function deployGraphQL({
   image: string;
   clickhouse: Clickhouse;
   environment: Environment;
-  tokens: Tokens;
   schema: Schema;
   schemaPolicy: SchemaPolicy;
   redis: Redis;
@@ -132,7 +129,6 @@ export function deployGraphQL({
             featureFlagsConfig.get('metricAlertRulesEnabled') ?? '0',
           REQUEST_LOGGING: '1',
           COMMERCE_ENDPOINT: serviceLocalEndpoint(commerce.service),
-          TOKENS_ENDPOINT: serviceLocalEndpoint(tokens.service),
           SCHEMA_ENDPOINT: serviceLocalEndpoint(schema.service),
           SCHEMA_POLICY_ENDPOINT: serviceLocalEndpoint(schemaPolicy.service),
           WEB_APP_URL: `https://${environment.appDns}`,

deployment/services/usage.ts

@@ -9,13 +9,11 @@ import { Observability } from './observability';
 import { Postgres } from './postgres';
 import { Redis } from './redis';
 import { Sentry } from './sentry';
-import { Tokens } from './tokens';
 
 export type Usage = ReturnType<typeof deployUsage>;
 
 export function deployUsage({
   environment,
-  tokens,
   postgres,
   redis,
   kafka,
@@ -29,7 +27,6 @@ export function deployUsage({
   observability: Observability;
   image: string;
   environment: Environment;
-  tokens: Tokens;
   postgres: Postgres;
   redis: Redis;
   kafka: Kafka;
@@ -69,7 +66,6 @@ export function deployUsage({
           KAFKA_BUFFER_INTERVAL: kafka.config.bufferInterval,
           KAFKA_BUFFER_DYNAMIC: kafkaBufferDynamic,
           KAFKA_TOPIC: kafka.config.topic,
-          TOKENS_ENDPOINT: serviceLocalEndpoint(tokens.service),
           COMMERCE_ENDPOINT: serviceLocalEndpoint(commerce.service),
           OPENTELEMETRY_COLLECTOR_ENDPOINT:
             observability.enabled &&
@@ -90,13 +86,7 @@ export function deployUsage({
           maxReplicas: environment.podsConfig.usageService.maxReplicas,
         },
       },
-      [
-        dbMigrations,
-        tokens.deployment,
-        tokens.service,
-        commerce.deployment,
-        commerce.service,
-      ].filter(Boolean),
+      [dbMigrations, commerce.deployment, commerce.service].filter(Boolean),
     )
       // Redis
       .withSecret('REDIS_HOST', redis.secret, 'host')

docker/docker-compose.community.yml

@@ -174,8 +174,6 @@ services:
         condition: service_completed_successfully
       s3_provision_buckets:
         condition: service_completed_successfully
-      tokens:
-        condition: service_healthy
       schema:
         condition: service_healthy
       policy:
@@ -197,7 +195,6 @@ services:
       REDIS_HOST: redis
       REDIS_PORT: 6379
       REDIS_PASSWORD: '${REDIS_PASSWORD}'
-      TOKENS_ENDPOINT: http://tokens:3003
       SCHEMA_ENDPOINT: http://schema:3002
       SCHEMA_POLICY_ENDPOINT: http://policy:3012
       ENCRYPTION_SECRET: '${HIVE_ENCRYPTION_SECRET}'
@@ -266,32 +263,6 @@ services:
       PROMETHEUS_METRICS: '${PROMETHEUS_METRICS:-}'
       LOG_LEVEL: '${LOG_LEVEL:-debug}'
 
-  tokens:
-    image: '${DOCKER_REGISTRY}tokens${DOCKER_TAG}'
-    networks:
-      - 'stack'
-    depends_on:
-      migrations:
-        condition: service_completed_successfully
-    environment:
-      NODE_ENV: production
-      POSTGRES_HOST: db
-      POSTGRES_USER: '${POSTGRES_USER}'
-      POSTGRES_PASSWORD: '${POSTGRES_PASSWORD}'
-      POSTGRES_PORT: 5432
-      POSTGRES_DB: '${POSTGRES_DB}'
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
-      REDIS_PASSWORD: '${REDIS_PASSWORD}'
-      PORT: 3003
-      SERVER_HOST: '${SERVER_HOST:-::}'
-      SERVER_HOST_IPV6_ONLY: '${SERVER_HOST_IPV6_ONLY:-0}'
-      LOG_LEVEL: '${LOG_LEVEL:-debug}'
-      OPENTELEMETRY_COLLECTOR_ENDPOINT: '${OPENTELEMETRY_COLLECTOR_ENDPOINT:-}'
-      SENTRY: '${SENTRY:-0}'
-      SENTRY_DSN: '${SENTRY_DSN:-}'
-      PROMETHEUS_METRICS: '${PROMETHEUS_METRICS:-}'
-
   workflows:
     image: '${DOCKER_REGISTRY}workflows${DOCKER_TAG}'
     networks:
@@ -328,13 +299,10 @@ services:
     depends_on:
       broker:
         condition: service_healthy
-      tokens:
-        condition: service_healthy
     ports:
       - 8081:3006
     environment:
       NODE_ENV: production
-      TOKENS_ENDPOINT: http://tokens:3003
       KAFKA_CONNECTION_MODE: 'docker'
       KAFKA_TOPIC: 'usage_reports_v2'
       KAFKA_BROKER: broker:29092

docker/docker.hcl

@@ -220,28 +220,6 @@ target "commerce" {
   ]
 }
 
-target "tokens" {
-  inherits = ["service-base", get_target()]
-  contexts = {
-    dist = "${PWD}/packages/services/tokens/dist"
-    shared = "${PWD}/docker/shared"
-  }
-  args = {
-    SERVICE_DIR_NAME = "@hive/tokens"
-    IMAGE_TITLE = "graphql-hive/tokens"
-    IMAGE_DESCRIPTION = "The tokens service of the GraphQL Hive project."
-    PORT = "3003"
-    HEALTHCHECK_CMD = "wget --spider -q http://127.0.0.1:$${PORT}/_readiness"
-  }
-  tags = [
-    local_image_tag("tokens"),
-    stable_image_tag("tokens"),
-    image_tag("tokens", COMMIT_SHA),
-    image_tag("tokens", COMMIT_SHORT_SHA),
-    image_tag("tokens", BRANCH_NAME)
-  ]
-}
-
 target "usage-ingestor" {
   inherits = ["service-base", get_target()]
   contexts = {
@@ -391,7 +369,6 @@ group "build" {
     "schema",
     "policy",
     "storage",
-    "tokens",
     "usage-ingestor",
     "usage",
     "server",
@@ -409,7 +386,6 @@ group "integration-tests" {
     "schema",
     "policy",
     "storage",
-    "tokens",
     "usage-ingestor",
     "usage",
     "server",

integration-tests/docker-compose.integration.yaml

@@ -223,8 +223,6 @@ services:
     depends_on:
       broker:
         condition: service_started # Redpand is ready when it starts
-      tokens:
-        condition: service_healthy
 
   usage-ingestor:
     environment:
@@ -234,8 +232,6 @@ services:
     depends_on:
       broker:
         condition: service_started # Redpand is ready when it starts
-      tokens:
-        condition: service_healthy
 
   workflows:
     environment: