CreateImageWizard/Repositories: set custom-repositories

Embed the payload repositories into the image.

src/Components/CreateImageWizard/CreateImageWizard.js

@@ -54,6 +54,10 @@ const onSave = (values) => {
     ];
   }
 
+  if (values['custom-repositories']?.length > 0) {
+    customizations['custom_repositories'] = [...values['custom-repositories']];
+  }
+
   if (values['register-system'] === 'register-now-rhc') {
     customizations.subscription = {
       'activation-key': values['subscription-activation-key'],
@@ -432,6 +436,10 @@ const requestToState = (composeRequest, distroInfo, isBeta, isProd) => {
     formState['payload-repositories'] =
       composeRequest?.customizations?.payload_repositories;
 
+    // these will be overwritten by the repositories step if revisited, and generated from the payload repositories added there
+    formState['custom-repositories'] =
+      composeRequest?.customizations?.custom_repositories;
+
     // filesystem
     const fs = composeRequest?.customizations?.filesystem;
     if (fs) {

src/Components/CreateImageWizard/formComponents/Repositories.js

@@ -99,8 +99,8 @@ const BulkSelect = ({
   );
 };
 
-// Utility function to convert from Content Sources to Image Builder API schema
-const convertSchemaToImageBuilder = (repo) => {
+// Utility function to convert from Content Sources to Image Builder payload repo API schema
+const convertSchemaToIBPayloadRepo = (repo) => {
   const imageBuilderRepo = {
     baseurl: repo.url,
     rhsm: false,
@@ -114,6 +114,22 @@ const convertSchemaToImageBuilder = (repo) => {
   return imageBuilderRepo;
 };
 
+// Utility function to convert from Content Sources to Image Builder custom repo API schema
+const convertSchemaToIBCustomRepo = (repo) => {
+  const imageBuilderRepo = {
+    id: repo.uuid,
+    name: repo.name,
+    baseurl: [repo.url],
+  };
+  if (repo.gpg_key) {
+    imageBuilderRepo.gpgkey = [repo.gpg_key];
+    imageBuilderRepo.check_gpg = true;
+    imageBuilderRepo.check_repo_gpg = repo.metadata_verification;
+  }
+
+  return imageBuilderRepo;
+};
+
 // Utility function to convert from Image Builder to Content Sources API schema
 const convertSchemaToContentSources = (repo) => {
   const contentSourcesRepo = {
@@ -162,7 +178,7 @@ const Repositories = (props) => {
     return repositories;
   };
 
-  const { getState } = useFormApi();
+  const { getState, change } = useFormApi();
   const { input } = useFieldApi(props);
   const [repositories] = useState(initializeRepositories());
   const [filterValue, setFilterValue] = useState('');
@@ -213,10 +229,15 @@ const Repositories = (props) => {
     }
 
     const payloadRepositories = selectedRepos.map((repo) =>
-      convertSchemaToImageBuilder(repo)
+      convertSchemaToIBPayloadRepo(repo)
+    );
+
+    const customRepositories = selectedRepos.map((repo) =>
+      convertSchemaToIBCustomRepo(repo)
     );
 
     input.onChange(payloadRepositories);
+    change('custom-repositories', customRepositories);
   };
 
   const updateSelected = (selectedRepos) => {

src/test/Components/CreateImageWizard/CreateImageWizard.beta.test.js

@@ -911,6 +911,25 @@ describe('Click through all steps', () => {
     // mock the backend API
     const ids = [];
     const customizations = {
+      custom_repositories: [
+        {
+          baseurl: ['http://yum.theforeman.org/releases/3.4/el8/x86_64/'],
+          check_gpg: true,
+          check_repo_gpg: false,
+          gpgkey: [
+            '-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGN9300BEAC1FLODu0cL6saMMHa7yJY1JZUc+jQUI/HdECQrrsTaPXlcc7nM\nykYMMv6amPqbnhH/R5BW2Ano+OMse+PXtUr0NXU4OcvxbnnXkrVBVUf8mXI9DzLZ\njw8KoD+4/s0BuzO78zAJF5uhuyHMAK0ll9v0r92kK45Fas9iZTfRFcqFAzvgjScf\n5jeBnbRs5U3UTz9mtDy802mk357o1A8BD0qlu3kANDpjLbORGWdAj21A6sMJDYXy\nHS9FBNV54daNcr+weky2L9gaF2yFjeu2rSEHCSfkbWfpSiVUx/bDTj7XS6XDOuJT\nJqvGS8jHqjHAIFBirhCA4cY/jLKxWyMr5N6IbXpPAYgt8/YYz2aOYVvdyB8tZ1u1\nkVsMYSGcvTBexZCn1cDkbO6I+waIlsc0uxGqUGBKF83AVYCQqOkBjF1uNnu9qefE\nkEc9obr4JZsAgnisboU25ss5ZJddKlmFMKSi66g4S5ChLEPFq7MB06PhLFioaD3L\nEXza7XitoW5VBwr0BSVKAHMC0T2xbm70zY06a6gQRlvr9a10lPmv4Tptc7xgQReg\nu1TlFPbrkGJ0d8O6vHQRAd3zdsNaVr4gX0Tg7UYiqT9ZUkP7hOc8PYXQ28hHrHTB\nA63MTq0aiPlJ/ivTuX8M6+Bi25dIV6N6IOUi/NQKIYxgovJCDSdCAAM0fQARAQAB\ntCFMdWNhcyBHYXJmaWVsZCA8bHVjYXNAcmVkaGF0LmNvbT6JAlcEEwEIAEEWIQTO\nQZeiHnXqdjmfUURc6PeuecS2PAUCY33fTQIbAwUJA8JnAAULCQgHAgIiAgYVCgkI\nCwIEFgIDAQIeBwIXgAAKCRBc6PeuecS2PCk3D/9jW7xrBB/2MQFKd5l+mNMFyKwc\nL9M/M5RFI9GaQRo55CwnPb0nnxOJR1V5GzZ/YGii53H2ose65CfBOE2L/F/RvKF0\nH9S9MInixlahzzKtV3TpDoZGk5oZIHEMuPmPS4XaHggolrzExY0ib0mQuBBE/uEV\n/HlyHEunBKPhTkAe+6Q+2dl22SUuVfWr4Uzlp65+DkdN3M37WI1a3Suhnef3rOSM\nV6puUzWRR7qcYs5C2In87AcYPn92P5ur1y/C32r8Ftg3fRWnEzI9QfRG52ojNOLK\nyGQ8ZC9PGe0q7VFcF7ridT/uzRU+NVKldbJg+rvBnszb1MjNuR7rUQHyvGmbsUVQ\nRCsgdovkee3lP4gfZHzk2SSLVSo0+NJRNaM90EmPk14Pgi/yfRSDGBVvLBbEanYI\nv1ZtdIPRyKi+/IaMOu/l7nayM/8RzghdU+0f1FAif5qf9nXuI13P8fqcqfu67gNd\nkh0UUF1XyR5UHHEZQQDqCuKEkZJ/+27jYlsG1ZiLb1odlIWoR44RP6k5OJl0raZb\nyLXbAfpITsXiJJBpCam9P9+XR5VSfgkqp5hIa7J8piN3DoMpoExg4PPQr6PbLAJy\nOUCOnuB7yYVbj0wYuMXTuyrcBHh/UymQnS8AMpQoEkCLWS/A/Hze/pD23LgiBoLY\nXIn5A2EOAf7t2IMSlA==\n=OanT\n-----END PGP PUBLIC KEY BLOCK-----',
+          ],
+          id: 'dbad4dfc-1547-45f8-b5af-1d7fec0476c6',
+          name: '13lk3',
+        },
+        {
+          baseurl: [
+            'http://mirror.stream.centos.org/SIGs/9/kmods/x86_64/packages-main/',
+          ],
+          id: '9cf1d45d-aa06-46fe-87ea-121845cc6bbb',
+          name: '2lmdtj',
+        },
+      ],
       payload_repositories: [
         {
           baseurl: 'http://yum.theforeman.org/releases/3.4/el8/x86_64/',