[Az.ServiceFabric] Update New and Set commands for Managed Clusters with new parameters

src/ServiceFabric/ServiceFabric/ChangeLog.md

@@ -19,6 +19,15 @@
 -->
 ## Upcoming Release
 * Updated SFMC to latest api general version "2026-02-01"
+* Fixed `Set-AzServiceFabricManagedClusterApplication` to use correct resource completer for managed clusters instead of classic clusters.
+* Added parameters `-IdentityType`, `-UserAssignedIdentityId`, and `-ApplicationManagedIdentity` to `New-AzServiceFabricManagedClusterApplication` to support managed identity configuration on applications.
+* Added parameters `-IdentityType`, `-UserAssignedIdentityId`, and `-ApplicationManagedIdentity` to `Set-AzServiceFabricManagedClusterApplication` to support managed identity configuration on applications.
+* Added parameters `-AzureActiveDirectoryClientApplication`, `-AzureActiveDirectoryClusterApplication`, `-AzureActiveDirectoryTenantId`, `-EnableHttpGatewayExclusiveAuthMode`, `-HttpGatewayTokenAuthConnectionPort`, `-MaxPercentUnhealthyApplication`, `-MaxPercentUnhealthyNode`, `-MaxUnusedVersionsToKeep`, `-AddonFeature`, `-DdosProtectionPlanId`, `-EnableIpv6`, `-EnableServicePublicIP`, `-PublicIPPrefixId`, `-PublicIPv6PrefixId`, `-SubnetId`, `-UseCustomVnet`, `-VMImage`, `-AllocatedOutboundPort`, `-EnableOutboundOnlyNodeType`, and `-SkipManagedNsgAssignment` to `New-AzServiceFabricManagedCluster`.
+* Added parameters `-AzureActiveDirectoryClientApplication`, `-AzureActiveDirectoryClusterApplication`, `-AzureActiveDirectoryTenantId`, `-EnableHttpGatewayExclusiveAuthMode`, `-HttpGatewayTokenAuthConnectionPort`, `-MaxPercentUnhealthyApplication`, `-MaxPercentUnhealthyNode`, `-MaxUnusedVersionsToKeep`, `-AddonFeature`, `-DdosProtectionPlanId`, `-PublicIPPrefixId`, `-PublicIPv6PrefixId`, `-VMImage`, `-AllocatedOutboundPort`, `-EnableOutboundOnlyNodeType`, and `-SkipManagedNsgAssignment` to `Set-AzServiceFabricManagedCluster`.
+* Enabled `Manual` option for the `-UpgradeMode` parameter in `Set-AzServiceFabricManagedCluster`.
+* Added parameters `-IsOutboundOnly`, `-EnableResilientEphemeralOSDisk`, `-EnableAcceleratedNetworking`, `-EnableEncryptionAtHost`, `-EnableNodePublicIP`, `-EnableNodePublicIPv6`, `-SecureBootEnabled`, and `-UseEphemeralOSDisk` to `New-AzServiceFabricManagedNodeType`.
+* Added parameters `-IsOutboundOnly`, `-EnableResilientEphemeralOSDisk`, `-EnableAcceleratedNetworking`, `-EnableEncryptionAtHost`, `-EnableNodePublicIP`, `-EnableNodePublicIPv6`, `-SecureBootEnabled`, and `-UseEphemeralOSDisk` to `Set-AzServiceFabricManagedNodeType`.
+* Added parameter `-ServiceDnsName` to `New-AzServiceFabricManagedClusterService` for DNS-based service discovery.
 
 ## Version 5.0.0
 * Removed `ReimageByName`, `ReimageById`, and `ReimageByObj` parameter sets from `Set-AzServiceFabricManagedNodeType`.

src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/NewAzServiceFabricManagedClusterApplication.cs

