Merge branch 'merged2' of github.com:Microsoft-Interop/azure-sdk-for-node-pr into merged2
This commit is contained in:
Sergey S Shinkevich
Коммит
519371bd9c
|
|
@ -101,7 +101,7 @@ exports.createServiceBusService = function (namespace, accessKey, issuer, acsNam
|
|||
* ServiceManagement client exports.
|
||||
*/
|
||||
|
||||
var ServiceManagementService = require('./services/servicemanagement/servicemanagementservice');
|
||||
var ServiceManagementService = require('./services/serviceManagement/servicemanagementservice');
|
||||
exports.ServiceManagementService = ServiceManagementService;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ exports.init = function (cli) {
|
|||
account.command('clear')
|
||||
.whiteListPowershell()
|
||||
.description('Remove any of the stored account info stored by import or config set')
|
||||
|
||||
|
||||
.action(function () {
|
||||
function deleteIfExists(file, isDir) {
|
||||
if (path.existsSync(file)) {
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ exports.init = function (cli) {
|
|||
});
|
||||
|
||||
config.command('set <name> <value>')
|
||||
|
||||
|
||||
.usage('<name> <value>')
|
||||
|
||||
|
||||
.whiteListPowershell()
|
||||
.description('Change a config setting')
|
||||
.action(function (name, value, options) {
|
||||
|
|
|
|||
|
|
@ -1,113 +0,0 @@
|
|||
/**
|
||||
* Copyright 2011 Microsoft Corporation
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
var fs = require('fs');
|
||||
var pfx2pem = require('../../util/certificates/pkcs').pfx2pem;
|
||||
var Channel = require('../channel');
|
||||
|
||||
return;
|
||||
/*
|
||||
exports.init = function (waz) {
|
||||
var cli = waz;
|
||||
function getChannel() {
|
||||
var pem = cli.category('account').pemCert();
|
||||
|
||||
var channel = new Channel({
|
||||
host: 'umapi-preview.core.windows-int.net',
|
||||
port: 8443,
|
||||
key: pem.key,
|
||||
cert: pem.cert
|
||||
}).header('x-ms-version', '2011-02-25');
|
||||
|
||||
return channel;
|
||||
}
|
||||
|
||||
var space = waz.category('space')
|
||||
.description('Commands to manage your Azure web spaces');
|
||||
|
||||
space.command('show [name]')
|
||||
.whiteListPowershell()
|
||||
.description('Show info about a web space')
|
||||
.option('-s, --subscription <id>', 'use the subscription id')
|
||||
.action(function (name, options) {
|
||||
|
||||
var subscription = cli.category('account').lookupSubscriptionId(options.subscription);
|
||||
|
||||
getChannel()
|
||||
.path(subscription)
|
||||
.path('services/webspaces')
|
||||
.path(name || '')
|
||||
.GET(function (err, thing) {
|
||||
console.log(thing);
|
||||
});
|
||||
});
|
||||
|
||||
space.command('delete <name>')
|
||||
.whiteListPowershell()
|
||||
.description('Delete a web space')
|
||||
.option('-s, --subscription <id>', 'use the subscription id')
|
||||
.action(function (name, options) {
|
||||
|
||||
var subscription = options.subscription || waz.category('account').defaultSubscriptionId();
|
||||
|
||||
channel
|
||||
.header('x-ms-version', '2011-02-25')
|
||||
.path(subscription)
|
||||
.path('services/webspaces')
|
||||
.path(name)
|
||||
.DELETE(function (err, thing) {
|
||||
console.log(thing);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
space.command('create <name>')
|
||||
.whiteListPowershell()
|
||||
.description('Create a web space')
|
||||
.option('-s, --subscription <id>', 'use the subscription id')
|
||||
.option('-p, --plan <plan>', 'use the plan')
|
||||
.action(function (name, options) {
|
||||
|
||||
var subscription = options.subscription || waz.category('account').defaultSubscriptionId();
|
||||
|
||||
getChannel()
|
||||
.path(subscription)
|
||||
.path('services/webspaces/')
|
||||
.header('Content-Type', 'application/xml')
|
||||
.POST(function (req) {
|
||||
req.write('<WebSpace xmlns="http://schemas.microsoft.com/windowsazure">');
|
||||
req.write('<Name>');
|
||||
req.write(name);
|
||||
req.write('</Name>');
|
||||
req.write('<Plan>');
|
||||
req.write(options.plan || 'VirtualDedicatedPlan');
|
||||
req.write('</Plan>');
|
||||
req.write('<Subscription>');
|
||||
req.write(subscription);
|
||||
req.write('</Subscription>');
|
||||
req.write('</WebSpace>');
|
||||
|
||||
req.end();
|
||||
},
|
||||
function (err, thing) {
|
||||
console.log(thing);
|
||||
});
|
||||
});
|
||||
};
|
||||
*/
|
||||
|
|
@ -13,7 +13,6 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
var assert = require('assert');
|
||||
var crypto = require('crypto');
|
||||
var fs = require('fs');
|
||||
|
|
|
|||
|
|
@ -215,33 +215,18 @@
|
|||
<Content Include="..\..\lib\cli\commands\account.js">
|
||||
<Link>lib\cli\commands\account.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\cert.js">
|
||||
<Link>lib\cli\commands\cert.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\cloudService.js">
|
||||
<Link>lib\cli\commands\cloudService.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\config.js">
|
||||
<Link>lib\cli\commands\config.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\disk.js">
|
||||
<Link>lib\cli\commands\disk.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\help.js">
|
||||
<Link>lib\cli\commands\help.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\image.js">
|
||||
<Link>lib\cli\commands\image.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\site.js">
|
||||
<Link>lib\cli\commands\site.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\site_.js">
|
||||
<Link>lib\cli\commands\site_.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\space.js">
|
||||
<Link>lib\cli\commands\space.js</Link>
|
||||
</Content>
|
||||
<Content Include="..\..\lib\cli\commands\vm.js">
|
||||
<Link>lib\cli\commands\vm.js</Link>
|
||||
</Content>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# This script is only used at build time, it is not part of the package.
|
||||
#
|
||||
|
||||
CURRENT_NODE_DISTRIBUTION_VERSION=v0.6.14
|
||||
CURRENT_NODE_DISTRIBUTION_VERSION=v0.6.17
|
||||
|
||||
# Check for Apple's PackageMaker
|
||||
# ------------------------------
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<pkgref spec="1.12" uuid="EB9E46F9-1AC4-4811-82D0-BBD3E615D914"><config><identifier>com.microsoft.azure.cli.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">out/azure.tar.gz</installFrom><installTo mod="true">/usr/local/azure/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>identifier</mod><mod>scripts.postinstall.isRelativeType</mod><mod>parent</mod><mod>installTo</mod></config><scripts><postinstall relative="true" mod="true">scripts/install.sh</postinstall></scripts></pkgref>
|
||||
<pkgref spec="1.12" uuid="EB9E46F9-1AC4-4811-82D0-BBD3E615D914"><config><identifier>com.microsoft.azure.cli.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">out/azure.tar.gz</installFrom><installTo mod="true">/usr/local/azure/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>installTo</mod><mod>identifier</mod><mod>scripts.postinstall.isRelativeType</mod><mod>parent</mod></config><scripts><postinstall relative="true" mod="true">scripts/install.sh</postinstall></scripts></pkgref>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<pkmkdoc spec="1.12"><properties><title>Windows Azure SDK</title><build>/Users/wilcoxj/Desktop/Windows Azure SDK.pkg</build><organization>com.microsoft.azure</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>The Windows Azure SDK for OS X adds the powerful azure command line interface for interacting with, publishing, and building open source applications for Windows Azure.</description><contents><choice title="Node.js Independent Binary" id="containednode" description="The Windows Azure SDK includes an independent binary of Node.js that is installed outside the path." starts_selected="true" starts_enabled="true" starts_hidden="true"><pkgref id="com.microsoft.azure.cli.node.pkg"/></choice><choice title="Windows Azure CLI" id="azurecli" starts_selected="true" starts_enabled="true" starts_hidden="true"><pkgref id="com.microsoft.azure.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="background">resources/background.png</resource><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf320
|
||||
<pkmkdoc spec="1.12"><properties><title>Windows Azure SDK</title><build>/Users/wilcoxj/Desktop/Windows Azure SDK.pkg</build><organization>com.microsoft.azure</organization><userSees ui="easy"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>The Windows Azure SDK for OS X adds the powerful azure command line interface for interacting with, publishing, and building open source applications for Windows Azure.</description><contents><choice title="Node.js Independent Binary" id="containednode" description="The Windows Azure SDK includes an independent binary of Node.js that is installed outside the path." starts_selected="true" starts_enabled="true" starts_hidden="true"><pkgref id="com.microsoft.azure.cli.node.pkg"/></choice><choice title="Windows Azure CLI" id="azurecli" starts_selected="true" starts_enabled="true" starts_hidden="true"><pkgref id="com.microsoft.azure.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="background">resources/background.png</resource><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf320
|
||||
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
|
||||
{\colortbl;\red255\green255\blue255;\red38\green38\blue38;}
|
||||
\deftab720
|
||||
|
|
@ -37,4 +37,4 @@ Please make sure that /usr/local/bin/ is in your $PATH.\
|
|||
\
|
||||
Thanks,\
|
||||
The Windows Azure Team\
|
||||
@windowsazure}]]></resource></locale></resources><requirements><requirement id="sosv" operator="ge" value="'10.6.7'"><message-title>Mac OS X 10.6.7 Required</message-title><message>The Windows Azure SDK requires at least operating system version 10.6.7.</message></requirement></requirements><flags/><postinstall><action id="com.apple.packagemaker.actions.openurl"><value>http://go.microsoft.com/fwlink/?LinkId=247438</value></action></postinstall><item type="file">01node.xml</item><item type="file">02azure.xml</item><mod>properties.systemDomain</mod><mod>properties.title</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>postinstallActions.actions</mod></pkmkdoc>
|
||||
@windowsazure}]]></resource></locale></resources><requirements><requirement id="sosv" operator="ge" value="'10.6.7'"><message-title>Mac OS X 10.6.7 Required</message-title><message>The Windows Azure SDK requires at least operating system version 10.6.7.</message></requirement></requirements><flags/><postinstall><action id="com.apple.packagemaker.actions.openurl"><value>http://go.microsoft.com/fwlink/?LinkId=247438</value></action></postinstall><item type="file">01node.xml</item><item type="file">02azure.xml</item><mod>postinstallActions.actions</mod><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>description</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
|
||||
Загрузка…
Ссылка в новой задаче