Resolves: MTV-3641 | address feedback

Signed-off-by: Jeff Puzzo <jpuzzo@redhat.com>

Author: jpuzz0

src/plans/create/steps/customization-scripts/ConfigMapSelect.tsx

@@ -1,20 +1,20 @@
 import { type ComponentProps, type ForwardedRef, forwardRef, useMemo } from 'react';
 
 import Select from '@components/common/Select';
+import type { IoK8sApiCoreV1ConfigMap } from '@forklift-ui/types';
 import { type K8sResourceCommon, useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { SelectList, SelectOption } from '@patternfly/react-core';
 import { getName } from '@utils/crds/common/selectors';
 import { isEmpty } from '@utils/helpers';
 import { useForkliftTranslation } from '@utils/i18n';
 
 import { CONFIG_MAP_GVK } from './constants';
-import type { K8sConfigMap } from './types';
 import { isScriptConfigMap } from './utils';
 
 type ConfigMapSelectProps = Pick<ComponentProps<typeof Select>, 'status'> & {
   id: string;
   namespace: string;
-  onSelect: (event: unknown, configMap: K8sConfigMap) => void;
+  onSelect: (event: unknown, configMap: IoK8sApiCoreV1ConfigMap) => void;
   testId?: string;
   value: string;
 };
@@ -31,14 +31,14 @@ const ConfigMapSelect = (
     namespace,
   });
 
