Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
chore(calendar-service): drop the /calendar-service gateway prefix (#6822)
gbirman4549d2cdd089
diff --git a/.github/workflows/deploy-service-generic.yml b/.github/workflows/deploy-service-generic.ymlindex ff5ab7c678..9b4c2c1f59 100644--- a/.github/workflows/deploy-service-generic.yml+++ b/.github/workflows/deploy-service-generic.yml@@ -10,6 +10,7 @@ on:- agent-schedule-service- authentication-service- bulk-upload+ - calendar-service- connection-gateway- contacts-service- convert-servicediff --git a/infra/stacks/calendar-service/index.ts b/infra/stacks/calendar-service/index.tsindex 0109ae51d6..ec835e0f42 100644--- a/infra/stacks/calendar-service/index.ts+++ b/infra/stacks/calendar-service/index.ts@@ -139,4 +139,4 @@ export const calendarServiceUrl = calendarService.domain;export const calendarServiceGatewayUrl = `https://${stack === 'prod' ? '' : `${stack}-`-}gateway.${BASE_DOMAIN}/calendar-service`;+}gateway.${BASE_DOMAIN}/calendar`;diff --git a/infra/stacks/calendar-service/service.ts b/infra/stacks/calendar-service/service.tsindex 8a6ad100b1..a42ede282b 100644--- a/infra/stacks/calendar-service/service.ts+++ b/infra/stacks/calendar-service/service.ts@@ -72,7 +72,7 @@ export class CalendarService extends pulumi.ComponentResource {super('my:components:CalendarService', name, {}, opts);this.domain = `https://${stack === 'prod' ? '' : `${stack}-`- }gateway.${BASE_DOMAIN}/calendar-service`;+ }gateway.${BASE_DOMAIN}/calendar`;this.tags = tags;this.cloudStorageClusterName = cloudStorageClusterName;@@ -184,21 +184,10 @@ export class CalendarService extends pulumi.ComponentResource {containerPort: serviceContainerPort,service: GatewayService.CALENDAR_SERVICE,healthCheckPath,- // calendar-service claims `/calendar` here ahead of cutover, but this- // rule receives no `/calendar` traffic yet: email-service's rule- // (GatewayService.EMAIL_SERVICE, priority 110) sits below- // calendar-service's (CALENDAR_SERVICE, priority 140) on the shared- // gateway listener, and the ALB evaluates lower priority numbers first- // — see infra/packages/shared/src/gateway_priorities.ts. Email keeps- // winning every `/calendar` match until the cutover PR drops those- // patterns from email-service. The `/calendar-service` prefixes stay- // for now so the service remains reachable in the meantime.- pathPatterns: [- '/calendar',- '/calendar/*',- '/calendar-service',- '/calendar-service/*',- ],+ // calendar-service owns `/calendar` on the shared gateway listener+ // (GatewayService.CALENDAR_SERVICE, priority 140) — see+ // infra/packages/shared/src/gateway_priorities.ts.+ pathPatterns: ['/calendar', '/calendar/*'],serviceSecurityGroupId: this.serviceSg.id,albSecurityGroupId: gatewayLoadBalancer.albSecurityGroupId,},