@@ -14,13 +14,15 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ServiceFabric.Common;
 using Microsoft.Azure.Commands.ServiceFabric.Models;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters;
 using Microsoft.Azure.Management.ServiceFabricManagedClusters.Models;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.ServiceFabric.Commands
 {
@@ -87,6 +89,30 @@ public class NewAzServiceFabricManagedClusterApplication : ManagedApplicationCmd
         [Parameter(Mandatory = false, ValueFromPipeline = true, ParameterSetName = CreateAppTypeVersion, HelpMessage = "Specify the tags as key/value pairs.")]
         public Hashtable Tag { get; set; }
 
+        #region Identity params
+
+        [Parameter(Mandatory = false, ParameterSetName = SkipAppTypeVersion,
+            HelpMessage = "Specify the type of managed identity for the application. Options are None, SystemAssigned, UserAssigned, and SystemAssigned,UserAssigned.")]
+        [Parameter(Mandatory = false, ParameterSetName = CreateAppTypeVersion,
+            HelpMessage = "Specify the type of managed identity for the application. Options are None, SystemAssigned, UserAssigned, and SystemAssigned,UserAssigned.")]
+        public ManagedIdentityType IdentityType { get; set; }
+
+        [Parameter(Mandatory = false, ParameterSetName = SkipAppTypeVersion,
+            HelpMessage = "Specify the list of user assigned identity ARM resource IDs for the application.")]
+        [Parameter(Mandatory = false, ParameterSetName = CreateAppTypeVersion,
+            HelpMessage = "Specify the list of user assigned identity ARM resource IDs for the application.")]
+        [ValidateNotNullOrEmpty]
+        public string[] UserAssignedIdentityId { get; set; }
+
+        [Parameter(Mandatory = false, ParameterSetName = SkipAppTypeVersion,
+            HelpMessage = "Specify the application managed identities as key/value pairs. The key is the friendly identity name, and the value is the principal id.")]
+        [Parameter(Mandatory = false, ParameterSetName = CreateAppTypeVersion,
+            HelpMessage = "Specify the application managed identities as key/value pairs. The key is the friendly identity name, and the value is the principal id.")]
+        [ValidateNotNullOrEmpty]
+        public Hashtable ApplicationManagedIdentity { get; set; }
+
+        #endregion
+
         [Parameter(Mandatory = false, HelpMessage = "Continue without prompts")]
         public SwitchParameter Force { get; set; }
 
@@ -168,9 +194,43 @@ private ApplicationResource GetNewAppParameters(string location)
                     version: this.GetAppTypeArmResourceId(this.DefaultContext.Subscription.Id, this.ResourceGroupName, this.ClusterName, this.ApplicationTypeName, this.ApplicationTypeVersion),
                     parameters: this.ApplicationParameter?.Cast<DictionaryEntry>().ToDictionary(d => d.Key as string, d => d.Value as string),
                     location: location,
+                    identity: this.GetManagedIdentity(),
+                    managedIdentities: this.GetApplicationManagedIdentities(),
                     tags: this.Tag?.Cast<DictionaryEntry>().ToDictionary(d => d.Key as string, d => d.Value as string));
         }
 
