get identity properties from InputObject and allow override by parameters

Author: solankisamir

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/ApiManagementClient.cs

@@ -24,7 +24,7 @@
     <WarningLevel>4</WarningLevel>
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <UseVSHostingProcess>true</UseVSHostingProcess>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -51,10 +51,6 @@
       <HintPath>..\..\..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.Azure.Management.ApiManagement, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.4.0.2-preview\lib\net452\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
       <Private>True</Private>
@@ -63,10 +59,6 @@
       <HintPath>..\..\..\packages\WindowsAzure.Storage.8.1.1\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiManagementClient.cs" />
@@ -171,6 +163,7 @@
     <Compile Include="Models\PsApiManagementIdentityProviderType.cs" />
     <Compile Include="Models\PsApiManagementOperationResult.cs" />
     <Compile Include="Models\PsApiManagementApiRelease.cs" />
+    <Compile Include="Models\PsApiManagementArmResource.cs" />
     <Compile Include="Models\PsApiManagementServiceFabric.cs" />
     <Compile Include="Models\PsApiManagementTenantConfigurationSyncState.cs" />
     <Compile Include="Models\PsApiManagementAuthorizationHeaderCredential.cs" />

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj

@@ -52,7 +52,7 @@ public class NewAzureApiManagementLogger : AzureApiManagementCmdletBase
             ParameterSetName = EventHubLoggerSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = true,
-            HelpMessage = "EventHub Connection String with Send Policy Rights. This parameter is optional.")]
+            HelpMessage = "EventHub Connection String with Send Policy Rights. This parameter is required.")]
         [ValidateNotNullOrEmpty]
         public String ConnectionString { get; set; }
 

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagementLogger.cs

@@ -36,6 +36,7 @@ public class RemoveAzureApiManagementApiRelease : AzureApiManagementCmdletBase
 
         [Parameter(
             ParameterSetName = ByApiReleaseIdParameterSet,
+            ValueFromPipelineByPropertyName = true,
             ValueFromPipeline = true,
             Mandatory = true,
             HelpMessage = "Instance of PsApiManagementContext. This parameter is required.")]

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/RemoveAzureApiManagementApiRelease.cs

@@ -47,7 +47,14 @@ public class SetAzureApiManagementApi : AzureApiManagementCmdletBase
         public String ApiId { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
+            ParameterSetName = ByInputObjectParameterSet,
+            ValueFromPipeline = true,
+            Mandatory = true,
+            HelpMessage = "Instance of PsApiManagementApi. This parameter is required.")]
+        [ValidateNotNullOrEmpty]
+        public PsApiManagementApi InputObject { get; set; }
+
+        [Parameter(
             ValueFromPipelineByPropertyName = true,
             Mandatory = true,
             HelpMessage = "Web API name. Public name of the API as it would appear on the developer and admin portals. " +
@@ -56,14 +63,12 @@ public class SetAzureApiManagementApi : AzureApiManagementCmdletBase
         public String Name { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "Web API description. This parameter is optional.")]
         public String Description { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = true,
             HelpMessage = "A URL of the web service exposing the API. " +
@@ -73,7 +78,6 @@ public class SetAzureApiManagementApi : AzureApiManagementCmdletBase
         public String ServiceUrl { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "Web API Path. Last part of the API's public URL." +
@@ -82,7 +86,6 @@ public class SetAzureApiManagementApi : AzureApiManagementCmdletBase
         public String Path { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = true,
             HelpMessage = "Web API protocols (http, https). Protocols over which API is made available." +
@@ -91,41 +94,29 @@ public class SetAzureApiManagementApi : AzureApiManagementCmdletBase
         public PsApiManagementSchema[] Protocols { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "OAuth authorization server identifier. This parameter is optional. Default value is $null. " +
                           "Must be specified if AuthorizationScope specified.")]
         public String AuthorizationServerId { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "OAuth operations scope. This parameter is optional. Default value is $null.")]
         public String AuthorizationScope { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "Subscription key header name. This parameter is optional. Default value is $null.")]
         public String SubscriptionKeyHeaderName { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "Subscription key query string parameter name. This parameter is optional. Default value is $null.")]
         public String SubscriptionKeyQueryParamName { get; set; }
-        
-        [Parameter(
-            ParameterSetName = ByInputObjectParameterSet,
-            ValueFromPipeline = true,
-            Mandatory = true,
-            HelpMessage = "Instance of PsApiManagementApi. This parameter is required.")]
-        [ValidateNotNullOrEmpty]
-        public PsApiManagementApi InputObject { get; set; }
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,
@@ -154,7 +145,7 @@ public override void ExecuteApiManagementCmdlet()
                 apiId = ApiId;
             }
 
-            Client.ApiSet(
+            var updatedApi = Client.ApiSet(
                 resourcegroupName,
                 serviceName,
                 apiId,
@@ -171,8 +162,7 @@ public override void ExecuteApiManagementCmdlet()
 
             if (PassThru.IsPresent)
             {
-                var api = Client.ApiById(resourcegroupName, serviceName, ApiId);
-                WriteObject(api);
+                WriteObject(updatedApi);
             }
         }
     }

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementApi.cs

