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

Move enabled to Enabled vs JetStream in response

Browse Source 
Signed-off-by: Derek Collison <derek@nats.io>
This commit is contained in:
Derek Collison
2020-04-30 13:01:22 -07:00
parent 513bff051b
commit cd5ec0f2e1
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/jetstream_api.go
View File

@@ -149,6 +149,12 @@ type ApiError struct {
Description string `json:"description,omitempty"`
}
// JSEnabledResponse is the response to see if JetStream is enabled for this account.
type JSApiEnabledResponse struct {
Error *ApiError `json:"error,omitempty"`
Enabled bool `json:"enabled"`
}
// JSApiStreamCreateResponse stream creation.
type JSApiStreamCreateResponse struct {
Error *ApiError `json:"error,omitempty"`
@@ -305,18 +311,12 @@ func (s *Server) sendAPIResponse(c *client, subject, reply, request, response st
s.sendJetStreamAPIAuditAdvisory(c, subject, request, response)
}
// JSEnabledResponse is the response to see if JetStream is enabled for this account.
type JSApiEnabledResponse struct {
Error *ApiError `json:"error,omitempty"`
JetStream bool `json:"jetstream"`
}
// Request to check if jetstream is enabled.
func (s *Server) isJsEnabledRequest(sub *subscription, c *client, subject, reply string, msg []byte) {
if c == nil || c.acc == nil {
return
}
b, _ := json.MarshalIndent(&JSApiEnabledResponse{JetStream: c.acc.JetStreamEnabled()}, "", " ")
b, _ := json.MarshalIndent(&JSApiEnabledResponse{Enabled: c.acc.JetStreamEnabled()}, "", " ")
s.sendAPIResponse(c, subject, reply, string(msg), string(b))
}

12
test/jetstream_test.go
View File

@@ -4126,7 +4126,7 @@ func TestJetStreamRequestAPI(t *testing.T) {
if err := json.Unmarshal(resp.Data, &enabledResp); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
if !enabledResp.JetStream {
if !enabledResp.Enabled {
t.Fatalf("Expected JetStream to be enabled")
}
@@ -5353,7 +5353,7 @@ func TestJetStreamMultipleAccountsBasics(t *testing.T) {
if err := json.Unmarshal(resp.Data, &enabledResp); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
if !enabledResp.JetStream {
if !enabledResp.Enabled {
t.Fatalf("Expected JetStream to be enabled")
}
@@ -5364,7 +5364,7 @@ func TestJetStreamMultipleAccountsBasics(t *testing.T) {
if err := json.Unmarshal(resp.Data, &enabledResp); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
if !enabledResp.JetStream {
if !enabledResp.Enabled {
t.Fatalf("Expected JetStream to be enabled")
}
@@ -5406,7 +5406,7 @@ func TestJetStreamMultipleAccountsBasics(t *testing.T) {
if err := json.Unmarshal(resp.Data, &enabledResp); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
if enabledResp.JetStream {
if enabledResp.Enabled {
t.Fatalf("Expected to get a response indicating jetstream is not enabled for this account, got %q", resp.Data)
}
}
@@ -5445,7 +5445,7 @@ func TestJetStreamMultipleAccountsBasics(t *testing.T) {
if err := json.Unmarshal(resp.Data, &enabledResp); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
if !enabledResp.JetStream {
if !enabledResp.Enabled {
t.Fatalf("Expected JetStream to be enabled")
}
@@ -5453,7 +5453,7 @@ func TestJetStreamMultipleAccountsBasics(t *testing.T) {
if err := json.Unmarshal(resp.Data, &enabledResp); err != nil {
t.Fatalf("Unexpected error: %v", err)
}
if !enabledResp.JetStream {
if !enabledResp.Enabled {
t.Fatalf("Expected JetStream to be enabled")
}