upcoming: [DPS-34879] - Delivery bugfixes after devcloud release (#12898)

kagora-akamai · web-flow · commit c63d15b6db44 · 2025-09-30T18:36:27.000+02:00
diff --git a/packages/api-v4/.changeset/pr-12898-upcoming-features-1758553903759.md b/packages/api-v4/.changeset/pr-12898-upcoming-features-1758553903759.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Logs Delivery Stream details type update and UpdateDestinationPayload update according to API docs ([#12898](https://github.com/linode/manager/pull/12898))
diff --git a/packages/api-v4/src/delivery/destinations.ts b/packages/api-v4/src/delivery/destinations.ts
@@ -1,4 +1,7 @@
-import { destinationSchema } from '@linode/validation';
+import {
+  createDestinationSchema,
+  updateDestinationSchema,
+} from '@linode/validation';
 
 import { BETA_API_ROOT } from '../constants';
 import Request, {
@@ -49,7 +52,7 @@ export const getDestinations = (params?: Params, filter?: Filter) =>
  */
 export const createDestination = (data: CreateDestinationPayload) =>
   Request<Destination>(
-    setData(data, destinationSchema),
+    setData(data, createDestinationSchema),
     setURL(`${BETA_API_ROOT}/monitor/streams/destinations`),
     setMethod('POST'),
   );
@@ -65,7 +68,7 @@ export const updateDestination = (
   data: UpdateDestinationPayload,
 ) =>
   Request<Destination>(
-    setData(data, destinationSchema),
+    setData(data, updateDestinationSchema),
     setURL(
       `${BETA_API_ROOT}/monitor/streams/destinations/${encodeURIComponent(destinationId)}`,
     ),
@@ -92,7 +95,7 @@ export const deleteDestination = (destinationId: number) =>
  */
 export const verifyDestination = (data: CreateDestinationPayload) =>
   Request<Destination>(
-    setData(data, destinationSchema),
+    setData(data, createDestinationSchema),
     setURL(`${BETA_API_ROOT}/monitor/streams/destinations/verify`),
     setMethod('POST'),
   );
diff --git a/packages/api-v4/src/delivery/types.ts b/packages/api-v4/src/delivery/types.ts
@@ -21,7 +21,7 @@ export interface AuditData {
 
 export interface Stream extends AuditData {
   destinations: Destination[];
-  details: StreamDetails;
+  details: StreamDetailsType;
   id: number;
   label: string;
   primary_destination_id: number;
@@ -36,6 +36,8 @@ export interface StreamDetails {
   is_auto_add_all_clusters_enabled?: boolean;
 }
 
+export type StreamDetailsType = null | StreamDetails;
+
 export const destinationType = {
   CustomHttps: 'custom_https',
   LinodeObjectStorage: 'linode_object_storage',
@@ -103,18 +105,17 @@ interface CustomHeader {
 
 export interface CreateStreamPayload {
   destinations: number[];
-  details: StreamDetails;
+  details?: StreamDetailsType;
   label: string;
   status?: StreamStatus;
   type: StreamType;
 }
 
 export interface UpdateStreamPayload {
   destinations: number[];
-  details: StreamDetails;
+  details?: StreamDetailsType;
   label: string;
   status: StreamStatus;
-  type: StreamType;
 }
 
 export interface UpdateStreamPayloadWithId extends UpdateStreamPayload {
@@ -136,7 +137,7 @@ export interface CreateDestinationPayload {
   type: DestinationType;
 }
 
-export type UpdateDestinationPayload = CreateDestinationPayload;
+export type UpdateDestinationPayload = Omit<CreateDestinationPayload, 'type'>;
 
 export interface UpdateDestinationPayloadWithId
   extends UpdateDestinationPayload {
diff --git a/packages/manager/.changeset/pr-12898-upcoming-features-1758554025685.md b/packages/manager/.changeset/pr-12898-upcoming-features-1758554025685.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Logs Delivery fixes after devcloud release ([#12898](https://github.com/linode/manager/pull/12898))
diff --git a/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx b/packages/manager/src/components/PrimaryNav/PrimaryNav.tsx
@@ -40,7 +40,6 @@ export type NavEntity =
   | 'Cloud Load Balancers'
   | 'Dashboard'
   | 'Databases'
-  | 'Delivery'
   | 'Domains'
   | 'Firewalls'
   | 'Help & Support'
@@ -49,6 +48,7 @@ export type NavEntity =
   | 'Kubernetes'
   | 'Linodes'
   | 'Login History'
+  | 'Logs'
   | 'Longview'
   | 'Maintenance'
   | 'Managed'
@@ -240,7 +240,7 @@ export const PrimaryNav = (props: PrimaryNavProps) => {
                 to: '/longview',
               },
               {
-                display: 'Delivery',
+                display: 'Logs',
                 hide: !flags.aclpLogs?.enabled,
                 to: '/logs/delivery',
                 isBeta: flags.aclpLogs?.beta,
diff --git a/packages/manager/src/factories/delivery.ts b/packages/manager/src/factories/delivery.ts
@@ -27,7 +27,7 @@ export const streamFactory = Factory.Sync.makeFactory<Stream>({
   destinations: Factory.each(() => [
     { ...destinationFactory.build(), id: 123 },
   ]),
-  details: {},
+  details: null,
   updated: '2025-07-30',
   updated_by: 'username',
   id: Factory.each((id) => id),
diff --git a/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx b/packages/manager/src/features/Delivery/Destinations/DestinationForm/DestinationEdit.tsx
@@ -4,7 +4,7 @@ import {
   useDestinationQuery,
   useUpdateDestinationMutation,
 } from '@linode/queries';
-import { Box, CircleProgress, ErrorState } from '@linode/ui';
+import { Box, CircleProgress, ErrorState, omitProps } from '@linode/ui';
 import { destinationFormSchema } from '@linode/validation';
 import { useNavigate, useParams } from '@tanstack/react-router';
 import { enqueueSnackbar } from 'notistack';
@@ -80,7 +80,7 @@ export const DestinationEdit = () => {
   const onSubmit = () => {
     const destination: UpdateDestinationPayloadWithId = {
       id: destinationId,
-      ...form.getValues(),
+      ...omitProps(form.getValues(), ['type']),
     };
 
     updateDestination(destination)
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.test.tsx
@@ -86,6 +86,9 @@ describe('StreamFormDelivery', () => {
             label: '',
             type: destinationType.LinodeObjectStorage,
           },
+          stream: {
+            destinations: [],
+          },
         },
       },
     });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/Delivery/StreamFormDelivery.tsx
@@ -67,11 +67,19 @@ export const StreamFormDelivery = () => {
     name: 'stream.destinations',
   });
 
-  const destinationNameFilterOptions = createFilterOptions<DestinationName>();
+  const destinationNameFilterOptions = createFilterOptions<DestinationName>({
+    stringify: (destination) => destination.label,
+  });
 
   const findDestination = (id: number) =>
     destinations?.find((destination) => destination.id === id);
 
+  const restDestinationForm = () => {
+    Object.values(controlPaths).forEach((controlPath) =>
+      setValue(controlPath, '')
+    );
+  };
+
   const getDestinationForm = () => (
     <>
       <Controller
@@ -121,6 +129,10 @@ export const StreamFormDelivery = () => {
             onChange={(_, newValue) => {
               const id = newValue?.id;
 
+              if (id === undefined && selectedDestinations.length > 0) {
+                restDestinationForm();
+              }
+
               setValue('stream.destinations', id ? [id] : []);
               const selectedDestination = id ? findDestination(id) : undefined;
               if (selectedDestination) {
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamCreate.tsx
@@ -33,7 +33,8 @@ export const StreamCreate = () => {
     defaultValues: {
       stream: {
         type: streamType.AuditLogs,
-        details: {},
+        details: null,
+        destinations: [],
       },
       destination: {
         type: destinationType.LinodeObjectStorage,
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.test.tsx
@@ -97,6 +97,26 @@ describe('StreamEdit', () => {
           { exact: false }
         );
         await userEvent.click(createNewTestDestination);
+        const hostInput = screen.getByLabelText('Host');
+        await waitFor(() => {
+          expect(hostInput).toBeDefined();
+        });
+        await userEvent.type(hostInput, 'Test');
+        const bucketInput = screen.getByLabelText('Bucket');
+        await userEvent.type(bucketInput, 'Test');
+        const regionAutocomplete = screen.getByLabelText('Region');
+        await userEvent.click(regionAutocomplete);
+        await userEvent.type(regionAutocomplete, 'US, Chi');
+        const chicagoRegion = await screen.findByText(
+          'US, Chicago, IL (us-ord)'
+        );
+        await userEvent.click(chicagoRegion);
+        const accessKeyIDInput = screen.getByLabelText('Access Key ID');
+        await userEvent.type(accessKeyIDInput, 'Test');
+        const secretAccessKeyInput = screen.getByLabelText('Secret Access Key');
+        await userEvent.type(secretAccessKeyInput, 'Test');
+        const logPathPrefixInput = screen.getByLabelText('Log Path Prefix');
+        await userEvent.type(logPathPrefixInput, 'Test');
       };
 
       describe('when form properly filled out and Test Connection button clicked and connection verified positively', () => {
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamEdit.tsx
@@ -51,7 +51,8 @@ export const StreamEdit = () => {
     defaultValues: {
       stream: {
         type: streamType.AuditLogs,
-        details: {},
+        details: null,
+        destinations: [],
       },
       destination: {
         type: destinationType.LinodeObjectStorage,
@@ -66,15 +67,14 @@ export const StreamEdit = () => {
   });
 
   useEffect(() => {
-    if (stream) {
-      const details =
-        Object.keys(stream.details).length > 0
-          ? {
-              is_auto_add_all_clusters_enabled: false,
-              cluster_ids: [],
-              ...stream.details,
-            }
-          : {};
+    if (stream && destinations) {
+      const details = stream.details
+        ? {
+            is_auto_add_all_clusters_enabled: false,
+            cluster_ids: [],
+            ...stream.details,
+          }
+        : null;
 
       const streamsDestinationIds = stream.destinations.map(({ id }) => id);
       const destination = destinations?.find(
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamForm.tsx
@@ -27,7 +27,6 @@ import { StreamFormDelivery } from 'src/features/Delivery/Streams/StreamForm/Del
 import { StreamFormClusters } from './Clusters/StreamFormClusters';
 import { StreamFormGeneralInfo } from './StreamFormGeneralInfo';
 
-import type { UpdateDestinationPayload } from '@linode/api-v4';
 import type { FormMode } from 'src/features/Delivery/Shared/types';
 import type { StreamAndDestinationFormType } from 'src/features/Delivery/Streams/StreamForm/types';
 
@@ -87,9 +86,7 @@ export const StreamForm = (props: StreamFormProps) => {
     let destinationId = destinations?.[0];
     if (!destinationId) {
       try {
-        const destinationPayload:
-          | CreateDestinationPayload
-          | UpdateDestinationPayload = {
+        const destinationPayload: CreateDestinationPayload = {
           ...destination,
           details: getDestinationPayloadDetails(destination.details),
         };
@@ -133,7 +130,6 @@ export const StreamForm = (props: StreamFormProps) => {
         await updateStream({
           id: streamId,
           label,
-          type,
           status: status as StreamStatus,
           destinations: [destinationId],
           details: payloadDetails,
@@ -186,7 +182,7 @@ export const StreamForm = (props: StreamFormProps) => {
           <FormSubmitBar
             blockSubmit={!selectedDestinations?.length}
             connectionTested={destinationVerified}
-            destinationType={destination.type}
+            destinationType={destination?.type}
             formType={'stream'}
             isSubmitting={isSubmitting}
             isTesting={isVerifyingDestination}
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx b/packages/manager/src/features/Delivery/Streams/StreamForm/StreamFormGeneralInfo.tsx
@@ -26,7 +26,7 @@ export const StreamFormGeneralInfo = (props: StreamFormGeneralInfoProps) => {
     if (value === streamType.LKEAuditLogs) {
       setValue('stream.details.is_auto_add_all_clusters_enabled', false);
     } else {
-      setValue('stream.details', {});
+      setValue('stream.details', null);
     }
   };
 
diff --git a/packages/manager/src/features/Delivery/Streams/StreamForm/types.ts b/packages/manager/src/features/Delivery/Streams/StreamForm/types.ts
@@ -1,7 +1,11 @@
-import type { CreateStreamPayload } from '@linode/api-v4';
+import type { CreateStreamPayload, StreamDetailsType } from '@linode/api-v4';
 import type { DestinationFormType } from 'src/features/Delivery/Shared/types';
 
+export interface StreamFromType extends Omit<CreateStreamPayload, 'details'> {
+  details: StreamDetailsType;
+}
+
 export interface StreamAndDestinationFormType {
   destination: DestinationFormType;
-  stream: CreateStreamPayload;
+  stream: StreamFromType;
 }
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.test.tsx
@@ -186,8 +186,7 @@ describe('Streams Landing Table', () => {
           status: 'inactive',
           label: 'Stream 1',
           destinations: [123],
-          details: {},
-          type: 'audit_logs',
+          details: null,
         });
       });
     });
@@ -209,8 +208,7 @@ describe('Streams Landing Table', () => {
           status: 'active',
           label: 'Stream 1',
           destinations: [123],
-          details: {},
-          type: 'audit_logs',
+          details: null,
         });
       });
     });
diff --git a/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx b/packages/manager/src/features/Delivery/Streams/StreamsLanding.tsx
@@ -63,7 +63,7 @@ export const StreamsLanding = () => {
       label: { '+contains': search?.label },
     }),
     ...(search?.status !== undefined && {
-      status: { '+contains': search?.status },
+      status: search?.status,
     }),
   };
 
@@ -147,15 +147,13 @@ export const StreamsLanding = () => {
     destinations,
     details,
     label,
-    type,
     status,
   }: Stream) => {
     updateStream({
       id,
       destinations: destinations.map(({ id: destinationId }) => destinationId),
       details,
       label,
-      type,
       status:
         status === streamStatus.Active
           ? streamStatus.Inactive
diff --git a/packages/manager/src/features/Delivery/deliveryUtils.ts b/packages/manager/src/features/Delivery/deliveryUtils.ts
diff --git a/packages/manager/src/mocks/presets/crud/handlers/delivery.ts b/packages/manager/src/mocks/presets/crud/handlers/delivery.ts
diff --git a/packages/validation/.changeset/pr-12898-upcoming-features-1758553940234.md b/packages/validation/.changeset/pr-12898-upcoming-features-1758553940234.md
diff --git a/packages/validation/src/delivery.schema.ts b/packages/validation/src/delivery.schema.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@linode/api-v4": Upcoming Features
 +---
++
 +Logs Delivery Stream details type update and UpdateDestinationPayload update according to API docs ([#12898](https://github.com/linode/manager/pull/12898))