huangpf · huangpf · Jan 5, 2016 · Jan 5, 2016 · Jan 5, 2016 · Jan 5, 2016
diff --git a/examples/resource-management/02-Resource.ps1 b/examples/resource-management/02-Resource.ps1
@@ -0,0 +1,41 @@
+Param(
+  [string]$groupName,
+  [string]$location,
+  [string]$rName,
+)
+
+Write-Host "=== Managing Resources in Azure ==="
+
+Write-Host "1. Creating a new resource group"
+New-AzureRmResourceGroup -Name $groupName -Location $location
+$destinationGroupName = $groupName + "Destination"
+
+Write-Host "2. Registering Resource Provider Namespace."
+$providerNamespace="Providers.Test"
+Register-AzureRmResourceProvider -ProviderNamespace $providerNamespace -Force
+
+Write-Host "3. Creating a new Resource"
+$resourceType = $providerNamespace + "/statefulResources"
+$apiversion="2014-04-01"
+New-AzureRmResource -Name $rName -Location $location -Tags @{Name = "testtag"; Value = "testval"} -ResourceGroupName $groupName -ResourceType $resourceType -PropertyObject @{"administratorLogin" = "adminuser"; "administratorLoginPassword" = "P@ssword1"} -ApiVersion $apiversion -Force
+
+Write-Host "4. Get information about Resource"
+$resourceInfo = Get-AzureRmResource -ResourceGroupName $groupName
+Write-Host "Validating Resource name"
+Assert-AreEqual $rName $resourceInfo.Name
+
+Write-Host "5. Find Resource with name"
+$foundResource = Find-AzureRmResource -ResourceType $resourceType -ResourceNameContains $rName
+Write-Host "Validating Resource name"
+Assert-AreEqual $rName $foundResource.Name
+
+Write-Host "6. Update Resource" 
+Set-AzureRmResource -ResourceGroupName $groupName -ResourceName $rName -ResourceType $resourceType -Tags @{Name = "testtagUpdated"; Value = "testvalueUpdated"} -Force
+
+Write-Host "7. Move Resource to resource group"
+New-AzureRmResourceGroup -Name $destinationGroupName -Location $location
+Move-AzureRmResource -DestinationResourceGroupName  $destinationGroupName -ResourceId $resourceInfo.ResourceId  -Force
+
+Write-Host "8. Removing resource"
+$foundResource = Find-AzureRmResource -ResourceType $resourceType -ResourceNameContains $rName
+Remove-AzureRmResource -ResourceId $foundResource.ResourceId -Force
diff --git a/examples/resource-management/03-Deployments.ps1 b/examples/resource-management/03-Deployments.ps1
@@ -0,0 +1,24 @@
+Param(
+  [string]$groupName,
+  [string]$location
+)
+
+Write-Host "=== Provisioning Deployments in Azure ==="
+
+Write-Host "1. Create a new resource group"
+New-AzureRmResourceGroup -Name $groupName -Location $location
+
+Write-Host "2. Test template"
+$siteName = Get-ResourceName
+$list = Test-AzureResourceGroupTemplate -ResourceGroupName $groupName -TemplateFile sampleTemplate.json -siteName $siteName -hostingPlanName $siteName -siteLocation $location -sku Free -workerSize 0
+Write-Host $list
+# Assert
+Assert-AreEqual 0 @($list).Count
+
+Write-Host "3. Provisioning Deployment"
+$deployment = New-AzureRmResourceGroupDeployment -Name $siteName -ResourceGroupName $groupName -TemplateFile sampleTemplate.json -TemplateParameterFile sampleTemplateParams.json
+Write-Host $deployment
+# Assert
+Assert-AreEqual Succeeded $deployment.ProvisioningState
+
+
diff --git a/examples/resource-management/03-Deployments.sh b/examples/resource-management/03-Deployments.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+printf "\n=== Provisioning Deployments in Azure ===\n"
+
+printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
+azure group create --name "$groupName" --location "$location"
+
+printf "\n2. Test template with dynamic parameters\n"
+siteName=`randomName testrn`
+azure group deployment test -g "$groupName" --templatefile $BASEDIR/resource-management/sampleTemplate.json --siteName "$siteName" --hostingPlanName "$siteName" --siteLocation "$location" --sku "Standard" --workerSize "0"
+
+printf "\n3. Test template with JSON parameter object\n"
+azure group deployment test -g "$groupName" --templatefile $BASEDIR/resource-management/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$siteName\",\"hostingPlanName\":\"$siteName\",\"siteLocation\":\"$location\",\"sku\":\"Standard\",\"workerSize\": 0 }"
+
+printf "\n4. Provisioning Deployment\n"
+deploymentInfo=`azure group deployment create --Name "$siteName" --ResourceGroupName "$groupName" --TemplateFile $BASEDIR/resource-management/sampleTemplate.json --TemplateParameterFile $BASEDIR/resource-management/sampleTemplateParams.json`
+echo $deploymentInfo
diff --git a/examples/resource-management/sampleTemplate.json b/examples/resource-management/sampleTemplate.json
@@ -0,0 +1,48 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "int",
+      "allowedValues": [
+        0,
+        1,
+        2
+      ],
+      "defaultValue": 0
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-04-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverfarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    }
+  ]
+}
diff --git a/examples/resource-management/sampleTemplateParams.json b/examples/resource-management/sampleTemplateParams.json
@@ -0,0 +1,17 @@
+{
+  "siteName": {
+    "value": "hao"
+    },
+  "hostingPlanName": {
+    "value": "xDeploymentTestHost26668"
+  },
+  "siteLocation": {
+    "value": "West US"
+  },
+  "sku": {
+    "value": "Standard"
+  },
+  "workerSize": {
+    "value": 0
+  }
+}
diff --git a/src/CLU/Commands.Common.ScenarioTest/project.json b/src/CLU/Commands.Common.ScenarioTest/project.json
@@ -21,7 +21,7 @@
     "Commands.Common.Authentication": "",
     "Commands.ResourceManager.Common": "",
     "Microsoft.Azure.Commands.Profile": "",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime.Azure": "2.5.4",

