From a7db00834b62e778604f1582a856fa80c59941e8 Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Wed, 8 Jan 2014 19:15:08 +0000 Subject: [PATCH 1/6] Update module versions --- lib/common/package.json | 2 +- lib/services/computeManagement/package.json | 2 +- lib/services/management/package.json | 2 +- lib/services/networkManagement/package.json | 2 +- lib/services/scheduler/package.json | 2 +- lib/services/schedulerManagement/package.json | 2 +- .../serviceBusManagement/package.json | 2 +- lib/services/sqlManagement/package.json | 2 +- lib/services/storageManagement/package.json | 2 +- .../subscriptionManagement/package.json | 2 +- lib/services/webSiteManagement/package.json | 2 +- package.json | 22 +++++++++---------- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/common/package.json b/lib/common/package.json index 39abb93e8..b9cba41b8 100644 --- a/lib/common/package.json +++ b/lib/common/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Common Client Library for node", "tags": [ "azure", diff --git a/lib/services/computeManagement/package.json b/lib/services/computeManagement/package.json index abde23d92..8fcf06d47 100644 --- a/lib/services/computeManagement/package.json +++ b/lib/services/computeManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Compute Management Client Library for node", "tags": [ "azure", diff --git a/lib/services/management/package.json b/lib/services/management/package.json index 102c72285..e1e7ad6c0 100644 --- a/lib/services/management/package.json +++ b/lib/services/management/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Management Client Library for node", "tags": [ "azure", diff --git a/lib/services/networkManagement/package.json b/lib/services/networkManagement/package.json index 5e34a413a..8572e025a 100644 --- a/lib/services/networkManagement/package.json +++ b/lib/services/networkManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Virtual Network Management Client Library for node", "tags": [ "azure", diff --git a/lib/services/scheduler/package.json b/lib/services/scheduler/package.json index 1d2bb8d29..7b3c81fc9 100644 --- a/lib/services/scheduler/package.json +++ b/lib/services/scheduler/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Scheduler Client Library for node", "tags": [ "azure", diff --git a/lib/services/schedulerManagement/package.json b/lib/services/schedulerManagement/package.json index de100f8aa..160cb37e4 100644 --- a/lib/services/schedulerManagement/package.json +++ b/lib/services/schedulerManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Scheduler Management Client Library for node", "tags": [ "azure", diff --git a/lib/services/serviceBusManagement/package.json b/lib/services/serviceBusManagement/package.json index a8271b723..ea03f5be2 100644 --- a/lib/services/serviceBusManagement/package.json +++ b/lib/services/serviceBusManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Service Bus Management Client Library for node", "tags": [ "azure", diff --git a/lib/services/sqlManagement/package.json b/lib/services/sqlManagement/package.json index bab392a93..2449b1669 100644 --- a/lib/services/sqlManagement/package.json +++ b/lib/services/sqlManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure SQL Management Client Library for node", "tags": [ "azure", diff --git a/lib/services/storageManagement/package.json b/lib/services/storageManagement/package.json index a5211eca7..d17ac1022 100644 --- a/lib/services/storageManagement/package.json +++ b/lib/services/storageManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Storage Management Client Library for node", "tags": [ "azure", diff --git a/lib/services/subscriptionManagement/package.json b/lib/services/subscriptionManagement/package.json index 8c2e4eeb9..9ffce9ba2 100644 --- a/lib/services/subscriptionManagement/package.json +++ b/lib/services/subscriptionManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Subscription Management Client Library for node", "tags": [ "azure", diff --git a/lib/services/webSiteManagement/package.json b/lib/services/webSiteManagement/package.json index d82989f38..3fcee2e2b 100644 --- a/lib/services/webSiteManagement/package.json +++ b/lib/services/webSiteManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure WebSite Management Client Library for node", "tags": [ "azure", diff --git a/package.json b/package.json index c6a4ac169..74cdcfd7e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.18", + "version": "0.8.0", "description": "Windows Azure Client Library for node", "tags": [ "azure", @@ -31,16 +31,16 @@ } ], "dependencies": { - "azure-common": "*", - "azure-mgmt-compute": "*", - "azure-mgmt": "*", - "azure-mgmt-vnet": "*", - "azure-mgmt-sb": "*", - "azure-mgmt-sql": "*", - "azure-mgmt-storage": "*", - "azure-mgmt-store": "*", - "azure-mgmt-subscription": "*", - "azure-mgmt-website": "*", + "azure-common": "0.9.0-pre.1", + "azure-mgmt-compute": "0.9.0-pre.1", + "azure-mgmt": "0.9.0-pre.1", + "azure-mgmt-vnet": "0.9.0-pre.1", + "azure-mgmt-sb": "0.9.0-pre.1", + "azure-mgmt-sql": "0.9.0-pre.1", + "azure-mgmt-storage": "0.9.0-pre.1", + "azure-mgmt-store": "0.9.0-pre.1", + "azure-mgmt-subscription": "0.9.0-pre.1", + "azure-mgmt-website": "0.9.0-pre.1", "mime": ">= 1.2.4", "underscore": ">= 1.3.1", "request": "2.27.0", From 349aab667ba9fc6e052969821cc85c00e52e5149 Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Wed, 8 Jan 2014 19:19:43 +0000 Subject: [PATCH 2/6] Rename createWebsiteManagementClient to createWebSiteManagementClient --- lib/azure.js | 2 +- lib/services/webSiteManagement/lib/website.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/azure.js b/lib/azure.js index fe5cbbec0..c8fb9ce4c 100644 --- a/lib/azure.js +++ b/lib/azure.js @@ -295,7 +295,7 @@ exports.WebsiteManagementService = WebsiteManagementService; * @param {string} [hostOptions.apiversion='2012-03-01'] The API vesion to be used. * @return {WebsiteManagementService} A new WebsitemanagementService object. */ -exports.createWebsiteManagementService = azureWebSite.createWebsiteManagementService; +exports.createWebSiteManagementService = azureWebSite.createWebSiteManagementService; /** * ScmService client exports. diff --git a/lib/services/webSiteManagement/lib/website.js b/lib/services/webSiteManagement/lib/website.js index cfba28039..68d84188a 100644 --- a/lib/services/webSiteManagement/lib/website.js +++ b/lib/services/webSiteManagement/lib/website.js @@ -30,7 +30,7 @@ exports.WebSiteManagementClient = WebSiteManagementClient; * @param {string} [baseUri] The base uri. * @return {WebSiteManagementClient} A new WebSiteManagementClient object. */ -exports.createWebsiteManagementClient = function (credentials, baseUri) { +exports.createWebSiteManagementClient = function (credentials, baseUri) { return new exports.WebSiteManagementClient.WebSiteManagementClient(credentials, baseUri); }; From 975cc204019ad86d29bec0105870837cee1a30fa Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Wed, 8 Jan 2014 19:21:13 +0000 Subject: [PATCH 3/6] Excluding non published modules --- lib/azure.js | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/azure.js b/lib/azure.js index c8fb9ce4c..021f3e1c5 100644 --- a/lib/azure.js +++ b/lib/azure.js @@ -401,8 +401,9 @@ exports.createStorageManagementClient = azureStorage.createStorageManagementClie * Generated StoreClient client exports. * @ignore */ -var azureStore = require('azure-mgmt-store'); -exports.StoreManagementClient = azureStore.StoreManagementClient; +// TODO: uncomment when store is published +// var azureStore = require('azure-mgmt-store'); +// exports.StoreManagementClient = azureStore.StoreManagementClient; /** * Creates a new {@link StoreManagementClient} object. @@ -415,14 +416,16 @@ exports.StoreManagementClient = azureStore.StoreManagementClient; * @param {string} [baseUri] The base uri. * @return {StoreManagementClient} A new StoreManagementClient object. */ -exports.createStoreManagementClient = azureStore.createStoreManagementClient; +// TODO: uncomment when store is published +// exports.createStoreManagementClient = azureStore.createStoreManagementClient; /** * Generated SubscriptionClient client exports. * @ignore */ -var azureSubscription = require('azure-mgmt-subscription'); -exports.SubscriptionClient = azureSubscription.SubscriptionClient; +// TODO: uncomment when subscription is published +// var azureSubscription = require('azure-mgmt-subscription'); +// exports.SubscriptionClient = azureSubscription.SubscriptionClient; /** * Creates a new {@link SubscriptionClient} object. @@ -435,7 +438,8 @@ exports.SubscriptionClient = azureSubscription.SubscriptionClient; * @param {string} [baseUri] The base uri. * @return {SubscriptionClient} A new SubscriptionClient object. */ -exports.createSubscriptionClient = azureSubscription.createSubscriptionClient; +// TODO: uncomment when subscription is published +// exports.createSubscriptionClient = azureSubscription.createSubscriptionClient; /** * Generated WebsiteManagementService client exports. @@ -499,8 +503,9 @@ exports.createServiceBusManagementClient = azureServiceBus.createServiceBusManag * Generated SchedulerManagementClient client exports. * @ignore */ -var azureSchedulerManagement = require('azure-mgmt-scheduler'); -exports.SchedulerManagementClient = azureSchedulerManagement.SchedulerManagementClient; +// TODO: uncomment when scheduler management is published +// var azureSchedulerManagement = require('azure-mgmt-scheduler'); +// exports.SchedulerManagementClient = azureSchedulerManagement.SchedulerManagementClient; /** * Creates a new {@link SchedulerManagementClient} object. @@ -513,7 +518,8 @@ exports.SchedulerManagementClient = azureSchedulerManagement.SchedulerManagement * @param {string} [baseUri] The base uri. * @return {SchedulerManagementClient} A new SchedulerManagementClient object. */ -exports.createSchedulerManagementClient = azureSchedulerManagement.createSchedulerManagementClient; +// TODO: uncomment when scheduler management is published +// exports.createSchedulerManagementClient = azureSchedulerManagement.createSchedulerManagementClient; /** * Generated SchedulerClient client exports. From 99c9eeea6fd373b52b9fc78f66470220c18ef69c Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Wed, 8 Jan 2014 20:35:06 +0000 Subject: [PATCH 4/6] Lock dependencies versions --- lib/services/computeManagement/package.json | 2 +- lib/services/management/package.json | 2 +- lib/services/networkManagement/package.json | 2 +- lib/services/scheduler/package.json | 2 +- lib/services/schedulerManagement/package.json | 2 +- lib/services/serviceBusManagement/package.json | 2 +- lib/services/sqlManagement/package.json | 2 +- lib/services/storageManagement/package.json | 2 +- lib/services/storeManagement/package.json | 4 ++-- lib/services/subscriptionManagement/package.json | 2 +- lib/services/webSiteManagement/package.json | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/services/computeManagement/package.json b/lib/services/computeManagement/package.json index 8fcf06d47..d279d6131 100644 --- a/lib/services/computeManagement/package.json +++ b/lib/services/computeManagement/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17" + "azure-common": "0.9.0-pre.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", "repository": { diff --git a/lib/services/management/package.json b/lib/services/management/package.json index e1e7ad6c0..f15582c46 100644 --- a/lib/services/management/package.json +++ b/lib/services/management/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17" + "azure-common": "0.9.0-pre.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", "repository": { diff --git a/lib/services/networkManagement/package.json b/lib/services/networkManagement/package.json index 8572e025a..ec979d47b 100644 --- a/lib/services/networkManagement/package.json +++ b/lib/services/networkManagement/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17" + "azure-common": "0.9.0-pre.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", "repository": { diff --git a/lib/services/scheduler/package.json b/lib/services/scheduler/package.json index 7b3c81fc9..66afd5c97 100644 --- a/lib/services/scheduler/package.json +++ b/lib/services/scheduler/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17" + "azure-common": "0.9.0-pre.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", "repository": { diff --git a/lib/services/schedulerManagement/package.json b/lib/services/schedulerManagement/package.json index 160cb37e4..e8ce6e710 100644 --- a/lib/services/schedulerManagement/package.json +++ b/lib/services/schedulerManagement/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17" + "azure-common": "0.9.0-pre.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", "repository": { diff --git a/lib/services/serviceBusManagement/package.json b/lib/services/serviceBusManagement/package.json index ea03f5be2..60d554606 100644 --- a/lib/services/serviceBusManagement/package.json +++ b/lib/services/serviceBusManagement/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17", + "azure-common": "0.9.0-pre.1", "underscore": ">= 1.3.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", diff --git a/lib/services/sqlManagement/package.json b/lib/services/sqlManagement/package.json index 2449b1669..885490361 100644 --- a/lib/services/sqlManagement/package.json +++ b/lib/services/sqlManagement/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17", + "azure-common": "0.9.0-pre.1", "underscore": ">= 1.3.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", diff --git a/lib/services/storageManagement/package.json b/lib/services/storageManagement/package.json index d17ac1022..57a24c003 100644 --- a/lib/services/storageManagement/package.json +++ b/lib/services/storageManagement/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17" + "azure-common": "0.9.0-pre.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", "repository": { diff --git a/lib/services/storeManagement/package.json b/lib/services/storeManagement/package.json index 88d085739..44085ea37 100644 --- a/lib/services/storeManagement/package.json +++ b/lib/services/storeManagement/package.json @@ -10,7 +10,7 @@ "Rodrigues, Andre ", "Tavares, Chris " ], - "version": "0.7.17", + "version": "0.9.0-pre.1", "description": "Windows Azure Store Management Client Library for node", "tags": [ "azure", @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17" + "azure-common": "0.9.0-pre.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", "repository": { diff --git a/lib/services/subscriptionManagement/package.json b/lib/services/subscriptionManagement/package.json index 9ffce9ba2..9c72e66a7 100644 --- a/lib/services/subscriptionManagement/package.json +++ b/lib/services/subscriptionManagement/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17" + "azure-common": "0.9.0-pre.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", "repository": { diff --git a/lib/services/webSiteManagement/package.json b/lib/services/webSiteManagement/package.json index 3fcee2e2b..c5435e64f 100644 --- a/lib/services/webSiteManagement/package.json +++ b/lib/services/webSiteManagement/package.json @@ -31,7 +31,7 @@ } ], "dependencies": { - "azure-common": " >= 0.7.17", + "azure-common": "0.9.0-pre.1", "underscore": ">= 1.3.1" }, "homepage": "http://github.com/WindowsAzure/azure-sdk-for-node", From 519a0e49b2cc6665249184e208858aac8545ef16 Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Wed, 8 Jan 2014 21:28:39 +0000 Subject: [PATCH 5/6] update package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 74cdcfd7e..1d0577e7b 100644 --- a/package.json +++ b/package.json @@ -38,9 +38,8 @@ "azure-mgmt-sb": "0.9.0-pre.1", "azure-mgmt-sql": "0.9.0-pre.1", "azure-mgmt-storage": "0.9.0-pre.1", - "azure-mgmt-store": "0.9.0-pre.1", - "azure-mgmt-subscription": "0.9.0-pre.1", "azure-mgmt-website": "0.9.0-pre.1", + "azure-scheduler": "0.9.0-pre.1", "mime": ">= 1.2.4", "underscore": ">= 1.3.1", "request": "2.27.0", From 52289fb0d4a392c605e4d64fbff0c130ae0053c4 Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Wed, 8 Jan 2014 21:55:40 +0000 Subject: [PATCH 6/6] fix casing --- lib/azure.js | 6 +++--- test/common/credentials/token-tests.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/azure.js b/lib/azure.js index 021f3e1c5..a7999a673 100644 --- a/lib/azure.js +++ b/lib/azure.js @@ -279,7 +279,7 @@ exports.WebsiteManagementService = WebsiteManagementService; /** * Creates a new {@link WebsiteManagementService} object. * -* @deprecated Use {@link createWebsiteManagementClient} instead. +* @deprecated Use {@link createWebSiteManagementClient} instead. * * @param {string} subscriptionId The subscription ID for the account. * @param {object} authentication The authentication object for the client. @@ -295,7 +295,7 @@ exports.WebsiteManagementService = WebsiteManagementService; * @param {string} [hostOptions.apiversion='2012-03-01'] The API vesion to be used. * @return {WebsiteManagementService} A new WebsitemanagementService object. */ -exports.createWebSiteManagementService = azureWebSite.createWebSiteManagementService; +exports.createWebsiteManagementService = azureWebSite.createWebsiteManagementService; /** * ScmService client exports. @@ -458,7 +458,7 @@ exports.WebSiteManagementClient = azureWebSite.WebSiteManagementClient; * @param {string} [baseUri] The base uri. * @return {WebSiteManagementClient} A new WebSiteManagementClient object. */ -exports.createWebsiteManagementClient = azureWebSite.createWebsiteManagementClient; +exports.createWebSiteManagementClient = azureWebSite.createWebSiteManagementClient; /** * Generated ComputeManagementClient client exports. diff --git a/test/common/credentials/token-tests.js b/test/common/credentials/token-tests.js index 4b757ca48..f64baa7b4 100644 --- a/test/common/credentials/token-tests.js +++ b/test/common/credentials/token-tests.js @@ -31,7 +31,7 @@ describe('Token credentials', function () { before(function (done) { assert.notEqual(process.env.AZURE_ACCESS_TOKEN, null); - service = azure.createWebsiteManagementClient(new TokenCloudCredentials({ token: process.env.AZURE_ACCESS_TOKEN, subscriptionId: process.env.AZURE_SUBSCRIPTION_ID })); + service = azure.createWebSiteManagementClient(new TokenCloudCredentials({ token: process.env.AZURE_ACCESS_TOKEN, subscriptionId: process.env.AZURE_SUBSCRIPTION_ID })); service.strictSSL = false; suiteUtil = new MockedTestUtils(service, testPrefix); suiteUtil.setupSuite(done);