adding missing files

Author: robertpatrick

webui/src/css/app.css

@@ -403,7 +403,12 @@ h6:first-child {
   width: 75%;
   height: auto;
   max-height: 85vh;
-  max-width: 800px;
+  max-width: 850px;
+}
+
+.wkt-center-text-in-frame {
+  vertical-align: center;
+  text-align: center;
 }
 
 /* typically the oj-panel on the code view tab */
@@ -421,6 +426,11 @@ h6:first-child {
   height: 100%;
 }
 
+.wkt-design-view-switcher {
+  min-height: 1px;
+  height: 100%;
+}
+
 .wkt-wide-table {
   width: 100%;
 }

webui/src/js/models/image-definition.js

@@ -10,16 +10,19 @@
  *
  * Returns a constructor for the object.
  */
-define(['utils/observable-properties', 'utils/validation-helper'],
-  function (props, validationHelper) {
+define(['knockout', 'utils/observable-properties', 'utils/validation-helper'],
+  function (ko, props, validationHelper) {
     /**
      * The object constructor.
      */
     return function (name, wdtModel) {
       function ImageModel() {
         this.imageTag = props.createProperty();
         this.imageTag.addValidator(...validationHelper.getImageTagValidators());
-        this.createCustomImageForPV = props.createProperty(true);
+        this.createPrimaryImage = props.createProperty(false);
+
+        // deprecated and no longer used as of version 1.1.0
+        this.createCustomImageForPV = props.createProperty(false);
 
         this.imageRegistryPushRequireAuthentication = props.createProperty(true);
         this.imageRegistryPushUser = props.createProperty().asCredential();
@@ -56,19 +59,56 @@ define(['utils/observable-properties', 'utils/validation-helper'],
         this.targetDomainType = props.createProperty('WLS');
         this.domainHomePath = props.createProperty('/u01/domains/${1}', wdtModel.domainName);
         this.modelHomePath = props.createProperty('/u01/wdt/models');
+        this.wdtHomePath = props.createProperty('/u01/wdt');
+
+        this.targetOpenShift = props.createProperty(false);
+        this.defaultGroupName = ko.computed(() => {
+          return this.targetOpenShift.value ? 'root' : 'oracle';
+        });
 
         this.fileOwner = props.createProperty('oracle');
-        this.fileGroup = props.createProperty('oracle');
+        this.fileGroup = props.createProperty('${1}', this.defaultGroupName);
         this.alwaysPullBaseImage = props.createProperty(false);
         this.builderNetworkName = props.createProperty();
-
         this.extendBuild = props.createProperty(false);
         this.additionalBuildCommandsFile = props.createProperty();
         this.additionalBuildFiles = props.createArrayProperty([]);
 
+        // aux image versions of the variables
+        this.useAuxImage = props.createProperty(true);
+        this.auxImageTag = props.createProperty();
+        this.auxImageTag.addValidator(...validationHelper.getImageTagValidators());
+        this.createAuxImage = props.createProperty(true);
+
+        this.auxImageRegistryPushRequireAuthentication = props.createProperty(true);
+        this.auxImageRegistryPushUser = props.createProperty().asCredential();
+        this.auxImageRegistryPushPassword = props.createProperty().asCredential();
+
+        this.auxUseCustomBaseImage = props.createProperty(false);
+        this.auxBaseImage = props.createProperty();
+        this.auxBaseImage.addValidator(...validationHelper.getImageTagValidators());
+        this.auxBaseImagePullRequiresAuthentication = props.createProperty(false);
+        this.auxBaseImagePullUsername = props.createProperty().asCredential();
+        this.auxBaseImagePullPassword = props.createProperty().asCredential();
+
+        this.auxTargetOpenShift = props.createProperty(false);
+        this.auxDefaultGroupName = ko.computed(() => {
+          return this.auxTargetOpenShift.value ? 'root' : 'oracle';
+        });
+
+        this.auxFileOwner = props.createProperty('oracle');
+        this.auxFileGroup = props.createProperty('${1}', this.auxDefaultGroupName);
+        this.auxAlwaysPullBaseImage = props.createProperty(false);
+        this.auxBuilderNetworkName = props.createProperty();
+        this.auxExtendBuild = props.createProperty(false);
+        this.auxAdditionalBuildCommandsFile = props.createProperty();
+        this.auxAdditionalBuildFiles = props.createArrayProperty([]);
+
         // internal fields that should not be read or written to the project file.
         this.internal = {
+          auxImageRegistryAddress: props.createProperty(),
           imageRegistryAddress: props.createProperty(),
+          auxBaseImageRegistryAddress: props.createProperty(),
           baseImageRegistryAddress: props.createProperty()
         };
 
@@ -81,6 +121,14 @@ define(['utils/observable-properties', 'utils/validation-helper'],
           this.internal.imageRegistryAddress.observable(host);
         });
 
+        this.auxImageTag.observable.subscribe(value => {
+          let host;
+          if (value && value.length > 0) {
+            host = window.api.k8s.getRegistryAddressFromImageTag(value);
+          }
+          this.internal.auxImageRegistryAddress.observable(host);
+        });
+
         this.baseImage.observable.subscribe(value => {
           let host;
           if (value && value.length > 0) {
@@ -89,6 +137,14 @@ define(['utils/observable-properties', 'utils/validation-helper'],
           this.internal.baseImageRegistryAddress.observable(host);
         });
 
+        this.auxBaseImage.observable.subscribe(value => {
+          let host;
+          if (value && value.length > 0) {
+            host = window.api.k8s.getRegistryAddressFromImageTag(value);
+          }
+          this.internal.auxBaseImageRegistryAddress.observable(host);
+        });
+
         this.readFrom = (json) => {
           props.createGroup(name, this).readFrom(json);
         };

webui/src/js/models/k8s-domain-definition.js

@@ -13,7 +13,7 @@
 define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'utils/validation-helper', 'utils/wkt-logger'],
   function (ko, props, utils, validationHelper, wktLogger) {
 
-    return function(name, wdtModel, imageDomainHomePathProperty) {
+    return function(name, wdtModel, imageDomainHomePathProperty, imageDomainTypeProperty) {
       function asLegalK8sName(observable) {
         return utils.toLegalK8sName(observable());
       }
@@ -25,6 +25,7 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
         this.kubernetesNamespace = props.createProperty('${1}-ns', this.uid.observable);
         this.kubernetesNamespace.addValidator(...validationHelper.getK8sNameValidators());
         this.domainHome = imageDomainHomePathProperty;
+        this.domainType = imageDomainTypeProperty;
 
         this.domainPersistentVolumeName = props.createProperty('weblogic-domain-storage-volume');
         this.domainPersistentVolumeMountPath = props.createProperty('/shared');
@@ -45,6 +46,17 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
 
         this.imagePullPolicy = props.createProperty('IfNotPresent');
 
+        // Auxiliary image-related properties
+        this.auxImageRegistryPullRequireAuthentication = props.createProperty(false);
+        this.auxImageRegistryUseExistingPullSecret = props.createProperty(true);
+        this.auxImageRegistryPullSecretName = props.createProperty();
+        this.auxImageRegistryPullSecretName.addValidator(...validationHelper.getK8sNameValidators());
+        this.auxImageRegistryPullUser = props.createProperty().asCredential();
+        this.auxImageRegistryPullPassword = props.createProperty().asCredential();
+        this.auxImageRegistryPullEmail = props.createProperty();
+        this.auxImageRegistryPullEmail.addValidator(...validationHelper.getEmailAddressValidators());
+        this.auxImagePullPolicy = props.createProperty('IfNotPresent');
+
         this.clusterKeys = [
           'name', 'maxServers', 'replicas', 'minHeap', 'maxHeap', 'cpuRequest', 'cpuLimit', 'memoryRequest',
           'memoryLimit', 'disableDebugStdout', 'disableFan', 'useUrandom', 'additionalArguments'

webui/src/js/models/wkt-project.js

@@ -77,7 +77,7 @@ function (ko, wdtConstructor, imageConstructor, kubectlConstructor, domainConstr
     this.image = imageConstructor('image', this.wdtModel);
     this.ingress = ingressConstructor('ingress');
     this.kubectl = kubectlConstructor('kubectl');
-    this.k8sDomain = domainConstructor('k8sDomain', this.wdtModel, this.image.domainHomePath);
+    this.k8sDomain = domainConstructor('k8sDomain', this.wdtModel, this.image.domainHomePath, this.image.targetDomainType);
     this.wko = wkoConstructor('wko');
     this.pages = [this.wdtModel, this.image, this.kubectl, this.k8sDomain, this.wko, this.settings, this.ingress];
 

webui/src/js/utils/image-pusher.js

@@ -14,19 +14,23 @@ define(['models/wkt-project', 'models/wkt-console', 'utils/i18n', 'utils/project
         return this.callPushImage();
       };
 
+      this.startPushAuxImage = async () => {
+        return this.callPushAuxImage();
+      };
+
       this.callPushImage = async (options) => {
         if (!options) {
           options = {};
         }
 
         let errTitle = i18n.t('image-pusher-push-aborted-title');
-        if (this.project.settings.targetDomainLocation.value === 'pv' && !this.project.image.createCustomImageForPV.value) {
-          const errMessage = i18n.t('image-pusher-domain-location-pv-message');
+        if (!this.project.image.createPrimaryImage.value) {
+          const errMessage = i18n.t('image-pusher-image-not-create-message');
           await window.api.ipc.invoke('show-info-message', errTitle, errMessage);
           return Promise.resolve(false);
         }
 
-        const validatableObject = this.getValidatableObject('flow-push-image-name');
+        const validatableObject = this.getValidatableObjectForPrimary('flow-push-image-name');
         if (validatableObject.hasValidationErrors()) {
           const validationErrorDialogConfig = validatableObject.getValidationErrorDialogConfig(errTitle);
           dialogHelper.openDialog('validation-error-dialog', validationErrorDialogConfig);
@@ -117,29 +121,168 @@ define(['models/wkt-project', 'models/wkt-console', 'utils/i18n', 'utils/project
         }
       };
 
-      this.getValidatableObject = (flowNameKey) => {
+      this.getValidatableObjectForPrimary = (flowNameKey) => {
         const validationObject = validationHelper.createValidatableObject(flowNameKey);
-        const settingsFormConfig = validationObject.getDefaultConfigObject();
-        settingsFormConfig.formName = 'project-settings-title';
+        const imageFormConfig = validationObject.getDefaultConfigObject();
+        imageFormConfig.formName = 'image-design-form-name';
+        imageFormConfig.tabName = 'image-design-form-primary-tab-name';
 
         validationObject.addField('image-design-image-tag-label',
-          this.project.image.imageTag.validate(true), settingsFormConfig);
+          this.project.image.imageTag.validate(true), imageFormConfig);
 
-        const settingsFormBuilderConfig = validationObject.getDefaultConfigObject();
-        settingsFormBuilderConfig.formName = 'project-settings-title';
-        settingsFormBuilderConfig.fieldNamePayload = { toolName: this.project.settings.builderType.value };
+        const settingsFormConfig = validationObject.getDefaultConfigObject();
+        settingsFormConfig.formName = 'project-settings-title';
+        settingsFormConfig.fieldNamePayload = { toolName: this.project.settings.builderType.value };
         validationObject.addField('project-settings-build-tool-label',
           validationHelper.validateRequiredField(this.project.settings.builderExecutableFilePath.value),
-          settingsFormBuilderConfig);
+          settingsFormConfig);
 
         if (this.project.image.imageRegistryPushRequireAuthentication.value) {
           // skip validating the host portion of the image tag since it may be empty for Docker Hub...
           validationObject.addField('image-design-image-registry-push-username-label',
             validationHelper.validateRequiredField(this.project.image.imageRegistryPushUser.value),
-            settingsFormConfig);
+            imageFormConfig);
           validationObject.addField('image-design-image-registry-push-password-label',
             validationHelper.validateRequiredField(this.project.image.imageRegistryPushPassword.value),
-            settingsFormConfig);
+            imageFormConfig);
+        }
+
+        return validationObject;
+      };
+
+      this.callPushAuxImage = async (options) => {
+        if (!options) {
+          options = {};
+        }
+
+        let errTitle = i18n.t('image-pusher-push-aborted-title');
+        let abortErrorMessage;
+        if (this.project.settings.targetDomainLocation.value !== 'mii') {
+          abortErrorMessage = i18n.t('image-pusher-aux-image-not-mii-message');
+        } else if (!this.project.image.useAuxImage.value) {
+          abortErrorMessage = i18n.t('image-pusher-aux-image-not-use-message');
+        } else if (!this.project.image.createAuxImage.value) {
+          abortErrorMessage = i18n.t('image-pusher-aux-image-not-create-message');
+        }
+        if (abortErrorMessage) {
+          await window.api.ipc.invoke('show-info-message', errTitle, abortErrorMessage);
+          return Promise.resolve(false);
+        }
+
+
+        const validatableObject = this.getValidatableObjectForAux('flow-push-aux-image-name');
+        if (validatableObject.hasValidationErrors()) {
+          const validationErrorDialogConfig = validatableObject.getValidationErrorDialogConfig(errTitle);
+          dialogHelper.openDialog('validation-error-dialog', validationErrorDialogConfig);
+          return Promise.resolve(false);
+        }
+
+        const totalSteps = 4.0;
+        const imageTag = this.project.image.auxImageTag.value;
+
+        let busyDialogMessage = i18n.t('flow-image-builder-validation-in-progress', {imageTag: imageTag});
+        dialogHelper.openBusyDialog(busyDialogMessage, 'bar');
+        dialogHelper.updateBusyDialog(busyDialogMessage, 0/totalSteps);
+        try {
+          const imageBuilderExe = this.project.settings.builderExecutableFilePath.value;
+          if (!options.skipImageBuilderValidation) {
+            const imageBuilderExeResults =
+              await window.api.ipc.invoke('validate-image-builder-exe', imageBuilderExe);
+            if (!imageBuilderExeResults.isValid) {
+              const errMessage = i18n.t('image-pusher-image-builder-invalid-error-message',
+                {fileName: imageBuilderExe, error: imageBuilderExeResults.reason});
+              await window.api.ipc.invoke('show-error-message', errTitle, errMessage);
+              return Promise.resolve(false);
+            }
+          }
+
+          busyDialogMessage = i18n.t('image-pusher-image-exists-in-progress', {imageTag: imageTag});
+          dialogHelper.updateBusyDialog(busyDialogMessage, 1/totalSteps);
+          if (!options.skipLocalImageExistsValidation) {
+            const imageExistsResults =
+              await window.api.ipc.invoke('validate-image-exists-locally', imageBuilderExe, imageTag);
+            let errMessage;
+            if (imageExistsResults.isSuccess && !imageExistsResults.imageExists) {
+              errMessage = i18n.t('image-pusher-image-not-exists-error-message', {imageTag: imageTag});
+            } else if (!imageExistsResults.isSuccess) {
+              errMessage = i18n.t('image-pusher-image-exists-failed-error-message',
+                {imageTag: imageTag, error: imageExistsResults.reason});
+            }
+            if (errMessage) {
+              await window.api.ipc.invoke('show-error-message', errTitle, errMessage);
+              return Promise.resolve(false);
+            }
+          }
+
+          busyDialogMessage = i18n.t('flow-save-project-in-progress');
+          dialogHelper.updateBusyDialog(busyDialogMessage, 2/totalSteps);
+          if (!options.skipProjectSave) {
+            const saveResult = await projectIo.saveProject();
+            if (!saveResult.saved) {
+              const errMessage = `${i18n.t('image-pusher-project-not-saved-error-prefix')}: ${saveResult.reason}`;
+              await window.api.ipc.invoke('show-error-message', errTitle, errMessage);
+              return Promise.resolve(false);
+            }
+          }
+
+          if (!options.skipClearAndShowConsole) {
+            wktConsole.clear();
+            wktConsole.show(true);
+          }
+
+          busyDialogMessage = i18n.t('image-pusher-push-in-progress', {imageTag: imageTag});
+          dialogHelper.updateBusyDialog(busyDialogMessage, 3/totalSteps);
+          const pushOptions = {
+            requiresLogin: this.project.image.auxImageRegistryPushRequireAuthentication.value,
+            host: this.project.image.internal.auxImageRegistryAddress.value,
+            username: this.project.image.auxImageRegistryPushUser.value,
+            password: this.project.image.auxImageRegistryPushPassword.value
+          };
+          let pushResults = await window.api.ipc.invoke('do-push-image', imageBuilderExe, imageTag, pushOptions);
+          dialogHelper.closeBusyDialog();
+          if (pushResults.isSuccess) {
+            if (!options.skipCompleteDialog) {
+              const title = i18n.t('image-pusher-create-complete-title');
+              const message = i18n.t('image-pusher-create-complete-message', {imageTag: imageTag});
+              await window.api.ipc.invoke('show-info-message', title, message);
+            }
+            return Promise.resolve(true);
+          } else {
+            const failedTitle = i18n.t('image-pusher-push-failed-title');
+            const failedMessage = i18n.t('image-pusher-push-failed-error-message', {error: pushResults.reason});
+            await window.api.ipc.invoke('show-error-message', failedTitle, failedMessage);
+            return Promise.resolve(false);
+          }
+        } catch (err) {
+          dialogHelper.closeBusyDialog();
+          throw err;
+        } finally {
+          dialogHelper.closeBusyDialog();
+        }
+      };
+
+      this.getValidatableObjectForAux = (flowNameKey) => {
+        const validationObject = validationHelper.createValidatableObject(flowNameKey);
+        const imageFormConfig = validationObject.getDefaultConfigObject();
+        imageFormConfig.formName = 'image-design-form-name';
+        imageFormConfig.tabName = 'image-design-form-auxiliary-tab-name';
+
+        validationObject.addField('image-design-image-tag-label',
+          this.project.image.auxImageTag.validate(true), imageFormConfig);
+
+        const settingsFormConfig = validationObject.getDefaultConfigObject();
+        settingsFormConfig.formName = 'project-settings-form-name';
+        settingsFormConfig.fieldNamePayload = { toolName: this.project.settings.builderType.value };
+        validationObject.addField('project-settings-build-tool-label',
+          validationHelper.validateRequiredField(this.project.settings.builderExecutableFilePath.value),
+          settingsFormConfig);
+
+        if (this.project.image.auxImageRegistryPushRequireAuthentication.value) {
+          // skip validating the host portion of the image tag since it may be empty for Docker Hub...
+          validationObject.addField('image-design-aux-image-registry-push-username-label',
+            validationHelper.validateRequiredField(this.project.image.auxImageRegistryPushUser.value), imageFormConfig);
+          validationObject.addField('image-design-aux-image-registry-push-password-label',
+            validationHelper.validateRequiredField(this.project.image.auxImageRegistryPushPassword.value), imageFormConfig);
         }
 
         return validationObject;