Fixes issue #36 - Allows a user to select an existing resource group.…

… If it's a new RG, then it will attmept to use the site or sql location. If it cannot resolve either, it will default to East US
projectkudu · Apr 21, 2015 · 0d21dcb · 0d21dcb
1 parent 80b12bd
commit 0d21dcb
Show file tree

Hide file tree

Showing 8 changed files with 265 additions and 47 deletions.
diff --git a/Slingshot.Api/Content/Styles/app.css b/Slingshot.Api/Content/Styles/app.css
@@ -48,6 +48,10 @@ pre                             { margin-bottom:20px; }
     overflow: hidden;
 }
 
+input[type="text"]:disabled{
+    background-color: #969393;
+}
+
 .code {font-size:12px; }
 
 .code-attrName{color:#ff0000;}

diff --git a/Slingshot.Api/Controllers/ARMController.cs b/Slingshot.Api/Controllers/ARMController.cs
@@ -95,25 +95,27 @@ public async Task<HttpResponseMessage> Get()
         [Authorize]
         [HttpPost]
         #pragma warning disable 4014
-        public async Task<HttpResponseMessage> Preview([FromBody] JObject parameters, string subscriptionId, string templateUrl)
+        public async Task<HttpResponseMessage> Preview(DeployInputs inputs)
         {
             JObject responseObj = new JObject();
             List<string> providers = new List<string>(32);
             HttpResponseMessage response = null;
-            using (var client = GetRMClient(subscriptionId))
+            using (var client = GetRMClient(inputs.subscriptionId))
             {
                 ResourceGroupCreateOrUpdateResult resourceResult = null;
                 string tempRGName = Guid.NewGuid().ToString();
 
                 try
                 {
-                    resourceResult = await client.ResourceGroups.CreateOrUpdateAsync(tempRGName, new BasicResourceGroup { Location = "East US" });
+                    resourceResult = await client.ResourceGroups.CreateOrUpdateAsync(
+                        tempRGName,
+                        new BasicResourceGroup { Location = inputs.resourceGroup.location });
 
                     // For now we just default to East US for the resource group location.
                     var basicDeployment = new BasicDeployment
                     {
-                        Parameters = parameters.ToString(),
-                        TemplateLink = new TemplateLink(new Uri(templateUrl))
+                        Parameters = inputs.parameters.ToString(),
+                        TemplateLink = new TemplateLink(new Uri(inputs.templateUrl))
                     };
 
                     var deploymentResult = await client.Deployments.ValidateAsync(tempRGName, tempRGName, basicDeployment);
@@ -146,7 +148,7 @@ public async Task<HttpResponseMessage> Preview([FromBody] JObject parameters, st
                         (resourceResult.StatusCode == HttpStatusCode.Created || resourceResult.StatusCode == HttpStatusCode.OK))
                     {
                         string token = GetTokenFromHeader();
-                        Task.Run(() => { DeleteResourceGroup(subscriptionId, token, tempRGName); });
+                        Task.Run(() => { DeleteResourceGroup(inputs.subscriptionId, token, tempRGName); });
                     }
                 }
             }
@@ -171,25 +173,32 @@ private void DeleteResourceGroup(string subscriptionId, string token, string rgN
 
         [Authorize]
         [HttpPost]
-        public async Task<HttpResponseMessage> Deploy([FromBody] JObject parameters, string subscriptionId, string resourceGroup, string templateUrl)
+        public async Task<HttpResponseMessage> Deploy(DeployInputs inputs)
         {
             CreateDeploymentResponse responseObj = new CreateDeploymentResponse();
             HttpResponseMessage response = null;
 
             try
             {
-                using (var client = GetRMClient(subscriptionId))
+                using (var client = GetRMClient(inputs.subscriptionId))
                 {
                     // For now we just default to East US for the resource group location.
-                    var resourceResult = await client.ResourceGroups.CreateOrUpdateAsync(resourceGroup, new BasicResourceGroup { Location = "East US" });
-                    var templateParams = parameters.ToString();
+                    var resourceResult = await client.ResourceGroups.CreateOrUpdateAsync(
+                        inputs.resourceGroup.name,
+                        new BasicResourceGroup { Location = inputs.resourceGroup.location });
+
+                    var templateParams = inputs.parameters.ToString();
                     var basicDeployment = new BasicDeployment
                     {
                         Parameters = templateParams,
-                        TemplateLink = new TemplateLink(new Uri(templateUrl))
+                        TemplateLink = new TemplateLink(new Uri(inputs.templateUrl))
                     };
 
-                    var deploymentResult = await client.Deployments.CreateOrUpdateAsync(resourceGroup, resourceGroup, basicDeployment);
+                    var deploymentResult = await client.Deployments.CreateOrUpdateAsync(
+                        inputs.resourceGroup.name,
+                        inputs.resourceGroup.name,
+                        basicDeployment);
+
                     response = Request.CreateResponse(HttpStatusCode.OK, responseObj);
                 }
             }
@@ -340,7 +349,7 @@ public async Task<HttpResponseMessage> GetTemplate(string repositoryUrl)
                 returnObj["subscriptions"] = JArray.FromObject(subscriptions);
                 returnObj["tenants"] = tenants;
                 returnObj["userDisplayName"] = userDisplayName;
-                returnObj["resourceGroup"] = resourceGroupName;
+                returnObj["resourceGroupName"] = resourceGroupName;
                 returnObj["template"] = template;
                 returnObj["templateUrl"] = templateUrl;
                 returnObj["repositoryUrl"] = repo.RepositoryUrl;

diff --git a/Slingshot.Api/Helpers/Utils.cs b/Slingshot.Api/Helpers/Utils.cs
@@ -4,17 +4,11 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
+using System.Collections.Generic;
+using Slingshot.Models;
 
 namespace Slingshot.Helpers
 {
-    public class SubscriptionInfo
-    {
-        public string id { get; set; }
-        public string subscriptionId { get; set; }
-        public string displayName { get; set; }
-        public string state { get; set; }
-    }
-
     public class Utils
     {
         public class ResultOf<T>
@@ -41,8 +35,21 @@ public static async Task<SubscriptionInfo[]> GetSubscriptionsAsync(string host,
                 {
                     if (response.IsSuccessStatusCode)
                     {
-                        var result = await response.Content.ReadAsAsync<ResultOf<SubscriptionInfo>>();
-                        return result.value;
+                        var subs = (await response.Content.ReadAsAsync<ResultOf<SubscriptionInfo>>()).value;
+
+                        var getRgTasks = new List<Task<ResourceGroupInfo[]>>();
+                        foreach (var sub in subs)
+                        {
+                            getRgTasks.Add(GetResourceGroups(client, host, sub.subscriptionId));
+                        }
+
+                        var rgsForAllSubs = await Task.WhenAll(getRgTasks.ToArray());
+                        for(int i = 0; i < rgsForAllSubs.Length; i ++)
+                        {
+                            subs[i].resourceGroups = rgsForAllSubs[i];
+                        }
+
+                        return subs;
                     }
 
                     var content = await response.Content.ReadAsStringAsync();
@@ -60,6 +67,39 @@ public static async Task<SubscriptionInfo[]> GetSubscriptionsAsync(string host,
             }
         }
 
+        private static async Task<ResourceGroupInfo[]> GetResourceGroups(
+            HttpClient client,
+            string host,
+            string subscriptionId)
+        {
+            string url = string.Format(
+                "{0}/subscriptions/{1}/resourceGroups?api-version={2}",
+                Utils.GetCSMUrl(host),
+                subscriptionId,
+                Constants.CSM.ApiVersion);
+
+            using (var response = await client.GetAsync(url))
+            {
+                if (response.IsSuccessStatusCode)
+                {
+                    return (await response.Content.ReadAsAsync<ResultOf<ResourceGroupInfo>>()).value;
+                }
+
+                var content = await response.Content.ReadAsStringAsync();
+                if (content.StartsWith("{"))
+                {
+                    var error = (JObject)JObject.Parse(content)["error"];
+                    if (error != null)
+                    {
+                        throw new InvalidOperationException(String.Format("GetResourceGroups {0}, {1}", response.StatusCode, error.Value<string>("message")));
+                    }
+                }
+
+                throw new InvalidOperationException(String.Format("GetResourceGroups {0}, {1}", response.StatusCode, await response.Content.ReadAsStringAsync()));
+
+            }
+        }
+
         public static async Task<HttpResponseMessage> Execute(Task<HttpResponseMessage> task)
         {
             var watch = new Stopwatch();

diff --git a/Slingshot.Api/Models/Inputs.cs b/Slingshot.Api/Models/Inputs.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using Newtonsoft.Json.Linq;
+
+namespace Slingshot.Models
+{
+    public class DeployInputs
+    {
+        public JObject parameters { get; set; }
+        public string subscriptionId { get; set; }
+        public ResourceGroupInfo resourceGroup { get; set; }
+        public string templateUrl { get; set; }
+    }
+}
diff --git a/Slingshot.Api/Models/Subscriptions.cs b/Slingshot.Api/Models/Subscriptions.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Slingshot.Models
+{
+    public class SubscriptionInfo
+    {
+        public string id { get; set; }
+        public string subscriptionId { get; set; }
+        public string displayName { get; set; }
+        public string state { get; set; }
+        public ResourceGroupInfo[] resourceGroups { get; set; }
+    }
+
+    public class ResourceGroupInfo
+    {
+        //public string id { get; set; }
+        public string name { get; set; }
+        public string location { get; set; }
+    }
+}
diff --git a/Slingshot.Api/Slingshot.Api.csproj b/Slingshot.Api/Slingshot.Api.csproj
@@ -154,6 +154,8 @@
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="Helpers\Utils.cs" />
     <Compile Include="Models\CreateDeploymentResponse.cs" />
+    <Compile Include="Models\Inputs.cs" />
+    <Compile Include="Models\Subscriptions.cs" />
     <Compile Include="Modules\AADOAuth2AccessToken.cs" />
     <Compile Include="Modules\ARMOAuthModule.cs" />
     <Compile Include="Modules\OpenIdConfiguration.cs" />