Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed usages from powershell commands #1

Merged
merged 18 commits into from
Apr 18, 2016
Merged

Fixed usages from powershell commands #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4074ad4
updated create machine to create hyper-v
Feb 11, 2016
a8414d0
Updating kitematic to use hyperv by default on windows part1
Feb 12, 2016
1dbe0cf
Implemented try first to start hypervbox, then start virtualbox
floradu88 Feb 21, 2016
5a77b14
Remove unnecesary console.log
floradu88 Feb 21, 2016
f2bee8a
Merge pull request #1 from floradu88/dev
floradu88 Feb 21, 2016
931a5ec
Merge pull request #2 from docker/master
floradu88 Feb 21, 2016
6282456
Added developer readme and hyper-v configuration
floradu88 Feb 21, 2016
e89d83b
Renamed .md to .txt
floradu88 Feb 21, 2016
a497291
Merged branch add-hyperv from pmario
Apr 15, 2016
5b76be3
Updated usages of powershell functions so that Hyperv can run if it i…
Apr 15, 2016
fe3c394
Removed debuggers from code.
Apr 15, 2016
1b02c5f
Refactored powershell into another file: `src/utils/PowershellUtil.js`
Apr 15, 2016
077e0cc
Added handling of the cases:
Apr 15, 2016
014da6c
Reverted getting an external virtual switch as this might be glitchy …
floradu88 Apr 15, 2016
f18e3f5
Due to i18n looks like we cannot expect to get a correct error messag…
floradu88 Apr 15, 2016
79fa39b
Fixed some undefined errors for virtualbox.
floradu88 Apr 15, 2016
4fa547c
Fixed Version retrieval from Hyper-v command.
Apr 18, 2016
9cc57e5
Make sure that the code is simple, we don't need to check whether or …
Apr 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 20 additions & 24 deletions src/utils/DockerMachineUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import path from 'path';
import Promise from 'bluebird';
import fs from 'fs';
import util from './Util';
import powershellUtil from './PowershellUtil';
import child_process from 'child_process';

