Add implementation for NetCore

markcowl · markcowl · commit e4ed74811bab · 2018-03-05T09:30:43.000-08:00
diff --git a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/WebApps/NewAzureWebApp.cs b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/WebApps/NewAzureWebApp.cs
@@ -132,7 +132,7 @@ public void ExecuteCmdletActions(SessionState state)
             if (ParameterSetName == SimpleParameterSet)
             {
                 ValidateWebAppName(Name);
-                if (ShouldProcess(string.Format(Resources.SimpleWebAppCreateTarget, Name), Resources.SimpleWebAppCreateAction))
+                if (ShouldProcess(string.Format(Microsoft.Azure.Commands.WebApps.Properties.Resources.SimpleWebAppCreateTarget, Name), Microsoft.Azure.Commands.WebApps.Properties.Resources.SimpleWebAppCreateAction))
                 {
                     var adapter = new PSCmdletAdapter(this, state);
                     adapter.WaitForCompletion(CreateWithSimpleParameters);
@@ -150,11 +150,19 @@ public void ExecuteCmdletActions(SessionState state)
 
         private void ValidateWebAppName(string name)
         {
+#if !NETSTANDARD
             var available = WebsitesClient.WrappedWebsitesClient.GlobalModel.CheckNameAvailability(new ResourceNameAvailabilityRequest { Name = name, Type = "Site" });
             if (available.NameAvailable.HasValue && !available.NameAvailable.Value)
             {
                 throw new InvalidOperationException(string.Format("Website name '{0}' is not available.  Please try a different name.", name));
             }
+#else
+            var available = WebsitesClient.WrappedWebsitesClient.CheckNameAvailability(name,"Site");
+            if (available.NameAvailable.HasValue && !available.NameAvailable.Value)
+            {
+                throw new InvalidOperationException(string.Format("Website name '{0}' is not available.  Please try a different name.", name));
+            }
+#endif
         }
 
         public void CreateWithClonedWebApp()
@@ -202,7 +210,7 @@ public void CreateWithClonedWebApp()
                 CloneSlots(slotNames);
             }
         }
-
+#if !NETSTANDARD
         private async Task<ServerFarmWithRichSku> GetDefaultServerFarm(string location)
         {
             var websiteLocation = string.IsNullOrWhiteSpace(location) ? new LocationConstraint() : new LocationConstraint(location);
@@ -225,6 +233,31 @@ private async Task<ServerFarmWithRichSku> GetDefaultServerFarm(string location)
 
             return defaultFarm;
         }
+#else
+        private async Task<AppServicePlan> GetDefaultServerFarm(string location)
+        {
+            var websiteLocation = string.IsNullOrWhiteSpace(location) ? new LocationConstraint() : new LocationConstraint(location);
+            var farmResources = await ResourcesClient.ResourceManagementClient.Resources.ListAsync(new ODataQuery<GenericResourceFilter>(r => r.ResourceType == "Microsoft.Web/serverFarms"));
+            AppServicePlan defaultFarm = null;
+            foreach (var resource in farmResources)
+            {
+                // Try to find a policy with Sku=Free and available site capacity
+                var id = new ResourceIdentifier(resource.Id);
+                var farm = await WebsitesClient.WrappedWebsitesClient.AppServicePlans.GetAsync(id.ResourceGroupName, id.ResourceName);
+                if (websiteLocation.Match(farm.Location)
+                    && string.Equals("free", farm.Sku?.Tier?.ToLower(), StringComparison.OrdinalIgnoreCase)
+                    && farm.NumberOfSites < MaxFreeSites)
+                {
+                    defaultFarm = farm;
+                    break;
+                }
+
+            }
+
+            return defaultFarm;
+        }
+
+#endif
 
         bool TryGetServerFarmFromResourceId(string serverFarm, out string resourceGroup, out string serverFarmName)
         {
@@ -269,7 +302,11 @@ public async Task CreateWithSimpleParameters(ICmdletAdapter adapter)
                 if (farm != null)
                 {
                     planResourceGroup = farm.ResourceGroup;
+#if !NETSTANDARD
                     planName = farm.ServerFarmWithRichSkuName;
+#else
+                    planName = farm.Name;
+#endif
                     planRG = ResourceGroupStrategy.CreateResourceGroupConfig(planResourceGroup);
                 }
             }
