Merge branch 'preview' into policyIdentity

Author: Maddie Clayton

src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.csproj

@@ -125,6 +125,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\TestProfileGetResourceUsage.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\TestSkuCreate.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.EndpointTests\TestEndpointResourceUsage.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.cs

@@ -35,6 +35,13 @@ public void TestProfileCrud()
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-ProfileCrud");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSkuCreate()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-SkuCreate");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestProfileCrudWithPiping()

src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.ps1

@@ -12,6 +12,49 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+<#
+.SYNOPSIS
+Create Profile with different Sku
+#>
+function Test-SkuCreate
+{
+    $profileName = getAssetName
+    $resourceGroup = TestSetup-CreateResourceGroup
+    $profileLocation = "EastUS"
+    $profileSku = "Standard_Microsoft"
+    $createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku
+
+    Assert-NotNull $createdProfile
+    Assert-AreEqual $profileName $createdProfile.Name
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
+    Assert-AreEqual $profileSku $createdProfile.Sku.Name
+
+	$profileSku = "Standard_Verizon"
+    $profileName = getAssetName
+    $createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku 
+    Assert-NotNull $createdProfile
+    Assert-AreEqual $profileName $createdProfile.Name
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
+    Assert-AreEqual $profileSku $createdProfile.Sku.Name
+
+	$profileSku = "Premium_Verizon"
+    $profileName = getAssetName
+    $createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku 
+    Assert-NotNull $createdProfile
+    Assert-AreEqual $profileName $createdProfile.Name
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
+    Assert-AreEqual $profileSku $createdProfile.Sku.Name
+	
+	$profileSku = "Standard_Akamai"
+    $profileName = getAssetName
+    $createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku 
+    Assert-NotNull $createdProfile
+    Assert-AreEqual $profileName $createdProfile.Name
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdProfile.ResourceGroupName
+    Assert-AreEqual $profileSku $createdProfile.Sku.Name
+
+    Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
+}
 <#
 .SYNOPSIS
 Full Profile CRUD cycle

src/ResourceManager/Cdn/Commands.Cdn.Test/SessionRecords/Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests/TestSkuCreate.json

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Added Standard_Microsoft in Cdn pricing sku. 
 
 ## Version 5.0.5
 * Fixed issue with default resource groups not being set.

src/ResourceManager/Cdn/Commands.Cdn/ChangeLog.md

@@ -20,6 +20,7 @@ public enum PSSkuName
         Premium_Verizon,
         Custom_Verizon,
         Standard_Akamai,
-        Standard_ChinaCdn
+        Standard_ChinaCdn,
+        Standard_Microsoft
     }
 }

src/ResourceManager/Cdn/Commands.Cdn/Models/Profile/PSSkuName.cs

@@ -52,7 +52,7 @@ public class NewAzureRmCdnProfile : AzureCdnCmdletBase
         /// <summary>
         /// The pricing sku name of the profile.
         /// </summary>
-        [Parameter(Mandatory = true, HelpMessage = "The pricing sku name of the Azure CDN profile. Valid values are StandardVerizon, StandardAkamai, and PremiumVerizon.")]
+        [Parameter(Mandatory = true, HelpMessage = "The pricing sku name of the Azure CDN profile. Valid values are StandardVerizon, StandardAkamai, Standard_Microsoft and PremiumVerizon.")]
         public PSSkuName Sku { get; set; }
 
         /// <summary>

src/ResourceManager/Cdn/Commands.Cdn/Profile/NewAzureRmCdnProfile.cs

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E8FFEA7F-A9CB-4FE6-A4D3-9334125B57B4}</ProjectGuid>
+    <ProjectGuid>{8058D403-06E3-4BED-8924-D166CE303961}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Azure.Commands.ResourceManager.Cmdlets</RootNamespace>
@@ -139,9 +139,11 @@
     <Compile Include="Implementation\ManagedApplications\NewAzureManagedApplication.cs" />
     <Compile Include="Implementation\ManagedApplications\ManagedApplicationCmdletBase.cs" />
     <Compile Include="Implementation\Policy\GetAzurePolicySetDefinition.cs" />
+    <Compile Include="Implementation\Policy\GetAzurePolicyAliasCmdlet.cs" />
     <Compile Include="Implementation\Policy\PolicyHelpStrings.cs" />
     <Compile Include="Implementation\Policy\NewAzurePolicySetDefinition.cs" />
     <Compile Include="Implementation\Policy\PolicyCmdletBase.cs" />
+    <Compile Include="Implementation\Policy\PsResourceProviderAlias.cs" />
     <Compile Include="Implementation\Policy\RemoveAzurePolicySetDefinition.cs" />
     <Compile Include="Implementation\Policy\SetAzurePolicySetDefinition.cs" />
     <Compile Include="Implementation\ResourceGroups\ExportAzureResourceGroupCmdlet.cs" />

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj

@@ -0,0 +1,172 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Management.Automation;
+
+    using Microsoft.Azure.Commands.ResourceManager.Common;
+    using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+    using Microsoft.Azure.Management.ResourceManager;
+    using Microsoft.Azure.Management.ResourceManager.Models;
+
+    /// <summary>
+    /// Get an existing resource.
+    /// </summary>
+    [Cmdlet(VerbsCommon.Get, AzureRMConstants.AzureRMPrefix + "PolicyAlias"), OutputType(typeof(PsResourceProviderAlias))]
+    public class GetAzurePolicyAlias : ResourceManagerCmdletBase
+    {
+        /// <summary>
+        /// Gets or sets the provider namespace match string
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = false, HelpMessage = "Limits the output to items whose namespace matches this value.")]
+        [Alias("Name", "Namespace")]
+        [ValidateNotNullOrEmpty]
+        public string NamespaceMatch { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets the resource type match string
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = false, HelpMessage = "Limits the output to items whose resource type matches this value.")]
+        [Alias("ResourceType", "Resource")]
+        [ValidateNotNullOrEmpty]
+        public string ResourceTypeMatch { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets the alias match string
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = false, HelpMessage = "Includes in the output items with aliases whose name matches this value.")]
+        [Alias("Alias")]
+        [ValidateNotNullOrEmpty]
+        public string AliasMatch { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets the alias path match string
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = false, HelpMessage = "Includes in the output items with aliases containing a path that matches this value.")]
+        [Alias("Path")]
+        [ValidateNotNullOrEmpty]
+        public string PathMatch { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets the api version match string
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = false, HelpMessage = "Includes in the output items whose resource types or aliases have a matching api version.")]
+        [ValidateNotNullOrEmpty]
+        public string ApiVersionMatch { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets the alias match string
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = false, HelpMessage = "Includes in the output items whose resource types have a matching location.")]
+        [Alias("Location")]
+        [ValidateNotNullOrEmpty]
+        [LocationCompleter("Microsoft.Resources/resourceGroups")]
+        public string LocationMatch { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets list available flag
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = false, HelpMessage = "Includes in the output matching items with and without aliases.")]
+        [Alias("ShowAll")]
+        [ValidateNotNullOrEmpty]
+        public SwitchParameter ListAvailable { get; set; }
+
+        /// <summary>
+        /// Executes the cmdlet
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            // remove leading and trailing whitespace
+            this.NamespaceMatch = this.NamespaceMatch?.Trim() ?? string.Empty;
+            this.ResourceTypeMatch = this.ResourceTypeMatch?.Trim() ?? string.Empty;
+            this.AliasMatch = this.AliasMatch?.Trim() ?? string.Empty;
+            this.PathMatch = this.PathMatch?.Trim() ?? String.Empty;
+            this.ApiVersionMatch = this.ApiVersionMatch?.Trim() ?? string.Empty;
+            this.LocationMatch = this.LocationMatch?.Trim() ?? string.Empty;
+
+            var resourceTypes = this.GetProviderResourceTypes(this.ListAvailable, this.NamespaceMatch, this.ResourceTypeMatch, this.AliasMatch, this.PathMatch, this.ApiVersionMatch, this.LocationMatch);
+            this.WriteObject(resourceTypes, enumerateCollection: true);
+        }
+
+        private bool IsStringMatch(string input, string match)
+        {
+            return input.IndexOf(match, StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+
+        private bool IsMatch(string input, string match)
+        {
+            return string.IsNullOrEmpty(match) || this.IsStringMatch(input, match);
+        }
+
+        private IEnumerable<Provider> GetAllProviders()
+        {
+            return this.ResourceManagerSdkClient.ResourceManagementClient.Providers.List(expand: "resourceTypes/aliases");
+        }
+
+        private IEnumerable<Provider> GetMatchingProviders(IEnumerable<Provider> input, string namespaceMatch, string resourceTypeMatch)
+        {
+            // Filter the list of all providers to what matches on namespace and resource type
+            return input.Where(item => this.IsMatch(item.NamespaceProperty, namespaceMatch) && item.ResourceTypes.Any(r => IsMatch(r.ResourceType, resourceTypeMatch)));
+        }
+
+        private bool FilterFunction(ProviderResourceType providerResourceType, bool listAvailable, string resourceTypesMatch, string aliasMatch, string pathMatch, string apiVersionMatch, string locationMatch)
+        {
+            return
+                // if resource type match was provided, the resource type name must match
+                (string.IsNullOrEmpty(resourceTypesMatch) || this.IsStringMatch(providerResourceType.ResourceType, resourceTypesMatch)) &&
+
+                // include everything remaining if list available switch is provided
+                (listAvailable ||
+
+                 // otherwise just those with aliases that match the rest of the parameters
+                 providerResourceType.Aliases.Coalesce().Any() &&
+
+                 // if no match strings provided, include everything
+                 (string.IsNullOrEmpty(locationMatch) && string.IsNullOrEmpty(aliasMatch) && string.IsNullOrEmpty(pathMatch) && string.IsNullOrEmpty(apiVersionMatch) ||
+
+                  // if location match was provided, include those with matching location
+                  !string.IsNullOrEmpty(locationMatch) && providerResourceType.Locations.Coalesce().Any(l => this.IsStringMatch(l, locationMatch)) ||
+
+                  // if API match was provided, include those with matching resource type API version
+                  !string.IsNullOrEmpty(apiVersionMatch) && providerResourceType.ApiVersions.Coalesce().Any(v => this.IsStringMatch(v, apiVersionMatch)) ||
+
+                  // if alias match was provided, include those with matching alias name
+                  !string.IsNullOrEmpty(aliasMatch) && providerResourceType.Aliases.Coalesce().Any(a => this.IsStringMatch(a.Name, aliasMatch)) ||
+
+                  // if alias path match was provided, includes those with matching path
+                  !string.IsNullOrEmpty(pathMatch) && providerResourceType.Aliases.Coalesce().Any(a => a.Paths.Any(p => this.IsStringMatch(p.Path, pathMatch))) ||
+
+                  // if API version match was provided, also include those with matching alias API version
+                  !string.IsNullOrEmpty(apiVersionMatch) && providerResourceType.Aliases.Coalesce().Any(a => a.Paths.Coalesce().Any(p => p.ApiVersions.Coalesce().Any(v => this.IsStringMatch(v, apiVersionMatch))))));
+        }
+
+        private IEnumerable<PsResourceProviderAlias> GetProviderResourceTypes(bool listAvailable, string namespaceMatch, string resourceTypeMatch, string aliasMatch, string pathMatch, string apiVersionMatch, string locationMatch)
+        {
+            var allProviders = this.GetAllProviders();
+            var providers = this.GetMatchingProviders(allProviders, namespaceMatch, resourceTypeMatch);
+            var rv = new List<PsResourceProviderAlias>();
+            foreach (var provider in providers)
+            {
+                var match = provider.ResourceTypes.Where(r => this.FilterFunction(r, listAvailable, resourceTypeMatch, aliasMatch, pathMatch, apiVersionMatch, locationMatch));
+                rv.AddRange(match.Select(t => new PsResourceProviderAlias {Aliases = t.Aliases, ApiVersions = t.ApiVersions, Locations = t.Locations, Namespace = provider.NamespaceProperty, ResourceType = t.ResourceType}));
+            }
+
+            return rv;
+        }
+    }
+}

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/GetAzurePolicyAliasCmdlet.cs

