Az.StorageSync MI GA Release (Shared/storage sync to main)

src/StorageSync/StorageSync.Management.Sdk/Generated/IRegisteredServersOperations.cs

@@ -115,8 +115,8 @@ public partial interface IRegisteredServersOperations
         /// <param name='serverId'>
         /// GUID identifying the on-premises server.
         /// </param>
-        /// <param name='identity'>
-        /// Apply server with newly discovered ApplicationId if available.
+        /// <param name='parameters'>
+        /// Body of Registered Server object.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -130,7 +130,7 @@ public partial interface IRegisteredServersOperations
         /// <exception cref="Microsoft.Rest.SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
-        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders>> UpdateWithHttpMessagesAsync(string resourceGroupName, string storageSyncServiceName, string serverId, bool? identity = default(bool?), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders>> UpdateWithHttpMessagesAsync(string resourceGroupName, string storageSyncServiceName, string serverId, RegisteredServerUpdateParameters parameters, System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// Delete the given registered server.
@@ -234,8 +234,8 @@ public partial interface IRegisteredServersOperations
         /// <param name='serverId'>
         /// GUID identifying the on-premises server.
         /// </param>
-        /// <param name='identity'>
-        /// Apply server with newly discovered ApplicationId if available.
+        /// <param name='parameters'>
+        /// Body of Registered Server object.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -249,7 +249,7 @@ public partial interface IRegisteredServersOperations
         /// <exception cref="Microsoft.Rest.SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
-        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders>> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string storageSyncServiceName, string serverId, bool? identity = default(bool?), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders>> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string storageSyncServiceName, string serverId, RegisteredServerUpdateParameters parameters, System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// Delete the given registered server.

src/StorageSync/StorageSync.Management.Sdk/Generated/Models/RegisteredServerUpdateParameters.cs

@@ -42,11 +42,15 @@ public RegisteredServerUpdateParameters()
 
         /// <param name="identity">Apply server with newly discovered ApplicationId if available.
         /// </param>
-        public RegisteredServerUpdateParameters(string id = default(string), string name = default(string), string type = default(string), SystemData systemData = default(SystemData), bool? identity = default(bool?))
+
+        /// <param name="applicationId">Apply server with new ServicePrincipal Id
+        /// </param>
+        public RegisteredServerUpdateParameters(string id = default(string), string name = default(string), string type = default(string), SystemData systemData = default(SystemData), bool? identity = default(bool?), string applicationId = default(string))
 
         : base(id, name, type, systemData)
         {
             this.Identity = identity;
+            this.ApplicationId = applicationId;
             CustomInit();
         }
 
@@ -61,5 +65,11 @@ public RegisteredServerUpdateParameters()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "properties.identity")]
         public bool? Identity {get; set; }
+
+        /// <summary>
+        /// Gets or sets apply server with new ServicePrincipal Id
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "properties.applicationId")]
+        public string ApplicationId {get; set; }
     }
 }

src/StorageSync/StorageSync.Management.Sdk/Generated/Models/RegisteredServerUpdateProperties.cs

@@ -26,10 +26,14 @@ public RegisteredServerUpdateProperties()
 
         /// <param name="identity">Apply server with newly discovered ApplicationId if available.
         /// </param>
-        public RegisteredServerUpdateProperties(bool? identity = default(bool?))
+
+        /// <param name="applicationId">Apply server with new ServicePrincipal Id
+        /// </param>
+        public RegisteredServerUpdateProperties(bool? identity = default(bool?), string applicationId = default(string))
 
         {
             this.Identity = identity;
+            this.ApplicationId = applicationId;
             CustomInit();
         }
 
@@ -44,5 +48,11 @@ public RegisteredServerUpdateProperties()
         /// </summary>
         [Newtonsoft.Json.JsonProperty(PropertyName = "identity")]
         public bool? Identity {get; set; }
+
+        /// <summary>
+        /// Gets or sets apply server with new ServicePrincipal Id
+        /// </summary>
+        [Newtonsoft.Json.JsonProperty(PropertyName = "applicationId")]
+        public string ApplicationId {get; set; }
     }
 }

src/StorageSync/StorageSync.Management.Sdk/Generated/RegisteredServersOperations.cs

@@ -542,19 +542,19 @@ internal RegisteredServersOperations (StorageSyncManagementClient client)
         /// <param name='serverId'>
         /// GUID identifying the on-premises server.
         /// </param>
-        /// <param name='identity'>
-        /// Apply server with newly discovered ApplicationId if available.
+        /// <param name='parameters'>
+        /// Body of Registered Server object.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders>> UpdateWithHttpMessagesAsync(string resourceGroupName, string storageSyncServiceName, string serverId, bool? identity = default(bool?), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders>> UpdateWithHttpMessagesAsync(string resourceGroupName, string storageSyncServiceName, string serverId, RegisteredServerUpdateParameters parameters, System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
                 // Send Request
