Skip to content

Commit 27aede5

Browse files
authored
Remove globalSearchFeatureFlag flag if no longer present in configmap (stolostron#3538)
Signed-off-by: zlayne <zlayne@redhat.com>
1 parent ec35cc2 commit 27aede5

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

backend/src/lib/config.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,15 @@ export async function loadConfigSettings(): Promise<void> {
4545
for (const key in settings) {
4646
if (key.startsWith('LOG_')) {
4747
process.env[key] = settings[key]
48-
} else if (key === 'searchApiEnpoint' || key === 'globalSearchFeatureFlag') {
49-
// 2.9 Federated search-api use will be restricted to user defined env variable.
48+
} else if (key === 'globalSearchFeatureFlag') {
49+
// Global search tech-preview requires feature flag toggle (2.11)
5050
process.env[key] = settings[key]
5151
}
5252
}
53+
if (process.env['globalSearchFeatureFlag'] && !settings['globalSearchFeatureFlag']) {
54+
// If globalSearchFeatureFlag is set but has been removed from config settings -> removing env var.
55+
delete process.env['globalSearchFeatureFlag']
56+
}
5357
if (settings.LOG_LEVEL) {
5458
logger.level = settings.LOG_LEVEL
5559
}

backend/src/routes/search.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ export async function search(req: Http2ServerRequest, res: Http2ServerResponse):
3030
const searchService = `https://search-search-api.${mch?.metadata?.namespace || namespace}.svc.cluster.local:4010`
3131

3232
const searchUrl = process.env.SEARCH_API_URL || searchService
33-
const endpoint =
34-
process.env.searchApiEnpoint ||
35-
(process.env.globalSearchFeatureFlag === 'enabled' ? '/federated' : '/searchapi/graphql')
33+
const endpoint = process.env.globalSearchFeatureFlag === 'enabled' ? '/federated' : '/searchapi/graphql'
3634
const url = new URL(searchUrl + endpoint)
3735
headers.authorization = `Bearer ${token}`
3836
headers.host = url.hostname

0 commit comments

Comments
 (0)