var DockerMachine = {
Expand All @@ -13,9 +14,6 @@ var DockerMachine = {
return '/usr/local/bin/docker-machine';
}
},
commandElevated: function () {
return 'powershell.exe';
},
name: function () {
return 'default';
},
Expand Down Expand Up @@ -60,31 +58,24 @@ var DockerMachine = {
return false;
});
},
create: function (machineName = this.name(), provider) {
create: function (machineName = this.name(), provider = "hyperv") {
//TODO: check options elements!
switch (provider){
case "virtualbox":{
console.log('started create with virtualbox');
return util.execFile([this.command(), '-D', 'create', '-d', 'virtualbox', '--virtualbox-memory', '2048', machineName]);
}
case "hyperv":{
//The switch may contain spaces!
console.log('started create with hyper-v');
let virtualSwitch = localStorage.getItem('virtualSwitch');
console.log('will use this switch ' + virtualSwitch + ' with an existing switch')

let args= `"` + `docker-machine.exe -D create --driver hyperv --hyperv-memory 2048 `+
`--hyperv-virtual-switch '${virtualSwitch}' ${machineName}` + `"`;

//TODO: in an ideal world, powershell has its own PowershellUtil.js ;)
console.log("cmd: ", args)
return util.execFile([this.commandElevated(), 'start-process', 'powershell', '-verb', 'runas', '-wait', '-argumentList', args]).then(stdout => {
return Promise.resolve(null);
}).catch((error) => {
throw new Error(error.message);
});
return powershellUtil.runCommandWithArgs(args);
}
default:{
console.log('started create with virtualbox');
return util.execFile([this.command(), '-D', 'create', '-d', 'virtualbox', '--virtualbox-memory', '2048', machineName]);
default: {
console.log('started create with virtualbox');

let args= `"docker-machine.exe -D create --driver virtualbox --virtualbox-memory 2048 ` + machineName + `"`;
return powershellUtil.runCommandWithArgs(args);
}
}
},
Expand Down Expand Up @@ -200,12 +191,17 @@ var DockerMachine = {
}
},
virtualBoxLogs: function (machineName = this.name()) {
let logsPath = path.join(util.home(), '.docker', 'machine', 'machines', machineName, machineName, 'Logs', 'VBox.log');
let logData = null;
try {
logData = fs.readFileSync(logsPath, 'utf8');
} catch (e) {
console.error(e);
let logsPath = path.join(util.home(), '.docker', 'machine', 'machines', machineName, machineName, 'Logs');

if (fs.existsSync(logsPath)) {
let logsFilePath = path.join(logsPath, 'VBox.log');

try {
logData = fs.readFileSync(logsFilePath, 'utf8');
} catch (e) {
console.error(e);
}
}
return logData;
}
Expand Down
31 changes: 16 additions & 15 deletions src/utils/HypervBoxUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ var HypervBox = {
return 'powershell.exe';
},
// TODO: ..We'll probably need a differnt command here in the future. That's why code dupe.
commandElevated: function () {
return 'powershell.exe';
},
installed: function () {
return util.execFile([this.command(), '@(Get-Command get-vm).ModuleName']).then(stdout => {
console.log('stdout: ', stdout);
Expand All @@ -31,37 +28,40 @@ var HypervBox = {
*/

hasAdminRights: function() {
return util.execFile([this.command(), 'Get-VMHostSupportedVersion']).then(stdout => {
return util.execFile([this.command(), 'Get-VMHost']).then(stdout => {
Copy link
Owner

@pmario pmario Apr 15, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I run the command get-vmhost from a non elevated powershell I get this output:

get-vmhost : Sie besitzen nicht die erforderliche Berechtigung für diese Aufgabe. Wenden Sie sich an den Administrator
der Autorisierungsrichtlinie für Computer "PC-MARIO".
In Zeile:1 Zeichen:1
+ get-vmhost
+ ~~~~~~~~~~
    + CategoryInfo          : NotSpecified: (:) [Get-VMHost], VirtualizationException
    + FullyQualifiedErrorId : Unspecified,Microsoft.HyperV.PowerShell.Commands.GetVMHost

So for me there is no text "invalidoperation" ...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, so maybe FullyQualifiedErrorId would be better to check for.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pmario changed this in my latest commit.

console.log('stdout: ', stdout);
// To execute the above command you'll need Admin or Hyper-V-Admin rights.
if ( stdout.toUpperCase().indexOf('TRUE') !== -1) {
if (stdout.toLowerCase().indexOf('fullyqualifiederrorid') === -1) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you have a problem with this admin test command?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That function is not available for all installations. It is present on 50% of the machines I've tested.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah. ok

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't pinpointed which package/program added the powershell commands :(

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just found

PS C:\Users\Mario> get-command get-vmhost

CommandType     Name                                               Version    Source
-----------     ----                                               -------    ------
Cmdlet          Get-VMHost                                         2.0.0.0    Hyper-V


PS C:\Users\Mario> get-module -ListAvailable -Name Hyper-v


    Verzeichnis: C:\WINDOWS\system32\WindowsPowerShell\v1.0\Modules


ModuleType Version    Name                                ExportedCommands
---------- -------    ----                                ----------------
Binary     2.0.0.0    Hyper-V                             {Add-VMAssignableDevice, Add-VMDvdDrive, Add-VMFibreChannelHba, Add-VMGroupMember...}
Binary     1.1        Hyper-V                             {Add-VMDvdDrive, Add-VMFibreChannelHba, Add-VMHardDiskDrive, Add-VMMigrationNetwork...}


PS C:\Users\Mario>

As you suggested. FullyQualifiedErrorId may be a good option

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the above lines of code.

return Promise.resolve(true);
}
return Promise.resolve(false);
}).catch(() => {
return Promise.resolve(false);
});
},
switchName: function (name) {
// return util.execFile([this.command(), '$(Get-VMSwitch | where {$_.SwitchType -eq "external"}).name']).then(out => {
return util.execFile([this.command(), '$(Get-VMSwitch).name']).then(out => {
// We use the same mechanism as docker-machine. Use the first switch we find.
return (out.replace('\r','').split('\n')[0]);
var name = (out.replace('\r','').split('\n')[0]);
if (name !== null && name !== '')
return name;
else
return false;
}).catch(() => {
return false;
});
},
version: function () {
version: function (machineName) {
// there seems to be a problem with elevated execution. see: https://github.com/nodejs/node-v0.x-archive/issues/6797
// The only easy possibility seems to be to communicat with a file.

return util.execFile([this.command(), 'Get-VMHostSupportedVersion']).then(stdout => {

let match = stdout.match(/^(.*) True/im);
if (match != null) {
return util.execFile([this.command(), 'Get-VM | Where {$_.Name -eq "'+ machineName +'" -and $_.Version} | select Version']).then(stdout => {
let match = stdout.match(/\d+(?:\.\d+)+/g);
Copy link
Owner

@pmario pmario Apr 18, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did test the stuff. Seems to work with hyper-v,

but there is a problem here. needs to be match[0] since we only have one version number. and it seems the promise chain is broken here. ... need some more investigation

Copy link
Author

@floradu88 floradu88 Apr 18, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

match[0] is correct, I added an extra check to see if we get one or more versions. Check my latest commit.

if (match != null && match.length >= 1) {
// matched text: match[0]
// match start: match.index
// capturing group n: match[n]
return Promise.resolve(match[1]);
return Promise.resolve(match[0]);
}
Promise.reject('No VM version information found');
}).catch(() => {
Expand All @@ -76,8 +76,9 @@ var HypervBox = {
// Needed for consistency check
vmExists: function (name) {
return util.execFile([this.command(), "Get-VM | Where {$_.Name -eq '" + name + "'}"]).then(out => {
console.log(out)
return (out.indexOf(name) !== -1);
console.log(out);
var machineExists = out.indexOf(name) !== -1;
return machineExists;
}).catch(() => {
return false;
});
Expand Down
18 changes: 18 additions & 0 deletions src/utils/PowershellUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import util from './Util';

var PowershellUtil =
{
runCommandWithArgs : function (args) {
console.log("cmd: ", args);
return util.execFile([this.commandElevated(), 'start-process', 'powershell', '-verb', 'runas', '-wait', '-argumentList', args]).then(stdout => {
return Promise.resolve(null);
}).catch((error) => {
throw new Error(error.message);
});
},
commandElevated: function commandElevated() {
return 'powershell.exe';
},
};

module.exports = PowershellUtil;
6 changes: 3 additions & 3 deletions src/utils/SetupUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export default {
continue;
}

(hypervInstalled) ? hypervBoxVersion = await hypervBox.version() : 'N/A';
(hypervInstalled) ? hypervBoxVersion = await hypervBox.version(machine.name()) : 'N/A';
(virtualBoxInstalled) ? virtualBoxVersion = await virtualBox.version() : 'N/A';
machineVersion = await machine.version();

Expand All @@ -191,7 +191,7 @@ export default {
let existsInVmGui = false;
switch (provider){
case "virtualbox":{
existsInVmGui = await VirtualBox.vmExists(machine.name())
existsInVmGui = await virtualBox.vmExists(machine.name())
}
case "hyperv": {
existsInVmGui = await hypervBox.vmExists(machine.name())
Expand Down Expand Up @@ -272,7 +272,7 @@ export default {

let message = error.message.split('\n');
let lastLine = message.length > 1 ? message[message.length - 2] : 'Docker Machine encountered an error.';
let virtualBoxLogs = (provider === 'virtualbox') ? machine.virtualBoxLogs() : 'N/A';
let virtualBoxLogs = (provider === 'virtualbox') ? machine.virtualBoxLogs() || 'N/A' : 'N/A';
bugsnag.notify('Setup Failed', lastLine, {
'Docker Machine Logs': error.message,
'VirtualBox Logs': virtualBoxLogs,
Expand Down