Skip to content

Commit

Permalink
Revert Go module support
Browse files Browse the repository at this point in the history
Reverts:
#712

(And an earlier PR that added a `go.mod` file in the first place.)

Unfortunately, there are still some fairly bad incompatibilities between
Go modules and Dep for users still on the latter. For now, we're going
to revert Go module support because there doesn't seem to be any easy
way (i.e., anything that's not maintaining a fork) of doing a good job
of both. Projects can still use the Go module system, but will have to
pull this package in as a pre-module incompatible one.

We are hoping to eventually see basic module awareness merged into Dep:

golang/dep#1963

If/when that gets done, we'll revert this revert after a small grace
period, and hopefully be back to a place where both packaging systems
are well supported.

I'll also modify the README to clarify the current situation in another
follow up PR.
  • Loading branch information
brandur committed Jan 16, 2019
1 parent fda9dbb commit 2774ff2
Show file tree
Hide file tree
Showing 156 changed files with 333 additions and 353 deletions.
2 changes: 1 addition & 1 deletion account.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package stripe
import (
"encoding/json"

"github.com/stripe/stripe-go/v55/form"
"github.com/stripe/stripe-go/form"
)

// AccountType is the type of an account.
Expand Down
4 changes: 2 additions & 2 deletions account/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package account
import (
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke APIs related to accounts.
Expand Down
4 changes: 2 additions & 2 deletions account/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestAccountDel(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion account_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
"github.com/stripe/stripe-go/v55/form"
"github.com/stripe/stripe-go/form"
)

func TestAccountExternalAccountParams_AppendTo(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion accountlink/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package accountlink
import (
"net/http"

stripe "github.com/stripe/stripe-go/v55"
stripe "github.com/stripe/stripe-go"
)

// Client is used to invoke APIs related to account links.
Expand Down
4 changes: 2 additions & 2 deletions accountlink/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestAccountLinkNew(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions applepaydomain/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package applepaydomain
import (
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke /apple_pay/domains and Apple Pay domain-related APIs.
Expand Down
4 changes: 2 additions & 2 deletions applepaydomain/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestApplePayDomainDel(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions balance/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package balance
import (
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke /balance and transaction-related APIs.
Expand Down
4 changes: 2 additions & 2 deletions balance/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestBalanceGet(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bankaccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"strconv"

"github.com/stripe/stripe-go/v55/form"
"github.com/stripe/stripe-go/form"
)

// BankAccountStatus is the list of allowed values for the bank account's status.
Expand Down
4 changes: 2 additions & 2 deletions bankaccount/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke /bank_accounts APIs.
Expand Down
4 changes: 2 additions & 2 deletions bankaccount/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestBankAccountDel_ByAccount(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion bankaccount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
"github.com/stripe/stripe-go/v55/form"
"github.com/stripe/stripe-go/form"
)

func TestBankAccount_UnmarshalJSON(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions bitcoinreceiver/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package bitcoinreceiver
import (
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke /bitcoin/receivers APIs.
Expand Down
4 changes: 2 additions & 2 deletions bitcoinreceiver/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestBitcoinReceiverGet(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions bitcointransaction/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package bitcointransaction
import (
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke /bitcoin/receivers/:receiver_id/transactions APIs.
Expand Down
4 changes: 2 additions & 2 deletions bitcointransaction/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestBitcoinTransactionList(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion card.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"strconv"

"github.com/stripe/stripe-go/v55/form"
"github.com/stripe/stripe-go/form"
)

// CardAvailablePayoutMethod is a set of available payout methods for the card.
Expand Down
4 changes: 2 additions & 2 deletions card/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke /cards APIs.
Expand Down
4 changes: 2 additions & 2 deletions card/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestCardDel(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion card_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
"github.com/stripe/stripe-go/v55/form"
"github.com/stripe/stripe-go/form"
)

func TestCardListParams_AppendTo(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions charge/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package charge
import (
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke APIs related to charges.
Expand Down
4 changes: 2 additions & 2 deletions charge/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
stripe "github.com/stripe/stripe-go/v55"
_ "github.com/stripe/stripe-go/v55/testing"
stripe "github.com/stripe/stripe-go"
_ "github.com/stripe/stripe-go/testing"
)

func TestChargeCapture(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion charge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

assert "github.com/stretchr/testify/require"
"github.com/stripe/stripe-go/v55/form"
"github.com/stripe/stripe-go/form"
)

func TestCharge_UnmarshalJSON(t *testing.T) {
Expand Down
116 changes: 58 additions & 58 deletions client/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,64 @@
package client

import (
stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/account"
"github.com/stripe/stripe-go/v55/applepaydomain"
"github.com/stripe/stripe-go/v55/balance"
"github.com/stripe/stripe-go/v55/bankaccount"
"github.com/stripe/stripe-go/v55/bitcoinreceiver"
"github.com/stripe/stripe-go/v55/bitcointransaction"
"github.com/stripe/stripe-go/v55/card"
"github.com/stripe/stripe-go/v55/charge"
"github.com/stripe/stripe-go/v55/countryspec"
"github.com/stripe/stripe-go/v55/coupon"
"github.com/stripe/stripe-go/v55/customer"
"github.com/stripe/stripe-go/v55/discount"
"github.com/stripe/stripe-go/v55/dispute"
"github.com/stripe/stripe-go/v55/ephemeralkey"
"github.com/stripe/stripe-go/v55/event"
"github.com/stripe/stripe-go/v55/exchangerate"
"github.com/stripe/stripe-go/v55/fee"
"github.com/stripe/stripe-go/v55/feerefund"
"github.com/stripe/stripe-go/v55/file"
"github.com/stripe/stripe-go/v55/filelink"
"github.com/stripe/stripe-go/v55/invoice"
"github.com/stripe/stripe-go/v55/invoiceitem"
"github.com/stripe/stripe-go/v55/issuerfraudrecord"
"github.com/stripe/stripe-go/v55/issuing/authorization"
issuingcard "github.com/stripe/stripe-go/v55/issuing/card"
"github.com/stripe/stripe-go/v55/issuing/cardholder"
issuingdispute "github.com/stripe/stripe-go/v55/issuing/dispute"
"github.com/stripe/stripe-go/v55/issuing/transaction"
"github.com/stripe/stripe-go/v55/loginlink"
"github.com/stripe/stripe-go/v55/order"
"github.com/stripe/stripe-go/v55/orderreturn"
"github.com/stripe/stripe-go/v55/paymentintent"
"github.com/stripe/stripe-go/v55/paymentsource"
"github.com/stripe/stripe-go/v55/payout"
"github.com/stripe/stripe-go/v55/plan"
"github.com/stripe/stripe-go/v55/product"
"github.com/stripe/stripe-go/v55/radar/valuelist"
"github.com/stripe/stripe-go/v55/radar/valuelistitem"
"github.com/stripe/stripe-go/v55/recipient"
"github.com/stripe/stripe-go/v55/refund"
"github.com/stripe/stripe-go/v55/reporting/reportrun"
"github.com/stripe/stripe-go/v55/reporting/reporttype"
"github.com/stripe/stripe-go/v55/reversal"
"github.com/stripe/stripe-go/v55/sigma/scheduledqueryrun"
"github.com/stripe/stripe-go/v55/sku"
"github.com/stripe/stripe-go/v55/source"
"github.com/stripe/stripe-go/v55/sourcetransaction"
"github.com/stripe/stripe-go/v55/sub"
"github.com/stripe/stripe-go/v55/subitem"
terminalconnectiontoken "github.com/stripe/stripe-go/v55/terminal/connectiontoken"
terminallocation "github.com/stripe/stripe-go/v55/terminal/location"
terminalreader "github.com/stripe/stripe-go/v55/terminal/reader"
"github.com/stripe/stripe-go/v55/token"
"github.com/stripe/stripe-go/v55/topup"
"github.com/stripe/stripe-go/v55/transfer"
"github.com/stripe/stripe-go/v55/usagerecord"
"github.com/stripe/stripe-go/v55/webhookendpoint"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/account"
"github.com/stripe/stripe-go/applepaydomain"
"github.com/stripe/stripe-go/balance"
"github.com/stripe/stripe-go/bankaccount"
"github.com/stripe/stripe-go/bitcoinreceiver"
"github.com/stripe/stripe-go/bitcointransaction"
"github.com/stripe/stripe-go/card"
"github.com/stripe/stripe-go/charge"
"github.com/stripe/stripe-go/countryspec"
"github.com/stripe/stripe-go/coupon"
"github.com/stripe/stripe-go/customer"
"github.com/stripe/stripe-go/discount"
"github.com/stripe/stripe-go/dispute"
"github.com/stripe/stripe-go/ephemeralkey"
"github.com/stripe/stripe-go/event"
"github.com/stripe/stripe-go/exchangerate"
"github.com/stripe/stripe-go/fee"
"github.com/stripe/stripe-go/feerefund"
"github.com/stripe/stripe-go/file"
"github.com/stripe/stripe-go/filelink"
"github.com/stripe/stripe-go/invoice"
"github.com/stripe/stripe-go/invoiceitem"
"github.com/stripe/stripe-go/issuerfraudrecord"
"github.com/stripe/stripe-go/issuing/authorization"
issuingcard "github.com/stripe/stripe-go/issuing/card"
"github.com/stripe/stripe-go/issuing/cardholder"
issuingdispute "github.com/stripe/stripe-go/issuing/dispute"
"github.com/stripe/stripe-go/issuing/transaction"
"github.com/stripe/stripe-go/loginlink"
"github.com/stripe/stripe-go/order"
"github.com/stripe/stripe-go/orderreturn"
"github.com/stripe/stripe-go/paymentintent"
"github.com/stripe/stripe-go/paymentsource"
"github.com/stripe/stripe-go/payout"
"github.com/stripe/stripe-go/plan"
"github.com/stripe/stripe-go/product"
"github.com/stripe/stripe-go/radar/valuelist"
"github.com/stripe/stripe-go/radar/valuelistitem"
"github.com/stripe/stripe-go/recipient"
"github.com/stripe/stripe-go/refund"
"github.com/stripe/stripe-go/reporting/reportrun"
"github.com/stripe/stripe-go/reporting/reporttype"
"github.com/stripe/stripe-go/reversal"
"github.com/stripe/stripe-go/sigma/scheduledqueryrun"
"github.com/stripe/stripe-go/sku"
"github.com/stripe/stripe-go/source"
"github.com/stripe/stripe-go/sourcetransaction"
"github.com/stripe/stripe-go/sub"
"github.com/stripe/stripe-go/subitem"
terminalconnectiontoken "github.com/stripe/stripe-go/terminal/connectiontoken"
terminallocation "github.com/stripe/stripe-go/terminal/location"
terminalreader "github.com/stripe/stripe-go/terminal/reader"
"github.com/stripe/stripe-go/token"
"github.com/stripe/stripe-go/topup"
"github.com/stripe/stripe-go/transfer"
"github.com/stripe/stripe-go/usagerecord"
"github.com/stripe/stripe-go/webhookendpoint"
)

// API is the Stripe client. It contains all the different resources available.
Expand Down
4 changes: 2 additions & 2 deletions countryspec/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package countryspec
import (
"net/http"

stripe "github.com/stripe/stripe-go/v55"
"github.com/stripe/stripe-go/v55/form"
stripe "github.com/stripe/stripe-go"
"github.com/stripe/stripe-go/form"
)

// Client is used to invoke /country_specs and countryspec-related APIs.
Expand Down
Loading

0 comments on commit 2774ff2

Please sign in to comment.