fix: handle different consumer group consumer list responses

kong/consumer_group.go

@@ -54,3 +54,8 @@ func (cg *ConsumerGroup) FriendlyName() string {
 	}
 	return ""
 }
+
+type consumerGroupConsumers struct {
+	Consumers []*Consumer `json:"consumers,omitempty" yaml:"consumers,omitempty"`
+	Data      []*Consumer `json:"data,omitempty" yaml:"data,omitempty"`
+}

kong/consumer_group_consumer_service.go

@@ -13,7 +13,7 @@ type AbstractConsumerGroupConsumerService interface {
 	// Delete deletes a ConsumerGroupConsumer in Kong
 	Delete(ctx context.Context, consumerGroupNameOrID *string, consumerNameOrID *string) error
 	// ListAll fetches all ConsumerGroup's Consumers in Kong.
-	ListAll(ctx context.Context, consumerGroupNameOrID *string) (*ConsumerGroupObject, error)
+	ListAll(ctx context.Context, consumerGroupNameOrID *string) ([]*Consumer, error)
 }
 
 // ConsumerGroupService handles ConsumerGroup in Kong.
@@ -77,7 +77,7 @@ func (s *ConsumerGroupConsumerService) Delete(ctx context.Context,
 // List fetches a list all of ConsumerGroup's consumers in Kong.
 func (s *ConsumerGroupConsumerService) ListAll(
 	ctx context.Context, consumerGroupNameOrID *string,
-) (*ConsumerGroupObject, error) {
+) ([]*Consumer, error) {
 	if isEmptyString(consumerGroupNameOrID) {
 		return nil, fmt.Errorf("consumerGroupNameOrID cannot be nil for ListAll operation")
 	}
@@ -89,11 +89,24 @@ func (s *ConsumerGroupConsumerService) ListAll(
 		return nil, err
 	}
 
-	var cg ConsumerGroupObject
+	var cg consumerGroupConsumers
 	_, err = s.client.Do(ctx, req, &cg)
 	if err != nil {
 		return nil, err
 	}
 
-	return &cg, nil
+	var consumers []*Consumer
+
+	// See https://github.com/Kong/kong-ee/pull/6421
+	if cg.Consumers != nil {
+		// Kong < 3.5
+		consumers = cg.Consumers
+	} else if cg.Data != nil {
+		// Kong >= 3.5
+		consumers = cg.Data
+	} else {
+		consumers = make([]*Consumer, 0)
+	}
+
+	return consumers, nil
 }

kong/consumer_group_consumer_test.go

@@ -98,12 +98,12 @@ func TestConsumerGroupConsumersListEndpoint(t *testing.T) {
 	consumerGroupConsumersFromKong, err := client.ConsumerGroupConsumers.ListAll(defaultCtx, cg.Name)
 	require.NoError(t, err)
 	assert.NotNil(consumerGroupConsumersFromKong)
-	assert.Equal(3, len(consumerGroupConsumersFromKong.Consumers))
+	assert.Equal(3, len(consumerGroupConsumersFromKong))
 
 	// check if we see all consumer groups
-	assert.True(compareConsumers(consumers, consumerGroupConsumersFromKong.Consumers))
+	assert.True(compareConsumers(consumers, consumerGroupConsumersFromKong))
 
-	for i := 0; i < len(consumerGroupConsumersFromKong.Consumers); i++ {
+	for i := 0; i < len(consumerGroupConsumersFromKong); i++ {
 		assert.NoError(client.Consumers.Delete(defaultCtx, consumers[i].ID))
 	}