diff --git a/src/CLU/Commands.ResourceManager.Cmdlets/project.json b/src/CLU/Commands.ResourceManager.Cmdlets/project.json
@@ -46,7 +46,7 @@
     "System.Threading": "4.0.11-beta-23516",
     "System.Threading.Tasks": "4.0.11-beta-23516",
     "System.Threading.Thread": "4.0.0-beta-23516",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.Extensions.Caching.Memory": "1.0.0-rc1-final"
   },
   "compilationOptions": {"emitEntryPoint": true}

diff --git a/src/CLU/Commands.ScenarioTests.ResourceManager.Common/project.json b/src/CLU/Commands.ScenarioTests.ResourceManager.Common/project.json
@@ -20,7 +20,7 @@
     "Commands.Common": "",
     "Commands.Common.Authentication": "",
     "Commands.ResourceManager.Common": "",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",
     "Microsoft.Rest.ClientRuntime.Azure": "2.5.4",

diff --git a/src/CLU/Microsoft.Azure.Commands.Network/project.json b/src/CLU/Microsoft.Azure.Commands.Network/project.json
@@ -19,9 +19,9 @@
     "Microsoft.CLU": "1.0.0",
     "Commands.Common.Authentication": "",
     "Commands.Common": "",
-    "Microsoft.Azure.Graph.RBAC": "2.1.0-preview",
-    "Microsoft.Azure.Management.Authorization": "2.1.0-preview",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Graph.RBAC": "2.1.1-preview",
+    "Microsoft.Azure.Management.Authorization": "2.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.Azure.Management.Network": "3.0.3-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",

diff --git a/src/CLU/Microsoft.Azure.Commands.Profile.Test/project.json b/src/CLU/Microsoft.Azure.Commands.Profile.Test/project.json
@@ -22,7 +22,7 @@
     "Commands.ResourceManager.Common": "",
     "Commands.ScenarioTests.ResourceManager.Common": "",
     "Microsoft.Azure.Commands.Profile": "",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",
     "Microsoft.Rest.ClientRuntime.Azure": "2.5.4",

