changed activations exports to match account format

nats-io · Oct 19, 2018 · e08b5f9 · e08b5f9
1 parent 9e34f00
commit e08b5f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/exports.go b/exports.go
@@ -63,3 +63,13 @@ type Exports struct {
 	Streams  ExportedStreams  `json:"streams,omitempty"`
 	Services ExportedServices `json:"services,omitempty"`
 }
+
+func (e *Exports) Valid() error {
+	if err := e.Services.Valid(); err != nil {
+		return err
+	}
+	if err := e.Streams.Valid(); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/types.go b/types.go
@@ -85,18 +85,13 @@ func (u *Permissions) Valid() error {
 }
 
 type Activation struct {
-	Exports []Export `json:"exports,omitempty"`
+	Exports Exports `json:"exports,omitempty"`
 	Limits
 	OperatorLimits
 }
 
 func (a *Activation) Valid() error {
-	for i, t := range a.Exports {
-		if err := t.Valid(); err != nil {
-			return fmt.Errorf("error validating activation (index %d):%v", i, err)
-		}
-	}
-	return nil
+	return a.Exports.Valid()
 }
 
 type Identity struct {