api/v2: return empty array of peers when disabled (prometheus#2203)

Signed-off-by: Simon Pasquier <[email protected]>
simonpasquier · Mar 10, 2020 · e347c31 · e347c31
1 parent 99e5cbf
commit e347c31
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/api/v2/api.go b/api/v2/api.go
@@ -166,6 +166,7 @@ func (api *API) getStatusHandler(params general_ops.GetStatusParams) middleware.
 		},
 		Cluster: &open_api_models.ClusterStatus{
 			Status: &status,
+			Peers:  []*open_api_models.PeerStatus{},
 		},
 	}
 

diff --git a/api/v2/api_test.go b/api/v2/api_test.go
@@ -47,8 +47,11 @@ func TestGetStatusHandlerWithNilPeer(t *testing.T) {
 		t.Fatal("expected cluster status not to be nil, violating the openapi specification")
 	}
 
-	if c.Peers != nil {
-		t.Fatal("expected cluster peers to be nil when api.peer is nil, violating the openapi specification")
+	if c.Peers == nil {
+		t.Fatal("expected cluster peers to be not nil when api.peer is nil, violating the openapi specification")
+	}
+	if len(c.Peers) != 0 {
+		t.Fatal("expected cluster peers to be empty when api.peer is nil, violating the openapi specification")
 	}
 
 	if c.Name != "" {

diff --git a/api/v2/models/cluster_status.go b/api/v2/models/cluster_status.go
diff --git a/api/v2/openapi.yaml b/api/v2/openapi.yaml
@@ -279,7 +279,6 @@ definitions:
         enum: ["ready", "settling", "disabled"]
       peers:
         type: array
-        minimum: 0
         items:
           $ref: '#/definitions/peerStatus'
     required:

diff --git a/api/v2/restapi/embedded_spec.go b/api/v2/restapi/embedded_spec.go