Merge branch 'main' into feat/subscription-addon-get

Author: borosr

.github/workflows/analysis-scorecard.yaml

@@ -42,6 +42,6 @@ jobs:
           retention-days: 5
 
       - name: Upload results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v3.29.5
+        uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/ci.yaml

@@ -200,7 +200,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up pnpm
-        uses: pnpm/action-setup@903f9c1a6ebcba6cf41d87230be49611ac97822e # v6
+        uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6
         with:
           package_json_file: api/client/javascript/package.json
 

.github/workflows/npm-release.yaml

@@ -47,7 +47,7 @@ jobs:
       # perform the OIDC handshake. setup-node provides a current npm and
       # writes a registry-scoped .npmrc with no _authToken.
       - name: Set up pnpm
-        uses: pnpm/action-setup@903f9c1a6ebcba6cf41d87230be49611ac97822e # v6
+        uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6
         with:
           package_json_file: api/client/javascript/package.json
 

e2e/addons_v3_test.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -132,11 +133,62 @@ func TestV3Addon(t *testing.T) {
 func TestV3AddonMixedRateCardRoundTrip(t *testing.T) {
 	c := newV3Client(t)
 
+	eventTypes := []string{
+		uniqueKey("sanity_event"),
+		uniqueKey("sanity_event"),
+	}
+
+	meterKeys := []string{
+		uniqueKey("sanity_meter"),
+		uniqueKey("sanity_meter"),
+	}
+
+	meters := make([]apiv3.Meter, 0, len(meterKeys))
+
+	for i := range meterKeys {
+		valueProperty := "$.value"
+
+		status, m, problem := c.CreateMeter(apiv3.CreateMeterRequest{
+			Key:           meterKeys[i],
+			Name:          "Test Meter " + meterKeys[i],
+			Aggregation:   apiv3.MeterAggregationSum,
+			EventType:     eventTypes[i],
+			ValueProperty: &valueProperty,
+		})
+		require.Equalf(t, http.StatusCreated, status, "problem: %+v", problem)
+		require.NotNil(t, m)
+		require.NotEmpty(t, m.Id)
+
+		meters = append(meters, *m)
+	}
+
+	featureKeys := []string{
+		uniqueKey("mix_unit"),
+		uniqueKey("mix_graduated"),
+	}
+
+	features := make([]apiv3.Feature, 0, len(featureKeys))
+
+	for i := range featureKeys {
+		status, f, problem := c.CreateFeature(apiv3.CreateFeatureRequest{
+			Key:  featureKeys[i],
+			Name: "Test Feature " + featureKeys[i],
+			Meter: &apiv3.FeatureMeterReference{
+				Id: meters[i].Id,
+			},
+		})
+		require.Equal(t, http.StatusCreated, status, "problem: %+v", problem)
+		require.NotNil(t, f)
+		require.NotEmpty(t, f.Id)
+
+		features = append(features, *f)
+	}
+
 	flat := validFlatRateCard("mix_flat")
-	unit := validUnitRateCard("mix_unit")
+	unit := validUnitRateCard(features[0])
 	percent := float32(10)
 	unit.Discounts = &apiv3.BillingRateCardDiscounts{Percentage: &percent}
-	graduated := validGraduatedRateCard("mix_graduated")
+	graduated := validGraduatedRateCard(features[1])
 
 	body := validAddonRequest("mixed_rc")
 	body.RateCards = []apiv3.BillingRateCard{flat, unit, graduated}
@@ -283,6 +335,34 @@ func TestV3AddonPaymentTermPriceCompatibility(t *testing.T) {
 // Only the "happy" rows are exercised — they confirm flat and unit prices are
 // accepted in their respective valid combinations.
 func TestV3AddonInstanceTypePriceCompatibility(t *testing.T) {
+	c := newV3Client(t)
+
+	meterKey := uniqueKey("single_unit")
+
+	status, m, problem := c.CreateMeter(apiv3.CreateMeterRequest{
+		Key:           meterKey,
+		Name:          "Test Meter " + meterKey,
+		Aggregation:   apiv3.MeterAggregationSum,
+		EventType:     uniqueKey("sanity_event"),
+		ValueProperty: lo.ToPtr("$.value"),
+	})
+	require.Equal(t, http.StatusCreated, status, "problem: %+v", problem)
+	require.NotNil(t, m)
+	require.NotEmpty(t, m.Id)
+
+	featureKey := uniqueKey("single_unit")
+
+	status, f, problem := c.CreateFeature(apiv3.CreateFeatureRequest{
+		Key:  featureKey,
+		Name: "Test Feature " + featureKey,
+		Meter: &apiv3.FeatureMeterReference{
+			Id: m.Id,
+		},
+	})
+	require.Equal(t, http.StatusCreated, status, "problem: %+v", problem)
+	require.NotNil(t, f)
+	require.NotEmpty(t, f.Id)
+
 	cases := []struct {
 		name           string
 		instanceType   apiv3.AddonInstanceType
@@ -298,15 +378,13 @@ func TestV3AddonInstanceTypePriceCompatibility(t *testing.T) {
 		{
 			name:           "single + unit rate card → 201",
 			instanceType:   apiv3.AddonInstanceTypeSingle,
-			rateCard:       validUnitRateCard("single_unit"),
+			rateCard:       validUnitRateCard(*f),
 			expectedStatus: http.StatusCreated,
 		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			c := newV3Client(t)
-
 			body := validAddonRequest("instance_type_price")
 			body.InstanceType = tc.instanceType
 			body.RateCards = []apiv3.BillingRateCard{tc.rateCard}

e2e/e2e_test.go

@@ -1560,7 +1560,9 @@ func TestCredit(t *testing.T) {
 		require.Len(t, *grantListResp.JSON200, 1)
 
 		// Get feature
-		featureListResp, err := client.ListFeaturesWithResponse(context.Background(), nil)
+		featureListResp, err := client.ListFeaturesWithResponse(t.Context(), &api.ListFeaturesParams{
+			MeterSlug: &[]string{meterSlug},
+		})
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, featureListResp.StatusCode())
 		require.NotNil(t, featureListResp.JSON200)

e2e/productcatalog_smoke_v3_test.go

@@ -30,49 +30,63 @@ import (
 func TestV3ProductCatalogSmoke(t *testing.T) {
 	c := newV3Client(t)
 
-	meterKey := uniqueKey("sanity_meter")
-	eventType := uniqueKey("sanity_event")
-	featureKey := uniqueKey("sanity_feature")
+	eventTypes := []string{
+		uniqueKey("sanity_event"),
+		uniqueKey("sanity_event"),
+	}
 
-	var (
-		meterID     string
-		featureID   string
-		planID      string
-		addonID     string
-		planAddonID string
-		phaseKey    string
-	)
+	meterKeys := []string{
+		uniqueKey("sanity_meter"),
+		uniqueKey("sanity_meter"),
+	}
+
+	meters := make([]apiv3.Meter, 0, len(meterKeys))
 
-	t.Run("Should create a meter", func(t *testing.T) {
+	for i := range meterKeys {
 		valueProperty := "$.value"
+
 		status, m, problem := c.CreateMeter(apiv3.CreateMeterRequest{
-			Key:           meterKey,
-			Name:          "Test Meter " + meterKey,
+			Key:           meterKeys[i],
+			Name:          "Test Meter " + meterKeys[i],
 			Aggregation:   apiv3.MeterAggregationSum,
-			EventType:     eventType,
+			EventType:     eventTypes[i],
 			ValueProperty: &valueProperty,
 		})
 		require.Equal(t, http.StatusCreated, status, "problem: %+v", problem)
 		require.NotNil(t, m)
 		require.NotEmpty(t, m.Id)
-		meterID = m.Id
-	})
 
-	t.Run("Should create a feature bound to the meter", func(t *testing.T) {
-		require.NotEmpty(t, meterID)
+		meters = append(meters, *m)
+	}
+
+	featureKeys := []string{
+		uniqueKey("sanity_feature"),
+		uniqueKey("sanity_feature"),
+	}
 
+	features := make([]apiv3.Feature, 0, len(featureKeys))
+
+	for i := range featureKeys {
 		status, f, problem := c.CreateFeature(apiv3.CreateFeatureRequest{
-			Key:  featureKey,
-			Name: "Test Feature " + featureKey,
+			Key:  featureKeys[i],
+			Name: "Test Feature " + featureKeys[i],
 			Meter: &apiv3.FeatureMeterReference{
-				Id: meterID,
+				Id: meters[i].Id,
 			},
 		})
 		require.Equal(t, http.StatusCreated, status, "problem: %+v", problem)
 		require.NotNil(t, f)
 		require.NotEmpty(t, f.Id)
-		featureID = f.Id
-	})
+
+		features = append(features, *f)
+	}
+
+	var (
+		planID      string
+		addonID     string
+		planAddonID string
+		phaseKey    string
+	)
 
 	t.Run("Should create a draft plan with a single flat rate card", func(t *testing.T) {
 		body := validPlanRequest("sanity_plan")
@@ -89,21 +103,15 @@ func TestV3ProductCatalogSmoke(t *testing.T) {
 	})
 
 	t.Run("Should update the plan to carry flat + usage + graduated rate cards", func(t *testing.T) {
-		t.Skip("Skip this test as it does not use rate cards with features properly")
-
-		require.NotEmpty(t, planID)
-		require.NotEmpty(t, phaseKey)
-		require.NotEmpty(t, featureID)
-
 		// Three different rate card shapes on one phase. The flat fee is
 		// in_advance, both usage-based ones are in_arrears (unit/graduated
 		// prices cannot be in_advance). Only the unit one carries a feature
 		// reference here — the graduated case follows the addon mixed
 		// round-trip pattern (no feature) to keep this iteration close to
 		// known-good shapes.
 		flat := validFlatRateCard("sanity_flat")
-		usage := validUsageRateCard("sanity_usage", featureID)
-		graduated := validGraduatedRateCard("sanity_graduated")
+		usage := validUnitRateCard(features[0])
+		graduated := validGraduatedRateCard(features[1])
 
 		update := apiv3.UpsertPlanRequest{
 			Name: "Sanity Plan",
@@ -129,16 +137,14 @@ func TestV3ProductCatalogSmoke(t *testing.T) {
 		}
 		require.NotNil(t, usageRC, "usage rate card missing after update")
 		require.NotNil(t, usageRC.Feature, "usage rate card lost its feature binding after update")
-		assert.Equal(t, featureID, usageRC.Feature.Id)
+		assert.Equal(t, usage.Feature.Id, usageRC.Feature.Id)
 	})
 
 	// Track the three valid rate cards across the invalid-loop subtests so
 	// "remove defective" PUTs can rebuild the phase from the same baseline.
 	var validRateCards []apiv3.BillingRateCard
 
 	t.Run("Should add a defective rate card and surface validation_errors", func(t *testing.T) {
-		t.Skip("Skip this test as it does not use rate cards with features properly")
-
 		require.NotEmpty(t, planID)
 		require.NotEmpty(t, phaseKey)
 
@@ -190,8 +196,6 @@ func TestV3ProductCatalogSmoke(t *testing.T) {
 	})
 
 	t.Run("Should remove the defective rate card and clear validation_errors", func(t *testing.T) {
-		t.Skip("Skip this test as it does not use rate cards with features properly")
-
 		require.NotEmpty(t, planID)
 		require.NotEmpty(t, phaseKey)
 		require.NotEmpty(t, validRateCards)

e2e/v3helpers_test.go

@@ -376,7 +376,7 @@ func validFlatRateCard(keyPrefix string) apiv3.BillingRateCard {
 // validUnitRateCard returns a usage-based unit-priced rate card. Unit prices
 // cannot use payment_term=in_advance (that's flat-only), so this uses
 // in_arrears.
-func validUnitRateCard(keyPrefix string) apiv3.BillingRateCard {
+func validUnitRateCard(f apiv3.Feature) apiv3.BillingRateCard {
 	cadence := apiv3.ISO8601Duration("P1M")
 	term := apiv3.BillingPricePaymentTermInArrears
 
@@ -389,27 +389,18 @@ func validUnitRateCard(keyPrefix string) apiv3.BillingRateCard {
 	}
 
 	return apiv3.BillingRateCard{
-		Key:            uniqueKey(keyPrefix),
-		Name:           "Test Unit Rate Card " + keyPrefix,
+		Key:            f.Key,
+		Name:           "Test Unit Rate Card " + f.Key,
 		Price:          price,
 		BillingCadence: &cadence,
 		PaymentTerm:    &term,
+		Feature:        &apiv3.FeatureReferenceItem{Id: f.Id},
 	}
 }
 
-// validUsageRateCard returns a unit-priced rate card bound to the given
-// feature ID — the shape needed when a plan/addon meters usage against a
-// metered feature. Reuses validUnitRateCard's price + cadence + payment_term
-// (unit prices must use in_arrears).
-func validUsageRateCard(keyPrefix, featureID string) apiv3.BillingRateCard {
-	rc := validUnitRateCard(keyPrefix)
-	rc.Feature = &apiv3.FeatureReferenceItem{Id: featureID}
-	return rc
-}
-
 // validGraduatedRateCard returns a graduated tiered rate card with two tiers:
 // 0–100 units at $0.10/unit and 100+ units at $0.05/unit.
-func validGraduatedRateCard(keyPrefix string) apiv3.BillingRateCard {
+func validGraduatedRateCard(f apiv3.Feature) apiv3.BillingRateCard {
 	cadence := apiv3.ISO8601Duration("P1M")
 	term := apiv3.BillingPricePaymentTermInArrears
 
@@ -437,11 +428,12 @@ func validGraduatedRateCard(keyPrefix string) apiv3.BillingRateCard {
 	}
 
 	return apiv3.BillingRateCard{
-		Key:            uniqueKey(keyPrefix),
-		Name:           "Test Graduated Rate Card " + keyPrefix,
+		Key:            f.Key,
+		Name:           "Test Graduated Rate Card " + f.Key,
 		Price:          price,
 		BillingCadence: &cadence,
 		PaymentTerm:    &term,
+		Feature:        &apiv3.FeatureReferenceItem{Id: f.Id},
 	}
 }