@@ -295,7 +332,11 @@ public async Task CreateWithSimpleParameters(ICmdletAdapter adapter)
                 var scmHostName = output.EnabledHostNames.FirstOrDefault(s => s.Contains(".scm."));
                 if (!string.IsNullOrWhiteSpace(scmHostName))
                 {
+#if !NETSTANDARD
                     var profile = await WebsitesClient.WrappedWebsitesClient.Sites.ListSitePublishingProfileXmlAsync(output.ResourceGroup, output.SiteName, new CsmPublishingProfileOptions { Format = "WebDeploy" });
+#else
+                    var profile = await WebsitesClient.WrappedWebsitesClient.WebApps.ListPublishingProfileXmlWithSecretsAsync(output.ResourceGroup, output.Name, new CsmPublishingProfileOptions { Format = "WebDeploy" });
+#endif
                     var doc = new XmlDocument();
                     doc.Load(profile);
                     userName = doc.SelectSingleNode("//publishProfile[@publishMethod=\"MSDeploy\"]/@userName").Value;
@@ -318,7 +359,7 @@ public async Task CreateWithSimpleParameters(ICmdletAdapter adapter)
                         else if (!string.IsNullOrWhiteSpace(userName) && !string.IsNullOrWhiteSpace(password))
                         {
                             await git.AddRemoteRepository("azure", $"https://{userName}:{password}@{scmHostName}");
-                            adapter.WriteVerboseAsync(Resources.GitRemoteMessage);
+                            adapter.WriteVerboseAsync(Microsoft.Azure.Commands.WebApps.Properties.Resources.GitRemoteMessage);
                             newOutput.GitRemoteName = "azure";
                         }
                     }
@@ -328,9 +369,8 @@ public async Task CreateWithSimpleParameters(ICmdletAdapter adapter)
             {
                 // do not write errors for problems with adding git repository
                 var repoPath = GitRepositoryPath ?? adapter?.SessionState?.Path?.CurrentFileSystemLocation?.Path;
-                adapter.WriteWarningAsync(String.Format(Resources.GitRemoteAddFailure, repoPath, exception.Message));
+                adapter.WriteWarningAsync(String.Format(Microsoft.Azure.Commands.WebApps.Properties.Resources.GitRemoteAddFailure, repoPath, exception.Message));
             }
-
             adapter.WriteObjectAsync(output);
         }
 
diff --git a/src/ResourceManager/Websites/Commands.Websites/Models.WebApp/PSSite.cs b/src/ResourceManager/Websites/Commands.Websites/Models.WebApp/PSSite.cs
@@ -26,7 +26,9 @@ public PSSite(Site other)
                   name: other.Name,
                   type: other.Type,
                   tags: other.Tags,
+#if !NETSTANDARD
                   siteName: other.SiteName,
+#endif
                   state: other.State,
                   hostNames: other.HostNames,
                   repositorySiteName: other.RepositorySiteName,
diff --git a/src/ResourceManager/Websites/Commands.Websites/Strategies/ExternalCommand.cs b/src/ResourceManager/Websites/Commands.Websites/Strategies/ExternalCommand.cs
@@ -37,7 +37,7 @@ public ExternalCommand(PathIntrinsics pathIntrinsics, string commandName, string
                 WorkingDirectory = PathInfo.GetUnresolvedProviderPathFromPSPath(workingDirectory);
                 if (!Directory.Exists(WorkingDirectory))
                 {
-                    throw new ArgumentOutOfRangeException(nameof(workingDirectory), string.Format(Resources.GitDirectoryDoesNotExist, workingDirectory));
+                    throw new ArgumentOutOfRangeException(nameof(workingDirectory), string.Format(Microsoft.Azure.Commands.WebApps.Properties.Resources.GitDirectoryDoesNotExist, workingDirectory));
                 }
             }
         }
diff --git a/src/ResourceManager/Websites/Commands.Websites/Strategies/GitCommand.cs b/src/ResourceManager/Websites/Commands.Websites/Strategies/GitCommand.cs
@@ -34,7 +34,7 @@ public override string InstallationInstructions
         {
             get
             {
-                return Resources.GitInstallMessage;
+                return Microsoft.Azure.Commands.WebApps.Properties.Resources.GitInstallMessage;
             }
         }
 
