Merge pull request #47 from oracle/aux-image-support

initial aux image support

Author: robertpatrick

electron/app/js/ipcRendererPreload.js

@@ -65,7 +65,9 @@ contextBridge.exposeInMainWorld(
           'blur-focused-item',
           'start-prepare-model',
           'start-create-image',
+          'start-create-aux-image',
           'start-push-image',
+          'start-push-aux-image',
           'start-k8s-verify-connection',
           'start-wko-install',
           'start-ingress-install',
@@ -145,6 +147,7 @@ contextBridge.exposeInMainWorld(
           'do-image-registry-login',
           'validate-image-builder-exe',
           'wit-create-image',
+          'wit-create-aux-image',
           'validate-image-exists-locally',
           'do-push-image',
           'kubectl-get-current-context',

electron/app/js/userSettings.js

@@ -268,7 +268,6 @@ function _getUserSettings() {
     if (userSettingsFileContent && userSettingsFileContent.length > 0) {
       try {
         const userSettingsObject = JSON.parse(userSettingsFileContent);
-        console.log('parsed userSettings object = %s', userSettingsObject);
         _userSettingsObject = _updateSettings(userSettingsObject);
       } catch (err) {
         throw new Error(`Failed to parse ${userSettingsFileName}: ${err}`);

electron/app/js/witCreate.js

@@ -17,7 +17,7 @@ async function createImage(currentWindow, stdoutChannel, stderrChannel, createCo
   const bypassProxyHosts = getBypassProxyHosts();
 
   const imageToolScript = getImagetoolShellScript();
-  const [ args, argsContainCredentials ] = buildArgumentsList(createConfig, httpsProxyUrl);
+  const [ args, argsContainCredentials ] = buildArgumentsListForCreate(createConfig, httpsProxyUrl);
   const env = {
     JAVA_HOME: createConfig.javaHome,
     DOCKER_BUILDKIT: '0',
@@ -35,9 +35,8 @@ async function createImage(currentWindow, stdoutChannel, stderrChannel, createCo
   };
 
   return new Promise(resolve => {
-    if (!argsContainCredentials) {
-      getLogger().debug('Executing %s shell script with args %s and environment %s', imageToolScript, args, JSON.stringify(env));
-    }
+    const filteredArgs = argsContainCredentials ? filterArgsForLogging(args) : args;
+    getLogger().debug('Executing %s shell script with args %s and environment %s', imageToolScript, filteredArgs, JSON.stringify(env));
     executeChildShellScript(currentWindow, imageToolScript, args, env, stdoutChannel,
       { stderrEventName: stderrChannel })
       .then(exitCode => {
@@ -56,7 +55,47 @@ async function createImage(currentWindow, stdoutChannel, stderrChannel, createCo
   });
 }
 
-function buildArgumentsList(createConfig, httpsProxyUrl) {
+async function createAuxImage(currentWindow, stdoutChannel, stderrChannel, createConfig) {
+  const httpsProxyUrl = getHttpsProxyUrl();
+  const bypassProxyHosts = getBypassProxyHosts();
+
+  const imageToolScript = getImagetoolShellScript();
+  const args = buildArgumentsListForCreateAuxImage(createConfig, httpsProxyUrl);
+  const env = {
+    JAVA_HOME: createConfig.javaHome,
+    DOCKER_BUILDKIT: '0',
+    WLSIMG_BLDDIR: app.getPath('temp')
+  };
+  if (httpsProxyUrl) {
+    env['HTTPS_PROXY'] = httpsProxyUrl;
+  }
+  if (bypassProxyHosts) {
+    env['NO_PROXY'] = bypassProxyHosts;
+  }
+
+  const result = {
+    isSuccess: true
+  };
+
+  return new Promise(resolve => {
+    getLogger().debug('Executing %s shell script with args %s and environment %s', imageToolScript, args, JSON.stringify(env));
+    executeChildShellScript(currentWindow, imageToolScript, args, env, stdoutChannel,
+      { stderrEventName: stderrChannel }).then(exitCode => {
+      if (exitCode !== 0) {
+        result.isSuccess = false;
+        result.reason = i18n.t('wit-create-create-aux-image-exit-code-error-message', { exitCode: exitCode });
+      }
+      resolve(result);
+    }).catch(err => {
+      getLogger().error(err);
+      result.isSuccess = false;
+      result.reason = i18n.t('wit-create-create-aux-image-error-message', { error: err.message || err });
+      resolve(result);
+    });
+  });
+}
+
+function buildArgumentsListForCreate(createConfig, httpsProxyUrl) {
   const args = [ 'create' ];
 
   if (createConfig.imageBuilderExe) {
@@ -81,6 +120,30 @@ function buildArgumentsList(createConfig, httpsProxyUrl) {
   return [ args, argsContainCredentials ];
 }
 
+function buildArgumentsListForCreateAuxImage(createConfig, httpsProxyUrl) {
+  const args = [ 'createAuxImage' ];
+
+  if (createConfig.imageBuilderExe) {
+    args.push('--builder', createConfig.imageBuilderExe);
+  }
+  args.push('--tag', createConfig.imageTag);
+
+  if (httpsProxyUrl) {
+    args.push('--httpsProxyUrl', httpsProxyUrl);
+  }
+
+  if (createConfig.baseImage) {
+    args.push('--fromImage', createConfig.baseImage);
+  }
+  if (createConfig.alwaysPullBaseImage) {
+    args.push('--pull');
+  }
+  addInstallerArgs(args, createConfig);
+  addWdtArgs(args, createConfig);
+  addAdvancedArgs(args, createConfig);
+  return args;
+}
+
 function addInstallerArgs(args, createConfig) {
   if (createConfig.jdkInstallerVersion) {
     args.push('--jdkVersion', createConfig.jdkInstallerVersion);
@@ -148,6 +211,10 @@ function addWdtArgs(args, createConfig) {
     args.push('--wdtDomainHome', createConfig.domainHome);
   }
 
+  if (createConfig.wdtHome) {
+    args.push('--wdtHome', createConfig.wdtHome);
+  }
+
   if (createConfig.modelHome) {
     args.push('--wdtModelHome', createConfig.modelHome);
   }
@@ -166,14 +233,33 @@ function addAdvancedArgs(args, createConfig) {
     args.push('--buildNetwork', createConfig.buildNetwork);
   }
 
-  if (createConfig.chownOwner || createConfig.chownGroup) {
-    const owner = createConfig.chownOwner || 'oracle';
-    const group = createConfig.chownGroup || 'oracle';
+  if (createConfig.target) {
+    args.push('--target', createConfig.target);
+  }
+
+  if (createConfig.chownOwner && createConfig.chownGroup) {
+    args.push('--chown', `${createConfig.chownOwner}:${createConfig.chownGroup}`);
+  }
+}
 
-    args.push('--chown', `${owner}:${group}`);
+function filterArgsForLogging(args) {
+  const filteredArgs = [];
+  let filterNextArg = false;
+  for (const arg of args) {
+    if (filterNextArg) {
+      filteredArgs.push('********');
+      filterNextArg = false;
+    } else {
+      filteredArgs.push(arg);
+      if (arg === '--user' || arg === '--password') {
+        filterNextArg = true;
+      }
+    }
   }
+  return filteredArgs;
 }
 
 module.exports = {
-  createImage
+  createImage,
+  createAuxImage
 };

electron/app/js/wktWindow.js

@@ -269,6 +269,34 @@ class WktAppMenu {
               sendToWindow(focusedWindow,'start-push-image');
             }
           },
+          {
+            id: 'createAuxImage',
+            label: i18n.t('menu-go-create-aux-image'),
+            enabled: !this._hasOpenDialog,
+            click(item, focusedWindow) {
+              if (!focusedWindow) {
+                return dialog.showErrorBox(
+                  i18n.t('menu-go-create-aux-image-error-title'),
+                  i18n.t('menu-go-create-aux-image-error-message')
+                );
+              }
+              sendToWindow(focusedWindow,'start-create-aux-image');
+            }
+          },
+          {
+            id: 'pushAuxImage',
+            label: i18n.t('menu-go-push-aux-image'),
+            enabled: !this._hasOpenDialog,
+            click(item, focusedWindow) {
+              if (!focusedWindow) {
+                return dialog.showErrorBox(
+                  i18n.t('menu-go-push-aux-image-error-title'),
+                  i18n.t('menu-go-push-aux-image-error-message')
+                );
+              }
+              sendToWindow(focusedWindow,'start-push-aux-image');
+            }
+          },
           {
             id: 'verifyConnectivity',
             label: i18n.t('menu-go-kubectl-verify-connectivity'),

electron/app/locales/en/electron.json

@@ -30,12 +30,18 @@
   "menu-go-prep-model-for-k8s": "Prepare Model for Kubernetes",
   "menu-go-prepare-model-error-title": "No Active Project Window",
   "menu-go-prepare-model-error-message": "Cannot run Prepare Model since there is no active window, and therefore no project with a model to prepare.",
-  "menu-go-create-image": "Create Image",
+  "menu-go-create-image": "Create Primary Image",
   "menu-go-create-image-error-title": "No Active Project Window",
-  "menu-go-create-image-error-message": "Cannot run Create Image since there is no active window, and therefore no project with an image to create.",
-  "menu-go-push-image": "Push Image to Registry",
+  "menu-go-create-image-error-message": "Cannot run Create Primary Image since there is no active window, and therefore no project with an image to create.",
+  "menu-go-push-image": "Push Primary Image to Registry",
   "menu-go-push-image-error-title": "No Active Project Window",
-  "menu-go-push-image-error-message": "Cannot push image since there is no active window, and therefore no project with an image to push.",
+  "menu-go-push-image-error-message": "Cannot push primary image since there is no active window, and therefore no project with an image to push.",
+  "menu-go-create-aux-image": "Create Auxiliary Image",
+  "menu-go-create-aux-image-error-title": "No Active Project Window",
+  "menu-go-create-aux-image-error-message": "Cannot run Create Auxiliary Image since there is no active window, and therefore no project with an image to create.",
+  "menu-go-push-aux-image": "Push Auxiliary Image to Registry",
+  "menu-go-push-aux-image-error-title": "No Active Project Window",
+  "menu-go-push-aux-image-error-message": "Cannot push primary image since there is no active window, and therefore no project with an image to push.",
   "menu-go-kubectl-verify-connectivity": "Verify Kubernetes Client Connection",
   "menu-go-kubectl-verify-connectivity-error-title": "No Active Project Window",
   "menu-go-kubectl-verify-connectivity-error-message": "Cannot verify Kubernetes client connectivity since there is no active window, and therefore no project with a Kubernetes configuration to verify.",
@@ -217,7 +223,9 @@
   "wit-cache-wdt-installer-cache-failed-error-message": "Failed to add the WebLogic Deploy Tooling installer to the WebLogic Image Tool cache: {{error}}.",
 
   "wit-create-create-exit-code-error-message": "Create Image exited with non-zero exit code {{exitCode}} that indicates an error.  Please consult the output window for more information.",
+  "wit-create-create-aux-image-exit-code-error-message": "Create Auxiliary Image exited with non-zero exit code {{exitCode}} that indicates an error.  Please consult the output window for more information.",
   "wit-create-create-error-message": "Creating image failed: {{error}}",
+  "wit-create-create-aux-image-error-message": "Creating auxiliary image failed: {{error}}",
 
   "image-builder-not-specified": "Image Builder executable was empty.",
   "image-builder-not-exists": "Image Builder executable {{imageBuilder}} does not exist.",