improvement(aws-marketplace): resolve each run's products once, keep env free of billing code, and drop derivable state

Author: waleedlatif1

apps/sim/lib/billing/aws-marketplace/checkout-guard.integration.ts

@@ -8,10 +8,10 @@ const PRODUCT = 'product-placeholder'
 const ACCOUNT = '000000000000'
 const TEAM_PLAN = 'team_6000'
 
-const productCode = vi.hoisted(() => ({ current: 'product-placeholder' as string | null }))
+const marketplace = vi.hoisted(() => ({ enabled: true }))
 
 vi.mock('@/lib/billing/aws-marketplace/config', () => ({
-  isAwsMarketplaceEnabled: () => productCode.current !== null,
+  isAwsMarketplaceEnabled: () => marketplace.enabled,
 }))
 
 import {
@@ -84,7 +84,7 @@ async function organizationWithLicense(status: LicenseStatus | null) {
 }
 
 afterEach(() => {
-  productCode.current = PRODUCT
+  marketplace.enabled = true
 })
 
 afterAll(async () => {
@@ -147,7 +147,7 @@ describe('Stripe checkout for an AWS Marketplace-billed reference', () => {
     const { ownerId, organizationId } = await organizationWithLicense('active')
     const userId = await createUser()
     await insertLicense({ organizationId: null, linkedByUserId: userId, status: 'active' })
-    productCode.current = null
+    marketplace.enabled = false
 
     await expect(
       authorizeSubscriptionReference(ownerId, organizationId, 'upgrade-subscription', TEAM_PLAN)

apps/sim/lib/billing/aws-marketplace/config.ts

@@ -4,23 +4,18 @@ import {
 } from '@/lib/billing/aws-marketplace/products'
 import { env } from '@/lib/core/config/env'
 
-/** Parsed once per distinct setting; env validation already rejected a malformed one at boot. */
-let parsed: { raw: string | undefined; products: ReadonlyMap<string, AwsMarketplaceProduct> } = {
-  raw: undefined,
-  products: new Map(),
-}
+let products: ReadonlyMap<string, AwsMarketplaceProduct> | undefined
 
 /**
  * The products this deployment sells through AWS Marketplace, by product code. Empty on
- * self-hosted installs and every environment but production, which turns the registration, claim,
- * and reconcile surfaces off.
+ * self-hosted installs and every environment but production, which turns the Marketplace surfaces
+ * off. A malformed setting throws a message naming the bad entry.
  */
 export function getAwsMarketplaceProducts(): ReadonlyMap<string, AwsMarketplaceProduct> {
-  const raw = env.AWS_MARKETPLACE_PRODUCTS
-  if (parsed.raw !== raw) {
-    parsed = { raw, products: raw ? parseAwsMarketplaceProducts(raw) : new Map() }
-  }
-  return parsed.products
+  products ??= env.AWS_MARKETPLACE_PRODUCTS
+    ? parseAwsMarketplaceProducts(env.AWS_MARKETPLACE_PRODUCTS)
+    : new Map()
+  return products
 }
 
 export function isAwsMarketplaceEnabled(): boolean {
@@ -33,8 +28,3 @@ export function findAwsMarketplaceProduct(
 ): AwsMarketplaceProduct | null {
   return productCode ? (getAwsMarketplaceProducts().get(productCode) ?? null) : null
 }
-
-/** Every configured product code, for queries that span all of them. */
-export function getAwsMarketplaceProductCodes(): string[] {
-  return [...getAwsMarketplaceProducts().keys()]
-}

apps/sim/lib/billing/aws-marketplace/entitlements.test.ts

@@ -14,20 +14,22 @@ vi.mock('@aws-sdk/client-marketplace-entitlement-service', () => ({
 
 import { verifyLicense } from '@/lib/billing/aws-marketplace/entitlements'
 import {
-  AWS_MARKETPLACE_PLANS,
   type AwsMarketplaceProduct,
+  parseAwsMarketplaceProducts,
 } from '@/lib/billing/aws-marketplace/products'
 
-const CONTRACT: AwsMarketplaceProduct = {
-  productCode: 'product-placeholder',
-  planId: 'contract',
-  plan: AWS_MARKETPLACE_PLANS.contract,
-}
-const USAGE: AwsMarketplaceProduct = {
-  productCode: 'usage-product-placeholder',
-  planId: 'platform-with-usage',
-  plan: AWS_MARKETPLACE_PLANS['platform-with-usage'],
+const PRODUCTS = parseAwsMarketplaceProducts(
+  'product-placeholder=contract,usage-product-placeholder=platform-with-usage'
+)
+
+function product(code: string): AwsMarketplaceProduct {
+  const found = PRODUCTS.get(code)
+  if (!found) throw new Error(`no test product ${code}`)
+  return found
 }
+
+const CONTRACT = product('product-placeholder')
+const USAGE = product('usage-product-placeholder')
 const LICENSE = 'license-placeholder'
 const NOW = new Date('2026-06-01T00:00:00.000Z')
 

apps/sim/lib/billing/aws-marketplace/notifications.ts

@@ -61,7 +61,7 @@ async function describeLicense(license: AwsMarketplaceLicenseRecord): Promise<st
     license.organizationId ? `${organizationName ?? 'Unknown'} (${license.organizationId})` : 'None'
   }
 License ID: ${license.id}
-Listing: ${license.productCode} (${findAwsMarketplaceProduct(license.productCode)?.planId ?? 'no longer sold'})
+Listing: ${license.productCode} (${findAwsMarketplaceProduct(license.productCode)?.plan.id ?? 'no longer sold'})
 License: ${license.licenseArn}
 AWS account: ${license.customerAwsAccountId}
 Agreement: ${license.agreementId ?? 'Not provided'}

apps/sim/lib/billing/aws-marketplace/products.ts

@@ -1,46 +1,39 @@
 /**
- * The AWS Marketplace products this deployment sells, and how each one is sold.
- *
- * A product's behavior lives in its plan, here in code; which product codes exist is deployment
- * configuration (`AWS_MARKETPLACE_PRODUCTS`), because codes differ per seller account and listing.
- * Every Marketplace path resolves a license's product from the code AWS returned or the code stored
- * on its row, so adding, repricing, or retiring a listing is a configuration change, never a branch.
- *
- * Free of imports from `@/lib/core/config/env`, so `env.ts` can validate the setting at boot.
+ * How each AWS Marketplace listing is sold. Behavior lives in a plan, here in code; which product
+ * codes exist is deployment configuration (`AWS_MARKETPLACE_PRODUCTS`), so adding, repricing, or
+ * retiring a listing is a configuration change, never a branch.
  */
 
 /** How one listing is sold, and so what Sim requires before granting access. */
 export interface AwsMarketplacePlan {
+  readonly id: string
   /**
    * The entitlement dimension that must be current for a license to count as active. Null accepts
-   * any current entitlement, which is right for a listing with a single contract dimension.
+   * any current entitlement, which suits a listing with a single contract dimension.
    */
   readonly requiredDimension: string | null
 }
 
-export const AWS_MARKETPLACE_PLANS = {
+const PLANS = [
   /** A contract-only listing: any current entitlement grants access. */
-  contract: { requiredDimension: null },
+  { id: 'contract', requiredDimension: null },
   /** Platform access by contract, plus LLM usage on Sim's keys billed through AWS. */
-  'platform-with-usage': { requiredDimension: 'platform' },
-} as const satisfies Record<string, AwsMarketplacePlan>
+  { id: 'platform-with-usage', requiredDimension: 'platform' },
+] as const satisfies readonly AwsMarketplacePlan[]
 
-export type AwsMarketplacePlanId = keyof typeof AWS_MARKETPLACE_PLANS
+export const AWS_MARKETPLACE_PLANS: ReadonlyMap<string, AwsMarketplacePlan> = new Map(
+  PLANS.map((plan) => [plan.id, plan])
+)
 
 export interface AwsMarketplaceProduct {
   readonly productCode: string
-  readonly planId: AwsMarketplacePlanId
   readonly plan: AwsMarketplacePlan
 }
 
-function isPlanId(value: string): value is AwsMarketplacePlanId {
-  return Object.hasOwn(AWS_MARKETPLACE_PLANS, value)
-}
-
 /**
  * Parses `AWS_MARKETPLACE_PRODUCTS`: comma-separated `<product code>=<plan>` pairs, for example
- * `abc123=contract,def456=platform-with-usage`. Throws on an empty entry, an unknown plan, or a
- * repeated code, so a misconfigured deployment fails at boot instead of refusing buyers later.
+ * `abc123=contract,def456=platform-with-usage`. Throws on a malformed entry, an unknown plan, or a
+ * repeated code.
  */
 export function parseAwsMarketplaceProducts(
   value: string
@@ -49,25 +42,20 @@ export function parseAwsMarketplaceProducts(
   for (const entry of value.split(',')) {
     const [productCode, planId, ...rest] = entry.split('=').map((part) => part.trim())
     if (!productCode || !planId || rest.length > 0) {
-      throw new Error(`expected <product code>=<plan>, received "${entry.trim()}"`)
+      throw new Error(
+        `AWS_MARKETPLACE_PRODUCTS: expected <product code>=<plan>, got "${entry.trim()}"`
+      )
     }
-    if (!isPlanId(planId)) {
+    const plan = AWS_MARKETPLACE_PLANS.get(planId)
+    if (!plan) {
       throw new Error(
-        `unknown plan "${planId}"; expected one of ${Object.keys(AWS_MARKETPLACE_PLANS).join(', ')}`
+        `AWS_MARKETPLACE_PRODUCTS: unknown plan "${planId}"; expected one of ${[...AWS_MARKETPLACE_PLANS.keys()].join(', ')}`
       )
     }
-    if (products.has(productCode)) throw new Error(`product code "${productCode}" is listed twice`)
-    products.set(productCode, { productCode, planId, plan: AWS_MARKETPLACE_PLANS[planId] })
+    if (products.has(productCode)) {
+      throw new Error(`AWS_MARKETPLACE_PRODUCTS: product code "${productCode}" is listed twice`)
+    }
+    products.set(productCode, { productCode, plan })
   }
   return products
 }
-
-/** `parseAwsMarketplaceProducts` as a predicate, for env validation. */
-export function isValidAwsMarketplaceProducts(value: string): boolean {
-  try {
-    parseAwsMarketplaceProducts(value)
-    return true
-  } catch {
-    return false
-  }
-}

apps/sim/lib/billing/aws-marketplace/reconcile.ts

@@ -10,10 +10,7 @@ import { getErrorMessage } from '@sim/utils/errors'
 import { toRecord } from '@sim/utils/object'
 import { truncate } from '@sim/utils/string'
 import { getEventsQueueClient } from '@/lib/billing/aws-marketplace/client'
-import {
-  findAwsMarketplaceProduct,
-  getAwsMarketplaceProductCodes,
-} from '@/lib/billing/aws-marketplace/config'
+import { getAwsMarketplaceProducts } from '@/lib/billing/aws-marketplace/config'
 import {
   isInvalidEntitlementRequest,
   verifyLicense,
@@ -84,8 +81,8 @@ interface AwsMarketplaceReconcileSummary {
 type BudgetCheck = (workMs: number) => boolean
 
 interface DrainContext {
-  /** Every configured product; an event for any other product is not ours to apply. */
-  productCodes: readonly string[]
+  /** This run's configured products, by code; an event for any other product is not ours. */
+  products: ReadonlyMap<string, AwsMarketplaceProduct>
   queueUrl: string
   summary: AwsMarketplaceReconcileSummary
   fits: BudgetCheck
@@ -225,15 +222,13 @@ async function applyAgreementEnded(
   message: Message
 ): Promise<MessageOutcome> {
   const messageId = message.MessageId
-  const licenses = await listLicensesForAgreement(context.productCodes, agreementId)
+  const licenses = await listLicensesForAgreement(context.products, agreementId)
   if (licenses.length === 0) {
     logger.info('Ignoring an AWS Marketplace agreement event for no stored license', { messageId })
     return 'discarded'
   }
   let incomplete = false
-  for (const [index, { licenseArn, productCode }] of licenses.entries()) {
-    const product = findAwsMarketplaceProduct(productCode)
-    if (!product) continue
+  for (const [index, { licenseArn, product }] of licenses.entries()) {
     if (!context.fits(LICENSE_READ_BUDGET_MS)) {
       context.summary.outOfBudget = true
       return 'retained'
@@ -264,10 +259,11 @@ async function applyAgreementEnded(
 }
 
 async function applyLicenseEvent(
+  context: DrainContext,
   event: Extract<MarketplaceEvent, { kind: 'license' }>,
   messageId: string | undefined
 ): Promise<MessageOutcome> {
-  const product = findAwsMarketplaceProduct(event.productCode)
+  const product = event.productCode ? context.products.get(event.productCode) : undefined
   if (!product) {
     logger.warn('Discarding an AWS Marketplace event for another product', { messageId })
     return 'discarded'
@@ -309,24 +305,24 @@ async function applyEvent(
   event: MarketplaceEvent,
   message: Message
 ): Promise<MessageOutcome> {
-  const { productCodes } = context
+  const { products } = context
   const messageId = message.MessageId
-  if (event.kind === 'license') return applyLicenseEvent(event, messageId)
+  if (event.kind === 'license') return applyLicenseEvent(context, event, messageId)
   if (event.kind === 'agreement-ended') {
     return applyAgreementEnded(context, event.agreementId, message)
   }
   const involved =
     event.kind === 'advisory'
       ? await enqueueAgreementAdvisory({
-          productCodes,
+          products,
           agreementId: event.agreementId,
           state: event.state,
           detail: event.detail,
           messageId: messageId ?? event.agreementId,
         })
       : event.previousAgreementId
         ? await applyAgreementRenewal({
-            productCodes,
+            products,
             previousAgreementId: event.previousAgreementId,
             agreementId: event.agreementId,
           })
@@ -418,15 +414,13 @@ async function drainEvents(context: DrainContext): Promise<void> {
 }
 
 async function reverifyStaleLicenses(
-  productCodes: readonly string[],
+  products: ReadonlyMap<string, AwsMarketplaceProduct>,
   summary: AwsMarketplaceReconcileSummary,
   fits: BudgetCheck
 ): Promise<void> {
   const cutoff = new Date(Date.now() - REVERIFY_AFTER_MS)
-  const licenses = await listLicensesDueForReverify(productCodes, cutoff, REVERIFY_BATCH_SIZE)
-  for (const { licenseArn, productCode } of licenses) {
-    const product = findAwsMarketplaceProduct(productCode)
-    if (!product) continue
+  const licenses = await listLicensesDueForReverify(products, cutoff, REVERIFY_BATCH_SIZE)
+  for (const { licenseArn, product } of licenses) {
     if (!fits(LICENSE_READ_BUDGET_MS)) {
       summary.outOfBudget = true
       return
@@ -450,8 +444,8 @@ async function reverifyStaleLicenses(
  * feature is off.
  */
 export async function reconcileAwsMarketplaceLicenses(): Promise<AwsMarketplaceReconcileSummary | null> {
-  const productCodes = getAwsMarketplaceProductCodes()
-  if (productCodes.length === 0) return null
+  const products = getAwsMarketplaceProducts()
+  if (products.size === 0) return null
   const summary: AwsMarketplaceReconcileSummary = {
     received: 0,
     applied: 0,
@@ -465,7 +459,7 @@ export async function reconcileAwsMarketplaceLicenses(): Promise<AwsMarketplaceR
   const startedAt = Date.now()
   const fits: BudgetCheck = (workMs) => Date.now() - startedAt + workMs <= RUN_BUDGET_MS
   const queueUrl = env.AWS_MARKETPLACE_EVENTS_QUEUE_URL
-  if (queueUrl) await drainEvents({ productCodes, queueUrl, summary, fits })
-  await reverifyStaleLicenses(productCodes, summary, fits)
+  if (queueUrl) await drainEvents({ products, queueUrl, summary, fits })
+  await reverifyStaleLicenses(products, summary, fits)
   return summary
 }

apps/sim/lib/billing/aws-marketplace/registration.ts

@@ -49,9 +49,8 @@ async function readEntitlements(
  * Turns the registration token AWS posts to the fulfillment URL into a license row. Every listing
  * shares the one fulfillment URL, so the product comes from the code AWS resolves the token to,
  * and a code this deployment does not sell is refused. Every registration reads the license's
- * entitlements. A license AWS has not confirmed yet still gets a
- * claim, so the buyer can leave contact details; only a lapsed one does not. The token itself is
- * never logged.
+ * entitlements. A license AWS has not confirmed yet still gets a claim, so the buyer can leave
+ * contact details; only a lapsed one does not. The token itself is never logged.
  */
 export async function registerAwsMarketplaceBuyer(
   registrationToken: string