diff --git a/src/ResourceManager/Websites/Commands.Websites/Strategies/ServerFarmStrategy.cs b/src/ResourceManager/Websites/Commands.Websites/Strategies/ServerFarmStrategy.cs
@@ -20,6 +20,7 @@ namespace Microsoft.Azure.Commands.Common.Strategies.WebApps
 {
     static class ServerFarmStrategy
     {
+#if !NETSTANDARD
         public static ResourceStrategy<ServerFarmWithRichSku> Strategy { get; } = AppServicePolicy.Create(
             provider: "serverFarms",
             getOperations: client => client.ServerFarms,
@@ -40,5 +41,28 @@ public static ResourceConfig<ServerFarmWithRichSku> CreateServerFarmConfig(
                         Name = name,
                         Sku = new SkuDescription {Tier = "Basic", Capacity = 1, Name = CmdletHelpers.GetSkuName("Basic", 1) }
                     });
+#else
+        public static ResourceStrategy<AppServicePlan> Strategy { get; } = AppServicePolicy.Create(
+            provider: "serverFarms",
+            getOperations: client => client.AppServicePlans,
+            getAsync: (o, p) => o.GetAsync(p.ResourceGroupName, p.Name, p.CancellationToken),
+            createOrUpdateAsync: (o, p) => o.CreateOrUpdateAsync(p.ResourceGroupName, p.Name, p.Model, cancellationToken: p.CancellationToken),
+            createTime: _ => 5,
+            compulsoryLocation: true);
+
+        public static ResourceConfig<AppServicePlan> CreateServerFarmConfig(
+            this ResourceConfig<ResourceGroup> resourceGroup,
+            string resourceGroupName,
+            string name) => Strategy.CreateResourceConfig(
+                resourceGroup,
+                name,
+                createModel: _ =>
+                    new AppServicePlan
+                    {
+                        Name = name,
+                        Sku = new SkuDescription { Tier = "Basic", Capacity = 1, Name = CmdletHelpers.GetSkuName("Basic", 1) }
+                    });
+
+#endif
     }
 }