-                Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders> _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, storageSyncServiceName, serverId, identity, customHeaders, cancellationToken).ConfigureAwait(false);
+                Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders> _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, storageSyncServiceName, serverId, parameters, customHeaders, cancellationToken).ConfigureAwait(false);
                 return await this.Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
@@ -875,8 +875,8 @@ internal RegisteredServersOperations (StorageSyncManagementClient client)
         /// <param name='serverId'>
         /// GUID identifying the on-premises server.
         /// </param>
-        /// <param name='identity'>
-        /// Apply server with newly discovered ApplicationId if available.
+        /// <param name='parameters'>
+        /// Body of Registered Server object.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -899,12 +899,16 @@ internal RegisteredServersOperations (StorageSyncManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders>> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string storageSyncServiceName, string serverId, bool? identity = default(bool?), System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Microsoft.Rest.Azure.AzureOperationResponse<RegisteredServer,RegisteredServersUpdateHeaders>> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string storageSyncServiceName, string serverId, RegisteredServerUpdateParameters parameters, System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
 
 
 
 
+            if (parameters == null)
+            {
+                throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "parameters");
+            }
 
             if (resourceGroupName == null)
             {
@@ -936,11 +940,6 @@ internal RegisteredServersOperations (StorageSyncManagementClient client)
                 throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "serverId");
             }
 
-            RegisteredServerUpdateParameters parameters = new RegisteredServerUpdateParameters();
-            if(identity != null)
-            {
-                parameters.Identity = identity;
-            }
             // Tracing
             bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
             string _invocationId = null;

src/StorageSync/StorageSync.Management.Sdk/Generated/RegisteredServersOperationsExtensions.cs

