feat: Format secondary native plugins

Author: wzrdx

src/components/draft/job-rundowns/NativeJobsCostRundown.tsx

@@ -3,6 +3,7 @@ import { PLUGIN_SIGNATURE_TYPES } from '@data/pluginSignatureTypes';
 import { getContainerOrWorkerTypeDescription } from '@lib/deeploy-utils';
 import JobsCostRundown from '@shared/jobs/drafts/JobsCostRundown';
 import { NativeDraftJob } from '@typedefs/deeploys';
+import { GenericSecondaryPlugin, SecondaryPlugin, SecondaryPluginType } from '@typedefs/steps/deploymentStepTypes';
 import { RiTerminalBoxLine } from 'react-icons/ri';
 
 export default function NativeJobsCostRundown({ jobs }: { jobs: NativeDraftJob[] }) {
@@ -56,9 +57,20 @@ export default function NativeJobsCostRundown({ jobs }: { jobs: NativeDraftJob[]
                     entries.push({
                         label: 'Secondary Plugins',
                         value: nativeJob.deployment.secondaryPlugins
-                            .map((plugin) =>
-                                plugin.deploymentType.type === 'container' ? 'Container App Runner' : 'Worker App Runner',
-                            )
+                            .map((plugin: SecondaryPlugin) => {
+                                switch (plugin.secondaryPluginType) {
+                                    case SecondaryPluginType.Generic:
+                                        return (plugin as GenericSecondaryPlugin).deploymentType.type === 'container'
+                                            ? 'Container App Runner'
+                                            : 'Worker App Runner';
+
+                                    case SecondaryPluginType.Native:
+                                        return 'Native Plugin';
+
+                                    default:
+                                        return '';
+                                }
+                            })
                             .join(', '),
                     });
                 }

src/lib/deeploy-utils.ts

@@ -23,7 +23,7 @@ import {
     ServiceJobDeployment,
     ServiceJobSpecifications,
 } from '@typedefs/deeploys';
-import { GenericSecondaryPlugin, SecondaryPluginType } from '@typedefs/steps/deploymentStepTypes';
+import { GenericSecondaryPlugin, NativeSecondaryPlugin, SecondaryPluginType } from '@typedefs/steps/deploymentStepTypes';
 import { addDays, addHours, differenceInDays, differenceInHours } from 'date-fns';
 import _ from 'lodash';
 import { FieldValues, UseFieldArrayAppend, UseFieldArrayRemove } from 'react-hook-form';
@@ -217,6 +217,12 @@ export const formatGenericJobVariables = (plugin: GenericSecondaryPlugin) => {
     };
 };
 
+export const formatNativeJobPluginSignature = (plugin: NativeSecondaryPlugin) => {
+    return plugin.pluginSignature === PLUGIN_SIGNATURE_TYPES[PLUGIN_SIGNATURE_TYPES.length - 1]
+        ? plugin.customPluginSignature
+        : plugin.pluginSignature;
+};
+
 export const formatGenericPluginConfigAndSignature = (
     resources: {
         cpu: number;
@@ -318,13 +324,6 @@ export const formatNativeJobPayload = (
 ) => {
     const jobTags = formatJobTags(specifications);
 
-    const customParams: Record<string, string> = {};
-    deployment.customParams.forEach((param) => {
-        if (param.key) {
-            customParams[param.key] = param.value;
-        }
-    });
-
     const pipelineParams: Record<string, string> = {};
     deployment.pipelineParams.forEach((param) => {
         if (param.key) {
@@ -342,31 +341,28 @@ export const formatNativeJobPayload = (
 
     // Primary plugin configuration
     const primaryPluginConfig: any = {
-        plugin_signature:
-            deployment.pluginSignature === PLUGIN_SIGNATURE_TYPES[PLUGIN_SIGNATURE_TYPES.length - 1]
-                ? deployment.customPluginSignature
-                : deployment.pluginSignature,
+        plugin_signature: formatNativeJobPluginSignature(deployment),
         PORT: deployment.port,
         CLOUDFLARE_TOKEN: deployment.tunnelingToken || null,
         TUNNEL_ENGINE_ENABLED: deployment.enableTunneling === 'True',
         NGROK_USE_API: true,
-        ENV: {},
-        DYNAMIC_ENV: {},
     };
 
-    if (!_.isEmpty(customParams)) {
-        Object.assign(primaryPluginConfig, customParams);
+    if (!_.isEmpty(deployment.customParams)) {
+        deployment.customParams.forEach((param) => {
+            if (param.key) {
+                primaryPluginConfig[param.key] = param.value;
+            }
+        });
     }
 
     // Build plugins array starting with the primary plugin
     const plugins = [primaryPluginConfig];
 
     // Add secondary plugins if they exist
     if (deployment.secondaryPlugins.length) {
-        // TODO: Implement native secondary plugin configuration
-        const secondaryPluginConfigs = deployment.secondaryPlugins
-            .filter((plugin) => plugin.secondaryPluginType === SecondaryPluginType.Generic)
-            .map((plugin) => {
+        const secondaryPluginConfigs = deployment.secondaryPlugins.map((plugin) => {
+            if (plugin.secondaryPluginType === SecondaryPluginType.Generic) {
                 const { pluginConfig, pluginSignature } = formatGenericPluginConfigAndSignature(
                     nodeResources,
                     plugin as GenericSecondaryPlugin,
@@ -376,7 +372,30 @@ export const formatNativeJobPayload = (
                     plugin_signature: pluginSignature,
                     ...pluginConfig,
                 };
-            });
+            }
+
+            if (plugin.secondaryPluginType === SecondaryPluginType.Native) {
+                const nativePlugin = plugin as NativeSecondaryPlugin;
+
+                const nativePluginConfig: any = {
+                    plugin_signature: formatNativeJobPluginSignature(nativePlugin),
+                    PORT: nativePlugin.port,
+                    CLOUDFLARE_TOKEN: nativePlugin.tunnelingToken || null,
+                    TUNNEL_ENGINE_ENABLED: nativePlugin.enableTunneling === 'True',
+                    NGROK_USE_API: true,
+                };
+
+                if (!_.isEmpty(nativePlugin.customParams)) {
+                    nativePlugin.customParams.forEach((param) => {
+                        if (param.key) {
+                            nativePluginConfig[param.key] = param.value;
+                        }
+                    });
+                }
+
+                return nativePluginConfig;
+            }
+        });
 
         plugins.push(...secondaryPluginConfigs);
     }