diff --git a/src/ResourceManager/Websites/Commands.Websites/Strategies/SiteStrategy.cs b/src/ResourceManager/Websites/Commands.Websites/Strategies/SiteStrategy.cs
@@ -20,6 +20,7 @@ namespace Microsoft.Azure.Commands.Common.Strategies.WebApps
 {
     static class SiteStrategy
     {
+#if !NETSTANDARD
         public static ResourceStrategy<Site> Strategy { get; } = AppServicePolicy.Create(
             provider: "sites",
             getOperations: client => client.Sites,
@@ -40,5 +41,26 @@ public static ResourceConfig<Site> CreateSiteConfig(this ResourceConfig<Resource
                     Name = siteName,
                     ServerFarmId = engine.GetId(plan)
                 });
+#else
+        public static ResourceStrategy<Site> Strategy { get; } = AppServicePolicy.Create(
+            provider: "sites",
+            getOperations: client => client.WebApps,
+            getAsync: (o, p) => o.GetAsync(p.ResourceGroupName, p.Name, p.CancellationToken),
+            createOrUpdateAsync: (o, p) => o.CreateOrUpdateAsync(p.ResourceGroupName, p.Name, p.Model, cancellationToken: p.CancellationToken),
+            createTime: _ => 20,
+            compulsoryLocation: true);
+
+        public static ResourceConfig<Site> CreateSiteConfig(this ResourceConfig<ResourceGroup> resourceGroup,
+            ResourceConfig<AppServicePlan> plan, string siteName) =>
+            Strategy.CreateResourceConfig(
+                resourceGroup,
+                siteName,
+            createModel: engine =>
+                new Site
+                {
+                    Name = siteName,
+                    ServerFarmId = engine.GetId(plan)
+                });
+#endif
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public void ExecuteCmdletActions(SessionState state)`
`132`	`132`	`if (ParameterSetName == SimpleParameterSet)`
`133`	`133`	`{`
`134`	`134`	`ValidateWebAppName(Name);`
`135`		`- if (ShouldProcess(string.Format(Resources.SimpleWebAppCreateTarget, Name), Resources.SimpleWebAppCreateAction))`
	`135`	`+ if (ShouldProcess(string.Format(Microsoft.Azure.Commands.WebApps.Properties.Resources.SimpleWebAppCreateTarget, Name), Microsoft.Azure.Commands.WebApps.Properties.Resources.SimpleWebAppCreateAction))`
`136`	`136`	`{`
`137`	`137`	`var adapter = new PSCmdletAdapter(this, state);`
`138`	`138`	`adapter.WaitForCompletion(CreateWithSimpleParameters);`
`@@ -150,11 +150,19 @@ public void ExecuteCmdletActions(SessionState state)`
`150`	`150`
`151`	`151`	`private void ValidateWebAppName(string name)`
`152`	`152`	`{`
	`153`	`+#if !NETSTANDARD`
`153`	`154`	`var available = WebsitesClient.WrappedWebsitesClient.GlobalModel.CheckNameAvailability(new ResourceNameAvailabilityRequest { Name = name, Type = "Site" });`
`154`	`155`	`if (available.NameAvailable.HasValue && !available.NameAvailable.Value)`
`155`	`156`	`{`
`156`	`157`	`throw new InvalidOperationException(string.Format("Website name '{0}' is not available. Please try a different name.", name));`
`157`	`158`	`}`
	`159`	`+#else`
	`160`	`+ var available = WebsitesClient.WrappedWebsitesClient.CheckNameAvailability(name,"Site");`
	`161`	`+ if (available.NameAvailable.HasValue && !available.NameAvailable.Value)`
	`162`	`+ {`
	`163`	`+ throw new InvalidOperationException(string.Format("Website name '{0}' is not available. Please try a different name.", name));`
	`164`	`+ }`
	`165`	`+#endif`
`158`	`166`	`}`
`159`	`167`
`160`	`168`	`public void CreateWithClonedWebApp()`
`@@ -202,7 +210,7 @@ public void CreateWithClonedWebApp()`
`202`	`210`	`CloneSlots(slotNames);`
`203`	`211`	`}`
`204`	`212`	`}`
`205`		`-`
	`213`	`+#if !NETSTANDARD`
`206`	`214`	`private async Task<ServerFarmWithRichSku> GetDefaultServerFarm(string location)`
`207`	`215`	`{`
`208`	`216`	`var websiteLocation = string.IsNullOrWhiteSpace(location) ? new LocationConstraint() : new LocationConstraint(location);`
`@@ -225,6 +233,31 @@ private async Task<ServerFarmWithRichSku> GetDefaultServerFarm(string location)`
`225`	`233`
`226`	`234`	`return defaultFarm;`
`227`	`235`	`}`
	`236`	`+#else`
	`237`	`+ private async Task<AppServicePlan> GetDefaultServerFarm(string location)`
	`238`	`+ {`
	`239`	`+ var websiteLocation = string.IsNullOrWhiteSpace(location) ? new LocationConstraint() : new LocationConstraint(location);`
	`240`	`+ var farmResources = await ResourcesClient.ResourceManagementClient.Resources.ListAsync(new ODataQuery<GenericResourceFilter>(r => r.ResourceType == "Microsoft.Web/serverFarms"));`
	`241`	`+ AppServicePlan defaultFarm = null;`
	`242`	`+ foreach (var resource in farmResources)`
	`243`	`+ {`
	`244`	`+ // Try to find a policy with Sku=Free and available site capacity`
	`245`	`+ var id = new ResourceIdentifier(resource.Id);`
	`246`	`+ var farm = await WebsitesClient.WrappedWebsitesClient.AppServicePlans.GetAsync(id.ResourceGroupName, id.ResourceName);`
	`247`	`+ if (websiteLocation.Match(farm.Location)`
	`248`	`+ && string.Equals("free", farm.Sku?.Tier?.ToLower(), StringComparison.OrdinalIgnoreCase)`
	`249`	`+ && farm.NumberOfSites < MaxFreeSites)`
	`250`	`+ {`
	`251`	`+ defaultFarm = farm;`
	`252`	`+ break;`
	`253`	`+ }`
	`254`	`+`
	`255`	`+ }`
	`256`	`+`
	`257`	`+ return defaultFarm;`
	`258`	`+ }`
	`259`	`+`
	`260`	`+#endif`
`228`	`261`
`229`	`262`	`bool TryGetServerFarmFromResourceId(string serverFarm, out string resourceGroup, out string serverFarmName)`
`230`	`263`	`{`
`@@ -269,7 +302,11 @@ public async Task CreateWithSimpleParameters(ICmdletAdapter adapter)`
`269`	`302`	`if (farm != null)`
`270`	`303`	`{`
`271`	`304`	`planResourceGroup = farm.ResourceGroup;`
	`305`	`+#if !NETSTANDARD`
`272`	`306`	`planName = farm.ServerFarmWithRichSkuName;`
	`307`	`+#else`
	`308`	`+ planName = farm.Name;`
	`309`	`+#endif`
`273`	`310`	`planRG = ResourceGroupStrategy.CreateResourceGroupConfig(planResourceGroup);`
`274`	`311`	`}`
`275`	`312`	`}`
`@@ -295,7 +332,11 @@ public async Task CreateWithSimpleParameters(ICmdletAdapter adapter)`
`295`	`332`	`var scmHostName = output.EnabledHostNames.FirstOrDefault(s => s.Contains(".scm."));`
`296`	`333`	`if (!string.IsNullOrWhiteSpace(scmHostName))`
`297`	`334`	`{`
	`335`	`+#if !NETSTANDARD`
`298`	`336`	`var profile = await WebsitesClient.WrappedWebsitesClient.Sites.ListSitePublishingProfileXmlAsync(output.ResourceGroup, output.SiteName, new CsmPublishingProfileOptions { Format = "WebDeploy" });`
	`337`	`+#else`
	`338`	`+ var profile = await WebsitesClient.WrappedWebsitesClient.WebApps.ListPublishingProfileXmlWithSecretsAsync(output.ResourceGroup, output.Name, new CsmPublishingProfileOptions { Format = "WebDeploy" });`
	`339`	`+#endif`
`299`	`340`	`var doc = new XmlDocument();`
`300`	`341`	`doc.Load(profile);`
`301`	`342`	`userName = doc.SelectSingleNode("//publishProfile[@publishMethod=\"MSDeploy\"]/@userName").Value;`
`@@ -318,7 +359,7 @@ public async Task CreateWithSimpleParameters(ICmdletAdapter adapter)`
`318`	`359`	`else if (!string.IsNullOrWhiteSpace(userName) && !string.IsNullOrWhiteSpace(password))`
`319`	`360`	`{`
`320`	`361`	`await git.AddRemoteRepository("azure", $"https://{userName}:{password}@{scmHostName}");`
`321`		`- adapter.WriteVerboseAsync(Resources.GitRemoteMessage);`
	`362`	`+ adapter.WriteVerboseAsync(Microsoft.Azure.Commands.WebApps.Properties.Resources.GitRemoteMessage);`
`322`	`363`	`newOutput.GitRemoteName = "azure";`
`323`	`364`	`}`
`324`	`365`	`}`
`@@ -328,9 +369,8 @@ public async Task CreateWithSimpleParameters(ICmdletAdapter adapter)`
`328`	`369`	`{`
`329`	`370`	`// do not write errors for problems with adding git repository`
`330`	`371`	`var repoPath = GitRepositoryPath ?? adapter?.SessionState?.Path?.CurrentFileSystemLocation?.Path;`
`331`		`- adapter.WriteWarningAsync(String.Format(Resources.GitRemoteAddFailure, repoPath, exception.Message));`
	`372`	`+ adapter.WriteWarningAsync(String.Format(Microsoft.Azure.Commands.WebApps.Properties.Resources.GitRemoteAddFailure, repoPath, exception.Message));`
`332`	`373`	`}`
`333`		`-`
`334`	`374`	`adapter.WriteObjectAsync(output);`
`335`	`375`	`}`
`336`	`376`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public ExternalCommand(PathIntrinsics pathIntrinsics, string commandName, string`
`37`	`37`	`WorkingDirectory = PathInfo.GetUnresolvedProviderPathFromPSPath(workingDirectory);`
`38`	`38`	`if (!Directory.Exists(WorkingDirectory))`
`39`	`39`	`{`
`40`		`- throw new ArgumentOutOfRangeException(nameof(workingDirectory), string.Format(Resources.GitDirectoryDoesNotExist, workingDirectory));`
	`40`	`+ throw new ArgumentOutOfRangeException(nameof(workingDirectory), string.Format(Microsoft.Azure.Commands.WebApps.Properties.Resources.GitDirectoryDoesNotExist, workingDirectory));`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public override string InstallationInstructions`
`34`	`34`	`{`
`35`	`35`	`get`
`36`	`36`	`{`
`37`		`- return Resources.GitInstallMessage;`
	`37`	`+ return Microsoft.Azure.Commands.WebApps.Properties.Resources.GitInstallMessage;`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`