diff --git a/go.mod b/go.mod index 79a39f1c7ea1..a14a741a16bd 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.8.4 - github.com/stripe/stripe-go/v73 v73.16.0 + github.com/stripe/stripe-go/v75 v75.8.0 github.com/vbauerster/mpb/v8 v8.4.0 github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3 github.com/zeebo/assert v1.3.1 diff --git a/go.sum b/go.sum index d711483fd7ba..0f9c01ea550d 100644 --- a/go.sum +++ b/go.sum @@ -567,8 +567,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stripe/stripe-go/v73 v73.16.0 h1:X3uTpl3zwY7tSPjcltQJ9t/7TYOgfqT6QQK7Qml995I= -github.com/stripe/stripe-go/v73 v73.16.0/go.mod h1:Uk0oBh96JHdlxRsu0/t8XfuJ3xOUQTUgpKAFZuDcFnQ= +github.com/stripe/stripe-go/v75 v75.8.0 h1:kXdHvihp03v64L0C+xXGjolsdzdOmCqwKLnK2wA6bio= +github.com/stripe/stripe-go/v75 v75.8.0/go.mod h1:wT44gah+eCY8Z0aSpY/vQlYYbicU9uUAbAqdaUxxDqE= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= @@ -769,6 +769,7 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= diff --git a/satellite/console/service.go b/satellite/console/service.go index 64d11e60f93c..a9af726e14b8 100644 --- a/satellite/console/service.go +++ b/satellite/console/service.go @@ -18,7 +18,7 @@ import ( "github.com/spacemonkeygo/monkit/v3" "github.com/spf13/pflag" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "github.com/zeebo/errs" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/satellite/payments/accountfreeze/chore_test.go b/satellite/payments/accountfreeze/chore_test.go index 72e4d09f1d5d..8e9727c2d7d7 100644 --- a/satellite/payments/accountfreeze/chore_test.go +++ b/satellite/payments/accountfreeze/chore_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "go.uber.org/zap" "storj.io/common/currency" diff --git a/satellite/payments/billing/chore_test.go b/satellite/payments/billing/chore_test.go index c53ccedccd43..d5e8936c7bd9 100644 --- a/satellite/payments/billing/chore_test.go +++ b/satellite/payments/billing/chore_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "github.com/zeebo/errs" "go.uber.org/zap/zaptest" diff --git a/satellite/payments/stripe/accounts.go b/satellite/payments/stripe/accounts.go index b1ab86df0c92..805110c6e11b 100644 --- a/satellite/payments/stripe/accounts.go +++ b/satellite/payments/stripe/accounts.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "github.com/zeebo/errs" "storj.io/common/uuid" diff --git a/satellite/payments/stripe/balances.go b/satellite/payments/stripe/balances.go index a92c205b6ee8..6f4c060d3c7e 100644 --- a/satellite/payments/stripe/balances.go +++ b/satellite/payments/stripe/balances.go @@ -7,7 +7,7 @@ import ( "context" "github.com/shopspring/decimal" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "storj.io/common/uuid" "storj.io/storj/satellite/payments" diff --git a/satellite/payments/stripe/client.go b/satellite/payments/stripe/client.go index 2c47192c6da3..88495f75a99c 100644 --- a/satellite/payments/stripe/client.go +++ b/satellite/payments/stripe/client.go @@ -12,16 +12,16 @@ import ( "net/http" "time" - "github.com/stripe/stripe-go/v73" - "github.com/stripe/stripe-go/v73/charge" - "github.com/stripe/stripe-go/v73/client" - "github.com/stripe/stripe-go/v73/customer" - "github.com/stripe/stripe-go/v73/customerbalancetransaction" - "github.com/stripe/stripe-go/v73/form" - "github.com/stripe/stripe-go/v73/invoice" - "github.com/stripe/stripe-go/v73/invoiceitem" - "github.com/stripe/stripe-go/v73/paymentmethod" - "github.com/stripe/stripe-go/v73/promotioncode" + "github.com/stripe/stripe-go/v75" + "github.com/stripe/stripe-go/v75/charge" + "github.com/stripe/stripe-go/v75/client" + "github.com/stripe/stripe-go/v75/customer" + "github.com/stripe/stripe-go/v75/customerbalancetransaction" + "github.com/stripe/stripe-go/v75/form" + "github.com/stripe/stripe-go/v75/invoice" + "github.com/stripe/stripe-go/v75/invoiceitem" + "github.com/stripe/stripe-go/v75/paymentmethod" + "github.com/stripe/stripe-go/v75/promotioncode" "go.uber.org/zap" "storj.io/common/time2" diff --git a/satellite/payments/stripe/client_test.go b/satellite/payments/stripe/client_test.go index b38ff3d4c7e1..6ac9d3bf34ba 100644 --- a/satellite/payments/stripe/client_test.go +++ b/satellite/payments/stripe/client_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/stripe/stripe-go/v73" - "github.com/stripe/stripe-go/v73/form" + "github.com/stripe/stripe-go/v75" + "github.com/stripe/stripe-go/v75/form" "go.uber.org/zap/zaptest" "storj.io/common/testcontext" diff --git a/satellite/payments/stripe/coupons.go b/satellite/payments/stripe/coupons.go index eb81c90b274e..60eb5df46da9 100644 --- a/satellite/payments/stripe/coupons.go +++ b/satellite/payments/stripe/coupons.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "storj.io/common/uuid" "storj.io/storj/satellite/payments" diff --git a/satellite/payments/stripe/creditcards.go b/satellite/payments/stripe/creditcards.go index 7664985168a8..f8da060134d2 100644 --- a/satellite/payments/stripe/creditcards.go +++ b/satellite/payments/stripe/creditcards.go @@ -7,7 +7,7 @@ import ( "context" "strings" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "github.com/zeebo/errs" "storj.io/common/uuid" diff --git a/satellite/payments/stripe/invoices.go b/satellite/payments/stripe/invoices.go index d39024a77891..b5324b274985 100644 --- a/satellite/payments/stripe/invoices.go +++ b/satellite/payments/stripe/invoices.go @@ -7,7 +7,7 @@ import ( "context" "time" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "github.com/zeebo/errs" "go.uber.org/zap" diff --git a/satellite/payments/stripe/invoices_test.go b/satellite/payments/stripe/invoices_test.go index 7b62a97b8579..a07b704a46a7 100644 --- a/satellite/payments/stripe/invoices_test.go +++ b/satellite/payments/stripe/invoices_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "storj.io/common/currency" "storj.io/common/testcontext" diff --git a/satellite/payments/stripe/service.go b/satellite/payments/stripe/service.go index 1be0a203e613..b2991f50cc42 100644 --- a/satellite/payments/stripe/service.go +++ b/satellite/payments/stripe/service.go @@ -17,7 +17,7 @@ import ( "github.com/shopspring/decimal" "github.com/spacemonkeygo/monkit/v3" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "github.com/zeebo/errs" "go.uber.org/zap" diff --git a/satellite/payments/stripe/service_test.go b/satellite/payments/stripe/service_test.go index de343a7911de..70b0260f02d9 100644 --- a/satellite/payments/stripe/service_test.go +++ b/satellite/payments/stripe/service_test.go @@ -14,7 +14,7 @@ import ( "github.com/shopspring/decimal" "github.com/stretchr/testify/require" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "go.uber.org/zap" "storj.io/common/currency" diff --git a/satellite/payments/stripe/stripemock.go b/satellite/payments/stripe/stripemock.go index d6a923a0e15b..0610bbb6dd87 100644 --- a/satellite/payments/stripe/stripemock.go +++ b/satellite/payments/stripe/stripemock.go @@ -10,15 +10,15 @@ import ( "sync" "time" - "github.com/stripe/stripe-go/v73" - "github.com/stripe/stripe-go/v73/charge" - "github.com/stripe/stripe-go/v73/customer" - "github.com/stripe/stripe-go/v73/customerbalancetransaction" - "github.com/stripe/stripe-go/v73/form" - "github.com/stripe/stripe-go/v73/invoice" - "github.com/stripe/stripe-go/v73/invoiceitem" - "github.com/stripe/stripe-go/v73/paymentmethod" - "github.com/stripe/stripe-go/v73/promotioncode" + "github.com/stripe/stripe-go/v75" + "github.com/stripe/stripe-go/v75/charge" + "github.com/stripe/stripe-go/v75/customer" + "github.com/stripe/stripe-go/v75/customerbalancetransaction" + "github.com/stripe/stripe-go/v75/form" + "github.com/stripe/stripe-go/v75/invoice" + "github.com/stripe/stripe-go/v75/invoiceitem" + "github.com/stripe/stripe-go/v75/paymentmethod" + "github.com/stripe/stripe-go/v75/promotioncode" "storj.io/common/testrand" "storj.io/common/uuid" @@ -570,7 +570,7 @@ func (m *mockInvoices) New(params *stripe.InvoiceParams) (*stripe.Invoice, error lineData := make([]*stripe.InvoiceLineItem, 0, len(invoiceItems)) for _, item := range invoiceItems { lineData = append(lineData, &stripe.InvoiceLineItem{ - InvoiceItem: item.ID, + InvoiceItem: item, Amount: item.Amount, }) amountDue += item.Amount @@ -814,7 +814,7 @@ func (m *mockInvoiceItems) New(params *stripe.InvoiceItemParams) (*stripe.Invoic inv.AmountRemaining += item.Amount inv.Total += item.Amount inv.Lines.Data = append(inv.Lines.Data, &stripe.InvoiceLineItem{ - InvoiceItem: item.ID, + InvoiceItem: item, Amount: item.Amount, }) diff --git a/satellite/payments/stripe/tokens.go b/satellite/payments/stripe/tokens.go index 5a1d3be9183e..c633b92a569a 100644 --- a/satellite/payments/stripe/tokens.go +++ b/satellite/payments/stripe/tokens.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "go.uber.org/zap" "storj.io/common/uuid" diff --git a/satellite/payments/stripe/tokens_test.go b/satellite/payments/stripe/tokens_test.go index 06da2be80f3e..267e83c8f38c 100644 --- a/satellite/payments/stripe/tokens_test.go +++ b/satellite/payments/stripe/tokens_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/stripe/stripe-go/v73" + "github.com/stripe/stripe-go/v75" "storj.io/common/memory" "storj.io/common/testcontext" @@ -71,11 +71,9 @@ func TestTokens_ListDepositBonuses(t *testing.T) { b, err := json.Marshal(credit) require.NoError(t, err) customerParams := stripe.CustomerParams{ - Params: stripe.Params{ - Context: ctx, - Metadata: map[string]string{ - "credit_" + credit.TransactionID.String(): string(b), - }, + Params: stripe.Params{Context: ctx}, + Metadata: map[string]string{ + "credit_" + credit.TransactionID.String(): string(b), }, } _, err = satellite.API.Payments.StripeClient.Customers().Update(customerID, &customerParams) diff --git a/testsuite/storjscan/go.mod b/testsuite/storjscan/go.mod index 5cb0e7e7e17f..90718146caac 100644 --- a/testsuite/storjscan/go.mod +++ b/testsuite/storjscan/go.mod @@ -122,7 +122,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.7.1 // indirect github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 // indirect - github.com/stripe/stripe-go/v73 v73.16.0 // indirect + github.com/stripe/stripe-go/v75 v75.8.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tklauser/go-sysconf v0.3.5 // indirect diff --git a/testsuite/storjscan/go.sum b/testsuite/storjscan/go.sum index e89e2ad1b202..8f84d535c559 100644 --- a/testsuite/storjscan/go.sum +++ b/testsuite/storjscan/go.sum @@ -759,8 +759,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stripe/stripe-go/v73 v73.16.0 h1:X3uTpl3zwY7tSPjcltQJ9t/7TYOgfqT6QQK7Qml995I= -github.com/stripe/stripe-go/v73 v73.16.0/go.mod h1:Uk0oBh96JHdlxRsu0/t8XfuJ3xOUQTUgpKAFZuDcFnQ= +github.com/stripe/stripe-go/v75 v75.8.0 h1:kXdHvihp03v64L0C+xXGjolsdzdOmCqwKLnK2wA6bio= +github.com/stripe/stripe-go/v75 v75.8.0/go.mod h1:wT44gah+eCY8Z0aSpY/vQlYYbicU9uUAbAqdaUxxDqE= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= @@ -986,6 +986,7 @@ golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= diff --git a/testsuite/ui/go.mod b/testsuite/ui/go.mod index a0155d6eecd8..0f7a5d7f13d2 100644 --- a/testsuite/ui/go.mod +++ b/testsuite/ui/go.mod @@ -173,7 +173,7 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.7.1 // indirect github.com/streadway/amqp v1.0.0 // indirect - github.com/stripe/stripe-go/v73 v73.16.0 // indirect + github.com/stripe/stripe-go/v75 v75.8.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect github.com/tidwall/gjson v1.9.3 // indirect github.com/tidwall/match v1.1.1 // indirect diff --git a/testsuite/ui/go.sum b/testsuite/ui/go.sum index 1270798cb09e..00c3dfd61972 100644 --- a/testsuite/ui/go.sum +++ b/testsuite/ui/go.sum @@ -1112,8 +1112,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stripe/stripe-go/v73 v73.16.0 h1:X3uTpl3zwY7tSPjcltQJ9t/7TYOgfqT6QQK7Qml995I= -github.com/stripe/stripe-go/v73 v73.16.0/go.mod h1:Uk0oBh96JHdlxRsu0/t8XfuJ3xOUQTUgpKAFZuDcFnQ= +github.com/stripe/stripe-go/v75 v75.8.0 h1:kXdHvihp03v64L0C+xXGjolsdzdOmCqwKLnK2wA6bio= +github.com/stripe/stripe-go/v75 v75.8.0/go.mod h1:wT44gah+eCY8Z0aSpY/vQlYYbicU9uUAbAqdaUxxDqE= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= @@ -1396,6 +1396,7 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=