fix(aws-marketplace): discover a license from any entitlement and decide access from the plan's dimension

Author: waleedlatif1

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

@@ -66,7 +66,7 @@ describe('verifyLicense', () => {
     const summary = await read(
       entitlement({ ExpirationDate: new Date('2026-05-31T23:59:59.000Z') })
     )
-    expect(summary).toMatchObject({ active: false, entitlementCount: 1, quantity: 25 })
+    expect(summary).toMatchObject({ active: false, accessReported: true, quantity: 25 })
   })
 
   it('reads an entitlement with a future expiry, or none at all, as active', async () => {
@@ -106,7 +106,12 @@ describe('verifyLicense', () => {
 
   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: 0, dimension: null })
+    expect(summary).toMatchObject({
+      active: false,
+      licenseSeen: true,
+      accessReported: false,
+      dimension: null,
+    })
   })
 
   it('reads a lapsed platform as inactive even while usage is current', async () => {
@@ -115,7 +120,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: 1, dimension: 'platform' })
+    expect(summary).toMatchObject({ active: false, accessReported: true, dimension: 'platform' })
   })
 
   it('reads a current platform as active and describes it, not the usage dimension', async () => {
@@ -139,7 +144,7 @@ describe('verifyLicense', () => {
 
     const summary = await verifyLicense(CONTRACT, LICENSE)
 
-    expect(summary).toMatchObject({ entitlementCount: 2, dimension: 'one' })
+    expect(summary).toMatchObject({ accessReported: true, dimension: 'one' })
     expect(mockSend.mock.calls.map(([command]) => command.input.NextToken)).toEqual([
       undefined,
       't1',

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

@@ -16,12 +16,14 @@ export interface EntitlementSummary {
    * no expiry or one in the future.
    */
   active: boolean
+  /** AWS returned an entitlement of any dimension: the license exists and names its account. */
+  licenseSeen: boolean
   /**
-   * 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.
+   * AWS returned an entitlement, current or lapsed, for the dimension that grants access (any
+   * dimension, for a plan with none). A usage dimension alone is not an answer about access, and
+   * no answer is ambiguous: see the license's status.
    */
-  entitlementCount: number
+  accessReported: boolean
   dimension: string | null
   quantity: number | null
   expiresAt: Date | null
@@ -58,7 +60,8 @@ function summarizeEntitlements(
   const chosen = current[0] ?? lapsed[0]
   return {
     active: current.length > 0,
-    entitlementCount: entitlements.length,
+    licenseSeen: allEntitlements.length > 0,
+    accessReported: entitlements.length > 0,
     dimension: chosen?.Dimension ?? null,
     quantity: chosen?.Value?.IntegerValue ?? null,
     expiresAt: chosen?.ExpirationDate ?? null,

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

@@ -1424,6 +1424,25 @@ describe('reconcileAwsMarketplaceLicenses', () => {
 })
 
 describe('license events across listings', () => {
+  it('records a usage listing license seen first by event as pending until AWS reports platform', async () => {
+    const licenseArn = uniqueArn()
+    entitlementsByLicense.set(licenseArn, [
+      currentEntitlement({ ProductCode: USAGE_PRODUCT, Dimension: 'llm_credits' }),
+    ])
+    const deleted = deliverOnce([licenseUpdated(licenseArn, undefined, undefined, USAGE_PRODUCT)])
+
+    expect(await reconcileAwsMarketplaceLicenses()).toMatchObject({ applied: 1, discarded: 0 })
+    expect(deleted).toEqual(['r-0'])
+    expect(await readLicense(licenseArn)).toMatchObject({
+      productCode: USAGE_PRODUCT,
+      status: 'pending',
+      dimension: null,
+    })
+    expect(await emailsTo(TEAM)).toEqual([
+      expect.objectContaining({ text: expect.stringMatching(/Unconfirmed/) }),
+    ])
+  })
+
   it("applies a usage listing's event under its own plan: a lapsed platform ends access", async () => {
     const { licenseArn } = await insertLicense({ productCode: USAGE_PRODUCT, status: 'active' })
     entitlementsByLicense.set(licenseArn, [

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

@@ -37,7 +37,7 @@ async function readEntitlements(
   let verifiedAt = new Date()
   let summary = await verifyLicense(product, licenseArn)
   for (const delayMs of NO_ENTITLEMENT_RETRY_DELAYS_MS) {
-    if (summary.entitlementCount > 0) break
+    if (summary.accessReported) break
     await sleep(delayMs)
     verifiedAt = new Date()
     summary = await verifyLicense(product, licenseArn)

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

@@ -54,21 +54,21 @@ export function isNewerRead(license: AwsMarketplaceLicenseRecord, verifiedAt: Da
 }
 
 /**
- * No entitlements after AWS has said the license ended, or on a license that was already confirmed
- * once, is a lapse. Otherwise AWS may simply not have finished, so the license stays pending.
+ * No answer about access after AWS has said the license ended, or on a license that was already
+ * confirmed once, is a lapse. Otherwise AWS may simply not have finished, so the license stays pending.
  */
 function statusFromRead(
   prior: AwsMarketplaceLicenseStatus | null,
   { summary, ended }: LicenseVerification
 ): AwsMarketplaceLicenseStatus {
   if (summary.active) return 'active'
-  if (summary.entitlementCount > 0 || ended) return 'inactive'
+  if (summary.accessReported || ended) return 'inactive'
   return prior === null || prior === 'pending' ? 'pending' : 'inactive'
 }
 
 /**
- * The columns a read writes. With no entitlements the last-known dimension, quantity, and expiry
- * stay as they were, and only the status can change. An inactive license has nothing to claim.
+ * The columns a read writes. With no answer about access the last-known dimension, quantity, and
+ * expiry stay as they were, and only the status can change. An inactive license has nothing to claim.
  */
 function verificationFields(
   prior: AwsMarketplaceLicenseStatus | null,
@@ -81,7 +81,7 @@ function verificationFields(
     lastVerifiedAt: verifiedAt,
     lastVerificationAttemptAt: verifiedAt,
     updatedAt: new Date(),
-    ...(summary.entitlementCount > 0 && {
+    ...(summary.accessReported && {
       dimension: summary.dimension,
       quantity: summary.quantity,
       expiresAt: summary.expiresAt,
@@ -277,7 +277,7 @@ export async function recordLicenseVerification(input: {
   const stamp = licenseEventReceivedAt ? { licenseEventReceivedAt } : {}
   return db.transaction(async (tx) => {
     const accountId = verification.summary.customerAwsAccountId ?? input.fallbackAccountId
-    if (accountId && verification.summary.entitlementCount > 0) {
+    if (accountId && verification.summary.licenseSeen) {
       const [created] = await tx
         .insert(awsMarketplaceLicense)
         .values({