diff --git a/src/CLU/Microsoft.Azure.Commands.Profile/project.json b/src/CLU/Microsoft.Azure.Commands.Profile/project.json
@@ -20,7 +20,7 @@
     "Commands.Common": "",
     "Commands.Common.Authentication": "",
     "Commands.ResourceManager.Common": "",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",
     "Microsoft.Rest.ClientRuntime.Azure": "2.5.4",

diff --git a/src/CLU/Microsoft.Azure.Commands.Resources.Test/project.json b/src/CLU/Microsoft.Azure.Commands.Resources.Test/project.json
@@ -24,7 +24,7 @@
     "Microsoft.Azure.Commands.Resources": "",
     "Microsoft.Azure.Graph.RBAC": "2.1.1-preview",
     "Microsoft.Azure.Management.Authorization": "2.3.0-preview",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",
     "Microsoft.Rest.ClientRuntime.Azure": "2.5.4",

diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourceClient.cs b/src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourceClient.cs
@@ -23,6 +23,7 @@
 using Microsoft.Azure.Management.Resources.Models;
 using Microsoft.Rest.Azure;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -328,7 +329,9 @@ private Deployment CreateBasicDeployment(ValidatePSResourceGroupDeploymentParame
             }
             else
             {
-                deployment.Properties.Template = DataStore.ReadFileAsText(parameters.TemplateFile);
+                var textData = DataStore.ReadFileAsText(parameters.TemplateFile);
+                deployment.Properties.Template = string.IsNullOrEmpty(textData) ?
+                    (object)textData : JObject.Parse(DataStore.ReadFileAsText(parameters.TemplateFile));
             }
 
             if (Uri.IsWellFormedUriString(parameters.ParameterUri, UriKind.Absolute))
@@ -340,7 +343,9 @@ private Deployment CreateBasicDeployment(ValidatePSResourceGroupDeploymentParame
             }
             else
             {
-                deployment.Properties.Parameters = GetDeploymentParameters(parameters.TemplateParameterObject);
+                var deploymentParameters = GetDeploymentParameters(parameters.TemplateParameterObject);
+                deployment.Properties.Parameters = string.IsNullOrEmpty(deploymentParameters) ?
+                    (object) deploymentParameters : JObject.Parse(deploymentParameters);
             }
 
             return deployment;

diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/project.json b/src/CLU/Microsoft.Azure.Commands.Resources/project.json
@@ -23,7 +23,7 @@
     "Commands.ResourceManager.Cmdlets": "",
     "Microsoft.Azure.Graph.RBAC": "2.1.1-preview",
     "Microsoft.Azure.Management.Authorization": "2.3.0-preview",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",
     "Microsoft.Rest.ClientRuntime.Azure": "2.5.4",

diff --git a/src/CLU/Microsoft.Azure.Commands.Websites.Test/project.json b/src/CLU/Microsoft.Azure.Commands.Websites.Test/project.json
@@ -22,7 +22,7 @@
     "Microsoft.Azure.Commands.Profile": "",
     "Microsoft.Azure.Commands.Websites": "",
     "Microsoft.Azure.Management.Authorization": "2.3.0-preview",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.Azure.Management.Websites": "1.0.0-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",

diff --git a/src/CLU/Microsoft.Azure.Commands.Websites/project.json b/src/CLU/Microsoft.Azure.Commands.Websites/project.json
@@ -25,7 +25,7 @@
     "Microsoft.Azure.Commands.Profile": "",
     "Microsoft.Azure.Graph.RBAC": "2.1.1-preview",
     "Microsoft.Azure.Management.Authorization": "2.3.0-preview",
-    "Microsoft.Azure.Management.Resources": "3.3.0-preview",
+    "Microsoft.Azure.Management.Resources": "3.3.1-preview",
     "Microsoft.Azure.Management.Websites": "1.0.0-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",