Mauricio Araujo il y a 2 ans
Parent
commit
9e9749fec2
2 fichiers modifiés avec 3 ajouts et 9 suppressions
  1. 1 5
      api/server/handlers/billing/create.go
  2. 2 4
      internal/billing/usage.go

+ 1 - 5
api/server/handlers/billing/create.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"context"
 	"fmt"
 	"fmt"
 	"net/http"
 	"net/http"
-	"time"
 
 
 	"github.com/porter-dev/porter/api/server/handlers"
 	"github.com/porter-dev/porter/api/server/handlers"
 	"github.com/porter-dev/porter/api/server/shared"
 	"github.com/porter-dev/porter/api/server/shared"
@@ -147,12 +146,9 @@ func (c *CreateBillingHandler) grantRewardIfReferral(ctx context.Context, referr
 	}
 	}
 
 
 	if referral != nil && referral.Status != models.ReferralStatusCompleted {
 	if referral != nil && referral.Status != models.ReferralStatusCompleted {
-		// Lago requires an expiration to be passed in, so we set it to 5 years which in
-		// practice will mean the credits will most likely run out before expiring
-		expiresAt := time.Now().AddDate(5, 0, 0)
 		name := "Referral reward"
 		name := "Referral reward"
 		rewardAmount := c.Config().BillingManager.LagoClient.DefaultRewardAmountCents
 		rewardAmount := c.Config().BillingManager.LagoClient.DefaultRewardAmountCents
-		err := c.Config().BillingManager.LagoClient.CreateCreditsGrant(ctx, referrerProject.ID, name, rewardAmount, &expiresAt, referrerProject.EnableSandbox)
+		err := c.Config().BillingManager.LagoClient.CreateCreditsGrant(ctx, referrerProject.ID, name, rewardAmount, referrerProject.EnableSandbox)
 		if err != nil {
 		if err != nil {
 			return telemetry.Error(ctx, span, err, "failed to grand credits reward")
 			return telemetry.Error(ctx, span, err, "failed to grand credits reward")
 		}
 		}

+ 2 - 4
internal/billing/usage.go

@@ -100,9 +100,7 @@ func (m LagoClient) CreateCustomerWithPlan(ctx context.Context, userEmail string
 		}
 		}
 
 
 		walletName := "Porter Credits"
 		walletName := "Porter Credits"
-		expiresAt := time.Now().UTC().AddDate(0, 1, 0).Truncate(24 * time.Hour)
-
-		err = m.CreateCreditsGrant(ctx, projectID, walletName, defaultStarterCreditsCents, &expiresAt, sandboxEnabled)
+		err = m.CreateCreditsGrant(ctx, projectID, walletName, defaultStarterCreditsCents, sandboxEnabled)
 		if err != nil {
 		if err != nil {
 			return telemetry.Error(ctx, span, err, "error while creating starter credits grant")
 			return telemetry.Error(ctx, span, err, "error while creating starter credits grant")
 		}
 		}
@@ -261,7 +259,7 @@ func (m LagoClient) CheckCustomerCouponExpiration(ctx context.Context, projectID
 }
 }
 
 
 // CreateCreditsGrant will create a new credit grant for the customer with the specified amount
 // CreateCreditsGrant will create a new credit grant for the customer with the specified amount
-func (m LagoClient) CreateCreditsGrant(ctx context.Context, projectID uint, name string, grantAmount int64, expiresAt *time.Time, sandboxEnabled bool) (err error) {
+func (m LagoClient) CreateCreditsGrant(ctx context.Context, projectID uint, name string, grantAmount int64, sandboxEnabled bool) (err error) {
 	ctx, span := telemetry.NewSpan(ctx, "create-credits-grant")
 	ctx, span := telemetry.NewSpan(ctx, "create-credits-grant")
 	defer span.End()
 	defer span.End()