fix: use same API to pull Consumer Groups from Konnect and Kong

dump/dump.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/kong/deck/konnect"
 	"github.com/kong/deck/utils"
 	"github.com/kong/go-kong/kong"
 	"golang.org/x/sync/errgroup"
@@ -71,15 +70,7 @@ func getConsumerGroupsConfiguration(ctx context.Context, group *errgroup.Group,
 	client *kong.Client, config Config, state *utils.KongRawState,
 ) {
 	group.Go(func() error {
-		var (
-			err            error
-			consumerGroups []*kong.ConsumerGroupObject
-		)
-		if config.KonnectRuntimeGroup != "" {
-			consumerGroups, err = GetAllKonnectConsumerGroups(ctx, client, config.SelectorTags)
-		} else {
-			consumerGroups, err = GetAllConsumerGroups(ctx, client, config.SelectorTags)
-		}
+		consumerGroups, err := GetAllConsumerGroups(ctx, client, config.SelectorTags)
 		if err != nil {
 			if kong.IsNotFoundErr(err) || kong.IsForbiddenErr(err) {
 				return nil
@@ -528,29 +519,6 @@ func GetAllUpstreams(ctx context.Context,
 	return upstreams, nil
 }
 
-// GetAllConsumerGroups queries Konnect for all the ConsumerGroups using client.
-func GetAllKonnectConsumerGroups(ctx context.Context,
-	client *kong.Client, tags []string,
-) ([]*kong.ConsumerGroupObject, error) {
-	var consumerGroupObjects []*kong.ConsumerGroupObject
-	opt := newOpt(tags)
-	cgs, err := konnect.ListAllConsumerGroups(ctx, client, opt.Tags)
-	if err != nil {
-		return nil, err
-	}
-	if err := ctx.Err(); err != nil {
-		return nil, err
-	}
-	for _, cg := range cgs {
-		r, err := konnect.GetConsumerGroupObject(ctx, client, cg.ID)
-		if err != nil {
-			return nil, err
-		}
-		consumerGroupObjects = append(consumerGroupObjects, r)
-	}
-	return consumerGroupObjects, nil
-}
-
 // GetAllConsumerGroups queries Kong for all the ConsumerGroups using client.
 func GetAllConsumerGroups(ctx context.Context,
 	client *kong.Client, tags []string,