+        private ManagedIdentity GetManagedIdentity()
+        {
+            if (!this.IsParameterBound(c => c.IdentityType))
+            {
+                return null;
+            }
+
+            var identity = new ManagedIdentity(type: this.IdentityType);
+
+            if (this.UserAssignedIdentityId != null && this.UserAssignedIdentityId.Length > 0)
+            {
+                identity.UserAssignedIdentities = this.UserAssignedIdentityId
+                    .ToDictionary(id => id, id => new UserAssignedIdentity());
+            }
+
+            return identity;
+        }
+
+        private IList<ApplicationUserAssignedIdentity> GetApplicationManagedIdentities()
+        {
+            if (this.ApplicationManagedIdentity == null)
+            {
+                return null;
+            }
+
+            return this.ApplicationManagedIdentity.Cast<DictionaryEntry>()
+                .Select(entry => new ApplicationUserAssignedIdentity(
+                    name: entry.Key as string,
+                    principalId: entry.Value as string))
+                .ToList();
+        }
+
         private string GetAppTypeArmResourceId(string subscriptionId, string resourceGroup, string clusterName, string appTypeName, string appTypeVersion)
         {
             return string.Format(AppTypeArmResourceIdFormat, subscriptionId, resourceGroup, clusterName, appTypeName, appTypeVersion);

src/ServiceFabric/ServiceFabric/Commands/ManagedClusters/Applications/SetAzServiceFabricManagedClusterApplication.cs

@@ -54,7 +54,7 @@ public class SetAzServiceFabricManagedClusterApplication : ManagedApplicationCmd
 
         [Parameter(Mandatory = true, Position = 1, ParameterSetName = ByResourceGroup, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Specify the name of the cluster.")]
-        [ResourceNameCompleter("Microsoft.ServiceFabric/clusters", nameof(ResourceGroupName))]
+        [ResourceNameCompleter(Constants.ManagedClustersFullType, nameof(ResourceGroupName))]
         [ValidateNotNullOrEmpty]
         public override string ClusterName { get; set; }
 
@@ -244,6 +244,36 @@ public class SetAzServiceFabricManagedClusterApplication : ManagedApplicationCmd
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Specify the tags as key/value pairs.")]
         public Hashtable Tag { get; set; }
 
+        #region Identity params
+
+        [Parameter(Mandatory = false, ParameterSetName = ByResourceGroup,
+            HelpMessage = "Specify the type of managed identity for the application. Options are None, SystemAssigned, UserAssigned, and SystemAssigned,UserAssigned.")]
+        [Parameter(Mandatory = false, ParameterSetName = ByResourceId,
+            HelpMessage = "Specify the type of managed identity for the application. Options are None, SystemAssigned, UserAssigned, and SystemAssigned,UserAssigned.")]
+        [Parameter(Mandatory = false, ParameterSetName = ByInputObject,
+            HelpMessage = "Specify the type of managed identity for the application. Options are None, SystemAssigned, UserAssigned, and SystemAssigned,UserAssigned.")]
+        public ManagedIdentityType IdentityType { get; set; }
+
+        [Parameter(Mandatory = false, ParameterSetName = ByResourceGroup,
+            HelpMessage = "Specify the list of user assigned identity ARM resource IDs for the application.")]
+        [Parameter(Mandatory = false, ParameterSetName = ByResourceId,
+            HelpMessage = "Specify the list of user assigned identity ARM resource IDs for the application.")]
+        [Parameter(Mandatory = false, ParameterSetName = ByInputObject,
+            HelpMessage = "Specify the list of user assigned identity ARM resource IDs for the application.")]
+        [ValidateNotNullOrEmpty]
+        public string[] UserAssignedIdentityId { get; set; }
+
+        [Parameter(Mandatory = false, ParameterSetName = ByResourceGroup,
+            HelpMessage = "Specify the application managed identities as key/value pairs. The key is the friendly identity name, and the value is the principal id.")]
+        [Parameter(Mandatory = false, ParameterSetName = ByResourceId,
+            HelpMessage = "Specify the application managed identities as key/value pairs. The key is the friendly identity name, and the value is the principal id.")]
+        [Parameter(Mandatory = false, ParameterSetName = ByInputObject,
+            HelpMessage = "Specify the application managed identities as key/value pairs. The key is the friendly identity name, and the value is the principal id.")]
+        [ValidateNotNullOrEmpty]
+        public Hashtable ApplicationManagedIdentity { get; set; }
+
+        #endregion
+
         [Parameter(Mandatory = true, ParameterSetName = ByResourceId, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Arm ResourceId of the managed application.")]
         [ResourceIdCompleter(Constants.ManagedClustersFullType)]
@@ -337,6 +367,36 @@ private ApplicationResource GetUpdatedAppParams(ApplicationResource inputObject
                 currentApp.Tags = this.Tag?.Cast<DictionaryEntry>().ToDictionary(d => d.Key as string, d => d.Value as string);
             }
 
+            if (this.IsParameterBound(c => c.IdentityType))
+            {
+                if (currentApp.Identity == null)
+                {
+                    currentApp.Identity = new ManagedIdentity();
+                }
+
+                currentApp.Identity.Type = this.IdentityType;
+            }
+
+            if (this.IsParameterBound(c => c.UserAssignedIdentityId))
+            {
+                if (currentApp.Identity == null)
+                {
+                    currentApp.Identity = new ManagedIdentity();
+                }
+
+                currentApp.Identity.UserAssignedIdentities = this.UserAssignedIdentityId
+                    ?.ToDictionary(id => id, id => new UserAssignedIdentity());
+            }
+
+            if (this.IsParameterBound(c => c.ApplicationManagedIdentity))
+            {
+                currentApp.ManagedIdentities = this.ApplicationManagedIdentity?.Cast<DictionaryEntry>()
+                    .Select(entry => new ApplicationUserAssignedIdentity(
+                        name: entry.Key as string,
+                        principalId: entry.Value as string))
+                    .ToList();
+            }
+
             currentApp.UpgradePolicy = SetUpgradePolicy(currentApp.UpgradePolicy);
 
             return currentApp;