[SSH] Upgrade HybridConnectivity SDK to stable version and other GA changes (#22146)

* Update HybridConnectivity SDK to the latest stable version

* Consider Service Configuration when retrieving Relay Information

* Check if arc agent is up to date for arc server

* Add retry logic for when service configuration gets created

* Check chmod exit code to determine if we were able to fix the permissions of the proxy to allow execution

* Re-record the scenario tests

* Update help files

* Add -Force parameter for creating service configuration with no prompt. Fix messages

* Fix Typo

* Update changelog

Author: vthiebaut10

src/Ssh/Ssh.Helpers/HybridConnectivity/EndpointsOperations.cs

@@ -275,6 +275,9 @@ internal EndpointsOperations(HybridConnectivityManagementAPIClient client)
         /// <param name='expiresin'>
         /// The is how long the endpoint access token is valid (in seconds).
         /// </param>
+        /// <param name='listCredentialsRequest'>
+        /// Object of type ListCredentialsRequest
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -296,7 +299,7 @@ internal EndpointsOperations(HybridConnectivityManagementAPIClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<EndpointAccessResource>> ListCredentialsWithHttpMessagesAsync(string resourceUri, string endpointName, long? expiresin = 10800, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<EndpointAccessResource>> ListCredentialsWithHttpMessagesAsync(string resourceUri, string endpointName, long? expiresin = 10800, ListCredentialsRequest listCredentialsRequest = default(ListCredentialsRequest), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -335,6 +338,7 @@ internal EndpointsOperations(HybridConnectivityManagementAPIClient client)
                 tracingParameters.Add("resourceUri", resourceUri);
                 tracingParameters.Add("endpointName", endpointName);
                 tracingParameters.Add("expiresin", expiresin);
+                tracingParameters.Add("listCredentialsRequest", listCredentialsRequest);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListCredentials", tracingParameters);
             }
@@ -390,6 +394,12 @@ internal EndpointsOperations(HybridConnectivityManagementAPIClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(listCredentialsRequest != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(listCredentialsRequest, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {

src/Ssh/Ssh.Helpers/HybridConnectivity/EndpointsOperationsExtensions.cs

@@ -85,9 +85,12 @@ public static EndpointResource CreateOrUpdate(this IEndpointsOperations operatio
             /// <param name='expiresin'>
             /// The is how long the endpoint access token is valid (in seconds).
             /// </param>
-            public static EndpointAccessResource ListCredentials(this IEndpointsOperations operations, string resourceUri, string endpointName, long? expiresin = 10800)
+            /// <param name='listCredentialsRequest'>
+            /// Object of type ListCredentialsRequest
+            /// </param>
+            public static EndpointAccessResource ListCredentials(this IEndpointsOperations operations, string resourceUri, string endpointName, long? expiresin = 10800, ListCredentialsRequest listCredentialsRequest = default(ListCredentialsRequest))
             {
-                return operations.ListCredentialsAsync(resourceUri, endpointName, expiresin).GetAwaiter().GetResult();
+                return operations.ListCredentialsAsync(resourceUri, endpointName, expiresin, listCredentialsRequest).GetAwaiter().GetResult();
             }
 
             /// <summary>
@@ -106,12 +109,15 @@ public static EndpointAccessResource ListCredentials(this IEndpointsOperations o
             /// <param name='expiresin'>
             /// The is how long the endpoint access token is valid (in seconds).
             /// </param>
+            /// <param name='listCredentialsRequest'>
+            /// Object of type ListCredentialsRequest
+            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<EndpointAccessResource> ListCredentialsAsync(this IEndpointsOperations operations, string resourceUri, string endpointName, long? expiresin = 10800, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<EndpointAccessResource> ListCredentialsAsync(this IEndpointsOperations operations, string resourceUri, string endpointName, long? expiresin = 10800, ListCredentialsRequest listCredentialsRequest = default(ListCredentialsRequest), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListCredentialsWithHttpMessagesAsync(resourceUri, endpointName, expiresin, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListCredentialsWithHttpMessagesAsync(resourceUri, endpointName, expiresin, listCredentialsRequest, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }

src/Ssh/Ssh.Helpers/HybridConnectivity/HybridConnectivityManagementAPIClient.cs

@@ -74,6 +74,11 @@ public partial class HybridConnectivityManagementAPIClient : ServiceClient<Hybri
         /// </summary>
         public virtual IEndpointsOperations Endpoints { get; private set; }
 
+        /// <summary>
+        /// Gets the IServiceConfigurationsOperations.
+        /// </summary>
+        public virtual IServiceConfigurationsOperations ServiceConfigurations { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the HybridConnectivityManagementAPIClient class.
         /// </summary>
@@ -316,8 +321,9 @@ public HybridConnectivityManagementAPIClient(System.Uri baseUri, ServiceClientCr
         private void Initialize()
         {
             Endpoints = new EndpointsOperations(this);
+            ServiceConfigurations = new ServiceConfigurationsOperations(this);
             BaseUri = new System.Uri("https://management.azure.com");
-            ApiVersion = "2022-05-01-preview";
+            ApiVersion = "2023-03-15";
             AcceptLanguage = "en-US";
             LongRunningOperationRetryTimeout = 30;
             GenerateClientRequestId = true;

src/Ssh/Ssh.Helpers/HybridConnectivity/IEndpointsOperations.cs

@@ -65,6 +65,9 @@ public partial interface IEndpointsOperations
         /// <param name='expiresin'>
         /// The is how long the endpoint access token is valid (in seconds).
         /// </param>
+        /// <param name='listCredentialsRequest'>
+        /// Object of type ListCredentialsRequest
+        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -80,6 +83,6 @@ public partial interface IEndpointsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<EndpointAccessResource>> ListCredentialsWithHttpMessagesAsync(string resourceUri, string endpointName, long? expiresin = 10800, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<EndpointAccessResource>> ListCredentialsWithHttpMessagesAsync(string resourceUri, string endpointName, long? expiresin = 10800, ListCredentialsRequest listCredentialsRequest = default(ListCredentialsRequest), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }

src/Ssh/Ssh.Helpers/HybridConnectivity/IHybridConnectivityManagementAPIClient.cs

@@ -69,5 +69,10 @@ public partial interface IHybridConnectivityManagementAPIClient : System.IDispos
         /// </summary>
         IEndpointsOperations Endpoints { get; }
 
+        /// <summary>
+        /// Gets the IServiceConfigurationsOperations.
+        /// </summary>
+        IServiceConfigurationsOperations ServiceConfigurations { get; }
+
     }
 }

src/Ssh/Ssh.Helpers/HybridConnectivity/IServiceConfigurationsOperations.cs

@@ -0,0 +1,89 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.PowerShell.Ssh.Helpers.HybridConnectivity
+{
+    using Microsoft.Rest;
+    using Microsoft.Rest.Azure;
+    using Models;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// ServiceConfigurationsOperations operations.
+    /// </summary>
+    public partial interface IServiceConfigurationsOperations
+    {
+        /// <summary>
+        /// Gets the details about the service to the resource.
+        /// </summary>
+        /// <param name='resourceUri'>
+        /// The fully qualified Azure Resource manager identifier of the
+        /// resource to be connected.
+        /// </param>
+        /// <param name='endpointName'>
+        /// The endpoint name.
+        /// </param>
+        /// <param name='serviceConfigurationName'>
+        /// The service name.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse<ServiceConfigurationResource>> GetWithHttpMessagesAsync(string resourceUri, string endpointName, string serviceConfigurationName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Create or update a service in serviceConfiguration for the endpoint
+        /// resource.
+        /// </summary>
+        /// <param name='resourceUri'>
+        /// The fully qualified Azure Resource manager identifier of the
+        /// resource to be connected.
+        /// </param>
+        /// <param name='endpointName'>
+        /// The endpoint name.
+        /// </param>
+        /// <param name='serviceConfigurationName'>
+        /// The service name.
+        /// </param>
+        /// <param name='serviceConfigurationResource'>
+        /// Service details
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse<ServiceConfigurationResource>> CreateOrupdateWithHttpMessagesAsync(string resourceUri, string endpointName, string serviceConfigurationName, ServiceConfigurationResource serviceConfigurationResource, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+    }
+}

src/Ssh/Ssh.Helpers/HybridConnectivity/Models/AzureEntityResource.cs

@@ -33,15 +33,17 @@ public AzureEntityResource()
         /// <summary>
         /// Initializes a new instance of the AzureEntityResource class.
         /// </summary>
-        /// <param name="id">Fully qualified resource ID for the resource. Ex -
-        /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}</param>
+        /// <param name="id">Fully qualified resource ID for the resource. E.g.
+        /// "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"</param>
         /// <param name="name">The name of the resource</param>
         /// <param name="type">The type of the resource. E.g.
         /// "Microsoft.Compute/virtualMachines" or
         /// "Microsoft.Storage/storageAccounts"</param>
+        /// <param name="systemData">Azure Resource Manager metadata containing
+        /// createdBy and modifiedBy information.</param>
         /// <param name="etag">Resource Etag.</param>
-        public AzureEntityResource(string id = default(string), string name = default(string), string type = default(string), string etag = default(string))
-            : base(id, name, type)
+        public AzureEntityResource(string id = default(string), string name = default(string), string type = default(string), SystemData systemData = default(SystemData), string etag = default(string))
+            : base(id, name, type, systemData)
         {
             Etag = etag;
             CustomInit();

src/Ssh/Ssh.Helpers/HybridConnectivity/Models/EndpointAccessResource.cs

@@ -40,13 +40,16 @@ public EndpointAccessResource()
         /// <param name="accessKey">Access key for hybrid connection.</param>
         /// <param name="expiresOn">The expiration of access key in unix
         /// time.</param>
-        public EndpointAccessResource(string namespaceName, string namespaceNameSuffix, string hybridConnectionName, string accessKey = default(string), long? expiresOn = default(long?))
+        /// <param name="serviceConfigurationToken">The token to access the
+        /// enabled service.</param>
+        public EndpointAccessResource(string namespaceName, string namespaceNameSuffix, string hybridConnectionName, string accessKey = default(string), long? expiresOn = default(long?), string serviceConfigurationToken = default(string))
         {
             NamespaceName = namespaceName;
             NamespaceNameSuffix = namespaceNameSuffix;
             HybridConnectionName = hybridConnectionName;
             AccessKey = accessKey;
             ExpiresOn = expiresOn;
+            ServiceConfigurationToken = serviceConfigurationToken;
             CustomInit();
         }
 
@@ -85,6 +88,12 @@ public EndpointAccessResource()
         [JsonProperty(PropertyName = "relay.expiresOn")]
         public long? ExpiresOn { get; set; }
 
+        /// <summary>
+        /// Gets or sets the token to access the enabled service.
+        /// </summary>
+        [JsonProperty(PropertyName = "relay.serviceConfigurationToken")]
+        public string ServiceConfigurationToken { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>

src/Ssh/Ssh.Helpers/HybridConnectivity/Models/EndpointProperties.cs

@@ -0,0 +1,86 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.PowerShell.Ssh.Helpers.HybridConnectivity.Models
+{
+    using Microsoft.Rest;
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Endpoint details
+    /// </summary>
+    public partial class EndpointProperties
+    {
+        /// <summary>
+        /// Initializes a new instance of the EndpointProperties class.
+        /// </summary>
+        public EndpointProperties()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the EndpointProperties class.
+        /// </summary>
+        /// <param name="type">The type of endpoint. Possible values include:
+        /// 'default', 'custom'</param>
+        /// <param name="resourceId">The resource Id of the connectivity
+        /// endpoint (optional).</param>
+        /// <param name="provisioningState">The resource provisioning
+        /// state.</param>
+        public EndpointProperties(string type, string resourceId = default(string), string provisioningState = default(string))
+        {
+            Type = type;
+            ResourceId = resourceId;
+            ProvisioningState = provisioningState;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the type of endpoint. Possible values include:
+        /// 'default', 'custom'
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the resource Id of the connectivity endpoint
+        /// (optional).
+        /// </summary>
+        [JsonProperty(PropertyName = "resourceId")]
+        public string ResourceId { get; set; }
+
+        /// <summary>
+        /// Gets the resource provisioning state.
+        /// </summary>
+        [JsonProperty(PropertyName = "provisioningState")]
+        public string ProvisioningState { get; private set; }
+
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (Type == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "Type");
+            }
+        }
+    }
+}