diff --git a/file/builder.go b/file/builder.go index ac1a9ec3c..d6ceb0079 100644 --- 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 index 48a4d2fb7..ce10d463e 100644 --- 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 index aec1546b2..ecba77163 100644 --- 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())