Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

docs(infra): say MICROSOFT_TOKEN_KMS_KEY_ID is set by hand in Doppler (#8382)

gbirmanf233138faef4
diff --git a/infra/stacks/authentication-service/Pulumi.dev.yaml b/infra/stacks/authentication-service/Pulumi.dev.yaml
index f1cdd44d6d..26a7dcbb0b 100644
--- a/infra/stacks/authentication-service/Pulumi.dev.yaml
+++ b/infra/stacks/authentication-service/Pulumi.dev.yaml
@@ -5,7 +5,9 @@ config:
authentication-service:fusionauth_api_key_secret_key: fusionauth-api-key-dev
authentication-service:authentication_service_internal_api_key: authentication-service-internal-api-key-dev
# Keep Microsoft OAuth credentials in the authentication_service Doppler config.
- # Pulumi injects MICROSOFT_TOKEN_KMS_KEY_ID from the per-stack key; it is not a secret config value.
+ # MICROSOFT_TOKEN_KMS_KEY_ID is not injected by Pulumi: it is set by hand in that
+ # Doppler config to the key this stack creates under
+ # alias/authentication-service-microsoft-token-dev.
authentication-service:microsoft_token_kms_deletion_window_days: 7
# Pulumi injects CURSOR_API_KEY_KMS_KEY_ID from the per-stack key; it is not a secret.
authentication-service:cursor_api_key_kms_deletion_window_days: 7
diff --git a/infra/stacks/authentication-service/Pulumi.prod.yaml b/infra/stacks/authentication-service/Pulumi.prod.yaml
index 27d2ae0b52..ce29358f78 100644
--- a/infra/stacks/authentication-service/Pulumi.prod.yaml
+++ b/infra/stacks/authentication-service/Pulumi.prod.yaml
@@ -5,7 +5,9 @@ config:
authentication-service:fusionauth_api_key_secret_key: fusionauth-api-key-prod
authentication-service:authentication_service_internal_api_key: authentication-service-internal-api-key-prod
# Keep Microsoft OAuth credentials in the authentication_service Doppler config.
- # Pulumi injects MICROSOFT_TOKEN_KMS_KEY_ID from the per-stack key; it is not a secret config value.
+ # MICROSOFT_TOKEN_KMS_KEY_ID is not injected by Pulumi: it is set by hand in that
+ # Doppler config to the key this stack creates under
+ # alias/authentication-service-microsoft-token-prod.
authentication-service:microsoft_token_kms_deletion_window_days: 30
# Pulumi injects CURSOR_API_KEY_KMS_KEY_ID from the per-stack key; it is not a secret.
authentication-service:cursor_api_key_kms_deletion_window_days: 30
diff --git a/infra/stacks/authentication-service/service.ts b/infra/stacks/authentication-service/service.ts
index 81bb900d91..8362eca5c0 100644
--- a/infra/stacks/authentication-service/service.ts
+++ b/infra/stacks/authentication-service/service.ts
@@ -529,9 +529,10 @@ export class AuthenticationService extends pulumi.ComponentResource {
{ name: 'BASE_URL', value: this.domain },
// Injected here rather than configured in Doppler: a key id is
// not a secret, and deriving it from the resource keeps the two
- // from drifting. Note MICROSOFT_TOKEN_KMS_KEY_ID is documented
- // as injected the same way but is not — see the Pulumi yaml
- // comment; that gap is not fixed here.
+ // from drifting. MICROSOFT_TOKEN_KMS_KEY_ID is the exception:
+ // it is set by hand in Doppler to the key behind
+ // `alias/${BASE_NAME}-microsoft-token-${stack}` (see the
+ // Pulumi.<stack>.yaml comment), so this stack does not emit it.
{
name: 'CURSOR_API_KEY_KMS_KEY_ID',
value: cursorApiKeyKmsKey.arn,