fix(tests): add lock_dictionary_name to expected Konnect state (#1449)

* fix(tests): add `lock_dictionary_name` to expected Konnect state * chore(lint): remove ignoring gosec
Kong · Nov 22, 2024 · 5cdea5d · 5cdea5d
1 parent 38e6449
commit 5cdea5d
Show file tree

Hide file tree

Showing 3 changed files with 167 additions and 2 deletions.
diff --git a/kong2kic/route.go b/kong2kic/route.go
@@ -103,7 +103,6 @@ func createIngressPaths(
 			if *servicePort > 65535 || *servicePort < 0 {
 				log.Fatalf("Port %d is not within the valid range. Please provide a port between 0 and 65535.\n", *servicePort)
 			}
-			//nolint: gosec
 			backend.Service.Port.Number = int32(*servicePort)
 		}
 		paths = append(paths, k8snetv1.HTTPIngressPath{

diff --git a/tests/integration/sync_test.go b/tests/integration/sync_test.go
@@ -1390,6 +1390,171 @@ var (
 		},
 	}
 
+	consumerGroupScopedPluginsKonnect = []*kong.Plugin{
+		{
+			Name: kong.String("rate-limiting-advanced"),
+			ConsumerGroup: &kong.ConsumerGroup{
+				ID: kong.String("77e6691d-67c0-446a-9401-27be2b141aae"),
+			},
+			Config: kong.Configuration{
+				"consumer_groups":         nil,
+				"dictionary_name":         string("kong_rate_limiting_counters"),
+				"disable_penalty":         bool(false),
+				"enforce_consumer_groups": bool(false),
+				"error_code":              float64(429),
+				"error_message":           string("API rate limit exceeded"),
+				"header_name":             nil,
+				"hide_client_headers":     bool(false),
+				"identifier":              string("consumer"),
+				"limit":                   []any{float64(10)},
+				"lock_dictionary_name":    string("kong_locks"),
+				"namespace":               string("gold"),
+				"path":                    nil,
+				"redis": map[string]any{
+					"cluster_addresses":   nil,
+					"connect_timeout":     nil,
+					"database":            float64(0),
+					"host":                nil,
+					"keepalive_backlog":   nil,
+					"keepalive_pool_size": float64(256),
+					"password":            nil,
+					"port":                nil,
+					"read_timeout":        nil,
+					"send_timeout":        nil,
+					"sentinel_addresses":  nil,
+					"sentinel_master":     nil,
+					"sentinel_password":   nil,
+					"sentinel_role":       nil,
+					"sentinel_username":   nil,
+					"server_name":         nil,
+					"ssl":                 false,
+					"ssl_verify":          false,
+					"timeout":             float64(2000),
+					"username":            nil,
+				},
+				"retry_after_jitter_max": float64(1),
+				"strategy":               string("local"),
+				"sync_rate":              float64(-1),
+				"window_size":            []any{float64(60)},
+				"window_type":            string("sliding"),
+			},
+			Enabled:   kong.Bool(true),
+			Protocols: []*string{kong.String("grpc"), kong.String("grpcs"), kong.String("http"), kong.String("https")},
+		},
+		{
+			Name: kong.String("rate-limiting-advanced"),
+			ConsumerGroup: &kong.ConsumerGroup{
+				ID: kong.String("5bcbd3a7-030b-4310-bd1d-2721ff85d236"),
+			},
+			Config: kong.Configuration{
+				"consumer_groups":         nil,
+				"dictionary_name":         string("kong_rate_limiting_counters"),
+				"disable_penalty":         bool(false),
+				"enforce_consumer_groups": bool(false),
+				"error_code":              float64(429),
+				"error_message":           string("API rate limit exceeded"),
+				"header_name":             nil,
+				"hide_client_headers":     bool(false),
+				"identifier":              string("consumer"),
+				"limit":                   []any{float64(7)},
+				"lock_dictionary_name":    string("kong_locks"),
+				"namespace":               string("silver"),
+				"path":                    nil,
+				"redis": map[string]any{
+					"cluster_addresses":   nil,
+					"connect_timeout":     nil,
+					"database":            float64(0),
+					"host":                nil,
+					"keepalive_backlog":   nil,
+					"keepalive_pool_size": float64(256),
+					"password":            nil,
+					"port":                nil,
+					"read_timeout":        nil,
+					"send_timeout":        nil,
+					"sentinel_addresses":  nil,
+					"sentinel_master":     nil,
+					"sentinel_password":   nil,
+					"sentinel_role":       nil,
+					"sentinel_username":   nil,
+					"server_name":         nil,
+					"ssl":                 false,
+					"ssl_verify":          false,
+					"timeout":             float64(2000),
+					"username":            nil,
+				},
+				"retry_after_jitter_max": float64(1),
+				"strategy":               string("local"),
+				"sync_rate":              float64(-1),
+				"window_size":            []any{float64(60)},
+				"window_type":            string("sliding"),
+			},
+			Enabled:   kong.Bool(true),
+			Protocols: []*string{kong.String("grpc"), kong.String("grpcs"), kong.String("http"), kong.String("https")},
+		},
+		{
+			Name: kong.String("rate-limiting-advanced"),
+			Config: kong.Configuration{
+				"consumer_groups":         nil,
+				"dictionary_name":         string("kong_rate_limiting_counters"),
+				"disable_penalty":         bool(false),
+				"enforce_consumer_groups": bool(false),
+				"error_code":              float64(429),
+				"error_message":           string("API rate limit exceeded"),
+				"header_name":             nil,
+				"hide_client_headers":     bool(false),
+				"identifier":              string("consumer"),
+				"limit":                   []any{float64(5)},
+				"lock_dictionary_name":    string("kong_locks"),
+				"namespace":               string("silver"),
+				"path":                    nil,
+				"redis": map[string]any{
+					"cluster_addresses":   nil,
+					"connect_timeout":     nil,
+					"database":            float64(0),
+					"host":                nil,
+					"keepalive_backlog":   nil,
+					"keepalive_pool_size": float64(256),
+					"password":            nil,
+					"port":                nil,
+					"read_timeout":        nil,
+					"send_timeout":        nil,
+					"sentinel_addresses":  nil,
+					"sentinel_master":     nil,
+					"sentinel_password":   nil,
+					"sentinel_role":       nil,
+					"sentinel_username":   nil,
+					"server_name":         nil,
+					"ssl":                 false,
+					"ssl_verify":          false,
+					"timeout":             float64(2000),
+					"username":            nil,
+				},
+				"retry_after_jitter_max": float64(1),
+				"strategy":               string("local"),
+				"sync_rate":              float64(-1),
+				"window_size":            []any{float64(60)},
+				"window_type":            string("sliding"),
+			},
+			Enabled:   kong.Bool(true),
+			Protocols: []*string{kong.String("grpc"), kong.String("grpcs"), kong.String("http"), kong.String("https")},
+		},
+		{
+			Name: kong.String("key-auth"),
+			Config: kong.Configuration{
+				"anonymous":        nil,
+				"hide_credentials": false,
+				"key_in_body":      false,
+				"key_in_header":    true,
+				"key_in_query":     true,
+				"key_names":        []interface{}{"apikey"},
+				"realm":            nil, // This is present on 3.7.x+
+				"run_on_preflight": true,
+			},
+			Enabled:   kong.Bool(true),
+			Protocols: []*string{kong.String("http"), kong.String("https")},
+		},
+	}
+
 	consumerGroupScopedPlugins381x = []*kong.Plugin{
 		{
 			Name: kong.String("rate-limiting-advanced"),
@@ -5074,7 +5239,7 @@ func Test_Sync_ConsumerGroupsScopedPluginsKonnect(t *testing.T) {
 						},
 					},
 				},
-				Plugins:  consumerGroupScopedPlugins37x,
+				Plugins:  consumerGroupScopedPluginsKonnect,
 				Services: svc1_207,
 				Routes:   route1_20x,
 				KeyAuths: []*kong.KeyAuth{

diff --git a/tests/integration/testdata/dump/002-skip-consumers/expected-no-skip_konnect.yaml b/tests/integration/testdata/dump/002-skip-consumers/expected-no-skip_konnect.yaml
@@ -16,6 +16,7 @@ consumer_groups:
       identifier: consumer
       limit:
       - 30000
+      lock_dictionary_name: kong_locks
       namespace: basic
       path: null
       redis: