Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1394 from Azure/v0.10.5-March2015

Integrate from releasing branch v0.10.5 to master
  • Loading branch information...
commit 00a1beec02dd4f963ab8d83e3cdeafa818ade845 2 parents 0e8a661 + ef81159
@yugangw-msft yugangw-msft authored
Showing with 101 additions and 627 deletions.
  1. +1 −2  .travis.yml
  2. +5 −0 ChangeLog.txt
  3. +22 −146 gruntfile.js
  4. +2 −2 lib/common/package.json
  5. +2 −2 lib/services/authorizationManagement/package.json
  6. +2 −2 lib/services/computeManagement/package.json
  7. +2 −2 lib/services/extra/package.json
  8. +2 −2 lib/services/gallery/package.json
  9. +2 −2 lib/services/hdinsight/package.json
  10. +2 −2 lib/services/legacyStorage/package.json
  11. +2 −2 lib/services/management/package.json
  12. +2 −2 lib/services/monitoring/package.json
  13. +2 −2 lib/services/networkManagement/package.json
  14. +2 −2 lib/services/resourceManagement/package.json
  15. +2 −2 lib/services/scheduler/package.json
  16. +2 −2 lib/services/schedulerManagement/package.json
  17. +2 −2 lib/services/serviceBus/package.json
  18. +2 −2 lib/services/serviceBusManagement/package.json
  19. +2 −2 lib/services/sqlManagement/package.json
  20. +2 −2 lib/services/storageManagement/package.json
  21. +2 −2 lib/services/storeManagement/package.json
  22. +2 −2 lib/services/subscriptionManagement/package.json
  23. +9 −6 lib/services/webSiteManagement/lib/webSiteExtensionsClient.js
  24. +2 −2 lib/services/webSiteManagement/lib/webSiteManagementClient.js
  25. +2 −2 lib/services/webSiteManagement/package.json
  26. +2 −2 lib/services/webSiteManagement2/package.json
  27. +20 −21 package.json
  28. +0 −22 packages.config
  29. +0 −56 scripts/generateFromSpecs.js
  30. +0 −65 scripts/update.js
  31. +0 −19 scripts/updatePackageVersions.ps1
  32. +0 −246 tasks/hydra-tasks.js
