gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-17 03:24:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

Incorporating review comments

Browse Source
This commit is contained in:
Matthias Hanel
2020-09-23 18:29:44 -04:00
parent 634ce9f7c8
commit 7a8a7a7234
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/events_test.go
View File

@@ -1326,16 +1326,16 @@ func TestAccountReqInfo(t *testing.T) {
t.Fatalf("Error on request: %v", err)
} else if err := json.Unmarshal(resp.Data, &msg); err != nil {
t.Fatalf("Unmarshalling failed: %v", err)
} else if len(info.Exps) != 1 {
t.Fatalf("Unexpected value: %v", info.Exps)
} else if len(info.Imps) != 0 {
t.Fatalf("Unexpected value: %v", info.Imps)
} else if info.Exps[0].Subject != "req.*" {
t.Fatalf("Unexpected value: %v", info.Exps)
} else if info.Exps[0].Type != jwt.Service {
t.Fatalf("Unexpected value: %v", info.Exps)
} else if info.Exps[0].ResponseType != jwt.ResponseTypeSingleton {
t.Fatalf("Unexpected value: %v", info.Exps)
} else if len(info.Exports) != 1 {
t.Fatalf("Unexpected value: %v", info.Exports)
} else if len(info.Imports) != 0 {
t.Fatalf("Unexpected value: %v", info.Imports)
} else if info.Exports[0].Subject != "req.*" {
t.Fatalf("Unexpected value: %v", info.Exports)
} else if info.Exports[0].Type != jwt.Service {
t.Fatalf("Unexpected value: %v", info.Exports)
} else if info.Exports[0].ResponseType != jwt.ResponseTypeSingleton {
t.Fatalf("Unexpected value: %v", info.Exports)
} else if info.SubCnt != 0 {
t.Fatalf("Unexpected value: %v", info.SubCnt)
} else {
@@ -1347,16 +1347,16 @@ func TestAccountReqInfo(t *testing.T) {
t.Fatalf("Error on request: %v", err)
} else if err := json.Unmarshal(resp.Data, &msg); err != nil {
t.Fatalf("Unmarshalling failed: %v", err)
} else if len(info.Exps) != 0 {
t.Fatalf("Unexpected value: %v", info.Exps)
} else if len(info.Imps) != 1 {
t.Fatalf("Unexpected value: %v", info.Imps)
} else if info.Imps[0].Subject != "req.1" {
t.Fatalf("Unexpected value: %v", info.Exps)
} else if info.Imps[0].Type != jwt.Service {
t.Fatalf("Unexpected value: %v", info.Exps)
} else if info.Imps[0].Account != pub1 {
t.Fatalf("Unexpected value: %v", info.Exps)
} else if len(info.Exports) != 0 {
t.Fatalf("Unexpected value: %v", info.Exports)
} else if len(info.Imports) != 1 {
t.Fatalf("Unexpected value: %v", info.Imports)
} else if info.Imports[0].Subject != "req.1" {
t.Fatalf("Unexpected value: %v", info.Exports)
} else if info.Imports[0].Type != jwt.Service {
t.Fatalf("Unexpected value: %v", info.Exports)
} else if info.Imports[0].Account != pub1 {
t.Fatalf("Unexpected value: %v", info.Exports)
} else if info.SubCnt != 1 {
t.Fatalf("Unexpected value: %v", info.SubCnt)
} else {

8
server/monitor.go
View File

@@ -1922,12 +1922,12 @@ type AccountzOptions struct {
type ExtImport struct {
jwt.Import
Invalid bool
Invalid bool `json:"invalid"`
}
type ExtExport struct {
jwt.Export
ApprovedAccounts []string `json:"approved_accounts"`
ApprovedAccounts []string `json:"approved_accounts,omitempty"`
}
type AccountInfo struct {
@@ -1939,8 +1939,8 @@ type AccountInfo struct {
LeafCnt int `json:"leafnode_connections"`
ClientCnt int `json:"client_connections"`
SubCnt uint32 `json:"subscriptions"`
Exps []ExtExport `json:"exports"`
Imps []ExtImport `json:"imports"`
Exports []ExtExport `json:"exports"`
Imports []ExtImport `json:"imports"`
Jwt string `json:"jwt,omitempty"`
Claim *jwt.AccountClaims `json:"decoded_jwt,omitempty"`
}