Skip to content

Commit 973cd08

Browse files
mduda-akamaiabailly-akamai
mduda-akamai
authored and
abailly-akamai
committed
change: [DPS-35856] Logs: limit access to "lke_audit_logs" type based on capability (#13171)
1 parent f518c22 commit 973cd08

6 files changed

Lines changed: 113 additions & 24 deletions

File tree

‎packages/api-v4/.changeset/pr-13171-added-1764924231615.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/api-v4": Added
3+
---
4+
5+
`Akamai Cloud Pulse Logs LKE-E Audit ` to the `AccountCapability` type ([#13171](https://github.com/linode/manager/pull/13171))

‎packages/api-v4/src/account/types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ export const accountCapabilities = [
6363
'Akamai Cloud Load Balancer',
6464
'Akamai Cloud Pulse',
6565
'Akamai Cloud Pulse Logs',
66+
'Akamai Cloud Pulse Logs LKE-E Audit',
6667
'Block Storage',
6768
'Block Storage Encryption',
6869
'Cloud Firewall',

‎packages/manager/.changeset/pr-13171-changed-1764924158682.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Changed
3+
---
4+
5+
Logs: in Stream Form limit access to "lke_audit_logs" type based on Akamai Cloud Pulse Logs LKE-E Audit capability ([#13171](https://github.com/linode/manager/pull/13171))

‎packages/manager/cypress/e2e/core/delivery/create-stream.spec.ts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { streamType } from '@linode/api-v4';
22
import { mockDestination } from 'support/constants/delivery';
3+
import { mockGetAccount } from 'support/intercepts/account';
34
import {
45
mockCreateDestination,
56
mockCreateStream,
@@ -12,9 +13,11 @@ import { ui } from 'support/ui';
1213
import { logsStreamForm } from 'support/ui/pages/logs-stream-form';
1314
import { randomLabel } from 'support/util/random';
1415

15-
import { kubernetesClusterFactory } from 'src/factories';
16+
import { accountFactory, kubernetesClusterFactory } from 'src/factories';
1617

1718
describe('Create Stream', () => {
19+
const account = accountFactory.build();
20+
1821
beforeEach(() => {
1922
mockAppendFeatureFlags({
2023
aclpLogs: {
@@ -23,6 +26,14 @@ describe('Create Stream', () => {
2326
bypassAccountCapabilities: true,
2427
},
2528
});
29+
30+
mockGetAccount({
31+
...account,
32+
capabilities: [
33+
...account.capabilities,
34+
'Akamai Cloud Pulse Logs LKE-E Audit',
35+
],
36+
});
2637
});
2738

2839
describe('given Audit Logs Stream Type', () => {

‎packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.test.tsx‎

Lines changed: 76 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,23 @@ import userEvent from '@testing-library/user-event';
44
import React from 'react';
55
import { describe, expect } from 'vitest';
66

7+
import { accountFactory } from 'src/factories';
78
import { renderWithThemeAndHookFormContext } from 'src/utilities/testHelpers';
89

910
import { StreamFormGeneralInfo } from './StreamFormGeneralInfo';
1011

12+
const queryMocks = vi.hoisted(() => ({
13+
useAccount: vi.fn().mockReturnValue({}),
14+
}));
15+
16+
vi.mock('@linode/queries', async () => {
17+
const actual = await vi.importActual('@linode/queries');
18+
return {
19+
...actual,
20+
useAccount: queryMocks.useAccount,
21+
};
22+
});
23+
1124
describe('StreamFormGeneralInfo', () => {
1225
describe('when in create mode', () => {
1326
it('should render Name input and allow to type text', async () => {
@@ -24,35 +37,77 @@ describe('StreamFormGeneralInfo', () => {
2437
});
2538
});
2639

27-
it('should render Stream type input and allow to select different options', async () => {
28-
renderWithThemeAndHookFormContext({
29-
component: <StreamFormGeneralInfo mode="create" />,
30-
useFormOptions: {
31-
defaultValues: {
32-
stream: {
33-
type: streamType.AuditLogs,
40+
describe('when user has Akamai Cloud Pulse Logs LKE-E Audit capability', () => {
41+
it('should render Stream type input and allow to select different options', async () => {
42+
const account = accountFactory.build({
43+
capabilities: ['Akamai Cloud Pulse Logs LKE-E Audit'],
44+
});
45+
46+
queryMocks.useAccount.mockReturnValue({
47+
data: account,
48+
isLoading: false,
49+
error: null,
50+
});
51+
52+
renderWithThemeAndHookFormContext({
53+
component: <StreamFormGeneralInfo mode="create" />,
54+
useFormOptions: {
55+
defaultValues: {
56+
stream: {
57+
type: streamType.AuditLogs,
58+
},
3459
},
3560
},
36-
},
37-
});
61+
});
3862

39-
const streamTypesAutocomplete = screen.getByRole('combobox');
63+
const streamTypesAutocomplete = screen.getByRole('combobox');
4064

41-
expect(streamTypesAutocomplete).toHaveValue('Audit Logs');
42-
43-
// Open the dropdown
44-
await userEvent.click(streamTypesAutocomplete);
65+
expect(streamTypesAutocomplete).toHaveValue('Audit Logs');
4566

46-
// Select the "Kubernetes API Audit Logs" option
47-
const kubernetesApiAuditLogs = await screen.findByText(
48-
'Kubernetes API Audit Logs'
49-
);
50-
await userEvent.click(kubernetesApiAuditLogs);
67+
// Open the dropdown
68+
await userEvent.click(streamTypesAutocomplete);
5169

52-
await waitFor(() => {
53-
expect(streamTypesAutocomplete).toHaveValue(
70+
// Select the "Kubernetes API Audit Logs" option
71+
const kubernetesApiAuditLogs = await screen.findByText(
5472
'Kubernetes API Audit Logs'
5573
);
74+
await userEvent.click(kubernetesApiAuditLogs);
75+
76+
await waitFor(() => {
77+
expect(streamTypesAutocomplete).toHaveValue(
78+
'Kubernetes API Audit Logs'
79+
);
80+
});
81+
});
82+
});
83+
84+
describe('when user does not have Akamai Cloud Pulse Logs LKE-E Audit capability', () => {
85+
it('should render disabled Stream type input with Audit Logs selected', async () => {
86+
const account = accountFactory.build({
87+
capabilities: [],
88+
});
89+
90+
queryMocks.useAccount.mockReturnValue({
91+
data: account,
92+
isLoading: false,
93+
error: null,
94+
});
95+
96+
renderWithThemeAndHookFormContext({
97+
component: <StreamFormGeneralInfo mode="create" />,
98+
useFormOptions: {
99+
defaultValues: {
100+
stream: {
101+
type: streamType.AuditLogs,
102+
},
103+
},
104+
},
105+
});
106+
107+
const streamTypesAutocomplete = screen.getByRole('combobox');
108+
109+
expect(streamTypesAutocomplete).toBeDisabled();
110+
expect(streamTypesAutocomplete).toHaveValue('Audit Logs');
56111
});
57112
});
58113
});

‎packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { streamType } from '@linode/api-v4';
2+
import { useAccount } from '@linode/queries';
23
import {
34
Autocomplete,
45
Box,
@@ -35,6 +36,10 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
3536

3637
const theme = useTheme();
3738
const { control, setValue } = useFormContext<StreamAndDestinationFormType>();
39+
const { data: account } = useAccount();
40+
const isLkeEAuditLogsTypeSelectionDisabled = !account?.capabilities?.includes(
41+
'Akamai Cloud Pulse Logs LKE-E Audit'
42+
);
3843

3944
const capitalizedMode = capitalize(mode);
4045
const description = {
@@ -47,8 +52,13 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
4752
audit_logs: `Logs Delivery Streams ${capitalizedMode}-Audit Logs`,
4853
lke_audit_logs: `Logs Delivery Streams ${capitalizedMode}-Kubernetes Audit Logs`,
4954
};
55+
56+
const filteredStreamTypeOptions = isLkeEAuditLogsTypeSelectionDisabled
57+
? streamTypeOptions.filter(({ value }) => value !== streamType.LKEAuditLogs)
58+
: streamTypeOptions;
59+
5060
const streamTypeOptionsWithPendo: AutocompleteOption[] =
51-
streamTypeOptions.map((option) => ({
61+
filteredStreamTypeOptions.map((option) => ({
5262
...option,
5363
pendoId: pendoIds[option.value as StreamType],
5464
}));
@@ -98,7 +108,9 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
98108
render={({ field, fieldState }) => (
99109
<Autocomplete
100110
disableClearable
101-
disabled={isFormInEditMode(mode)}
111+
disabled={
112+
isFormInEditMode(mode) || isLkeEAuditLogsTypeSelectionDisabled
113+
}
102114
errorText={fieldState.error?.message}
103115
label="Stream Type"
104116
onBlur={field.onBlur}

0 commit comments

Comments
 (0)