Skip to content

Commit

Permalink
enable rpc in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
chronolaw committed Nov 26, 2024
1 parent f400d10 commit c6c1373
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 0 deletions.
12 changes: 12 additions & 0 deletions spec/02-integration/09-hybrid_mode/02-start_stop_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
admin_listen = "off",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -27,6 +28,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
cluster_listen = "off",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -42,6 +44,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
database = "off",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -57,6 +60,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
cluster_mtls = "pki",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -74,6 +78,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
proxy_listen = "off",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -88,6 +93,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
prefix = "servroot2",
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -105,6 +111,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
cluster_dp_labels = "w@:_a",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -122,6 +129,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
cluster_cert_key = "spec/fixtures/kong_clustering.key",
proxy_listen = "0.0.0.0:" .. helpers.get_available_port(),
cluster_dp_labels = "Aa-._zZ_key:Aa-._zZ_val",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})
assert.True(ok)
Expand All @@ -137,6 +145,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
nginx_conf = "spec/fixtures/custom_nginx.template",
database = param[2],
prefix = "servroot2",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -151,6 +160,7 @@ describe("invalid config are rejected" .. " inc_sync=" .. inc_sync, function()
database = param[2],
prefix = "servroot2",
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})

Expand All @@ -175,6 +185,7 @@ describe("when CP exits before DP" .. " inc_sync=" .. inc_sync, function()
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
cluster_listen = "127.0.0.1:9005",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
}))
assert(helpers.start_kong({
Expand All @@ -185,6 +196,7 @@ describe("when CP exits before DP" .. " inc_sync=" .. inc_sync, function()
cluster_control_plane = "127.0.0.1:9005",
proxy_listen = "0.0.0.0:9002",
database = "off",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
-- EE [[
-- vitals uses the clustering strategy by default, and it logs the exact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ for _, strategy in helpers.each_strategy() do
cluster_cert_key = "spec/fixtures/kong_clustering.key",
cluster_listen = "127.0.0.1:9005",
nginx_conf = "spec/fixtures/custom_nginx.template",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
}

Expand All @@ -109,6 +110,7 @@ for _, strategy in helpers.each_strategy() do
database = "off",
untrusted_lua = "on",
nginx_conf = "spec/fixtures/custom_nginx.template",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
worker_state_update_frequency = 1,
}
Expand Down
2 changes: 2 additions & 0 deletions spec/02-integration/09-hybrid_mode/11-status_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ for _, strategy in helpers.each_strategy() do
proxy_listen = "127.0.0.1:9002",
nginx_main_worker_processes = 8,
status_listen = "127.0.0.1:" .. dp_status_port,
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})
end
Expand All @@ -36,6 +37,7 @@ for _, strategy in helpers.each_strategy() do
cluster_listen = "127.0.0.1:9005",
nginx_conf = "spec/fixtures/custom_nginx.template",
status_listen = "127.0.0.1:" .. cp_status_port,
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
})
end
Expand Down
2 changes: 2 additions & 0 deletions spec/02-integration/18-hybrid_rpc/01-rpc_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ for _, strategy in helpers.each_strategy() do
database = strategy,
cluster_listen = "127.0.0.1:9005",
nginx_conf = "spec/fixtures/custom_nginx.template",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync, -- incremental sync
}))

Expand All @@ -30,6 +31,7 @@ for _, strategy in helpers.each_strategy() do
cluster_control_plane = "127.0.0.1:9005",
proxy_listen = "0.0.0.0:9002",
nginx_conf = "spec/fixtures/custom_nginx.template",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync, -- incremental sync
}))
end)
Expand Down
3 changes: 3 additions & 0 deletions spec/02-integration/18-hybrid_rpc/04-concentrator_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ for _, strategy in helpers.each_strategy() do
cluster_listen = "127.0.0.1:9005",
admin_listen = "127.0.0.1:" .. helpers.get_available_port(),
nginx_conf = "spec/fixtures/custom_nginx.template",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync, -- incremental sync
}))

Expand All @@ -57,6 +58,7 @@ for _, strategy in helpers.each_strategy() do
database = strategy,
cluster_listen = "127.0.0.1:" .. helpers.get_available_port(),
nginx_conf = "spec/fixtures/custom_nginx.template",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync, -- incremental sync
}))

Expand All @@ -69,6 +71,7 @@ for _, strategy in helpers.each_strategy() do
cluster_control_plane = "127.0.0.1:9005",
proxy_listen = "0.0.0.0:9002",
nginx_conf = "spec/fixtures/custom_nginx.template",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync, -- incremental sync
}))
end)
Expand Down
3 changes: 3 additions & 0 deletions spec/02-integration/20-wasm/10-wasmtime_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ describe("#wasm wasmtime (role: " .. role .. ")", function()
role = role,
cluster_cert = "spec/fixtures/kong_clustering.crt",
cluster_cert_key = "spec/fixtures/kong_clustering.key",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
}))

Expand Down Expand Up @@ -94,6 +95,7 @@ describe("#wasm wasmtime (role: " .. role .. ")", function()
status_listen = "127.0.0.1:" .. status_port,
nginx_main_worker_processes = 2,

cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
}))

Expand All @@ -116,6 +118,7 @@ describe("#wasm wasmtime (role: " .. role .. ")", function()
cluster_cert_key = "spec/fixtures/kong_clustering.key",
status_listen = "off",
nginx_main_worker_processes = 2,
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
}))
end
Expand Down
2 changes: 2 additions & 0 deletions spec/03-plugins/09-key-auth/04-hybrid_mode_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ for _, strategy in helpers.each_strategy({"postgres"}) do
cluster_listen = "127.0.0.1:9005",
cluster_telemetry_listen = "127.0.0.1:9006",
nginx_conf = "spec/fixtures/custom_nginx.template",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
}))

Expand All @@ -53,6 +54,7 @@ for _, strategy in helpers.each_strategy({"postgres"}) do
cluster_control_plane = "127.0.0.1:9005",
cluster_telemetry_endpoint = "127.0.0.1:9006",
proxy_listen = "0.0.0.0:9002",
cluster_rpc = "on",
cluster_incremental_sync = inc_sync,
}))
end)
Expand Down

0 comments on commit c6c1373

Please sign in to comment.