feat: disable Consumer Groups scoped Plugins for Konnect

Kong · Aug 1, 2023 · b2b24d3 · b2b24d3
1 parent 9f68186
commit b2b24d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/file/builder.go b/file/builder.go
@@ -73,7 +73,7 @@ func (b *stateBuilder) build() (*utils.KongRawState, *utils.KonnectRawState, err
 		b.checkRoutePaths = true
 	}
 
-	if utils.Kong340Version.LTE(b.kongVersion) || b.isKonnect {
+	if utils.Kong340Version.LTE(b.kongVersion) {
 		b.isConsumerGroupScopedPluginSupported = true
 	}
 
@@ -931,7 +931,7 @@ func (b *stateBuilder) plugins() {
 			p.ConsumerGroup = utils.GetConsumerGroupReference(cg.ConsumerGroup)
 		}
 
-		if b.isConsumerGroupScopedPluginSupported && *p.Name == ratelimitingAdvancedPluginName {
+		if (b.isConsumerGroupScopedPluginSupported && !b.isKonnect) && *p.Name == ratelimitingAdvancedPluginName {
 			// check if deprecated consumer-groups configuration is present in the config
 			var consumerGroupsFound bool
 			if groups, ok := p.Config["consumer_groups"]; ok {

diff --git a/tests/integration/dump_test.go b/tests/integration/dump_test.go
@@ -230,6 +230,9 @@ func Test_Dump_SkipConsumers_35x(t *testing.T) {
 }
 
 func Test_Dump_SkipConsumers_Konnect(t *testing.T) {
+	// TODO: remove skip once Konnect support is enabled.
+	t.Skip()
+
 	tests := []struct {
 		name          string
 		stateFile     string

diff --git a/tests/integration/sync_test.go b/tests/integration/sync_test.go
@@ -3716,6 +3716,8 @@ func Test_Sync_SkipConsumers_34x(t *testing.T) {
 // test scope:
 //   - konnect
 func Test_Sync_SkipConsumers_Konnect(t *testing.T) {
+	// TODO: remove skip once Konnect support is enabled.
+	t.Skip()
 	runWhenKonnect(t)
 	// setup stage
 	client, err := getTestClient()
@@ -4542,6 +4544,9 @@ func Test_Sync_ConsumerGroupsScopedPlugins_Post340(t *testing.T) {
 }
 
 func Test_Sync_ConsumerGroupsScopedPluginsKonnect(t *testing.T) {
+	// TODO: remove skip once Konnect support is enabled.
+	t.Skip()
+
 	client, err := getTestClient()
 	if err != nil {
 		t.Errorf(err.Error())