View
3  .travis.yml
@@ -1,12 +1,11 @@
language: node_js
node_js:
- - "0.11"
+ - "0.12"
- "0.10"
- "0.8"
matrix:
allow_failures:
- - node_js: "0.11"
# setup links to submodules
before_install:
View
5 ChangeLog.txt
@@ -1,3 +1,8 @@
+2015.03.25 Version 0.10.5
+* Used newer 'request' package version of '2.45.0'
+* Updated website client lib to accept status code of 200 on 'createPublishingUser'
+* Updated compute client readme file
+
2015.02.09 Version 0.10.4
* regenerate client lib code for the latest service api
View
168 gruntfile.js
@@ -17,153 +17,30 @@
module.exports = function(grunt) {
//init stuff
grunt.initConfig({
- downloadNuGet: {
- path : '.nuget',
- src : 'http://www.nuget.org/nuget.exe'
- },
packageVersions: {
- 'azure': '0.10.4',
- 'azure-common': '0.9.10',
- 'azure-mgmt-authorization': '0.9.0-pre.5',
- 'azure-mgmt-compute': '0.9.15',
- 'azure-gallery': '2.0.0-pre.14',
- 'azure-mgmt-hdinsight': '0.9.13',
- 'azure-mgmt': '0.9.15',
- 'azure-monitoring': '0.9.1-pre.15',
- 'azure-mgmt-vnet': '0.9.16',
- 'azure-mgmt-resource': '2.0.0-pre.15',
- 'azure-scheduler': '0.9.1-pre.15',
- 'azure-mgmt-scheduler': '0.9.1-pre.15',
- 'azure-sb': '0.9.15',
- 'azure-mgmt-sb': '0.9.15',
- 'azure-mgmt-sql': '0.9.16',
- 'azure-mgmt-storage': '0.9.15',
- 'azure-mgmt-store': '0.9.15',
- 'azure-mgmt-subscription': '0.9.15',
- 'azure-mgmt-website': '0.9.15',
- 'azure-rm-website': '0.9.0-pre.9',
- 'azure-storage-legacy': '0.9.13',
- 'azure-extra': '0.1.6'
- },
- hydra: {
- 'Microsoft.WindowsAzure.Management.Compute.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.Management.Compute.ComputeManagementClient',
- destDir: 'lib/services/computeManagement/lib',
- output: 'ComputeManagementClient.js'
- },
- 'Microsoft.WindowsAzure.Management.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.Management.ManagementClient',
- destDir: 'lib/services/management/lib',
- output: 'ManagementClient.js'
- },
- 'Microsoft.WindowsAzure.Management.Monitoring.Specification.dll' : [
- {
- clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.AlertsClient',
- destDir: 'lib/services/monitoring/lib',
- output: 'alertsClient.js'
- },
- {
- clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Autoscale.AutoscaleClient',
- destDir: 'lib/services/monitoring/lib',
- output: 'autoscaleClient.js'
- },
- {
- clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Metrics.MetricsClient',
- destDir: 'lib/services/monitoring/lib',
- output: 'metricsClient.js'
- }/*,
- {
- clientType: 'Microsoft.WindowsAzure.Management.Monitoring.Events.EventsClient',
- destDir: 'lib/services/monitoring/lib',
- output: 'eventsClient.js'
- }*/
- ],
- 'Microsoft.WindowsAzure.Management.Network.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.Management.Network.NetworkManagementClient',
- destDir: 'lib/services/networkManagement/lib',
- output: 'networkManagementClient.js'
- },
- 'Microsoft.WindowsAzure.Management.Scheduler.Specification.dll' : [
- {
- clientType: 'Microsoft.WindowsAzure.Management.Scheduler.SchedulerManagementClient',
- destDir: 'lib/services/schedulerManagement/lib',
- output: 'schedulerManagementClient.js'
- },
- {
- clientType: 'Microsoft.WindowsAzure.Scheduler.SchedulerClient',
- destDir: 'lib/services/scheduler/lib',
- output: 'schedulerClient.js'
- }
- ],
- 'Microsoft.WindowsAzure.Management.ServiceBus.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.Management.ServiceBus.ServiceBusManagementClient',
- destDir: 'lib/services/serviceBusManagement/lib',
- output: 'serviceBusManagementClient.js'
- },
- 'Microsoft.WindowsAzure.Management.Sql.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.Management.Sql.SqlManagementClient',
- destDir: 'lib/services/sqlManagement/lib',
- output: 'sqlManagementClient.js'
- },
- 'Microsoft.WindowsAzure.Management.Storage.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.Management.Storage.StorageManagementClient',
- destDir: 'lib/services/storageManagement/lib',
- output: 'storageManagementClient.js'
- },
- 'Microsoft.WindowsAzure.Management.Store.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.Management.Store.StoreManagementClient',
- destDir: 'lib/services/storeManagement/lib',
- output: 'storeManagementClient.js'
- },
- 'Microsoft.WindowsAzure.Management.WebSites.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.Management.WebSites.WebSiteManagementClient',
- destDir: 'lib/services/webSiteManagement/lib',
- output: 'webSiteManagementClient.js'
- },
- 'Microsoft.WindowsAzure.WebSitesExtensions.Specification.dll' : {
- clientType: 'Microsoft.WindowsAzure.WebSitesExtensions.WebSiteExtensionsClient',
- destDir: 'lib/services/webSiteManagement/lib',
- output: 'webSiteExtensionsClient.js'
- },
- 'Microsoft.WindowsAzure.Subscriptions.Specification.dll': {
- clientType: 'Microsoft.WindowsAzure.Subscriptions.SubscriptionClient',
- destDir: 'lib/services/subscriptionManagement/lib',
- output: 'subscriptionClient.js'
- },
- 'Microsoft.Azure.Management.Resources.Specification.dll' : [
- {
- clientType: 'Microsoft.Azure.Management.Resources.ResourceManagementClient',
- destDir: 'lib/services/resourceManagement/lib',
- output: 'resourceManagementClient.js'
- },
- {
- clientType: 'Microsoft.Azure.Subscriptions.SubscriptionClient',
- destDir: 'lib/services/resourceManagement/lib',
- output: 'subscriptionClient.js'
- }
- ],
- 'Microsoft.Azure.Gallery.Specification.dll': {
- clientType: 'Microsoft.Azure.Gallery.GalleryClient',
- destDir: 'lib/services/gallery/lib',
- output: 'galleryClient.js'
- },
- 'Microsoft.Azure.Management.Authorization.Specification.dll': {
- clientType: 'Microsoft.Azure.Management.Authorization.AuthorizationManagementClient',
- destDir: 'lib/services/authorizationManagement/lib',
- output: 'authorizationManagementClient.js'
- },
- 'Microsoft.Azure.Graph.RBAC.Specification.dll': {
- clientType: 'Microsoft.Azure.Graph.RBAC.GraphRbacManagementClient',
- destDir: 'lib/services/extra/lib',
- output: 'graphRbacManagementClient.js'
- },
- 'Microsoft.Azure.Management.WebSites.Specification.dll': {
- clientType: 'Microsoft.Azure.Management.WebSites.WebSiteManagementClient',
- destDir: 'lib/services/webSiteManagement2/lib',
- output: 'webSiteManagementClient.js'
- }
+ 'azure': '0.10.5',
+ 'azure-common': '0.9.11',
+ 'azure-mgmt-authorization': '0.9.0-pre.6',
+ 'azure-mgmt-compute': '0.9.16',
+ 'azure-gallery': '2.0.0-pre.15',
+ 'azure-mgmt-hdinsight': '0.9.15',
+ 'azure-mgmt': '0.9.16',
+ 'azure-monitoring': '0.9.1-pre.16',
+ 'azure-mgmt-vnet': '0.9.17',
+ 'azure-mgmt-resource': '2.0.0-pre.16',
+ 'azure-scheduler': '0.9.1-pre.16',
+ 'azure-mgmt-scheduler': '0.9.1-pre.16',
+ 'azure-sb': '0.9.16',
+ 'azure-mgmt-sb': '0.9.16',
+ 'azure-mgmt-sql': '0.9.17',
+ 'azure-mgmt-storage': '0.9.16',
+ 'azure-mgmt-store': '0.9.16',
+ 'azure-mgmt-subscription': '0.9.16',
+ 'azure-mgmt-website': '0.9.16',
+ 'azure-rm-website': '0.9.0-pre.10',
+ 'azure-storage-legacy': '0.9.14',
+ 'azure-extra': '0.1.7'
},
-
//jsdoc config
jsdoc : {
dist : {
@@ -220,5 +97,4 @@ module.exports = function(grunt) {
grunt.loadTasks('tasks');
grunt.registerTask('publishdocs', ['githubPages:target']);
- grunt.registerTask('generateCode', [ 'downloadNuGet', 'restorePackages', 'hydra']);
};
View
4 lib/common/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.10",
+ "version": "0.9.11",
"description": "Microsoft Azure Common Client Library for node",
"tags": [
"azure",
@@ -36,7 +36,7 @@
"dateformat": "1.0.2-1.2.3",
"underscore": "1.4.x",
"tunnel": "~0.0.2",
- "request": "2.27.0",
+ "request": "2.45.0",
"validator": "~3.1.0",
"envconf": "~0.0.4",
"duplexer": "~0.1.1",
View
4 lib/services/authorizationManagement/package.json
@@ -7,7 +7,7 @@
"Tavares, Chris <ctavares@microsoft.com>",
"Mkrtchyan, Hovsep <hovsepm@microsoft.com>"
],
- "version": "0.9.0-pre.5",
+ "version": "0.9.0-pre.6",
"description": "Microsoft Azure Authorization Management Client Library for node",
"tags": [
"azure",
@@ -28,7 +28,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/computeManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.15",
+ "version": "0.9.16",
"description": "Microsoft Azure Compute Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10"
+ "azure-common": "0.9.11"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
"repository": {
View
4 lib/services/extra/package.json
@@ -7,7 +7,7 @@
"Tavares, Chris <ctavares@microsoft.com>",
"Mkrtchyan, Hovsep <hovsepm@microsoft.com>"
],
- "version": "0.1.6",
+ "version": "0.1.7",
"description": "Microsoft Azure Client Library in node for miscellaneous items",
"tags": [
"azure",
@@ -28,7 +28,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/gallery/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "2.0.0-pre.14",
+ "version": "2.0.0-pre.15",
"description": "Microsoft Azure Gallery Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/hdinsight/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.13",
+ "version": "0.9.15",
"description": "Microsoft Azure HDInsight Service Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/legacyStorage/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.13",
+ "version": "0.9.14",
"description": "Microsoft Azure Storage Client Library for node for back compat with older versions of node sdk",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x",
"mime": "~1.2.4"
},
View
4 lib/services/management/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.15",
+ "version": "0.9.16",
"description": "Microsoft Azure Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/monitoring/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.1-pre.15",
+ "version": "0.9.1-pre.16",
"description": "Microsoft Azure Monitoring Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x",
"moment": "2.6.0"
},
View
4 lib/services/networkManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.16",
+ "version": "0.9.17",
"description": "Microsoft Azure Virtual Network Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10"
+ "azure-common": "0.9.11"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
"repository": {
View
4 lib/services/resourceManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "2.0.0-pre.15",
+ "version": "2.0.0-pre.16",
"description": "Microsoft Azure Resource Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/scheduler/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.1-pre.15",
+ "version": "0.9.1-pre.16",
"description": "Microsoft Azure Scheduler Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"moment": "2.6.0"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/schedulerManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.1-pre.15",
+ "version": "0.9.1-pre.16",
"description": "Microsoft Azure Scheduler Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10"
+ "azure-common": "0.9.11"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
"repository": {
View
4 lib/services/serviceBus/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.15",
+ "version": "0.9.16",
"description": "Microsoft Azure Service Bus Service Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x",
"wns": "~0.5.3",
"mpns": "~2.0.0"
View
4 lib/services/serviceBusManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.15",
+ "version": "0.9.16",
"description": "Microsoft Azure Service Bus Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/sqlManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.16",
+ "version": "0.9.17",
"description": "Microsoft Azure SQL Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
View
4 lib/services/storageManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.15",
+ "version": "0.9.16",
"description": "Microsoft Azure Storage Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10"
+ "azure-common": "0.9.11"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
"repository": {
View
4 lib/services/storeManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.15",
+ "version": "0.9.16",
"description": "Microsoft Azure Store Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10"
+ "azure-common": "0.9.11"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
"repository": {
View
4 lib/services/subscriptionManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.15",
+ "version": "0.9.16",
"description": "Microsoft Azure Subscription Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10"
+ "azure-common": "0.9.11"
},
"homepage": "http://github.com/Azure/azure-sdk-for-node",
"repository": {
View
15 lib/services/webSiteManagement/lib/webSiteExtensionsClient.js
@@ -785,14 +785,15 @@ var ContinuousWebJobOperations = ( /** @lends ContinuousWebJobOperations */ func
var requestContent = null;
var requestDoc = null;
+ var continuousWebJobSettingsUpdateParametersValue = {};
+ requestDoc = continuousWebJobSettingsUpdateParametersValue;
+
if (settings.isSingleton !== null && settings.isSingleton !== undefined) {
- requestDoc = {};
- requestDoc['IsSingleton'] = settings.isSingleton;
+ continuousWebJobSettingsUpdateParametersValue['IsSingleton'] = settings.isSingleton;
}
if (settings.shutdownGraceTimeInSeconds !== null && settings.shutdownGraceTimeInSeconds !== undefined) {
- requestDoc = {};
- requestDoc['ShutdownGraceTimeInSeconds'] = settings.shutdownGraceTimeInSeconds;
+ continuousWebJobSettingsUpdateParametersValue['ShutdownGraceTimeInSeconds'] = settings.shutdownGraceTimeInSeconds;
}
requestContent = JSON.stringify(requestDoc);
@@ -3391,9 +3392,11 @@ var TriggeredWebJobOperations = ( /** @lends TriggeredWebJobOperations */ functi
var requestContent = null;
var requestDoc = null;
+ var triggeredWebJobSettingsUpdateParametersValue = {};
+ requestDoc = triggeredWebJobSettingsUpdateParametersValue;
+
if (settings.shutdownGraceTimeInSeconds !== null && settings.shutdownGraceTimeInSeconds !== undefined) {
- requestDoc = {};
- requestDoc['ShutdownGraceTimeInSeconds'] = settings.shutdownGraceTimeInSeconds;
+ triggeredWebJobSettingsUpdateParametersValue['ShutdownGraceTimeInSeconds'] = settings.shutdownGraceTimeInSeconds;
}
requestContent = JSON.stringify(requestDoc);
View
4 lib/services/webSiteManagement/lib/webSiteManagementClient.js
@@ -7982,7 +7982,7 @@ var WebSpaceOperations = ( /** @lends WebSpaceOperations */ function() {
return callback(err);
}
var statusCode = response.statusCode;
- if (statusCode !== 201) {
+ if (statusCode !== 200 && statusCode !== 201) {
var error = new Error(body);
error.statusCode = response.statusCode;
return callback(error);
@@ -7991,7 +7991,7 @@ var WebSpaceOperations = ( /** @lends WebSpaceOperations */ function() {
// Create Result
var result = null;
// Deserialize Response
- if (statusCode === 201) {
+ if (statusCode === 200 || statusCode === 201) {
var responseContent = body;
result = {};
var options = {};
View
4 lib/services/webSiteManagement/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.15",
+ "version": "0.9.16",
"description": "Microsoft Azure WebSite Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x",
"moment": "2.6.0"
},
View
4 lib/services/webSiteManagement2/package.json
@@ -10,7 +10,7 @@
"Rodrigues, Andre <andrerod@microsoft.com>",
"Tavares, Chris <ctavares@microsoft.com>"
],
- "version": "0.9.0-pre.9",
+ "version": "0.9.0-pre.10",
"description": "Microsoft Azure WebSite Management Client Library for node",
"tags": [
"azure",
@@ -31,7 +31,7 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
+ "azure-common": "0.9.11",
"underscore": "1.4.x",
"moment": "2.6.0"
},
View
41 package.json
@@ -14,7 +14,7 @@
"Mkrtchyan, Hovsep <hovsepm@microsoft.com>",
"Lu, Jianghao <jianghlu@microsoft.com>"
],
- "version": "0.10.4",
+ "version": "0.10.5",
"description": "Microsoft Azure Client Library for node",
"tags": [
"azure",
@@ -35,27 +35,27 @@
}
],
"dependencies": {
- "azure-common": "0.9.10",
- "azure-mgmt-authorization": "0.9.0-pre.5",
- "azure-mgmt-compute": "0.9.15",
- "azure-gallery": "2.0.0-pre.14",
- "azure-mgmt-hdinsight": "0.9.13",
- "azure-mgmt": "0.9.15",
- "azure-monitoring": "0.9.1-pre.15",
- "azure-mgmt-vnet": "0.9.16",
- "azure-mgmt-resource": "2.0.0-pre.15",
- "azure-scheduler": "0.9.1-pre.15",
- "azure-mgmt-scheduler": "0.9.1-pre.15",
- "azure-sb": "0.9.15",
- "azure-mgmt-sb": "0.9.15",
- "azure-mgmt-sql": "0.9.16",
- "azure-mgmt-storage": "0.9.15",
- "azure-mgmt-subscription": "0.9.15",
- "azure-mgmt-website": "0.9.15",
- "azure-rm-website": "0.9.0-pre.9",
+ "azure-common": "0.9.11",
+ "azure-mgmt-authorization": "0.9.0-pre.6",
+ "azure-mgmt-compute": "0.9.16",
+ "azure-gallery": "2.0.0-pre.15",
+ "azure-mgmt-hdinsight": "0.9.15",
+ "azure-mgmt": "0.9.16",
+ "azure-monitoring": "0.9.1-pre.16",
+ "azure-mgmt-vnet": "0.9.17",
+ "azure-mgmt-resource": "2.0.0-pre.16",
+ "azure-scheduler": "0.9.1-pre.16",
+ "azure-mgmt-scheduler": "0.9.1-pre.16",
+ "azure-sb": "0.9.16",
+ "azure-mgmt-sb": "0.9.16",
+ "azure-mgmt-sql": "0.9.17",
+ "azure-mgmt-storage": "0.9.16",
+ "azure-mgmt-subscription": "0.9.16",
+ "azure-mgmt-website": "0.9.16",
+ "azure-rm-website": "0.9.0-pre.10",
"mime": "~1.2.4",
"underscore": "1.4.x",
- "request": "2.27.0",
+ "request": "2.45.0",
"node-uuid": "~1.2.0",
"azure-storage": "0.3.3"
},
@@ -81,7 +81,6 @@
"test": "npm -s run-script jshint && npm -s run-script unit",
"unit": "node scripts/unit.js testlist.txt",
"setup": "node scripts/setup.js",
- "update": "node scripts/update.js",
"jshint": "jshint lib --reporter=jslint",
"ci": "node scripts/unit.js testlist.txt",
"coverage": "node scripts/unit.js testlist.txt -coverage > coverage.html"
View
22 packages.config
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Hyak.Generator" version="1.0.5505.27412-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.Compute.Specification" version="2.0.5507.19575-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.Scheduler.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.CloudServices.Specification" version="1.0.5507.19575-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.Sql.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.Storage.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.WebSites.Specification" version="3.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+win+wp80" />
- <package id="Microsoft.WindowsAzure.WebSitesExtensions.Specification" version="3.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+win+wp80" />
- <package id="Microsoft.WindowsAzure.Management.Store.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.Network.Specification" version="2.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.ServiceBus.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Subscriptions.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.Azure.Management.Resources.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.Azure.Gallery.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.WindowsAzure.Management.Monitoring.Specification" version="1.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.Azure.Management.WebSites.Specification" version="2.0.5507.19576-prerelease" targetFramework="portable-net45+sl50+wp80+win" />
- <package id="Microsoft.Azure.Management.Authorization.Specification" version="1.0.5507.19577-prerelease" targetFramework="portable-net45+sl50+win+wp80" />
- <package id="Microsoft.Azure.Graph.RBAC.Specification" version="1.0.5507.19578-prerelease" targetFramework="portable-net45+sl50+win+wp80" />
-</packages>
View
56 scripts/generateFromSpecs.js
@@ -1,56 +0,0 @@
-var os = require('os');
-var executeCmds = require('./executeCmds.js');
-
-if (os.platform() !== 'win32') {
- throw new Error('The script can only run on windows platform');
-}
-
-var cmds = [
- { cmd: 'chcp 850' },//to avoid https://github.com/npm/npm/issues/6438
- { cmd: 'npm install'},
- { cmd: 'npm install grunt-cli -g'},
- { cmd: 'grunt generateCode'},
-];
-
-var updatePackageVersion = false;
-var removeExistingSpecPackages = false;
-var showHelp;
-
-process.argv.forEach(function(v){
- v = v.toLowerCase();
- if (v.indexOf('updatePackageVersion') !== -1){
- updatePackageVersion = true;
- } else if (v.indexOf('removeExistingSpecPackages') !== -1) {
- removeExistingSpecPackages = true;
- } else if (v.indexOf('help') !== -1) {
- showHelp = true;
- }
-});
-
-console.log('***********');
-if (showHelp) {
- console.log('Use \'updatePackageVersion\' if you want to update your library\'s package version.');
- console.log('Use \'removeExistingSpecPackages\' to delete any existing spec packages. ' +
- 'Recommended when you have older packages downloaded before');
- process.exit();
-}
-
-
-console.log('*Info: Please make sure spec version was updated in <repository-root>\\packages.config');
-if (updatePackageVersion) {
- console.log('*Info: Please make sure the version was updated in <repository-root>\\gruntfile.js');
-}
-console.log('*After you commit changes to remote, you can access tarball using link such as ' +
- 'https://github.com/Azure/azure-sdk-for-node/tarball/dev/lib/services/computeManagement/');
-console.log('***********');
-
-if (updatePackageVersion) {
- cmds.push({ cmd: 'grunt updateVersions' });
-}
-
-if (removeExistingSpecPackages) {
- var packagesFolder = '"' + __dirname + '\\..\\packages' + '"';
- cmds.unshift({ cmd: 'if exist ' + packagesFolder + ' rmdir /s /q ' + packagesFolder });
-}
-
-executeCmds.execute(cmds);
View
65 scripts/update.js
@@ -1,65 +0,0 @@
-#!/usr/bin/env node
-//
-// Copyright (c) Microsoft and contributors. All rights reserved.
-//
-// 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 path = require('path');
-var fs = require('fs');
-var util = require('util');
-
-var repository = path.join(__dirname, '../../hydra');
-
-var walk = function(dir, done) {
- var results = [];
- fs.readdir(dir, function(err, list) {
- if (err) return done(err);
- var pending = list.length;
- if (!pending) return done(null, results);
- list.forEach(function(file) {
- file = dir + '/' + file;
- fs.stat(file, function(err, stat) {
- if (stat && stat.isDirectory()) {
- walk(file, function(err, res) {
- results = results.concat(res);
- if (!--pending) done(null, results);
- });
- } else {
- results.push(file);
- if (!--pending) done(null, results);
- }
- });
- });
- });
-};
-
-walk(repository, function (err, files) {
- files = files.filter(function (f) {
- return path.extname(f) === '.js' && f.toLowerCase().indexOf('/generated/') > 0;
- });
-
- walk(path.join(__dirname, '../lib/services'), function (err, matchingFiles) {
- files.forEach(function (newFile) {
- var match = matchingFiles.filter(function (matchingFile) {
- return path.basename(matchingFile).toLowerCase() === path.basename(newFile).toLowerCase();
- })[0];
-
- if (match) {
- fs.writeFileSync(match, fs.readFileSync(newFile));
- } else {
- console.log(util.format('Cloud not find match for %s', newFile));
- }
- });
- });
-});
View
19 scripts/updatePackageVersions.ps1
@@ -1,19 +0,0 @@
-param($sourceName)
-
-$packages = & ..\.nuget\nuget list -source $sourceName -prerelease
-$packages = $packages[1 .. ($packages.length - 1)]
-$packageVersions = @{}
-
-$packages | % { $packageVersions.add($_.split(' ')[0], $_.split(' ')[1]) }
-
-$packageConfig = [xml](gc ..\packages.config)
-
-$packageConfig.packages.package | % { $_.version = $packageVersions[$_.id] }
-
-$sw=New-Object system.io.stringwriter
-$writer=New-Object system.xml.xmltextwriter($sw)
-$writer.Formatting = [System.xml.formatting]::Indented
-$packageConfig.WriteContentTo($writer)
-
-set-content -path ..\packages.config -value $sw.ToString() -encoding UTF8
-
View
246 tasks/hydra-tasks.js
@@ -1,246 +0,0 @@
-//
-// Copyright (c) Microsoft and contributors. All rights reserved.
-//
-// 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 _ = require('underscore');
-var fs = require('fs');
-var os = require('os');
-var path = require('path');
-var request = require('request');
-var util = require('util');
-
-module.exports = function (grunt) {
- 'use strict';
-
- grunt.registerTask('downloadNuGet', 'Download the NuGet.exe file if not already present', function () {
- var config = {
- path: grunt.config('downloadNuGet.path') || '.nuget',
- src: grunt.config('downloadNuGet.src') || 'http://www.nuget.org/nuget.exe'
- };
-
- var done = this.async();
-
- if (!grunt.file.exists(config.path)) {
- grunt.file.mkdir(config.path);
- }
-
- var nugetExePath = path.join(config.path, 'nuget.exe');
-
- if (!grunt.file.exists(nugetExePath)) {
- var nugetExeStream = fs.createWriteStream(nugetExePath);
-
- nugetExeStream.on('finish', function (err) {
- // Wait a few milliseconds - finish fires before the file is actually closed
- setTimeout(function () { done(err); }, 500);
- });
-
- request(config.src).pipe(nugetExeStream);
- } else {
- done();
- }
- });
-
- grunt.registerTask('restorePackages', 'Download any missing packages from the nuget repositories', function () {
- var nugetPath = grunt.config('downloadNuGet.path') || '.nuget';
- var nugetExe = path.join(nugetPath, 'nuget.exe');
- var n;
- var restoreConfigFile = 'restore.config';
- var done = this.async();
-
- var configVars = [
- ['PRIVATE_FEED_URL', 'privateFeedUrl'],
- ['PRIVATE_FEED_USER_NAME', 'privateFeedUserName'],
- ['PRIVATE_FEED_PASSWORD', 'privateFeedPassword'],
- ['SECONDARY_FEED_URL', 'secondaryFeedUrl'],
- ['SECONDARY_FEED_USER_NAME', 'secondaryFeedUserName'],
- ['SECONDARY_FEED_PASSWORD', 'secondaryFeedPassword']
- ];
-
- configVars = configVars.map(function (v) { return [v[0], v[1], process.env[v[0]] || grunt.config('restorePackages.' + v[1])]; });
-
- var primaryFeed = configVars[0][2];
- var secondaryFeed = configVars[3][2];
-
- if (primaryFeed || secondaryFeed) {
- var config = _.chain(configVars).map(function (v) { return [v[1], v[2]]; }).object().value();
-
- deleteFile(restoreConfigFile);
-
- n = nuget(nugetExe, restoreConfigFile);
-
- var cleanupAndFail = function (err) {
- deleteFile(restoreConfigFile);
- grunt.fatal(err);
- done(false);
- };
-
- n.configSource('primaryFeed', config.privateFeedUrl, config.privateFeedUserName, config.privateFeedPassword, function (err) {
- if (err) { return cleanupAndFail(err); }
-
- n.configSource('secondaryFeed', config.secondaryFeedUrl, config.secondaryFeedUserName, config.secondaryFeedPassword, function (err) {
- if (err) { return cleanupAndFail(err); }
-
- n.restorePackages('packages.config', 'packages', function (err) {
- deleteFile(restoreConfigFile);
- if (err) {
- grunt.fatal(err);
- done(false);
- } else {
- done();
- }
- });
- });
- });
- } else {
- console.log('No configuration for private feed, using default sources');
- n = nuget(nugetExe);
- n.restorePackages('packages.config', 'packages', function (err) {
- if (err) { done(false); } else { done(); }
- });
- }
- });
-
- grunt.registerMultiTask('hydra', 'Run hydra code generator', function () {
- var hydraExePath = newest(grunt.file.expand('./packages/Hyak.Generator.*/tools/hyak.exe'));
- var specDllName = this.target;
- var specPath = newest(grunt.file.expand('./packages/**/tools/' + specDllName));
- var args;
-
- var data;
- if (Object.prototype.toString.call(this.data) === '[object Array]') {
- data = this.data;
- } else {
- data = [this.data];
- }
-
- function generate(elements, cb) {
- if (elements.length <= 0) {
- return cb();
- }
-
- var element = elements.pop();
- if (element.split) {
- args = ['-f', 'js', '-d', element.destDir, '-s', element.split, '-c', element.clientType, specPath];
- } else if (element.output) {
- args = ['-f', 'js', '-d', element.destDir, '-o', element.output, '-c', element.clientType, specPath];
- } else {
- // this will most likely be an error on the CLI, but pass it anyways to make sure
- // we throw the right error
- args = ['-f', 'js', '-d', element.destDir, '-c', element.clientType, specPath];
- }
-
- runExe(hydraExePath, args, function (err) {
- if (err) { grunt.fatal(err); cb(false); } else { generate(elements, cb); }
- });
- }
-
- generate(data, this.async());
- });
-
- function deleteFile(filename) {
- if (grunt.file.exists(filename)) {
- grunt.file.delete(filename);
- }
- }
-
- // Get the newest file by version number out of an array
- function newest(files) {
- // newest version will sort last
- return files.sort().pop();
- }
-
- // helper function/object to make it easier to run nuget
-
- function nuget(nugetExePath, configFile) {
- var defaultArgs = [];
- var argsTail = ['-NonInteractive'];
-
- if (os.platform() !== 'win32') {
- defaultArgs = ['--runtime=v4.0.30319', nugetExePath];
- nugetExePath = 'mono';
- }
-
- if (configFile) {
- argsTail.push('-configFile', configFile);
- grunt.file.write(configFile, '<configuration></configuration>');
- }
-
- function spawnOpts() {
- var args = _.toArray(arguments);
- return {
- cmd: nugetExePath,
- args: defaultArgs.concat(args).concat(argsTail)
- };
- }
-
- function addSource(sourceName, sourceUrl, callback) {
- var opts = spawnOpts('sources', 'add', '-name', sourceName, '-source', sourceUrl);
- grunt.util.spawn(opts, callback);
- }
-
- function updateSource(sourceName, userName, password, callback) {
- var opts = spawnOpts('sources', 'update', '-name', sourceName, '-username', userName, '-password', password);
- grunt.util.spawn(opts, callback);
- }
-
- function configSource(sourceName, sourceUrl, userName, password, callback) {
- if (sourceUrl) {
- addSource(sourceName, sourceUrl, function (error) {
- if (error) {
- callback(error);
- }
- if (userName && password) {
- updateSource(sourceName, userName, password, callback);
- }
- else {
- callback();
- }
- });
- } else {
- callback();
- }
- }
-
- function restorePackages(packageConfigFile, packagesDir, callback) {
- var opts = spawnOpts('restore', packageConfigFile, '-PackagesDirectory', packagesDir);
- var child = grunt.util.spawn(opts, callback);
- }
-
- return {
- configSource: configSource,
- restorePackages: restorePackages
- };
- }
-
-
- //
- // Run a CLR executable - run it directly if on Windows,
- // through mono if not
- //
- function runExe(exePath, args, callback) {
-
- var spawnOpts = {
- cmd: exePath,
- args: args
- };
-
- if (os.platform() !== 'win32') {
- spawnOpts.args = ['--runtime=v4.0.30319', exePath].concat(args);
- spawnOpts.cmd = 'mono';
- }
-
- grunt.util.spawn(spawnOpts, callback);
- }
-};
Please sign in to comment.
Something went wrong with that request. Please try again.