-  const scriptConfigMaps = useMemo((): K8sConfigMap[] => {
+  const scriptConfigMaps = useMemo((): IoK8sApiCoreV1ConfigMap[] => {
     if (!allConfigMaps) {
       return [];
     }
 
     return allConfigMaps.filter((cm) =>
-      isScriptConfigMap((cm as K8sConfigMap).data),
-    ) as K8sConfigMap[];
+      isScriptConfigMap((cm as IoK8sApiCoreV1ConfigMap).data),
+    ) as IoK8sApiCoreV1ConfigMap[];
   }, [allConfigMaps]);
 
   const hasNoScriptConfigMaps = isEmpty(scriptConfigMaps);

src/plans/create/steps/customization-scripts/types.ts

@@ -1,11 +1,5 @@
-import type { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
-
 import type { GuestType, ScriptType } from './constants';
 
-export type K8sConfigMap = K8sResourceCommon & {
-  data?: Record<string, string>;
-};
-
 export type CustomScript = {
   content: string;
   guestType: GuestType;

src/plans/create/steps/customization-scripts/utils.ts

@@ -11,9 +11,9 @@ import {
 import type { CustomScript } from './types';
 
 /**
- * Builds a ConfigMap data key from a script definition.
- * Format: `{order}_{os}_{type}_{name}.{ext}`
- * Example: `10_linux_firstboot_setup_network.sh`
+ * Builds a ConfigMap data key matching the backend regex patterns in customize.go.
+ * Order is zero-padded so lexicographic sorting matches numeric order (e.g. `02_` before `10_`).
+ * @see https://github.com/kubev2v/forklift/blob/main/pkg/virt-v2v/customize/customize.go
  */
 export const buildConfigMapKey = (script: CustomScript): string => {
   const paddedOrder = String(script.order).padStart(2, '0');
@@ -23,19 +23,13 @@ export const buildConfigMapKey = (script: CustomScript): string => {
   return `${paddedOrder}_${osPrefix}_${script.scriptType}_${script.name}.${ext}`;
 };
 
-/**
- * Converts an array of scripts to ConfigMap data entries.
- */
 export const scriptsToConfigMapData = (scripts: CustomScript[]): Record<string, string> => {
   return scripts.reduce<Record<string, string>>((data, script) => {
     data[buildConfigMapKey(script)] = script.content;
     return data;
   }, {});
 };
 
-/**
- * Calculates the next order number for a new script entry.
- */
 export const getNextOrder = (scripts: CustomScript[]): number => {
   if (isEmpty(scripts)) {
     return ORDER_INCREMENT;
@@ -45,10 +39,6 @@ export const getNextOrder = (scripts: CustomScript[]): number => {
   return maxOrder + ORDER_INCREMENT;
 };
 
-/**
- * Validates a script name for use in ConfigMap keys.
- * Must be lowercase alphanumeric with hyphens and underscores, starting with alphanumeric.
- */
 export const validateScriptName = (value: string): string | undefined => {
   if (!value?.trim()) {
     return t('Script name is required.');
@@ -63,9 +53,6 @@ export const validateScriptName = (value: string): string | undefined => {
   return undefined;
 };
 
-/**
- * Checks if a ConfigMap contains at least one key matching the customization script naming pattern.
- */
 export const isScriptConfigMap = (data: Record<string, string> | undefined): boolean => {
   if (!data) {
     return false;

src/plans/create/types.ts

@@ -4,8 +4,9 @@ import type { StorageMapping, TargetStorage } from 'src/storageMaps/utils/types'
 import type { InventoryNetwork } from 'src/utils/hooks/useNetworks';
 import type { InventoryStorage } from 'src/utils/hooks/useStorages';
 
-import type { HypervNetwork } from '@forklift-ui/types';
 import type {
+  HypervNetwork,
+  IoK8sApiCoreV1ConfigMap,
   OpenShiftNetworkAttachmentDefinition,
   OpenshiftVM,
   OpenstackNetwork,
@@ -30,7 +31,7 @@ import type {
   CustomScriptsFieldId,
   CustomScriptsType,
 } from './steps/customization-scripts/constants';
-import type { CustomScript, K8sConfigMap } from './steps/customization-scripts/types';
+import type { CustomScript } from './steps/customization-scripts/types';
 import type { GeneralFormFieldId } from './steps/general-information/constants';
 import type { HooksFormFieldId, MigrationHook } from './steps/migration-hooks/constants';
 import type { MigrationTypeFieldId, MigrationTypeValue } from './steps/migration-type/constants';
@@ -83,7 +84,7 @@ export type CreatePlanFormData = FieldValues & {
   [OtherSettingsFormFieldId.PreserveStaticIps]: boolean;
   [OtherSettingsFormFieldId.MigrateSharedDisks]: boolean;
   [CustomScriptsFieldId.ScriptsType]: CustomScriptsType;
-  [CustomScriptsFieldId.ExistingConfigMap]: K8sConfigMap | undefined;
+  [CustomScriptsFieldId.ExistingConfigMap]: IoK8sApiCoreV1ConfigMap | undefined;
   [CustomScriptsFieldId.Scripts]: CustomScript[];
   [HooksFormFieldId.PreMigration]: MigrationHook;
   [HooksFormFieldId.PostMigration]: MigrationHook;
@@ -122,7 +123,7 @@ export type CreatePlanParams = {
   migrateSharedDisks?: boolean;
   luks?: V1beta1PlanSpecVmsLuks;
   nbdeClevis?: boolean;
-  customScriptsConfigMap?: K8sConfigMap;
+  customScriptsConfigMap?: IoK8sApiCoreV1ConfigMap;
   preHook?: V1beta1Hook;
   postHook?: V1beta1Hook;
   targetPowerState: TargetPowerStateValue;

src/plans/create/utils/addOwnerRefs.ts

@@ -1,9 +1,3 @@
-import type {
-  IoK8sApiCoreV1Secret,
-  V1beta1Hook,
-  V1beta1NetworkMap,
-  V1beta1StorageMap,
-} from '@forklift-ui/types';
 import {
   type K8sModel,
   k8sPatch,
@@ -12,18 +6,9 @@ import {
 import { isEmpty } from '@utils/helpers';
 import type { ObjectRef } from '@utils/helpers/getObjectRef';
 
-/**
- * Adds owner references to a resource
- * This establishes parent-child relationships between Kubernetes resources
- */
 export const addOwnerRefs = async (
   model: K8sModel,
-  resource:
-    | V1beta1NetworkMap
-    | V1beta1StorageMap
-    | IoK8sApiCoreV1Secret
-    | V1beta1Hook
-    | K8sResourceCommon,
+  resource: K8sResourceCommon,
   newOwnerReferences: ObjectRef[],
 ) => {
   const existingOwnerReferences = resource.metadata?.ownerReferences;

src/plans/create/utils/addPlanResourceOwnerRefs.ts

@@ -1,5 +1,6 @@
 import {
   HookModel,
+  type IoK8sApiCoreV1ConfigMap,
   type IoK8sApiCoreV1Secret,
   NetworkMapModel,
   SecretModel,
@@ -11,20 +12,15 @@ import {
 import { ConfigMapModel } from '@utils/analytics/constants';
 import type { ObjectRef } from '@utils/helpers/getObjectRef';
 
-import type { K8sConfigMap } from '../steps/customization-scripts/types';
-
 import { addOwnerRefs } from './addOwnerRefs';
 
-/**
- * Adds owner references to all created resources for a created plan
- */
 export const addPlanResourceOwnerRefs = async (
   resources: {
     networkMap: V1beta1NetworkMap;
     storageMap: V1beta1StorageMap;
     secret?: IoK8sApiCoreV1Secret;
     hooks: { preHook?: V1beta1Hook; postHook?: V1beta1Hook };
-    scriptsConfigMap?: K8sConfigMap;
+    scriptsConfigMap?: IoK8sApiCoreV1ConfigMap;
   },
   planRef: ObjectRef,
 ) => {

src/plans/create/utils/createCustomScriptsConfigMap.ts

@@ -1,7 +1,8 @@
+import type { IoK8sApiCoreV1ConfigMap } from '@forklift-ui/types';
 import { k8sCreate } from '@openshift-console/dynamic-plugin-sdk';
 import { ConfigMapModel } from '@utils/analytics/constants';
 
-import type { CustomScript, K8sConfigMap } from '../steps/customization-scripts/types';
+import type { CustomScript } from '../steps/customization-scripts/types';
 import { scriptsToConfigMapData } from '../steps/customization-scripts/utils';
 
 type CreateConfigMapParams = {
@@ -10,16 +11,12 @@ type CreateConfigMapParams = {
   scripts: CustomScript[];
 };
 
-/**
- * Creates a ConfigMap containing customization scripts for guest conversion.
- * Keys follow the naming pattern: `{order}_{os}_{type}_{name}.{ext}`
- */
 export const createCustomScriptsConfigMap = async ({
   planName,
   planProject,
   scripts,
-}: CreateConfigMapParams): Promise<K8sConfigMap> => {
-  const configMap: K8sConfigMap = {
+}: CreateConfigMapParams): Promise<IoK8sApiCoreV1ConfigMap> => {
+  const configMap: IoK8sApiCoreV1ConfigMap = {
     apiVersion: 'v1',
     data: scriptsToConfigMapData(scripts),
     kind: 'ConfigMap',

src/plans/create/utils/resolveScriptsConfigMap.ts

@@ -1,17 +1,11 @@
+import type { IoK8sApiCoreV1ConfigMap } from '@forklift-ui/types';
 import { isEmpty } from '@utils/helpers';
 
 import { CustomScriptsType } from '../steps/customization-scripts/constants';
-import type { K8sConfigMap } from '../steps/customization-scripts/types';
 import type { CreatePlanFormData } from '../types';
 
 import { createCustomScriptsConfigMap } from './createCustomScriptsConfigMap';
 
-/**
- * Resolves the scripts ConfigMap based on the user's selection:
- * - Existing mode: returns the selected ConfigMap as-is
- * - New mode: creates a new ConfigMap from the defined scripts
- * - No scripts: returns undefined
- */
 export const resolveScriptsConfigMap = async ({
   customScripts,
   customScriptsType,
@@ -25,7 +19,7 @@ export const resolveScriptsConfigMap = async ({
   | 'existingCustomScriptsConfigMap'
   | 'planName'
   | 'planProject'
->): Promise<K8sConfigMap | undefined> => {
+>): Promise<IoK8sApiCoreV1ConfigMap | undefined> => {
   if (customScriptsType === CustomScriptsType.Existing) {
     return existingCustomScriptsConfigMap;
   }

src/plans/create/utils/submitMigrationPlan.ts

@@ -1,14 +1,14 @@
 import { createStorageMap } from 'src/storageMaps/create/utils/createStorageMap';
 
 import type {
+  IoK8sApiCoreV1ConfigMap,
   IoK8sApiCoreV1Secret,
   V1beta1NetworkMap,
   V1beta1StorageMap,
 } from '@forklift-ui/types';
 import { CreationMethod, TELEMETRY_EVENTS } from '@utils/analytics/constants';
 import { isEmpty } from '@utils/helpers';
 
-import type { K8sConfigMap } from '../steps/customization-scripts/types';
 import { MigrationHookFieldId } from '../steps/migration-hooks/constants';
 import type { CreatePlanFormData } from '../types';
 
@@ -68,7 +68,7 @@ export const submitMigrationPlan = async (
     Promise<V1beta1StorageMap>,
     Promise<IoK8sApiCoreV1Secret | undefined>,
     Promise<CreatedHooks>,
-    Promise<K8sConfigMap | undefined>,
+    Promise<IoK8sApiCoreV1ConfigMap | undefined>,
   ] = [
     existingNetworkMap
       ? copyNetworkMap(existingNetworkMap, planName, planProject)