@@ -0,0 +1,52 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
+{
+    using System.Collections.Generic;
+    using Microsoft.Azure.Management.ResourceManager.Models;
+    using Microsoft.WindowsAzure.Commands.Common.Attributes;
+
+    public class PsResourceProviderAlias
+    {
+        /// <summary>
+        /// Gets or sets the namespace of this resource type
+        /// </summary>
+        [Ps1Xml(Target = ViewControl.All, Position = 0)]
+        public string Namespace { get; set; }
+
+        /// <summary>
+        /// Gets or sets the resource type (name) of this resource type
+        /// </summary>
+        [Ps1Xml(Target = ViewControl.All, Position = 1)]
+        public string ResourceType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the collection of locations where this resource type
+        /// can be created.
+        /// </summary>
+        [Ps1Xml(Target = ViewControl.List, Position = 4)]
+        public IList<string> Locations { get; set; }
+
+        /// <summary>
+        /// Gets or sets the aliases that are supported by this resource type.
+        /// </summary>
+        [Ps1Xml(Target = ViewControl.All, Position = 2)]
+        public IList<AliasType> Aliases { get; set; }
+
+        /// <summary>Gets or sets the API version collection.</summary>
+        [Ps1Xml(Target = ViewControl.List, Position = 3)]
+        public IList<string> ApiVersions { get; set; }
+    }
+}

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PsResourceProviderAlias.cs

@@ -76,7 +76,9 @@
     <Compile Include="ScenarioTests\ManagementGroupsTests.cs" />
     <Compile Include="ScenarioTests\MoveResourceTest.cs" />
     <Compile Include="ScenarioTests\ManagedApplicationDefinitionTests.cs" />
+    <Compile Include="ScenarioTests\PolicyAliasTests.cs" />
     <Compile Include="ScenarioTests\ProviderFeatureTests.cs" />
+    <Compile Include="ScenarioTests\ProviderListBuilder.cs" />
     <Compile Include="ScenarioTests\ProviderTests.cs" />
     <Compile Include="ScenarioTests\ResourcesController.cs" />
     <Compile Include="ScenarioTests\DeploymentTests.cs" />