@@ -156,9 +156,9 @@ public static RegisteredServer Create(this IRegisteredServersOperations operatio
         /// <param name='serverId'>
         /// GUID identifying the on-premises server.
         /// </param>
-        public static RegisteredServer Update(this IRegisteredServersOperations operations, string resourceGroupName, string storageSyncServiceName, string serverId, bool? identity = default(bool?))
+        public static RegisteredServer Update(this IRegisteredServersOperations operations, string resourceGroupName, string storageSyncServiceName, string serverId, RegisteredServerUpdateParameters parameters)
         {
-                return ((IRegisteredServersOperations)operations).UpdateAsync(resourceGroupName, storageSyncServiceName, serverId, identity).GetAwaiter().GetResult();
+                return ((IRegisteredServersOperations)operations).UpdateAsync(resourceGroupName, storageSyncServiceName, serverId, parameters).GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -179,9 +179,9 @@ public static RegisteredServer Create(this IRegisteredServersOperations operatio
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public static async System.Threading.Tasks.Task<RegisteredServer> UpdateAsync(this IRegisteredServersOperations operations, string resourceGroupName, string storageSyncServiceName, string serverId, bool? identity = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public static async System.Threading.Tasks.Task<RegisteredServer> UpdateAsync(this IRegisteredServersOperations operations, string resourceGroupName, string storageSyncServiceName, string serverId, RegisteredServerUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, storageSyncServiceName, serverId, identity, null, cancellationToken).ConfigureAwait(false))
+            using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, storageSyncServiceName, serverId, parameters, null, cancellationToken).ConfigureAwait(false))
             {
                 return _result.Body;
             }
@@ -336,9 +336,9 @@ public static RegisteredServer BeginCreate(this IRegisteredServersOperations ope
         /// <param name='serverId'>
         /// GUID identifying the on-premises server.
         /// </param>
-        public static RegisteredServer BeginUpdate(this IRegisteredServersOperations operations, string resourceGroupName, string storageSyncServiceName, string serverId, bool? identity = default(bool?))
+        public static RegisteredServer BeginUpdate(this IRegisteredServersOperations operations, string resourceGroupName, string storageSyncServiceName, string serverId, RegisteredServerUpdateParameters parameters)
         {
-                return ((IRegisteredServersOperations)operations).BeginUpdateAsync(resourceGroupName, storageSyncServiceName, serverId, identity).GetAwaiter().GetResult();
+                return ((IRegisteredServersOperations)operations).BeginUpdateAsync(resourceGroupName, storageSyncServiceName, serverId, parameters).GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -359,9 +359,9 @@ public static RegisteredServer BeginCreate(this IRegisteredServersOperations ope
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public static async System.Threading.Tasks.Task<RegisteredServer> BeginUpdateAsync(this IRegisteredServersOperations operations, string resourceGroupName, string storageSyncServiceName, string serverId, bool? identity = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public static async System.Threading.Tasks.Task<RegisteredServer> BeginUpdateAsync(this IRegisteredServersOperations operations, string resourceGroupName, string storageSyncServiceName, string serverId, RegisteredServerUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(resourceGroupName, storageSyncServiceName, serverId, identity, null, cancellationToken).ConfigureAwait(false))
+            using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(resourceGroupName, storageSyncServiceName, serverId, parameters, null, cancellationToken).ConfigureAwait(false))
             {
                 return _result.Body;
             }

src/StorageSync/StorageSync.Management.Sdk/Generated/StorageSyncManagementClient.cs

@@ -305,6 +305,9 @@ public StorageSyncManagementClient(System.Uri baseUri, Microsoft.Rest.ServiceCli
         /// <param name='rootHandler'>
         /// Optional. The http client handler used to handle http transport.
         /// </param>
+        /// <param name='handlers'>
+        /// Optional. The delegating handlers to add to the http client pipeline.
+        /// </param>
         /// <exception cref="System.ArgumentNullException">
         /// Thrown when a required parameter is null
         /// </exception>

src/StorageSync/StorageSync.Management.Sdk/README.md

@@ -6,7 +6,6 @@ In this directory, run AutoRest:
 ```
 autorest --reset
 autorest --use:@autorest/[email protected]
-autorest.cmd README.md --version=v2
 ```
 
 ### AutoRest Configuration
@@ -27,7 +26,7 @@ payload-flattening-threshold: 1
 
 ###
 ``` yaml
-commit: 9ec0fcc278aa2128c4fbb2b8a1aa93432d72cce0
+commit: c29b9330313c91d43a75d9d08144c98071c904d0
 input-file:
   - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/storagesync/resource-manager/Microsoft.StorageSync/stable/2022-09-01/storagesync.json
 

src/StorageSync/StorageSync.Test/CleanKeys.ps1

@@ -0,0 +1,39 @@
+# Define the directory and file pattern
+$directory = "."
+$filePattern = "*Test*.json"
+
+# Define a regex pattern to match the specific pattern for Storage Account keys ending with ==
+$pattern = '\\\"value\\\":\s\\\"(?<SAKey>[a-zA-Z0-9+/=]{86}==)\\\",'
+# Iterate over all files in the directory matching the pattern
+Get-ChildItem -Path $directory -Filter $filePattern -Recurse | ForEach-Object {
+	# Initialize a hash set to store unique matched keys
+	$storageAccountKeys = [System.Collections.Generic.HashSet[string]]::new()
+
+    $fileContent = Get-Content -Path $_.FullName -Raw
+    Write-Output $_.FullName
+    # Find all matches in the file content
+    $matches = [regex]::Matches($fileContent, $pattern)
+
+    $shouldContinue = $false 
+    # Extract and store the keys
+    foreach ($match in $matches) {
+        $storageAccountKeys.Add($match.Groups["SAKey"].Value) | Out-Null
+		$shouldContinue = $true		
+    }
+	# Print each unique matched key
+	foreach ($key in $storageAccountKeys) {
+    Write-Output $key
+	}
+	if($shouldContinue)
+	{
+		# Replace all matches in the file content with *REDACTED*
+		$modifiedContent = [regex]::Replace($fileContent, $pattern, '\"value\": \"*REDACTED*\",')
+
+		# Save the modified content back to the file
+		Set-Content -Path $_.FullName -Value $modifiedContent -Force
+	}
+}
+
+# Print a message indicating completion
+Write-Output "All keys have been replaced with *REDACTED* in the specified files."
+

src/StorageSync/StorageSync.Test/Common/MockEcsManagementInteropClient.cs

@@ -693,5 +693,10 @@ public IConnectionPoint GetStableVersionDeepGcConnectionPoint()
         {
             throw new NotImplementedException();
         }
+
+        public int ResetServerCertificateSettingsRegistry()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/StorageSync/StorageSync.Test/Common/MockServerManagedIdentityProvider.cs

@@ -11,6 +11,17 @@ namespace Microsoft.Azure.Commands.StorageSync.Test.Common
 {
     internal class MockServerManagedIdentityProvider : IServerManagedIdentityProvider
     {
+        /// <summary>
+        /// Gets the name of the test.
+        /// </summary>
+        /// <value>The name of the test.</value>
+        protected string TestName;
+
+        public MockServerManagedIdentityProvider(string testName)
+        {
+            this.TestName = testName;
+        }
+
         public bool EnableMIChecking { get; set; }
 
         public Guid GetServerApplicationId(LocalServerType serverType, bool throwIfNotFound = true, bool validateSystemAssignedManagedIdentity = true)
@@ -20,6 +31,10 @@ public Guid GetServerApplicationId(LocalServerType serverType, bool throwIfNotFo
 
         public LocalServerType GetServerType(IEcsManagement ecsManagement)
         {
+            if(TestName == "TestPatchRegisteredServer")
+            {
+                return LocalServerType.ArcEnabledHybridServer;
+            }
             return LocalServerType.HybridServer;
         }
     }