@@ -14,18 +14,18 @@
 
 namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
 {
-    using Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models;
     using System;
     using System.Linq;
     using System.Management.Automation;
-    using Properties;
     using Management.ApiManagement.Models;
+    using Models;
+    using Properties;
 
     [Cmdlet(VerbsCommon.Set,
         Constants.ApiManagementApiRevision,
         DefaultParameterSetName = ExpandedParameterSet,
         SupportsShouldProcess = true)]
-    [OutputType(typeof(PsApiManagementApi))]
+    [OutputType(typeof(PsApiManagementApi), ParameterSetName = new[] { ExpandedParameterSet, ByInputObjectParameterSet })]
     public class SetAzureApiManagementApiRevision : SetAzureApiManagementApi
     {   
         [Parameter(
@@ -45,13 +45,15 @@ public override void ExecuteApiManagementCmdlet()
 
             if (ParameterSetName.Equals(ByInputObjectParameterSet))
             {
+                // identity properties from InputObject
                 resourcegroupName = InputObject.ResourceGroupName;
                 serviceName = InputObject.ServiceName;
                 apiId = InputObject.ApiId;
                 apiRevision = InputObject.ApiRevision;
             }
             else
             {
+                // identity properties from individual variables
                 resourcegroupName = Context.ResourceGroupName;
                 serviceName = Context.ServiceName;
                 apiId = ApiId;
@@ -62,7 +64,7 @@ public override void ExecuteApiManagementCmdlet()
 
             if (ShouldProcess(id, Resources.SetApiRevision))
             {
-                Client.ApiSet(
+                var updatedApiRevision = Client.ApiSet(
                     resourcegroupName,
                     serviceName,
                     id,
@@ -78,9 +80,8 @@ public override void ExecuteApiManagementCmdlet()
                     InputObject);
 
                 if (PassThru.IsPresent)
-                {
-                    var api = Client.ApiById(resourcegroupName, serviceName, id);
-                    WriteObject(api);
+                {                                      
+                    WriteObject(updatedApiRevision);
                 }
             }
         }

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementApiRevision.cs

@@ -57,37 +57,32 @@ public class SetAzureApiManagementApiVersionSet : AzureApiManagementCmdletBase
         public String ApiVersionSetId { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "The name of the ApiVersion Set. This parameter is optional.")]
         public String Name { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "Versioning Scheme to select for the Api Versioning Set. This parameter is optional.")]
         public PsApiManagementVersioningScheme Scheme { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "The Header value which will contain the versioning information. " +
             "If versioning Scheme HEADER is choosen, then this value must be specified.")]
         public String HeaderName { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "The Query value which will contain the versioning information. " +
             "If versioning Scheme Query is choosen, then this value must be specified.")]
         public String QueryName { get; set; }
 
         [Parameter(
-            ParameterSetName = ExpandedParameterSet,
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "Description of the Api Version set.")]

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementApiVersionSet.cs

@@ -58,7 +58,6 @@ public class UpdateAzureApiManagementApiRelease : AzureApiManagementCmdletBase
 
         [Parameter(
             ValueFromPipelineByPropertyName = true,
-            ParameterSetName = ExpandedParameterSet,
             Mandatory = false,
             HelpMessage = "Api Release Notes. This parameter is optional.")]
         public String Note { get; set; }
@@ -87,20 +86,22 @@ public override void ExecuteApiManagementCmdlet()
 
             if (ParameterSetName == ExpandedParameterSet)
             {
+                // get identity properties from individual variables
                 resourceGroupName = Context.ResourceGroupName;
                 serviceName = Context.ServiceName;
                 apiId = ApiId;
                 releaseId = ReleaseId;
             }
             else
             {
+                // get identity properties from InputObject
                 resourceGroupName = InputObject.ResourceGroupName;
                 serviceName = InputObject.ServiceName;
                 apiId = InputObject.ApiId;
                 releaseId = InputObject.ReleaseId;
             }
 
-            if (ShouldProcess(releaseId, Resources.SetApiRelease))
+            if (ShouldProcess(releaseId, Resources.UpdateApiRelease))
             {                          
                 Client.UpdateApiRelease(
                     resourceGroupName,

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/UpdateAzureApiManagementApiRelease.cs

@@ -14,12 +14,8 @@
 
 namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models
 {
-    public class PsApiManagementApi
+    public class PsApiManagementApi : PsApiManagementArmResource
     {
-        public string ResourceGroupName { get; set; }
-
-        public string ServiceName { get; set; }
-
         public string ApiId { get; set; }
 
         public string Name { get; set; }

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Models/PsApiManagementApi.cs

@@ -15,17 +15,42 @@
 namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models
 {
     using System;
+    using System.Text.RegularExpressions;
 
-    public class PsApiManagementApiRelease
+    public class PsApiManagementApiRelease : PsApiManagementArmResource
     {
-        public string ResourceGroupName { get;  set;}
-
-        public string ServiceName { get; set; }
+        // resource group regex
+        static readonly Regex ApiNameRegex = new Regex(@"(.*?)/apis/(?<apiName>\S+)/releases/(.*?)", RegexOptions.IgnoreCase);
 
         public string ReleaseId { get; set; }
 
-        public string ApiId { get; set; }
-        
+        private string apiId;
+        public string ApiId
+        {
+            get
+            {
+                if (!string.IsNullOrWhiteSpace(Id))
+                {
+                    var match = ApiNameRegex.Match(Id);
+                    if (match.Success)
+                    {
+                        var apiNameGroup = match.Groups["apiName"];
+                        if (apiNameGroup != null && apiNameGroup.Success)
+                        {
+                            return apiNameGroup.Value;
+                        }
+                    }
+                }
+
+                return this.apiId;                
+            }
+
+            set
+            {
+                this.apiId = value;
+            }
+        }
+
         public DateTime? CreatedDateTime { get; private set; }
 
         public DateTime? UpdatedDateTime { get; private set; }