[ADDED] Return account reservations on AccountInfo (#1511)

Signed-off-by: Piotr Piotrowski <piotr@synadia.com>
nats-io · Jan 12, 2024 · cd2f25a · cd2f25a
1 parent 990323d
commit cd2f25a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/jetstream/jetstream.go b/jetstream/jetstream.go
@@ -112,13 +112,20 @@ type (
 
 	// AccountInfo contains info about the JetStream usage from the current account.
 	AccountInfo struct {
-		Memory    uint64        `json:"memory"`
-		Store     uint64        `json:"storage"`
-		Streams   int           `json:"streams"`
-		Consumers int           `json:"consumers"`
-		Domain    string        `json:"domain"`
-		API       APIStats      `json:"api"`
-		Limits    AccountLimits `json:"limits"`
+		Tier
+		Domain string          `json:"domain"`
+		API    APIStats        `json:"api"`
+		Tiers  map[string]Tier `json:"tiers"`
+	}
+
+	Tier struct {
+		Memory         uint64        `json:"memory"`
+		Store          uint64        `json:"storage"`
+		ReservedMemory uint64        `json:"reserved_memory"`
+		ReservedStore  uint64        `json:"reserved_storage"`
+		Streams        int           `json:"streams"`
+		Consumers      int           `json:"consumers"`
+		Limits         AccountLimits `json:"limits"`
 	}
 
 	// APIStats reports on API calls to JetStream for this account.

diff --git a/jsm.go b/jsm.go
@@ -252,11 +252,13 @@ type AccountInfo struct {
 }
 
 type Tier struct {
-	Memory    uint64        `json:"memory"`
-	Store     uint64        `json:"storage"`
-	Streams   int           `json:"streams"`
-	Consumers int           `json:"consumers"`
-	Limits    AccountLimits `json:"limits"`
+	Memory         uint64        `json:"memory"`
+	Store          uint64        `json:"storage"`
+	ReservedMemory uint64        `json:"reserved_memory"`
+	ReservedStore  uint64        `json:"reserved_storage"`
+	Streams        int           `json:"streams"`
+	Consumers      int           `json:"consumers"`
+	Limits         AccountLimits `json:"limits"`
 }
 
 // APIStats reports on API calls to JetStream for this account.