fix(aws-marketplace): treat a usage-only read as no answer about access, and refuse to boot on a malformed product catalog

Author: waleedlatif1

apps/sim/bootstrap.ts

@@ -1,16 +1,22 @@
 /**
- * Container entrypoint. Hydrates `process.env` from the runtime secret, resolves an AWS
- * Marketplace Enterprise license into `ENTERPRISE_ENABLED` on Marketplace installs, and drops
+ * Container entrypoint. Hydrates `process.env` from the runtime secret, refuses to start on a
+ * malformed `AWS_MARKETPLACE_PRODUCTS` (so a bad deploy rolls back instead of failing buyers and
+ * checkouts later), resolves an AWS Marketplace Enterprise license into `ENTERPRISE_ENABLED` on
+ * Marketplace installs, and drops
  * Next's route cache when an earlier build wrote it, before loading the Next.js standalone server,
  * so application modules that read env at import time see the full configuration. See
  * `@sim/runtime-secrets`.
  */
 import { fileURLToPath } from 'node:url'
 import { loadRuntimeSecrets } from '@sim/runtime-secrets'
 import { applyAwsMarketplaceContainerLicense } from '@/lib/billing/aws-marketplace/container-license'
+import { parseAwsMarketplaceProducts } from '@/lib/billing/aws-marketplace/products'
 import { clearRouteCacheFromOtherBuild } from '@/lib/core/utils/route-cache'
 
 await loadRuntimeSecrets()
+if (process.env.AWS_MARKETPLACE_PRODUCTS) {
+  parseAwsMarketplaceProducts(process.env.AWS_MARKETPLACE_PRODUCTS)
+}
 await applyAwsMarketplaceContainerLicense()
 await clearRouteCacheFromOtherBuild(fileURLToPath(new URL('./.next', import.meta.url)))
 // `server.js` is the Next standalone build artifact, a sibling of this file in

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

@@ -9,7 +9,7 @@ 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 Marketplace surfaces
- * off. A malformed setting throws a message naming the bad entry.
+ * off. The container entrypoint refuses to start on a malformed setting.
  */
 export function getAwsMarketplaceProducts(): ReadonlyMap<string, AwsMarketplaceProduct> {
   products ??= env.AWS_MARKETPLACE_PRODUCTS

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

@@ -104,9 +104,9 @@ describe('verifyLicense', () => {
     expect(summary).toMatchObject({ active: true, dimension: 'b-current', quantity: 50 })
   })
 
-  it('does not let a current usage entitlement stand in for a required platform one', async () => {
+  it('reads a usage entitlement alone as no answer about access, not as access', async () => {
     const summary = await readAs(USAGE, entitlement({ Dimension: 'llm_credits' }))
-    expect(summary).toMatchObject({ active: false, entitlementCount: 1, dimension: null })
+    expect(summary).toMatchObject({ active: false, entitlementCount: 0, dimension: null })
   })
 
   it('reads a lapsed platform as inactive even while usage is current', async () => {
@@ -115,7 +115,7 @@ describe('verifyLicense', () => {
       entitlement({ Dimension: 'llm_credits' }),
       entitlement({ Dimension: 'platform', ExpirationDate: new Date('2026-01-01T00:00:00.000Z') })
     )
-    expect(summary).toMatchObject({ active: false, entitlementCount: 2, dimension: 'platform' })
+    expect(summary).toMatchObject({ active: false, entitlementCount: 1, dimension: 'platform' })
   })
 
   it('reads a current platform as active and describes it, not the usage dimension', async () => {

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

@@ -17,8 +17,9 @@ export interface EntitlementSummary {
    */
   active: boolean
   /**
-   * Entitlements AWS returned for any dimension, current or lapsed: whether AWS has answered at all.
-   * Zero is ambiguous, see the license's status.
+   * Entitlements AWS returned for the dimension that grants access (any dimension, for a plan with
+   * none), current or lapsed: whether AWS has answered about access at all. A usage dimension alone
+   * is no answer. Zero is ambiguous, see the license's status.
    */
   entitlementCount: number
   dimension: string | null
@@ -57,7 +58,7 @@ function summarizeEntitlements(
   const chosen = current[0] ?? lapsed[0]
   return {
     active: current.length > 0,
-    entitlementCount: allEntitlements.length,
+    entitlementCount: entitlements.length,
     dimension: chosen?.Dimension ?? null,
     quantity: chosen?.Value?.IntegerValue ?? null,
     expiresAt: chosen?.ExpirationDate ?? null,

apps/sim/lib/billing/aws-marketplace/lifecycle.integration.ts

@@ -405,12 +405,13 @@ describe('POST /api/marketplace/aws/register', () => {
       currentEntitlement({ ProductCode: USAGE_PRODUCT, Dimension: 'llm_credits' }),
     ])
 
-    const refused = await registration('x-amzn-marketplace-token=usage-only-token')
+    const unconfirmed = await registration('x-amzn-marketplace-token=usage-only-token')
 
-    expect(errorOf(refused)).toBe('no-subscription')
+    expect(claimTokenOf(unconfirmed)).not.toBeNull()
+    expect(entitlementSend).toHaveBeenCalledTimes(3)
     expect(await readLicense(usageOnly)).toMatchObject({
       productCode: USAGE_PRODUCT,
-      status: 'inactive',
+      status: 'pending',
     })
 
     const withPlatform = uniqueArn()

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

@@ -5,7 +5,7 @@
  */
 
 /** How one listing is sold, and so what Sim requires before granting access. */
-export interface AwsMarketplacePlan {
+interface AwsMarketplacePlan {
   readonly id: string
   /**
    * The entitlement dimension that must be current for a license to count as active. Null accepts
@@ -21,7 +21,7 @@ const PLANS = [
   { id: 'platform-with-usage', requiredDimension: 'platform' },
 ] as const satisfies readonly AwsMarketplacePlan[]
 
-export const AWS_MARKETPLACE_PLANS: ReadonlyMap<string, AwsMarketplacePlan> = new Map(
+const AWS_MARKETPLACE_PLANS: ReadonlyMap<string, AwsMarketplacePlan> = new Map(
   PLANS.map((plan) => [plan.id, plan])
 )
 

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

@@ -29,7 +29,7 @@ function errorName(error: unknown): string | undefined {
   return error instanceof Error ? error.name : undefined
 }
 
-/** AWS may not have finished right after a purchase, so an empty answer is asked again briefly. */
+/** AWS may not have finished right after a purchase, so a read with no answer about access is asked again briefly. */
 async function readEntitlements(
   product: AwsMarketplaceProduct,
   licenseArn: string