Skip to content

Commit 902a6c7

Browse files
committed
inline dp features and allow individual fixtures
Signed-off-by: schogges <[email protected]>
1 parent e6a6985 commit 902a6c7

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

packages/kuma-http-api/mocks/Env.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,7 @@ export type Env = keyof {
4141
KUMA_DATAPLANE_TLS_ISSUED_MESHIDENTITY: string
4242
KUMA_MESHIDENTITY_COUNT: string
4343
KUMA_MESHTRUST_COUNT: string
44+
KUMA_DATAPLANE_TRANSPARENT_PROXY: string
45+
KUMA_DATAPLANE_BIND_OUTBOUNDS: string
46+
KUMA_DATAPLANE_TCP_ACCESSLOG_VIA_NAMED_PIPE: string
4447
}

packages/kuma-http-api/mocks/FakeKuma.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,14 +307,6 @@ gbXR5RnEs0hDxugaIknJMKk1b0g=
307307
}
308308
}
309309

310-
dataplaneFeatures() {
311-
return this.faker.helpers.arrayElements([
312-
'feature-tcp-accesslog-via-named-pipe',
313-
'feature-transparent-proxy-in-dataplane-metadata',
314-
'feature-bind-outbounds',
315-
])
316-
}
317-
318310
ruleMatch({ kind }: { kind?: 'path' | 'method' | 'headers' | 'queryParams' } = { kind: 'path' }) {
319311
const _kind = kind ?? this.faker.helpers.arrayElement<'path' | 'method' | 'headers' | 'queryParams'>(['path', 'method', 'headers', 'queryParams'])
320312

packages/kuma-http-api/mocks/src/meshes/_/dataplanes/_/_overview.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ export default ({ env, fake }: Dependencies): ResponseHandler => (req) => {
2020
const unifiedResourceNaming = env('KUMA_DATAPLANE_RUNTIME_UNIFIED_RESOURCE_NAMING_ENABLED', '')
2121
const isTlsIssuedMeshIdentity = env('KUMA_DATAPLANE_TLS_ISSUED_MESHIDENTITY', `${fake.datatype.boolean()}`) === 'true'
2222
const isUnifiedResourceNamingEnabled = unifiedResourceNaming.length ? unifiedResourceNaming === 'true' : fake.datatype.boolean()
23+
const isTransparentProxyingEnabled = env('KUMA_DATAPLANE_TRANSPARENT_PROXY', `${fake.datatype.boolean()}`) === 'true'
24+
const isBindOutboundsEnabled = env('KUMA_DATAPLANE_BIND_OUTBOUNDS', `${fake.datatype.boolean()}`) === 'true'
25+
const isTcpAccesslogViaNamedPipeEnabled = env('KUMA_DATAPLANE_TCP_ACCESSLOG_VIA_NAMED_PIPE', `${fake.datatype.boolean()}`) === 'true'
2326

2427
const outboundCount = parseInt(env('KUMA_DATAPLANEOUTBOUND_COUNT', `${fake.number.int({ min: 1, max: 10 })}`))
2528
const subscriptionCount = parseInt(env('KUMA_SUBSCRIPTION_COUNT', `${fake.number.int({ min: 1, max: 10 })}`))
@@ -180,9 +183,11 @@ export default ({ env, fake }: Dependencies): ResponseHandler => (req) => {
180183
}),
181184
metadata: {
182185
features: [
183-
...fake.kuma.dataplaneFeatures(),
184-
...(isUnifiedResourceNamingEnabled ? ['feature-unified-resource-naming'] : []),
185-
],
186+
...(isTcpAccesslogViaNamedPipeEnabled ? ['feature-tcp-accesslog-via-named-pipe'] : []),
187+
...(isTransparentProxyingEnabled ? ['feature-transparent-proxy-in-dataplane-metadata'] : []),
188+
...(isUnifiedResourceNamingEnabled ? ['feature-unified-resource-naming'] : []),
189+
...(isBindOutboundsEnabled ? ['feature-bind-outbounds'] : []),
190+
]
186191
},
187192
},
188193
},

0 commit comments

Comments
 (0)