diff --git a/src/components/Wizard/CreateVmWizard/initialState/providers/vmWareInitialState.js b/src/components/Wizard/CreateVmWizard/initialState/providers/vmWareInitialState.js index 652df384b..41b13f47e 100644 --- a/src/components/Wizard/CreateVmWizard/initialState/providers/vmWareInitialState.js +++ b/src/components/Wizard/CreateVmWizard/initialState/providers/vmWareInitialState.js @@ -10,6 +10,9 @@ import { PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY, PROVIDER_VMWARE_VCENTER_KEY, PROVIDER_VMWARE_VM_KEY, + PROVIDER_VMWARE_NEW_VCENTER_NAME_KEY, + PROVIDER_VMWARE_CHECK_CONNECTION_BTN_TEXT_KEY, + PROVIDER_VMWARE_CHECK_CONNECTION_BTN_SAVE, } from '../../providers/VMwareImportProvider/constants'; import { getSimpleV2vVMwareStatus } from '../../../../../utils/status/v2vVMware/v2vVMwareStatus'; @@ -29,7 +32,7 @@ export const getVmWareInitialState = props => ({ [PROVIDER_VMWARE_CHECK_CONNECTION_KEY]: { isDisabled: asDisabled(true, PROVIDER_VMWARE_VCENTER_KEY), }, - [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: {}, + [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: { value: true }, [PROVIDER_VMWARE_VM_KEY]: { isDisabled: asDisabled(true, PROVIDER_VMWARE_VM_KEY), }, @@ -40,6 +43,8 @@ export const getVmWareInitialState = props => ({ // simple values [PROVIDER_VMWARE_V2V_NAME_KEY]: null, + [PROVIDER_VMWARE_NEW_VCENTER_NAME_KEY]: null, + [PROVIDER_VMWARE_CHECK_CONNECTION_BTN_TEXT_KEY]: PROVIDER_VMWARE_CHECK_CONNECTION_BTN_SAVE, }); const titleResolver = { @@ -47,7 +52,7 @@ const titleResolver = { [PROVIDER_VMWARE_HOSTNAME_KEY]: 'vCenter Hostname', [PROVIDER_VMWARE_USER_NAME_KEY]: 'vCenter User Name', [PROVIDER_VMWARE_USER_PASSWORD_KEY]: 'vCenter Password', - [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: 'Remember vCenter credentials', + [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: 'Save as New vCenter Instance', [PROVIDER_VMWARE_VM_KEY]: 'VM to Import', }; @@ -75,7 +80,7 @@ const helpResolver = { [PROVIDER_VMWARE_USER_NAME_KEY]: () => 'User name to be used for connection to a vCenter instance.', [PROVIDER_VMWARE_USER_PASSWORD_KEY]: () => 'User password to be used for connection to a vCenter instance.', [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: () => - 'If checked, new secret keeping connection details will be created for later use.', + 'If checked, a new secret containing the connection details will be created for future use.', [PROVIDER_VMWARE_VM_KEY]: () => 'Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded.', }; diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareImportProvider.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareImportProvider.js index 90f1680bc..d409e8232 100644 --- a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareImportProvider.js +++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/VMWareImportProvider.js @@ -26,6 +26,7 @@ import { FormRow } from '../../../../Form/FormRow'; import { CONNECT_TO_NEW_INSTANCE } from '../../strings'; import { PROVIDER_VMWARE, + PROVIDER_VMWARE_CHECK_CONNECTION_BTN_TEXT_KEY, PROVIDER_VMWARE_CHECK_CONNECTION_KEY, PROVIDER_VMWARE_HOSTNAME_KEY, PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY, @@ -180,7 +181,7 @@ export class VMWareImportProvider extends React.Component { disabled={isFieldDisabled(this.getField(PROVIDER_VMWARE_CHECK_CONNECTION_KEY))} onClick={() => this.onChange(PROVIDER_VMWARE_CHECK_CONNECTION_KEY, true)} > - Check + {this.getField(PROVIDER_VMWARE_CHECK_CONNECTION_BTN_TEXT_KEY)} diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants.js index 389405286..f29ab646d 100644 --- a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants.js +++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants.js @@ -7,8 +7,12 @@ export const PROVIDER_VMWARE_USER_PASSWORD_KEY = 'vmwarePassword'; export const PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY = 'rememberVMwareCredentials'; export const PROVIDER_VMWARE_CHECK_CONNECTION_KEY = 'checkConnectionButton'; +export const PROVIDER_VMWARE_CHECK_CONNECTION_BTN_TEXT_KEY = 'checkConnectionButtonText'; +export const PROVIDER_VMWARE_CHECK_CONNECTION_BTN_SAVE = 'Check and Save'; +export const PROVIDER_VMWARE_CHECK_CONNECTION_BTN_DONT_SAVE = 'Check'; export const PROVIDER_VMWARE_STATUS_KEY = 'vmwareStatus'; export const PROVIDER_VMWARE_VM_KEY = 'vmwareVm'; export const PROVIDER_VMWARE_V2V_NAME_KEY = 'v2vVmwareName'; +export const PROVIDER_VMWARE_NEW_VCENTER_NAME_KEY = 'newVCenterName'; diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareImportProvider.fixture.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareImportProvider.fixture.js index b272463ec..ec0d24ac3 100644 --- a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareImportProvider.fixture.js +++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/fixtures/VMWareImportProvider.fixture.js @@ -1 +1,34 @@ -// TODO: add +import { PROVIDERS_DATA_KEY } from '../../../constants'; +import { PROVIDER_VMWARE, PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY, PROVIDER_VMWARE_STATUS_KEY } from '../constants'; +import { V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL } from '../../../../../../utils/status/v2vVMware'; +import { VMWareImportProvider } from '../VMWareImportProvider'; + +export const vmSettingsConnectionSuccessful = { + [PROVIDERS_DATA_KEY]: { + [PROVIDER_VMWARE]: { + [PROVIDER_VMWARE_STATUS_KEY]: { + value: V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL, + }, + }, + }, +}; + +export const vmSettingsDontSaveCredentials = { + [PROVIDERS_DATA_KEY]: { + [PROVIDER_VMWARE]: { + [PROVIDER_VMWARE_STATUS_KEY]: { + value: V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL, + }, + [PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY]: { + value: false, + }, + }, + }, +}; + +export default { + component: VMWareImportProvider, + props: { + vmSettings: vmSettingsConnectionSuccessful, + }, +}; diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareImportProvider.test.js b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareImportProvider.test.js index 8e7194fc0..044487c96 100644 --- a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareImportProvider.test.js +++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/VMWareImportProvider.test.js @@ -2,6 +2,10 @@ import React from 'react'; import { mount } from 'enzyme'; import { VMWareImportProvider } from '../VMWareImportProvider'; +import { + vmSettingsConnectionSuccessful, + vmSettingsDontSaveCredentials, +} from '../fixtures/VMWareImportProvider.fixture'; const testVMWareImportProvider = () => ; @@ -11,4 +15,14 @@ describe('', () => { const component = mount(testVMWareImportProvider()); expect(component).toMatchSnapshot(); }); + + it('renders correctly when connection is successful', () => { + const component = mount(); + expect(component).toMatchSnapshot(); + }); + + it('renders correctly when password is not saved', () => { + const component = mount(); + expect(component).toMatchSnapshot(); + }); }); diff --git a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareImportProvider.test.js.snap b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareImportProvider.test.js.snap index e22f0abd9..bcfd494d3 100644 --- a/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareImportProvider.test.js.snap +++ b/src/components/Wizard/CreateVmWizard/providers/VMwareImportProvider/tests/__snapshots__/VMWareImportProvider.test.js.snap @@ -813,7 +813,7 @@ exports[` renders correctly 1`] = ` renders correctly 1`] = ` renders correctly 1`] = ` className="text-right col-sm-3" > @@ -870,7 +870,7 @@ exports[` renders correctly 1`] = ` @@ -882,7 +882,7 @@ exports[` renders correctly 1`] = ` id="popover" placement="right" > - If checked, new secret keeping connection details will be created for later use. + If checked, a new secret containing the connection details will be created for future use. } placement="right" @@ -943,7 +943,7 @@ exports[` renders correctly 1`] = ` id="vcenter-remember-credentials" onBlur={[Function]} onChange={[Function]} - title="Remember vCenter credentials" + title="Save as New vCenter Instance" > renders correctly 1`] = ` onChange={[Function]} type="checkbox" /> - Remember vCenter credentials + Save as New vCenter Instance @@ -1063,9 +1063,7 @@ exports[` renders correctly 1`] = ` id="vcenter-connect" onClick={[Function]} type="button" - > - Check - + /> @@ -1432,3 +1430,2890 @@ exports[` renders correctly 1`] = ` `; + +exports[` renders correctly when connection is successful 1`] = ` + + + + +
+ +
+ + + + + + + Select secret containing connection details for a vCenter instance. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + +
+ + + + + +
+ + + + + + + + + +
+ + + + + +
+ + +
+ +
+ + + + + + +
+ +
+ + + + + + + Address to be used for connection to a vCenter instance. The "https://" protocol will be added automatically. Example: "my.domain.com:1234". + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + User name to be used for connection to a vCenter instance. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + User password to be used for connection to a vCenter instance. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + If checked, a new secret containing the connection details will be created for future use. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + +
+ +
+ + +
+ +
+ + + + + + +
+ +
+ + + + +
+ + +
+ +
+ +
+ + + + + + +
+ +
+ + + + +
+ + +
+ + + +
+ Connection successful +
+ + + +
+ +
+ + + + + + +
+ +
+ + + + + + + Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + +
+ + + + + +
+ + + + + + +
    + + +
+ + + + + +
+ + +
+ +
+ + + + +`; + +exports[` renders correctly when password is not saved 1`] = ` + + + + +
+ +
+ + + + + + + Select secret containing connection details for a vCenter instance. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + +
+ + + + + +
+ + + + + + + + + +
+ + + + + +
+ + +
+ +
+ + + + + + +
+ +
+ + + + + + + Address to be used for connection to a vCenter instance. The "https://" protocol will be added automatically. Example: "my.domain.com:1234". + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + User name to be used for connection to a vCenter instance. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + User password to be used for connection to a vCenter instance. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + If checked, a new secret containing the connection details will be created for future use. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + +
+ +
+ + +
+ +
+ + + + + + +
+ +
+ + + + +
+ + +
+ +
+ +
+ + + + + + +
+ +
+ + + + +
+ + +
+ + + +
+ Connection successful +
+ + + +
+ +
+ + + + + + +
+ +
+ + + + + + + Select a vCenter virtual machine to import. Loading of their list might take some time. The list will be enabled for selection once data are loaded. + + } + placement="right" + rootClose={true} + trigger={ + Array [ + "click", + ] + } + > + + + + + +
+ + +
+ + +
+ + + + + +
+ + + + + + +
    + + +
+ + + + + +
+ + +
+ +
+ + + + +`; diff --git a/src/components/Wizard/CreateVmWizard/stateUpdate/providers/vmWareStateUpdate.js b/src/components/Wizard/CreateVmWizard/stateUpdate/providers/vmWareStateUpdate.js index 43ea7d903..40664d721 100644 --- a/src/components/Wizard/CreateVmWizard/stateUpdate/providers/vmWareStateUpdate.js +++ b/src/components/Wizard/CreateVmWizard/stateUpdate/providers/vmWareStateUpdate.js @@ -1,4 +1,4 @@ -import { get } from 'lodash'; +import { get, has } from 'lodash'; import { VM_SETTINGS_TAB_KEY, @@ -48,6 +48,10 @@ import { PROVIDER_VMWARE_USER_PASSWORD_KEY, PROVIDER_VMWARE_VCENTER_KEY, PROVIDER_VMWARE_VM_KEY, + PROVIDER_VMWARE_NEW_VCENTER_NAME_KEY, + PROVIDER_VMWARE_CHECK_CONNECTION_BTN_TEXT_KEY, + PROVIDER_VMWARE_CHECK_CONNECTION_BTN_SAVE, + PROVIDER_VMWARE_CHECK_CONNECTION_BTN_DONT_SAVE, } from '../../providers/VMwareImportProvider/constants'; import { vmSettingsCreator } from '../vmSettingsTabStateUpdate'; import { @@ -57,7 +61,15 @@ import { import { requestVmDetail } from '../../../../../k8s/requests/v2v/requestVmDetail'; import { prefilUpdateCreator } from './prefillVmStateUpdate'; import { getSimpleV2vVMwareStatus } from '../../../../../utils/status/v2vVMware/v2vVMwareStatus'; -import { V2V_WMWARE_STATUS_ALL_OK, V2V_WMWARE_STATUS_UNKNOWN } from '../../../../../utils/status/v2vVMware'; +import { + V2V_WMWARE_STATUS_ALL_OK, + V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL, + V2V_WMWARE_STATUS_UNKNOWN, +} from '../../../../../utils/status/v2vVMware'; +import { addLabelToVmwareSecretPatch, removeLabelFromVmwareSecretPatch } from '../../../../../utils'; +import { VCENTER_TEMPORARY_LABEL } from '../../../../../constants'; +import { SecretModel } from '../../../../../models'; +import { getVmwareConnectionName, getVmwareSecretLabels } from '../../../../../selectors/v2v'; const { info, warn, error } = console; @@ -84,6 +96,8 @@ export const getVmwareProviderStateUpdate = (prevProps, prevState, props, state, ...[ secretUpdateCreator, secretValueUpdateCreator, + saveSecretUpdateCreator, + successfulConnectionUpdateCreator, checkConnectionUpdateCreator, vmwareNameChangedUpdateCreator, vmChangedUpdateCreator, @@ -236,6 +250,49 @@ export const secretValueUpdateCreator = (prevProps, prevState, props, state, ext }; }; +export const successfulConnectionUpdateCreator = (prevProps, prevState, props, state, extra) => { + const connectionStatus = getVmwareValue(state, PROVIDER_VMWARE_STATUS_KEY); + + if (connectionStatus !== V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL) { + return null; + } + + const vCenterName = getVmwareField(state, PROVIDER_VMWARE_NEW_VCENTER_NAME_KEY); + const secret = props.vCenterSecrets.find(s => getName(s) === vCenterName); + const hasTempLabel = has(getVmwareSecretLabels(secret), VCENTER_TEMPORARY_LABEL); + const saveCredentialsRequested = getVmwareValue(state, PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY); + + if (saveCredentialsRequested && hasTempLabel) { + const patch = removeLabelFromVmwareSecretPatch(VCENTER_TEMPORARY_LABEL); + props.k8sPatch(SecretModel, secret, patch).catch(err => { + if (!get(err, 'message').includes('Unable to remove nonexistent key')) { + console.error(err); // eslint-disable-line no-console + } + }); + } + + if (!saveCredentialsRequested && !hasTempLabel) { + const patch = addLabelToVmwareSecretPatch(VCENTER_TEMPORARY_LABEL); + props.k8sPatch(SecretModel, secret, patch).catch(err => console.log(err)); // eslint-disable-line no-console + } + + return null; +}; + +export const saveSecretUpdateCreator = (prevProps, prevState, props, state, extra) => { + if (!hasVmWareSettingsValuesChanged(prevState, state, PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY)) { + return null; + } + + const saveCredentialsRequested = getVmwareValue(state, PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY); + + return { + [PROVIDER_VMWARE_CHECK_CONNECTION_BTN_TEXT_KEY]: saveCredentialsRequested + ? PROVIDER_VMWARE_CHECK_CONNECTION_BTN_SAVE + : PROVIDER_VMWARE_CHECK_CONNECTION_BTN_DONT_SAVE, + }; +}; + export const checkConnectionUpdateCreator = (prevProps, prevState, props, state, extra) => { const oldConnect = !!getVmwareValue(prevState, PROVIDER_VMWARE_CHECK_CONNECTION_KEY); const connect = !!getVmwareValue(state, PROVIDER_VMWARE_CHECK_CONNECTION_KEY); @@ -359,6 +416,7 @@ const createConnectionObjects = (props, params, { safeSetState }, afterData) => value: getSimpleV2vVMwareStatus(null, { isConnecting: true }), }, [PROVIDER_VMWARE_V2V_NAME_KEY]: getName(v2vVmware), + [PROVIDER_VMWARE_NEW_VCENTER_NAME_KEY]: getVmwareConnectionName(v2vVmware), }) ) .catch(err => { diff --git a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/CreateVmWizard.test.js.snap b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/CreateVmWizard.test.js.snap index b2b1449c8..f8c2df5a6 100644 --- a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/CreateVmWizard.test.js.snap +++ b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/CreateVmWizard.test.js.snap @@ -183,6 +183,7 @@ Object { "vCenterInstance": true, }, }, + "checkConnectionButtonText": "Check", "rememberVMwareCredentials": Object { "isDisabled": Object { "VMWARE_PROVIDER_METADATA_ID": false, diff --git a/src/k8s/requests/v2v/createV2VvmwareObject.js b/src/k8s/requests/v2v/createV2VvmwareObject.js index f4f22f1f1..c34fa2347 100644 --- a/src/k8s/requests/v2v/createV2VvmwareObject.js +++ b/src/k8s/requests/v2v/createV2VvmwareObject.js @@ -5,7 +5,7 @@ import { buildV2VVMwareObject } from '../../objects/v2v/vmware/vmWareObject'; import { buildVMwareSecret } from '../../objects/v2v/vmware/vmWareSecret'; export const createV2VvmwareObjectWithSecret = async ({ url, username, password, namespace }, { k8sCreate }) => { - const secretName = `temp-${getDefaultSecretName({ url, username })}-`; + const secretName = `${getDefaultSecretName({ url, username })}-`; const secret = await k8sCreate( SecretModel, buildVMwareSecret({ diff --git a/src/k8s/requests/v2v/importVmware.js b/src/k8s/requests/v2v/importVmware.js index 07b0e42a7..bce9bbec0 100644 --- a/src/k8s/requests/v2v/importVmware.js +++ b/src/k8s/requests/v2v/importVmware.js @@ -16,7 +16,7 @@ import { STORAGE_TYPE_EXTERNAL_V2V_VDDK, } from '../../../components/Wizard/CreateVmWizard/constants'; import { getName } from '../../../selectors'; -import { buildConversionPod, buildConversionPodSecret, buildV2VRole, buildVMwareSecret } from '../../objects/v2v'; +import { buildConversionPod, buildConversionPodSecret, buildV2VRole } from '../../objects/v2v'; import { buildPvc, buildServiceAccount, buildServiceAccountRoleBinding } from '../../objects'; import { CONVERSION_GENERATE_NAME } from './constants'; import { buildOwnerReference, buildAddOwnerReferencesPatch } from '../../util/utils'; @@ -24,7 +24,6 @@ import { PROVIDER_VMWARE_HOSTNAME_KEY, PROVIDER_VMWARE_USER_NAME_KEY, PROVIDER_VMWARE_USER_PASSWORD_KEY, - PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY, PROVIDER_VMWARE_VCENTER_KEY, PROVIDER_VMWARE_VM_KEY, } from '../../../components/Wizard/CreateVmWizard/providers/VMwareImportProvider/constants'; @@ -36,24 +35,6 @@ import { } from '../../../components/Wizard/CreateVmWizard/providers/VMwareImportProvider/selectors'; import { getValidK8SSize } from '../../../utils'; -const asImportProviderSecret = vmSettings => { - if (getVmwareValue(vmSettings, PROVIDER_VMWARE_REMEMBER_PASSWORD_KEY)) { - const url = getVmwareValue(vmSettings, PROVIDER_VMWARE_HOSTNAME_KEY); - const username = getVmwareValue(vmSettings, PROVIDER_VMWARE_USER_NAME_KEY); - const password = getVmwareValue(vmSettings, PROVIDER_VMWARE_USER_PASSWORD_KEY); - const namespace = settingsValue(vmSettings, NAMESPACE_KEY); - - return buildVMwareSecret({ - url, - username, - password, - namespace, - }); - } - - return null; -}; - const asVolumenMount = ({ name, storageType, data }) => ({ name, mountPath: data && data.mountPath, @@ -66,16 +47,6 @@ const asVolume = ({ name, data }) => ({ }, }); -const createProviderSecret = async (vmSettings, networks, storages, { k8sCreate }) => { - const importProviderSecret = asImportProviderSecret(vmSettings); - - if (importProviderSecret) { - await k8sCreate(SecretModel, importProviderSecret); - } - - return null; -}; - const resolveStorages = async (vmSettings, networks, storages, { k8sCreate }, lastResults, { units }) => { const isImportStorage = storage => [STORAGE_TYPE_EXTERNAL_IMPORT, STORAGE_TYPE_EXTERNAL_V2V_TEMP].includes(storage.storageType); @@ -235,27 +206,24 @@ const startConversionPod = async ( }; export const importVmwareVm = async (vmSettings, networks, storages, { k8sCreate, k8sPatch }, context) => - [ - createProviderSecret, - createConversionPodSecret, - resolveRolesAndServiceAccount, - resolveStorages, - startConversionPod, - ].reduce(async (lastResultPromise, stepFunction) => { - const lastResult = await lastResultPromise; - const nextResult = await stepFunction( - vmSettings, - networks, - storages, - { - k8sCreate, - k8sPatch, - }, - lastResult, - context - ); - return { - ...lastResult, - ...nextResult, - }; - }, Promise.resolve({})); + [createConversionPodSecret, resolveRolesAndServiceAccount, resolveStorages, startConversionPod].reduce( + async (lastResultPromise, stepFunction) => { + const lastResult = await lastResultPromise; + const nextResult = await stepFunction( + vmSettings, + networks, + storages, + { + k8sCreate, + k8sPatch, + }, + lastResult, + context + ); + return { + ...lastResult, + ...nextResult, + }; + }, + Promise.resolve({}) + ); diff --git a/src/k8s/tests/request.test.js b/src/k8s/tests/request.test.js index c922899be..202c063d5 100644 --- a/src/k8s/tests/request.test.js +++ b/src/k8s/tests/request.test.js @@ -14,7 +14,6 @@ import { vmSettingsContainer, vmSettingsContainerWindows, vmSettingsCustomFlavor, - vmSettingsImportVmwareNewConnection, vmSettingsPxe, vmSettingsUrl, vmSettingsUserTemplate, @@ -23,9 +22,9 @@ import { rootContainerDisk, rootDataVolumeDisk, } from '../../components/Wizard/CreateVmWizard/stateUpdate/storageTabStateUpdate'; -import { k8sCreate, k8sPatch } from '../../tests/k8s'; +import { k8sCreate } from '../../tests/k8s'; -import { settingsValue, selectVm, selectTemplate, selectSecret } from '../selectors'; +import { settingsValue, selectVm, selectTemplate } from '../selectors'; import { TEMPLATE_PARAM_VM_NAME, @@ -112,15 +111,6 @@ const testContainerImage = results => { return vm; }; -const testImportSecret = results => { - const secret = selectSecret(results); - expect(secret.kind).toBe('Secret'); - expect(secret.metadata.generateName).toBe('my.domain.com-username-'); // composed from input values - expect(secret.data.username).toBe('dXNlcm5hbWU='); // base64 - expect(secret.data.password).toBe('cGFzc3dvcmQ='); // base64 - expect(secret.data.url).toBe('bXkuZG9tYWluLmNvbQ=='); // base64 -}; - const everyDiskHasVolume = results => { const vm = selectVm(results); vm.spec.template.spec.domain.devices.disks.forEach(disk => { @@ -617,17 +607,6 @@ describe('request.js - metadata', () => { getNamespace(urlTemplate) ); }); - it('Import Secret is created', async () => { - const results = await createVm( - new EnhancedK8sMethods({ k8sCreate, k8sPatch }), - templates, - vmSettingsImportVmwareNewConnection, - [], - [], - persistentVolumeClaims - ); - testImportSecret(results); - }); }); describe('request.js - Create Vm Template', () => { diff --git a/src/selectors/v2v/selectors.js b/src/selectors/v2v/selectors.js index 1875435cd..6e03860a8 100644 --- a/src/selectors/v2v/selectors.js +++ b/src/selectors/v2v/selectors.js @@ -10,3 +10,6 @@ export const getLoadedVm = (v2vvmware, vmName) => getSimpleV2vVMwareStatus(v2vvmware) === V2V_WMWARE_STATUS_CONNECTION_SUCCESSFUL ? getVms(v2vvmware, []).find(v => v.name === vmName && v.detail && v.detail.raw) : null; + +export const getVmwareSecretLabels = secret => get(secret, 'metadata.labels', {}); +export const getVmwareConnectionName = value => get(value, 'spec.connection'); diff --git a/src/utils/patches.js b/src/utils/patches.js index 15940af74..40699d58a 100644 --- a/src/utils/patches.js +++ b/src/utils/patches.js @@ -432,3 +432,26 @@ export const getDeviceBootOrderPatch = (vm, removedDevicePathKey, removedDeviceN return patches; }; + +export const removeLabelFromVmwareSecretPatch = labelKey => { + const patches = []; + const escapedLabel = labelKey.replace('~', '~0').replace('/', '~1'); + patches.push({ + op: 'remove', + path: `/metadata/labels/${escapedLabel}`, + }); + + return patches; +}; + +export const addLabelToVmwareSecretPatch = labelKey => { + const patches = []; + const escapedLabel = labelKey.replace('~', '~0').replace('/', '~1'); + patches.push({ + op: 'add', + path: `/metadata/labels/${escapedLabel}`, + value: 'true', + }); + + return patches; +}; diff --git a/src/utils/tests/patches.test.js b/src/utils/tests/patches.test.js index d7c18f87a..2e9213afc 100644 --- a/src/utils/tests/patches.test.js +++ b/src/utils/tests/patches.test.js @@ -8,6 +8,7 @@ import { TEMPLATE_FLAVOR_LABEL, POD_NETWORK, DISK_PATH_KEY, + VCENTER_TEMPORARY_LABEL, } from '../../constants'; import { getPxeBootPatch, @@ -18,6 +19,8 @@ import { getStartStopPatch, getUpdateCpuMemoryPatch, getDeviceBootOrderPatch, + removeLabelFromVmwareSecretPatch, + addLabelToVmwareSecretPatch, } from '../patches'; import { cloudInitTestVm } from '../../tests/mocks/vm/cloudInitTestVm.mock'; import { NETWORK_TYPE_POD, NETWORK_TYPE_MULTUS } from '../../components/Wizard/CreateVmWizard/constants'; @@ -455,6 +458,27 @@ describe('patches.js tests', () => { expect(patch).toHaveLength(1); comparePatch(patch[0], '/spec', { running: false }); }); + + it('removeLabelFromVmwareSecretPatch patch', () => { + const patch = removeLabelFromVmwareSecretPatch(VCENTER_TEMPORARY_LABEL); + expect(patch).toEqual([ + { + op: 'remove', + path: '/metadata/labels/kubevirt.io~1temporary', + }, + ]); + }); + + it('addLabelToVmwareSecretPatch patch', () => { + const patch = addLabelToVmwareSecretPatch(VCENTER_TEMPORARY_LABEL); + expect(patch).toEqual([ + { + op: 'add', + path: '/metadata/labels/kubevirt.io~1temporary', + value: 'true', + }, + ]); + }); }); describe('getDeviceBootOrderPatch() tests', () => {