Skip to content

Commit dff5cac

Browse files
DhariniJeevaDhariniJeeva
authored
refactor: 💡 worker filter feature flags (#2720)
1 parent ecd0c1d commit dff5cac

File tree

16 files changed

+35
-39
lines changed

16 files changed

+35
-39
lines changed

‎ui/admin/app/components/credential-stores/credential-store/actions/index.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{{t 'resources.credential.actions.create'}}
1919
</dd.Interactive>
2020
{{/if}}
21-
{{#if (and (feature-flag 'vault-worker-filter') @model.isVault)}}
21+
{{#if (and (feature-flag 'worker-filter') @model.isVault)}}
2222
<dd.Interactive
2323
@route='scopes.scope.credential-stores.credential-store.edit-worker-filter'
2424
>

‎ui/admin/app/components/credential-stores/credential-store/nav/index.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{{t 'titles.details'}}
99
</nav.link>
1010
{{#if @model.isVault}}
11-
{{#if (feature-flag 'vault-worker-filter')}}
11+
{{#if (feature-flag 'worker-filter')}}
1212
<nav.link
1313
@route='scopes.scope.credential-stores.credential-store.worker-filter'
1414
>

‎ui/admin/app/components/form/credential-store/vault/index.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</Hds::Form::TextInput::Field>
119119

120120
{{! worker_filter }}
121-
{{#if (and (feature-flag 'vault-worker-filter') @model.isNew)}}
121+
{{#if (and (feature-flag 'worker-filter') @model.isNew)}}
122122
{{#let (unique-id) (unique-id) as |labelId helpId|}}
123123
<Hds::Form::Fieldset
124124
@isOptional={{true}}

‎ui/admin/app/components/form/host-catalog/aws/index.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350
</Hds::Form::TextInput::Field>
351351
{{/if}}
352352

353-
{{#if (feature-flag 'host-catalog-worker-filter')}}
353+
{{#if (feature-flag 'worker-filter')}}
354354
<Hds::Form::Textarea::Field
355355
name='worker_filter'
356356
@value={{@model.worker_filter}}

‎ui/admin/app/components/form/host-catalog/gcp/index.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
{{/if}}
258258
</Hds::Form::Textarea::Field>
259259

260-
{{#if (feature-flag 'host-catalog-worker-filter')}}
260+
{{#if (feature-flag 'worker-filter')}}
261261
<Hds::Form::Textarea::Field
262262
name='worker_filter'
263263
@value={{@model.worker_filter}}

‎ui/admin/app/components/worker-diagram/dual-filter/hcp/index.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{{t 'resources.target.workers.diagram.client'}}
5252
</D.Item>
5353
<D.Item @icon='settings'>
54-
{{#if (feature-flag 'target-worker-filters-v2-hcp')}}
54+
{{#if (feature-flag 'worker-filter-hcp')}}
5555
{{t 'resources.target.workers.diagram.hcp-worker'}}
5656
{{else}}
5757
{{t 'resources.target.workers.diagram.frontline-worker'}}

‎ui/admin/app/components/worker-diagram/index.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
}}
55

66
<div class='worker-diagram'>
7-
{{#if (feature-flag 'target-worker-filters-v2-ingress')}}
8-
{{#if (feature-flag 'target-worker-filters-v2-hcp')}}
7+
{{#if (feature-flag 'worker-filter')}}
8+
{{#if (feature-flag 'worker-filter-hcp')}}
99
<WorkerDiagram::DualFilter::Hcp
1010
@egressWorkerFilterEnabled={{@egressWorkerFilterEnabled}}
1111
@ingressWorkerFilterEnabled={{@ingressWorkerFilterEnabled}}

‎ui/admin/app/templates/scopes/scope/targets/target/workers.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
@ingressWorkerFilterEnabled={{@model.ingress_worker_filter}}
4040
/>
4141
<Hds::Accordion as |A|>
42-
{{#if (feature-flag 'target-worker-filters-v2-ingress')}}
42+
{{#if (feature-flag 'worker-filter')}}
4343
<A.Item
4444
@containsInteractive={{true}}
4545
@isOpen={{@model.ingress_worker_filter}}

‎ui/admin/config/features.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ const baseEdition = {
2323
'byow-pki-hcp-cluster-id': false,
2424
'json-credentials': false,
2525
'static-credentials': false,
26-
'target-worker-filters-v2-ingress': false,
27-
'target-worker-filters-v2-hcp': false,
2826
'target-network-address': false,
29-
'vault-worker-filter': false,
3027
'ldap-auth-methods': false,
31-
'host-catalog-worker-filter': false,
28+
'worker-filter': false,
29+
'worker-filter-hcp': false,
3230
};
3331
// Editions maps edition keys to their associated featuresets.
3432
const featureEditions = {};
@@ -42,14 +40,12 @@ featureEditions.oss = {
4240
};
4341
featureEditions.enterprise = {
4442
...featureEditions.oss,
45-
'target-worker-filters-v2-ingress': true,
46-
'vault-worker-filter': true,
47-
'host-catalog-worker-filter': true,
43+
'worker-filter': true,
4844
};
4945
featureEditions.hcp = {
5046
...featureEditions.enterprise,
5147
'byow-pki-hcp-cluster-id': true,
52-
'target-worker-filters-v2-hcp': true,
48+
'worker-filter-hcp': true,
5349
};
5450

5551
module.exports = {

‎ui/admin/tests/acceptance/credential-store/create-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ module('Acceptance | credential-stores | create', function (hooks) {
9191

9292
test('Users can create a new credential store of type vault with a worker filter', async function (assert) {
9393
featuresService.enable('static-credentials');
94-
featuresService.enable('vault-worker-filter');
94+
featuresService.enable('worker-filter');
9595
const count = getVaultCredentialStoresCount();
9696
await visit(urls.newCredentialStore);
9797

‎ui/admin/tests/acceptance/credential-store/update-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module('Acceptance | credential-stores | update', function (hooks) {
6363

6464
// Enable feature flag
6565
const featuresService = this.owner.lookup('service:features');
66-
featuresService.enable('vault-worker-filter');
66+
featuresService.enable('worker-filter');
6767
});
6868

6969
test('can save changes to existing static credential store', async function (assert) {

‎ui/admin/tests/acceptance/host-catalogs/create-test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,13 @@ module('Acceptance | host-catalogs | create', function (hooks) {
231231
});
232232

233233
test('users should see worker filter field in enterprise edition when AWS host catalog is selected', async function (assert) {
234-
featuresService.enable('host-catalog-worker-filter');
234+
featuresService.enable('worker-filter');
235235
await visit(urls.newAWSDynamicHostCatalog);
236236
assert.dom(WORKER_FILTER_INPUT_SELECTOR).isVisible();
237237
});
238238

239239
test('users should see worker filter field in enterprise edition when GCP host catalog is selected', async function (assert) {
240-
featuresService.enable('host-catalog-worker-filter');
240+
featuresService.enable('worker-filter');
241241
await visit(urls.newAWSDynamicHostCatalog);
242242
assert.dom(WORKER_FILTER_INPUT_SELECTOR).isVisible();
243243
});

‎ui/admin/tests/acceptance/targets/workers-test.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ module('Acceptance | targets | workers', function (hooks) {
161161
assert.dom(CODE_BLOCK_SELECTOR('egress')).doesNotExist();
162162
});
163163

164-
test('user can view egress and ingress filters when `target-worker-filters-v2-ingress` is enabled', async function (assert) {
165-
featuresService.enable('target-worker-filters-v2-ingress');
164+
test('user can view egress and ingress filters when `worker-filter` is enabled', async function (assert) {
165+
featuresService.enable('worker-filter');
166166
await visit(urls.target);
167167

168168
await click(`[href="${urls.targetWorkers}"]`);
@@ -175,8 +175,8 @@ module('Acceptance | targets | workers', function (hooks) {
175175
.hasText(instances.target.egress_worker_filter);
176176
});
177177

178-
test('user can only view egress filter when `target-worker-filters-v2-ingress` is disabled', async function (assert) {
179-
featuresService.disable('target-worker-filters-v2-ingress');
178+
test('user can only view egress filter when `worker-filter` is disabled', async function (assert) {
179+
featuresService.disable('worker-filter');
180180
await visit(urls.target);
181181

182182
await click(`[href="${urls.targetWorkers}"]`);
@@ -187,8 +187,8 @@ module('Acceptance | targets | workers', function (hooks) {
187187
.hasText(instances.target.egress_worker_filter);
188188
});
189189

190-
test('user can save ingress worker filter to a target when `target-worker-filters-v2-ingress` is enabled', async function (assert) {
191-
featuresService.enable('target-worker-filters-v2-ingress');
190+
test('user can save ingress worker filter to a target when `worker-filter` is enabled', async function (assert) {
191+
featuresService.enable('worker-filter');
192192
instances.target.update({ ingress_worker_filter: '' });
193193
const ingressWorkerFilter = '"random" in "/worker/filters"';
194194
await visit(urls.target);
@@ -205,8 +205,8 @@ module('Acceptance | targets | workers', function (hooks) {
205205
assert.dom(CODE_BLOCK_SELECTOR('ingress')).hasText(ingressWorkerFilter);
206206
});
207207

208-
test('user can cancel changes to ingress worker filter in a target when `target-worker-filters-v2-ingress` is enabled', async function (assert) {
209-
featuresService.enable('target-worker-filters-v2-ingress');
208+
test('user can cancel changes to ingress worker filter in a target when `worker-filter` is enabled', async function (assert) {
209+
featuresService.enable('worker-filter');
210210
const ingressWorkerFilter = '"random" in "/worker/filters"';
211211
await visit(urls.target);
212212

@@ -246,7 +246,7 @@ module('Acceptance | targets | workers', function (hooks) {
246246
});
247247

248248
test('user will see "Add worker filter" if no filter set', async function (assert) {
249-
featuresService.enable('target-worker-filters-v2-ingress');
249+
featuresService.enable('worker-filter');
250250
instances.target.update({
251251
egress_worker_filter: '',
252252
ingress_worker_filter: '',
@@ -264,7 +264,7 @@ module('Acceptance | targets | workers', function (hooks) {
264264
});
265265

266266
test('user will see "Edit worker filter" if filter is set', async function (assert) {
267-
featuresService.enable('target-worker-filters-v2-ingress');
267+
featuresService.enable('worker-filter');
268268
await visit(urls.target);
269269

270270
await click(`[href="${urls.targetWorkers}"]`);
@@ -296,7 +296,7 @@ module('Acceptance | targets | workers', function (hooks) {
296296
});
297297

298298
test('can discard unsaved ingress worker filter changes in a target via dialog', async function (assert) {
299-
featuresService.enable('target-worker-filters-v2-ingress');
299+
featuresService.enable('worker-filter');
300300
const confirmService = this.owner.lookup('service:confirm');
301301
confirmService.enabled = true;
302302
const ingressWorkerFilter = '"random" in "/worker/filters"';
@@ -321,7 +321,7 @@ module('Acceptance | targets | workers', function (hooks) {
321321
});
322322

323323
test('can click cancel on discard dialog box for unsaved ingress worker filter changes', async function (assert) {
324-
featuresService.enable('target-worker-filters-v2-ingress');
324+
featuresService.enable('worker-filter');
325325
const confirmService = this.owner.lookup('service:confirm');
326326
confirmService.enabled = true;
327327
const ingressWorkerFilter = '"random" in "/worker/filters"';

‎ui/admin/tests/integration/components/worker-diagram/dual-filter/hcp/index-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module(
1616
setupIntl(hooks, 'en-us');
1717

1818
let featuresService;
19-
const targetWorkerFilterHCP = 'target-worker-filters-v2-hcp';
19+
const targetWorkerFilterHCP = 'worker-filter-hcp';
2020

2121
hooks.beforeEach(function () {
2222
featuresService = this.owner.lookup('service:features');

‎ui/admin/tests/integration/components/worker-diagram/dual-filter/index-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module(
1616
setupIntl(hooks, 'en-us');
1717

1818
let featuresService;
19-
const targetWorkerFilterIngress = 'target-worker-filters-v2-ingress';
19+
const targetWorkerFilterIngress = 'worker-filter';
2020

2121
hooks.beforeEach(function () {
2222
featuresService = this.owner.lookup('service:features');

‎ui/admin/tests/integration/components/worker-diagram/index-test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ module('Integration | Component | worker-diagram/index', function (hooks) {
1414
setupIntl(hooks, 'en-us');
1515

1616
let featuresService;
17-
const targetWorkerFilterIngress = 'target-worker-filters-v2-ingress';
18-
const targetWorkerFilterHCP = 'target-worker-filters-v2-hcp';
17+
const targetWorkerFilterIngress = 'worker-filter';
18+
const targetWorkerFilterHCP = 'worker-filter-hcp';
1919

2020
test('it renders a single filter diagram', async function (assert) {
2121
featuresService = this.owner.lookup('service:features');
@@ -25,7 +25,7 @@ module('Integration | Component | worker-diagram/index', function (hooks) {
2525
assert.dom('[data-test-single-filter-egress-off]').isVisible();
2626
});
2727

28-
test('it renders a dual filter diagram when `target-worker-filters-v2-ingress` is enabled', async function (assert) {
28+
test('it renders a dual filter diagram when `worker-filter` is enabled', async function (assert) {
2929
featuresService = this.owner.lookup('service:features');
3030
featuresService.enable(targetWorkerFilterIngress);
3131
assert.true(featuresService.isEnabled(targetWorkerFilterIngress));
@@ -35,7 +35,7 @@ module('Integration | Component | worker-diagram/index', function (hooks) {
3535
assert.dom('[data-test-dual-filter-egress-off-ingress-off]').isVisible();
3636
});
3737

38-
test('it renders an HCP dual filter diagram when `target-worker-filters-v2-hcp` is enabled', async function (assert) {
38+
test('it renders an HCP dual filter diagram when `worker-filter-hcp` is enabled', async function (assert) {
3939
featuresService = this.owner.lookup('service:features');
4040
featuresService.enable(targetWorkerFilterIngress);
4141
featuresService.enable(targetWorkerFilterHCP);

0 commit comments

Comments
 (0)