Merge pull request #4527 from Microsoft/users/biprasad/MoveAzureArm

Move azure-arm-rest to Common directory

Tasks/AzureResourceGroupDeployment/make.json

@@ -0,0 +1,10 @@
+{
+    "common": [
+        {
+            "module": "../Common/azure-arm-rest",
+            "type": "node",
+            "dest": "./",
+            "compile" : true
+        }
+    ]
+}

Tasks/AzureResourceGroupDeployment/models/DeployAzureRG.ts

@@ -2,7 +2,7 @@
 /// <reference path="../../../definitions/vsts-task-lib.d.ts" /> 
 
 import tl = require("vsts-task-lib/task");
-import msRestAzure = require("./../operations/azure-rest/azure-arm-common");
+import msRestAzure = require('azure-arm-rest/azure-arm-common');
 
 class TokenCredentials {
     private hostUrl: string;

Tasks/AzureResourceGroupDeployment/operations/AzureUtil.ts

@@ -1,8 +1,8 @@
-import networkManagementClient = require("./azure-rest/azure-arm-network");
-import computeManagementClient = require("./azure-rest/azure-arm-compute");
+import networkManagementClient = require("azure-arm-rest/azure-arm-network");
+import computeManagementClient = require("azure-arm-rest/azure-arm-compute");
 import deployAzureRG = require("../models/DeployAzureRG");
 import tl = require("vsts-task-lib/task")
-import az = require("./azure-rest/azureModels");
+import az = require("azure-arm-rest/azureModels");
 import utils = require("./Utils");
 
 export class NetworkInterface {

Tasks/AzureResourceGroupDeployment/operations/DeploymentGroupExtensionHelper.ts

@@ -1,9 +1,9 @@
-import computeManagementClient = require("./azure-rest/azure-arm-compute");
+import computeManagementClient = require("azure-arm-rest/azure-arm-compute");
 import util = require("util");
 import tl = require("vsts-task-lib/task");
 import azure_utils = require("./AzureUtil");
 import deployAzureRG = require("../models/DeployAzureRG");
-import az = require("./azure-rest/azureModels");
+import az = require("azure-arm-rest/azureModels");
 import utils = require("./Utils");
 
 export class DeploymentGroupExtensionHelper {

Tasks/AzureResourceGroupDeployment/operations/ResourceGroup.ts

@@ -10,7 +10,7 @@ import util = require("util");
 
 import env = require("./Environment");
 import deployAzureRG = require("../models/DeployAzureRG");
-import armResource = require("./azure-rest/azure-arm-resource");
+import armResource = require("azure-arm-rest/azure-arm-resource");
 import winRM = require("./WinRMExtensionHelper");
 import dgExtensionHelper = require("./DeploymentGroupExtensionHelper");
 var parameterParser = require("./ParameterParser").parse;

Tasks/AzureResourceGroupDeployment/operations/VirtualMachine.ts

@@ -3,7 +3,7 @@
 
 import path = require("path");
 import tl = require("vsts-task-lib/task");
-import armCompute = require('./azure-rest/azure-arm-compute');
+import armCompute = require('azure-arm-rest/azure-arm-compute');
 import deployAzureRG = require("../models/DeployAzureRG");
 import utils = require("./Utils")
 import dgExtensionHelper = require("./DeploymentGroupExtensionHelper");

Tasks/AzureResourceGroupDeployment/operations/WinRMExtensionHelper.ts

@@ -1,10 +1,10 @@
-import networkManagementClient = require("./azure-rest/azure-arm-network");
-import computeManagementClient = require("./azure-rest/azure-arm-compute");
+import networkManagementClient = require("azure-arm-rest/azure-arm-network");
+import computeManagementClient = require("azure-arm-rest/azure-arm-compute");
 import util = require("util");
 import tl = require("vsts-task-lib/task");
 import azure_utils = require("./AzureUtil");
 import deployAzureRG = require("../models/DeployAzureRG");
-import az = require("./azure-rest/azureModels");
+import az = require("azure-arm-rest/azureModels");
 import utils = require("./Utils");
 
 export class WinRMExtensionHelper {

Tasks/AzureResourceGroupDeployment/task.json

@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 1,
-        "Patch": 6
+        "Patch": 7
     },
     "demands": [],
     "minimumAgentVersion": "2.0.0",

Tasks/AzureResourceGroupDeployment/task.loc.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 1,
-    "Patch": 6
+    "Patch": 7
   },
   "demands": [],
   "minimumAgentVersion": "2.0.0",

Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson

@@ -0,0 +1,29 @@
+{
+  "loc.messages.ClientIdCannotBeEmpty": "clientId must be a non empty string.",
+  "loc.messages.DomainCannotBeEmpty": "domain must be a non empty string.",
+  "loc.messages.SecretCannotBeEmpty": "secret must be a non empty string.",
+  "loc.messages.armUrlCannotBeEmpty": "arm Url must be a non empty string.",
+  "loc.messages.authorityUrlCannotBeEmpty": "authority must be a non empty string.",
+  "loc.messages.CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s",
+  "loc.messages.CallbackCannotBeNull": "callback cannot be null.",
+  "loc.messages.VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.",
+  "loc.messages.InvalidValue": "%s is not a valid value. The valid values are: %s",
+  "loc.messages.VmExtensionNameCannotBeNull": "vmExtensionName cannot be null or undefined and it must be of type string.",
+  "loc.messages.ExpandShouldBeOfTypeString": "expand must be of type string.",
+  "loc.messages.ExtensionParametersCannotBeNull": "extensionParameters cannot be null or undefined.",
+  "loc.messages.LoadBalancerNameCannotBeNull": "'loadBalancerName cannot be null or undefined and it must be of type string.'",
+  "loc.messages.ParametersCannotBeNull": "parameters cannot be null or undefined.",
+  "loc.messages.NetworkInterfaceNameCannotBeNull": "networkInterfaceName cannot be null or undefined and it must be of type string.",
+  "loc.messages.NetworkSecurityGroupNameCannotBeNull": "networkSecurityGroupName cannot be null or undefined and it must be of type string.",
+  "loc.messages.SecurityRuleNameCannotBeNull": "securityRuleName cannot be null or undefined and it must be of type string.",
+  "loc.messages.SecurityRuleParametersCannotBeNull": "securityRuleParameters cannot be null or undefined.",
+  "loc.messages.DeploymentNameCannotBeNull": "deploymentName cannot be null or undefined and it must be of type string.",
+  "loc.messages.CredentialsCannotBeNull": "'credentials' cannot be null.",
+  "loc.messages.SubscriptionIdCannotBeNull": "'subscriptionId' cannot be null.",
+  "loc.messages.InvalidResponseLongRunningOperation": "Invalid response received for fetching status of a long running operation.",
+  "loc.messages.TimeoutWhileWaiting": "Timed out while waiting",
+  "loc.messages.ResourceGroupCannotBeNull": "resourceGroupName cannot be null or undefined and it must be of type string.",
+  "loc.messages.ResourceGroupExceededLength": "\"resourceGroupName\" should satisfy the constraint - \"MaxLength\": 90",
+  "loc.messages.ResourceGroupDeceededLength": "\"resourceGroupName\" should satisfy the constraint - \"MinLength\": 1",
+  "loc.messages.ResourceGroupDoesntMatchPattern": "\"resourceGroupName\" should satisfy the constraint - \"Pattern\": /^[-\\w\\._\\(\\)]+$/"
+}

Tasks/Common/azure-arm-rest/module.json

@@ -0,0 +1,31 @@
+{
+    "messages": {
+        "ClientIdCannotBeEmpty": "clientId must be a non empty string.",
+        "DomainCannotBeEmpty": "domain must be a non empty string.",
+        "SecretCannotBeEmpty": "secret must be a non empty string.",
+        "armUrlCannotBeEmpty": "arm Url must be a non empty string.",
+        "authorityUrlCannotBeEmpty": "authority must be a non empty string.",
+        "CouldNotFetchAccessTokenforAzureStatusCode": "Could not fetch access token for azure. Status code: %s, status message: %s",
+        "CallbackCannotBeNull": "callback cannot be null.",
+        "VMNameCannotBeNull": "vmName cannot be null or undefined and it must be of type string.",
+        "InvalidValue": "%s is not a valid value. The valid values are: %s",
+        "VmExtensionNameCannotBeNull": "vmExtensionName cannot be null or undefined and it must be of type string.",
+        "ExpandShouldBeOfTypeString": "expand must be of type string.",
+        "ExtensionParametersCannotBeNull": "extensionParameters cannot be null or undefined.",
+        "LoadBalancerNameCannotBeNull": "'loadBalancerName cannot be null or undefined and it must be of type string.'",
+        "ParametersCannotBeNull": "parameters cannot be null or undefined.",
+        "NetworkInterfaceNameCannotBeNull": "networkInterfaceName cannot be null or undefined and it must be of type string.",
+        "NetworkSecurityGroupNameCannotBeNull": "networkSecurityGroupName cannot be null or undefined and it must be of type string.",
+        "SecurityRuleNameCannotBeNull": "securityRuleName cannot be null or undefined and it must be of type string.",
+        "SecurityRuleParametersCannotBeNull": "securityRuleParameters cannot be null or undefined.",
+        "DeploymentNameCannotBeNull": "deploymentName cannot be null or undefined and it must be of type string.",
+        "CredentialsCannotBeNull": "'credentials' cannot be null.",
+        "SubscriptionIdCannotBeNull": "'subscriptionId' cannot be null.",
+        "InvalidResponseLongRunningOperation": "Invalid response received for fetching status of a long running operation.",
+        "TimeoutWhileWaiting": "Timed out while waiting",
+        "ResourceGroupCannotBeNull": "resourceGroupName cannot be null or undefined and it must be of type string.",
+        "ResourceGroupExceededLength": "\"resourceGroupName\" should satisfy the constraint - \"MaxLength\": 90",
+        "ResourceGroupDeceededLength": "\"resourceGroupName\" should satisfy the constraint - \"MinLength\": 1",
+        "ResourceGroupDoesntMatchPattern": "\"resourceGroupName\" should satisfy the constraint - \"Pattern\": /^[-\\w\\._\\(\\)]+$/"
+    }
+}

Tasks/Common/azure-arm-rest/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "azure-arm-rest",
+  "version": "1.0.0",
+  "description": "Common Lib for Azure ARM REST apis",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://[email protected]/Microsoft/vsts-tasks.git"
+  },
+  "author": "Microsoft Corporation",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/Microsoft/vsts-tasks/issues"
+  },
+  "homepage": "https://github.com/Microsoft/vsts-tasks#readme",
+  "dependencies": {
+    "q": "1.4.1",
+    "vso-node-api": "6.0.1-preview",
+    "vsts-task-lib": "^0.9.20"
+  }
+}

Tasks/Common/azure-arm-rest/tsconfig.json

@@ -0,0 +1,7 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "declaration": true
+    }
+}

Tasks/Common/azure-arm-rest/typings.json

@@ -0,0 +1,7 @@
+{
+  "globalDependencies": {
+    "mocha": "registry:dt/mocha#2.2.5+20160720003353",
+    "node": "registry:dt/node#6.0.0+20160920093002",
+    "q": "registry:dt/q#0.0.0+20160613154756"
+  }
+}