Skip to content

Commit f7cf431

Browse files
authored
fix: GET /_info breaking change (#666)
1 parent c10b32b commit f7cf431

29 files changed

+32
-54
lines changed

internal/api/router.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func NewRouter(
7676
v2Router := v2.NewRouter(
7777
systemController,
7878
authenticator,
79-
debug,
79+
version,
8080
v2.WithTracer(routerOptions.tracer),
8181
v2.WithBulkerFactory(routerOptions.bulkerFactory),
8282
v2.WithBulkHandlerFactories(map[string]bulking.HandlerFactory{

internal/api/v1/controllers_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type LedgerStorage struct {
3232
Ledgers []string `json:"ledgers"`
3333
}
3434

35-
func getInfo(systemController system.Controller, version string) func(w http.ResponseWriter, r *http.Request) {
35+
func GetInfo(systemController system.Controller, version string) func(w http.ResponseWriter, r *http.Request) {
3636
return func(w http.ResponseWriter, r *http.Request) {
3737

3838
ledgerNames := make([]string, 0)

internal/api/v1/routes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func NewRouter(
2727

2828
router := chi.NewMux()
2929

30-
router.Get("/_info", getInfo(systemController, version))
30+
router.Get("/_info", GetInfo(systemController, version))
3131

3232
router.Group(func(router chi.Router) {
3333
router.Use(auth.Middleware(authenticator))

internal/api/v2/controllers_accounts_add_metadata_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"net/http"
77
"net/http/httptest"
88
"net/url"
9-
"os"
109
"testing"
1110

1211
ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
@@ -72,7 +71,7 @@ func TestAccountsAddMetadata(t *testing.T) {
7271
Return(&ledger.Log{}, nil)
7372
}
7473

75-
router := NewRouter(systemController, auth.NewNoAuth(), os.Getenv("DEBUG") == "true")
74+
router := NewRouter(systemController, auth.NewNoAuth(), "develop")
7675

7776
req := httptest.NewRequest(http.MethodPost, "/", api.Buffer(t, testCase.body))
7877
// httptest.NewRequest check for invalid urls while we want to test invalid urls

internal/api/v2/controllers_accounts_count_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"net/http"
77
"net/http/httptest"
88
"net/url"
9-
"os"
109
"testing"
1110

1211
"errors"
@@ -138,7 +137,7 @@ func TestAccountsCount(t *testing.T) {
138137
Return(10, testCase.returnErr)
139138
}
140139

141-
router := NewRouter(systemController, auth.NewNoAuth(), os.Getenv("DEBUG") == "true")
140+
router := NewRouter(systemController, auth.NewNoAuth(), "develop")
142141

143142
req := httptest.NewRequest(http.MethodHead, "/xxx/accounts?pit="+before.Format(time.RFC3339Nano), bytes.NewBufferString(testCase.body))
144143
rec := httptest.NewRecorder()

internal/api/v2/controllers_accounts_delete_metadata_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"net/http"
88
"net/http/httptest"
99
"net/url"
10-
"os"
1110
"testing"
1211

1312
"errors"
@@ -72,7 +71,7 @@ func TestAccountsDeleteMetadata(t *testing.T) {
7271
Return(&ledger.Log{}, tc.returnErr)
7372
}
7473

75-
router := NewRouter(systemController, auth.NewNoAuth(), os.Getenv("DEBUG") == "true")
74+
router := NewRouter(systemController, auth.NewNoAuth(), "develop")
7675

7776
req := httptest.NewRequest(http.MethodDelete, "/", nil)
7877
req.URL.Path = "/ledger0/accounts/" + tc.account + "/metadata/foo"

internal/api/v2/controllers_accounts_list_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"net/http"
77
"net/http/httptest"
88
"net/url"
9-
"os"
109
"testing"
1110

1211
"errors"
@@ -218,7 +217,7 @@ func TestAccountsList(t *testing.T) {
218217
Return(&expectedCursor, tc.returnErr)
219218
}
220219

221-
router := NewRouter(systemController, auth.NewNoAuth(), os.Getenv("DEBUG") == "true")
220+
router := NewRouter(systemController, auth.NewNoAuth(), "develop")
222221

223222
req := httptest.NewRequest(http.MethodGet, "/xxx/accounts?pit="+before.Format(time.RFC3339Nano), bytes.NewBufferString(tc.body))
224223
rec := httptest.NewRecorder()

internal/api/v2/controllers_accounts_read_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"net/http"
88
"net/http/httptest"
99
"net/url"
10-
"os"
1110
"testing"
1211

1312
"github.com/formancehq/go-libs/v2/api"
@@ -93,7 +92,7 @@ func TestAccountsRead(t *testing.T) {
9392
Return(&ledger.Account{}, tc.returnErr)
9493
}
9594

96-
router := NewRouter(systemController, auth.NewNoAuth(), os.Getenv("DEBUG") == "true")
95+
router := NewRouter(systemController, auth.NewNoAuth(), "develop")
9796

9897
req := httptest.NewRequest(http.MethodGet, "/", bytes.NewBufferString(tc.body))
9998
req.URL.Path = "/xxx/accounts/" + tc.account

internal/api/v2/controllers_balances_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"net/http"
77
"net/http/httptest"
88
"net/url"
9-
"os"
109
"testing"
1110

1211
ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
@@ -100,7 +99,7 @@ func TestBalancesAggregates(t *testing.T) {
10099
GetAggregatedBalances(gomock.Any(), testCase.expectQuery).
101100
Return(expectedBalances, nil)
102101

103-
router := NewRouter(systemController, auth.NewNoAuth(), os.Getenv("DEBUG") == "true")
102+
router := NewRouter(systemController, auth.NewNoAuth(), "develop")
104103

105104
req := httptest.NewRequest(http.MethodGet, "/xxx/aggregate/balances?pit="+now.Format(time.RFC3339Nano), bytes.NewBufferString(testCase.body))
106105
rec := httptest.NewRecorder()

internal/api/v2/controllers_bulk_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"net/http"
99
"net/http/httptest"
1010
"net/url"
11-
"os"
1211
"testing"
1312

1413
"github.com/formancehq/go-libs/v2/collectionutils"
@@ -485,7 +484,7 @@ func TestBulk(t *testing.T) {
485484
systemController, ledgerController := newTestingSystemController(t, true)
486485
testCase.expectations(ledgerController)
487486

488-
router := NewRouter(systemController, auth.NewNoAuth(), os.Getenv("DEBUG") == "true")
487+
router := NewRouter(systemController, auth.NewNoAuth(), "develop")
489488

490489
req := httptest.NewRequest(http.MethodPost, "/xxx/_bulk", bytes.NewBufferString(testCase.body))
491490
req.Header = testCase.headers

0 commit comments

Comments
 (0)