diff --git a/go/go.mod b/go/go.mod index ef5952a..e9326e0 100644 --- a/go/go.mod +++ b/go/go.mod @@ -14,12 +14,14 @@ require ( github.com/redis/go-redis/v9 v9.17.2 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.11.1 + github.com/stripe/stripe-go/v85 v85.0.1 github.com/testcontainers/testcontainers-go v0.40.0 github.com/testcontainers/testcontainers-go/modules/postgres v0.40.0 go.jetify.com/typeid v1.3.0 go.uber.org/mock v0.6.0 google.golang.org/grpc v1.79.1 google.golang.org/protobuf v1.36.11 + nhooyr.io/websocket v1.8.17 ) require ( @@ -142,7 +144,6 @@ require ( github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect github.com/shirou/gopsutil/v4 v4.25.6 // indirect github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect - github.com/stripe/stripe-go/v81 v81.4.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/twitchtv/twirp v8.1.3+incompatible // indirect @@ -177,5 +178,4 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.110.1 // indirect - nhooyr.io/websocket v1.8.17 // indirect ) diff --git a/go/go.sum b/go/go.sum index 8fedaf0..db9694f 100644 --- a/go/go.sum +++ b/go/go.sum @@ -335,8 +335,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/stripe/stripe-go/v81 v81.4.0 h1:AuD9XzdAvl193qUCSaLocf8H+nRopOouXhxqJUzCLbw= -github.com/stripe/stripe-go/v81 v81.4.0/go.mod h1:C/F4jlmnGNacvYtBp/LUHCvVUJEZffFQCobkzwY1WOo= +github.com/stripe/stripe-go/v85 v85.0.1 h1:vlIo5VHrR9GkYneH5D9YGOPwNDRD6LW/THhtx9zNs6M= +github.com/stripe/stripe-go/v85 v85.0.1/go.mod h1:5P+HGFenpWgak27T5Is6JMsmDfUC1yJnjhhmquz7kXw= github.com/testcontainers/testcontainers-go v0.40.0 h1:pSdJYLOVgLE8YdUY2FHQ1Fxu+aMnb6JfVz1mxk7OeMU= github.com/testcontainers/testcontainers-go v0.40.0/go.mod h1:FSXV5KQtX2HAMlm7U3APNyLkkap35zNLxukw9oBi/MY= github.com/testcontainers/testcontainers-go/modules/postgres v0.40.0 h1:s2bIayFXlbDFexo96y+htn7FzuhpXLYJNnIuglNKqOk= @@ -417,7 +417,6 @@ golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= @@ -434,7 +433,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -457,7 +455,6 @@ golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= diff --git a/go/internal/billing/service.go b/go/internal/billing/service.go index a97217b..c15635c 100644 --- a/go/internal/billing/service.go +++ b/go/internal/billing/service.go @@ -6,12 +6,12 @@ import ( "fmt" "github.com/jackc/pgx/v5/pgxpool" - "github.com/stripe/stripe-go/v81" - billingportalsession "github.com/stripe/stripe-go/v81/billingportal/session" - checkoutsession "github.com/stripe/stripe-go/v81/checkout/session" - stripecustomer "github.com/stripe/stripe-go/v81/customer" - stripeprice "github.com/stripe/stripe-go/v81/price" - stripesub "github.com/stripe/stripe-go/v81/subscription" + "github.com/stripe/stripe-go/v85" + billingportalsession "github.com/stripe/stripe-go/v85/billingportal/session" + checkoutsession "github.com/stripe/stripe-go/v85/checkout/session" + stripecustomer "github.com/stripe/stripe-go/v85/customer" + stripeprice "github.com/stripe/stripe-go/v85/price" + stripesub "github.com/stripe/stripe-go/v85/subscription" ) type Service interface { diff --git a/go/internal/billing/webhooks.go b/go/internal/billing/webhooks.go index a0e50ab..9dab258 100644 --- a/go/internal/billing/webhooks.go +++ b/go/internal/billing/webhooks.go @@ -7,8 +7,8 @@ import ( "log/slog" "time" - "github.com/stripe/stripe-go/v81" - "github.com/stripe/stripe-go/v81/webhook" + "github.com/stripe/stripe-go/v85" + "github.com/stripe/stripe-go/v85/webhook" ) func (s *serviceImpl) HandleWebhook(ctx context.Context, payload []byte, signature string) error { @@ -95,8 +95,8 @@ func subscriptionFromStripe(sub *stripe.Subscription, networkID string) (*Subscr Cadence: cadence, Quantity: int(item.Quantity), CancelAtPeriodEnd: sub.CancelAtPeriodEnd, - CurrentPeriodStart: time.Unix(sub.CurrentPeriodStart, 0).UTC(), - CurrentPeriodEnd: time.Unix(sub.CurrentPeriodEnd, 0).UTC(), + CurrentPeriodStart: time.Unix(item.CurrentPeriodStart, 0).UTC(), + CurrentPeriodEnd: time.Unix(item.CurrentPeriodEnd, 0).UTC(), }, nil }