azure_mgmt_api_management 0.18.4 → 0.19.0

data/lib/2018-06-01-preview/generated/azure_mgmt_api_management/tenant_access.rb

@@ -22,7 +22,94 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     attr_reader :client
 
     #
-    # Get tenant access information details.
+    # Tenant access metadata
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param service_name [String] The name of the API Management service.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    #
+    def get_entity_tag(resource_group_name, service_name, custom_headers:nil)
+      response = get_entity_tag_async(resource_group_name, service_name, custom_headers:custom_headers).value!
+      nil
+    end
+
+    #
+    # Tenant access metadata
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param service_name [String] The name of the API Management service.
+    # @param custom_headers [Hash{String => String}] A hash of custom headers that
+    # will be added to the HTTP request.
+    #
+    # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
+    #
+    def get_entity_tag_with_http_info(resource_group_name, service_name, custom_headers:nil)
+      get_entity_tag_async(resource_group_name, service_name, custom_headers:custom_headers).value!
+    end
+
+    #
+    # Tenant access metadata
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param service_name [String] The name of the API Management service.
+    # @param [Hash{String => String}] A hash of custom headers that will be added
+    # to the HTTP request.
+    #
+    # @return [Concurrent::Promise] Promise object which holds the HTTP response.
+    #
+    def get_entity_tag_async(resource_group_name, service_name, custom_headers:nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, 'service_name is nil' if service_name.nil?
+      fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
+      fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
+      fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
+      fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
+      fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
+      access_name = 'access'
+
+
+      request_headers = {}
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+
+      # Set Headers
+      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/tenant/{accessName}'
+
+      request_url = @base_url || @client.base_url
+
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'subscriptionId' => @client.subscription_id,'accessName' => access_name},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {}),
+          base_url: request_url
+      }
+      promise = @client.make_request_async(:head, path_template, options)
+
+      promise = promise.then do |result|
+        http_response = result.response
+        status_code = http_response.status
+        response_content = http_response.body
+        unless status_code == 200
+          error_model = JSON.load(response_content)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
+        end
+
+        result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
+
+        result
+      end
+
+      promise.execute
+    end
+
+    #
+    # Get tenant access information details
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -37,7 +124,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Get tenant access information details.
+    # Get tenant access information details
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -51,7 +138,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Get tenant access information details.
+    # Get tenant access information details
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -96,10 +183,12 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         response_content = http_response.body
         unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model)
+          fail MsRest::HttpOperationError.new(result.request, http_response, error_model)
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -220,6 +309,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -228,7 +319,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Regenerate primary access key.
+    # Regenerate primary access key
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -242,7 +333,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Regenerate primary access key.
+    # Regenerate primary access key
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -256,7 +347,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Regenerate primary access key.
+    # Regenerate primary access key
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -305,6 +396,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -313,7 +406,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Regenerate secondary access key.
+    # Regenerate secondary access key
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -327,7 +420,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Regenerate secondary access key.
+    # Regenerate secondary access key
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -341,7 +434,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     end
 
     #
-    # Regenerate secondary access key.
+    # Regenerate secondary access key
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
@@ -390,6 +483,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end

data/lib/2018-06-01-preview/generated/azure_mgmt_api_management/tenant_access_git.rb

@@ -100,6 +100,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -195,6 +197,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -280,6 +284,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end

data/lib/2018-06-01-preview/generated/azure_mgmt_api_management/tenant_configuration.rb

@@ -244,6 +244,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -360,6 +362,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -473,6 +477,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -586,6 +592,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin

data/lib/2018-06-01-preview/generated/azure_mgmt_api_management/user.rb

@@ -26,32 +26,32 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param filter [String] | Field            | Supported operators    |
-    # Supported functions               |
-    # |------------------|------------------------|-----------------------------------|
-    # | id               | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | firstName        | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | lastName         | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | email            | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | state            | eq                     | N/A
-    # |
-    # | registrationDate | ge, le, eq, ne, gt, lt | N/A
-    # |
-    # | note             | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
+    # @param filter [String] | Field       | Supported operators    | Supported
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |firstName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |lastName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |email | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |state | eq |    |
+    # |registrationDate | ge, le, eq, ne, gt, lt |    |
+    # |note | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |groups |     |    |
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
+    # @param expand_groups [Boolean]
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [Array<UserContract>] operation results.
     #
-    def list_by_service(resource_group_name, service_name, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      first_page = list_by_service_as_lazy(resource_group_name, service_name, filter:filter, top:top, skip:skip, custom_headers:custom_headers)
+    def list_by_service(resource_group_name, service_name, filter:nil, top:nil, skip:nil, expand_groups:nil, custom_headers:nil)
+      first_page = list_by_service_as_lazy(resource_group_name, service_name, filter:filter, top:top, skip:skip, expand_groups:expand_groups, custom_headers:custom_headers)
       first_page.get_all_items
     end
 
@@ -60,32 +60,32 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param filter [String] | Field            | Supported operators    |
-    # Supported functions               |
-    # |------------------|------------------------|-----------------------------------|
-    # | id               | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | firstName        | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | lastName         | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | email            | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | state            | eq                     | N/A
-    # |
-    # | registrationDate | ge, le, eq, ne, gt, lt | N/A
-    # |
-    # | note             | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
+    # @param filter [String] | Field       | Supported operators    | Supported
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |firstName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |lastName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |email | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |state | eq |    |
+    # |registrationDate | ge, le, eq, ne, gt, lt |    |
+    # |note | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |groups |     |    |
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
+    # @param expand_groups [Boolean]
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def list_by_service_with_http_info(resource_group_name, service_name, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      list_by_service_async(resource_group_name, service_name, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
+    def list_by_service_with_http_info(resource_group_name, service_name, filter:nil, top:nil, skip:nil, expand_groups:nil, custom_headers:nil)
+      list_by_service_async(resource_group_name, service_name, filter:filter, top:top, skip:skip, expand_groups:expand_groups, custom_headers:custom_headers).value!
     end
 
     #
@@ -93,31 +93,31 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param filter [String] | Field            | Supported operators    |
-    # Supported functions               |
-    # |------------------|------------------------|-----------------------------------|
-    # | id               | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | firstName        | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | lastName         | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | email            | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | state            | eq                     | N/A
-    # |
-    # | registrationDate | ge, le, eq, ne, gt, lt | N/A
-    # |
-    # | note             | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
+    # @param filter [String] | Field       | Supported operators    | Supported
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |firstName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |lastName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |email | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |state | eq |    |
+    # |registrationDate | ge, le, eq, ne, gt, lt |    |
+    # |note | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |groups |     |    |
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
+    # @param expand_groups [Boolean]
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def list_by_service_async(resource_group_name, service_name, filter:nil, top:nil, skip:nil, custom_headers:nil)
+    def list_by_service_async(resource_group_name, service_name, filter:nil, top:nil, skip:nil, expand_groups:nil, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
@@ -142,7 +142,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
           path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'subscriptionId' => @client.subscription_id},
-          query_params: {'$filter' => filter,'$top' => top,'$skip' => skip,'api-version' => @client.api_version},
+          query_params: {'$filter' => filter,'$top' => top,'$skip' => skip,'expandGroups' => expand_groups,'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
       }
@@ -158,6 +158,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -180,14 +182,14 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     #
-    def get_entity_tag(resource_group_name, service_name, uid, custom_headers:nil)
-      response = get_entity_tag_async(resource_group_name, service_name, uid, custom_headers:custom_headers).value!
+    def get_entity_tag(resource_group_name, service_name, user_id, custom_headers:nil)
+      response = get_entity_tag_async(resource_group_name, service_name, user_id, custom_headers:custom_headers).value!
       nil
     end
 
@@ -196,15 +198,15 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_entity_tag_with_http_info(resource_group_name, service_name, uid, custom_headers:nil)
-      get_entity_tag_async(resource_group_name, service_name, uid, custom_headers:custom_headers).value!
+    def get_entity_tag_with_http_info(resource_group_name, service_name, user_id, custom_headers:nil)
+      get_entity_tag_async(resource_group_name, service_name, user_id, custom_headers:custom_headers).value!
     end
 
     #
@@ -212,23 +214,23 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_entity_tag_async(resource_group_name, service_name, uid, custom_headers:nil)
+    def get_entity_tag_async(resource_group_name, service_name, user_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'uid is nil' if uid.nil?
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MaxLength': '80'" if !uid.nil? && uid.length > 80
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MinLength': '1'" if !uid.nil? && uid.length < 1
-      fail ArgumentError, "'uid' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !uid.nil? && uid.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'user_id is nil' if user_id.nil?
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MaxLength': '80'" if !user_id.nil? && user_id.length > 80
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MinLength': '1'" if !user_id.nil? && user_id.length < 1
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !user_id.nil? && user_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -239,13 +241,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{uid}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'uid' => uid,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'userId' => user_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -262,6 +264,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -274,15 +278,15 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [UserContract] operation results.
     #
-    def get(resource_group_name, service_name, uid, custom_headers:nil)
-      response = get_async(resource_group_name, service_name, uid, custom_headers:custom_headers).value!
+    def get(resource_group_name, service_name, user_id, custom_headers:nil)
+      response = get_async(resource_group_name, service_name, user_id, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
@@ -291,15 +295,15 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_with_http_info(resource_group_name, service_name, uid, custom_headers:nil)
-      get_async(resource_group_name, service_name, uid, custom_headers:custom_headers).value!
+    def get_with_http_info(resource_group_name, service_name, user_id, custom_headers:nil)
+      get_async(resource_group_name, service_name, user_id, custom_headers:custom_headers).value!
     end
 
     #
@@ -307,23 +311,23 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_async(resource_group_name, service_name, uid, custom_headers:nil)
+    def get_async(resource_group_name, service_name, user_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'uid is nil' if uid.nil?
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MaxLength': '80'" if !uid.nil? && uid.length > 80
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MinLength': '1'" if !uid.nil? && uid.length < 1
-      fail ArgumentError, "'uid' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !uid.nil? && uid.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'user_id is nil' if user_id.nil?
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MaxLength': '80'" if !user_id.nil? && user_id.length > 80
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MinLength': '1'" if !user_id.nil? && user_id.length < 1
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !user_id.nil? && user_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -334,13 +338,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{uid}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'uid' => uid,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'userId' => user_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -357,6 +361,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -379,7 +385,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserCreateParameters] Create or update parameters.
     # @param if_match [String] ETag of the Entity. Not required when creating an
@@ -389,8 +395,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [UserContract] operation results.
     #
-    def create_or_update(resource_group_name, service_name, uid, parameters, if_match:nil, custom_headers:nil)
-      response = create_or_update_async(resource_group_name, service_name, uid, parameters, if_match:if_match, custom_headers:custom_headers).value!
+    def create_or_update(resource_group_name, service_name, user_id, parameters, if_match:nil, custom_headers:nil)
+      response = create_or_update_async(resource_group_name, service_name, user_id, parameters, if_match:if_match, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
@@ -399,7 +405,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserCreateParameters] Create or update parameters.
     # @param if_match [String] ETag of the Entity. Not required when creating an
@@ -409,8 +415,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def create_or_update_with_http_info(resource_group_name, service_name, uid, parameters, if_match:nil, custom_headers:nil)
-      create_or_update_async(resource_group_name, service_name, uid, parameters, if_match:if_match, custom_headers:custom_headers).value!
+    def create_or_update_with_http_info(resource_group_name, service_name, user_id, parameters, if_match:nil, custom_headers:nil)
+      create_or_update_async(resource_group_name, service_name, user_id, parameters, if_match:if_match, custom_headers:custom_headers).value!
     end
 
     #
@@ -418,7 +424,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserCreateParameters] Create or update parameters.
     # @param if_match [String] ETag of the Entity. Not required when creating an
@@ -428,16 +434,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def create_or_update_async(resource_group_name, service_name, uid, parameters, if_match:nil, custom_headers:nil)
+    def create_or_update_async(resource_group_name, service_name, user_id, parameters, if_match:nil, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'uid is nil' if uid.nil?
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MaxLength': '80'" if !uid.nil? && uid.length > 80
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MinLength': '1'" if !uid.nil? && uid.length < 1
-      fail ArgumentError, "'uid' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !uid.nil? && uid.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'user_id is nil' if user_id.nil?
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MaxLength': '80'" if !user_id.nil? && user_id.length > 80
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MinLength': '1'" if !user_id.nil? && user_id.length < 1
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !user_id.nil? && user_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'parameters is nil' if parameters.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
@@ -456,13 +462,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       request_content = @client.serialize(request_mapper,  parameters)
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{uid}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'uid' => uid,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'userId' => user_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           body: request_content,
           headers: request_headers.merge(custom_headers || {}),
@@ -480,6 +486,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 201
           begin
@@ -512,7 +520,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserUpdateParameters] Update parameters.
     # @param if_match [String] ETag of the Entity. ETag should match the current
@@ -522,8 +530,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # will be added to the HTTP request.
     #
     #
-    def update(resource_group_name, service_name, uid, parameters, if_match, custom_headers:nil)
-      response = update_async(resource_group_name, service_name, uid, parameters, if_match, custom_headers:custom_headers).value!
+    def update(resource_group_name, service_name, user_id, parameters, if_match, custom_headers:nil)
+      response = update_async(resource_group_name, service_name, user_id, parameters, if_match, custom_headers:custom_headers).value!
       nil
     end
 
@@ -532,7 +540,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserUpdateParameters] Update parameters.
     # @param if_match [String] ETag of the Entity. ETag should match the current
@@ -543,8 +551,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def update_with_http_info(resource_group_name, service_name, uid, parameters, if_match, custom_headers:nil)
-      update_async(resource_group_name, service_name, uid, parameters, if_match, custom_headers:custom_headers).value!
+    def update_with_http_info(resource_group_name, service_name, user_id, parameters, if_match, custom_headers:nil)
+      update_async(resource_group_name, service_name, user_id, parameters, if_match, custom_headers:custom_headers).value!
     end
 
     #
@@ -552,7 +560,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserUpdateParameters] Update parameters.
     # @param if_match [String] ETag of the Entity. ETag should match the current
@@ -563,16 +571,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def update_async(resource_group_name, service_name, uid, parameters, if_match, custom_headers:nil)
+    def update_async(resource_group_name, service_name, user_id, parameters, if_match, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'uid is nil' if uid.nil?
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MaxLength': '80'" if !uid.nil? && uid.length > 80
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MinLength': '1'" if !uid.nil? && uid.length < 1
-      fail ArgumentError, "'uid' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !uid.nil? && uid.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'user_id is nil' if user_id.nil?
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MaxLength': '80'" if !user_id.nil? && user_id.length > 80
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MinLength': '1'" if !user_id.nil? && user_id.length < 1
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !user_id.nil? && user_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'parameters is nil' if parameters.nil?
       fail ArgumentError, 'if_match is nil' if if_match.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
@@ -592,13 +600,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       request_content = @client.serialize(request_mapper,  parameters)
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{uid}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'uid' => uid,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'userId' => user_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           body: request_content,
           headers: request_headers.merge(custom_headers || {}),
@@ -616,6 +624,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -628,7 +638,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param if_match [String] ETag of the Entity. ETag should match the current
     # entity state from the header response of the GET request or it should be *
@@ -641,8 +651,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     # will be added to the HTTP request.
     #
     #
-    def delete(resource_group_name, service_name, uid, if_match, delete_subscriptions:nil, notify:nil, custom_headers:nil)
-      response = delete_async(resource_group_name, service_name, uid, if_match, delete_subscriptions:delete_subscriptions, notify:notify, custom_headers:custom_headers).value!
+    def delete(resource_group_name, service_name, user_id, if_match, delete_subscriptions:nil, notify:nil, custom_headers:nil)
+      response = delete_async(resource_group_name, service_name, user_id, if_match, delete_subscriptions:delete_subscriptions, notify:notify, custom_headers:custom_headers).value!
       nil
     end
 
@@ -651,7 +661,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param if_match [String] ETag of the Entity. ETag should match the current
     # entity state from the header response of the GET request or it should be *
@@ -665,8 +675,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def delete_with_http_info(resource_group_name, service_name, uid, if_match, delete_subscriptions:nil, notify:nil, custom_headers:nil)
-      delete_async(resource_group_name, service_name, uid, if_match, delete_subscriptions:delete_subscriptions, notify:notify, custom_headers:custom_headers).value!
+    def delete_with_http_info(resource_group_name, service_name, user_id, if_match, delete_subscriptions:nil, notify:nil, custom_headers:nil)
+      delete_async(resource_group_name, service_name, user_id, if_match, delete_subscriptions:delete_subscriptions, notify:notify, custom_headers:custom_headers).value!
     end
 
     #
@@ -674,7 +684,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param if_match [String] ETag of the Entity. ETag should match the current
     # entity state from the header response of the GET request or it should be *
@@ -688,16 +698,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def delete_async(resource_group_name, service_name, uid, if_match, delete_subscriptions:nil, notify:nil, custom_headers:nil)
+    def delete_async(resource_group_name, service_name, user_id, if_match, delete_subscriptions:nil, notify:nil, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'uid is nil' if uid.nil?
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MaxLength': '80'" if !uid.nil? && uid.length > 80
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MinLength': '1'" if !uid.nil? && uid.length < 1
-      fail ArgumentError, "'uid' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !uid.nil? && uid.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'user_id is nil' if user_id.nil?
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MaxLength': '80'" if !user_id.nil? && user_id.length > 80
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MinLength': '1'" if !user_id.nil? && user_id.length < 1
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !user_id.nil? && user_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'if_match is nil' if if_match.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
@@ -710,13 +720,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['If-Match'] = if_match unless if_match.nil?
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{uid}'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'uid' => uid,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'userId' => user_id,'subscriptionId' => @client.subscription_id},
           query_params: {'deleteSubscriptions' => delete_subscriptions,'notify' => notify,'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -733,6 +743,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
 
         result
       end
@@ -746,15 +758,15 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [GenerateSsoUrlResult] operation results.
     #
-    def generate_sso_url(resource_group_name, service_name, uid, custom_headers:nil)
-      response = generate_sso_url_async(resource_group_name, service_name, uid, custom_headers:custom_headers).value!
+    def generate_sso_url(resource_group_name, service_name, user_id, custom_headers:nil)
+      response = generate_sso_url_async(resource_group_name, service_name, user_id, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
@@ -764,15 +776,15 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def generate_sso_url_with_http_info(resource_group_name, service_name, uid, custom_headers:nil)
-      generate_sso_url_async(resource_group_name, service_name, uid, custom_headers:custom_headers).value!
+    def generate_sso_url_with_http_info(resource_group_name, service_name, user_id, custom_headers:nil)
+      generate_sso_url_async(resource_group_name, service_name, user_id, custom_headers:custom_headers).value!
     end
 
     #
@@ -781,23 +793,23 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param [Hash{String => String}] A hash of custom headers that will be added
     # to the HTTP request.
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def generate_sso_url_async(resource_group_name, service_name, uid, custom_headers:nil)
+    def generate_sso_url_async(resource_group_name, service_name, user_id, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'uid is nil' if uid.nil?
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MaxLength': '80'" if !uid.nil? && uid.length > 80
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MinLength': '1'" if !uid.nil? && uid.length < 1
-      fail ArgumentError, "'uid' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !uid.nil? && uid.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'user_id is nil' if user_id.nil?
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MaxLength': '80'" if !user_id.nil? && user_id.length > 80
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MinLength': '1'" if !user_id.nil? && user_id.length < 1
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !user_id.nil? && user_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
 
@@ -808,13 +820,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
       request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{uid}/generateSsoUrl'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/generateSsoUrl'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'uid' => uid,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'userId' => user_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {}),
           base_url: request_url
@@ -831,6 +843,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -853,7 +867,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserTokenParameters] Create Authorization Token
     # parameters.
@@ -862,8 +876,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [UserTokenResult] operation results.
     #
-    def get_shared_access_token(resource_group_name, service_name, uid, parameters, custom_headers:nil)
-      response = get_shared_access_token_async(resource_group_name, service_name, uid, parameters, custom_headers:custom_headers).value!
+    def get_shared_access_token(resource_group_name, service_name, user_id, parameters, custom_headers:nil)
+      response = get_shared_access_token_async(resource_group_name, service_name, user_id, parameters, custom_headers:custom_headers).value!
       response.body unless response.nil?
     end
 
@@ -872,7 +886,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserTokenParameters] Create Authorization Token
     # parameters.
@@ -881,8 +895,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [MsRestAzure::AzureOperationResponse] HTTP response information.
     #
-    def get_shared_access_token_with_http_info(resource_group_name, service_name, uid, parameters, custom_headers:nil)
-      get_shared_access_token_async(resource_group_name, service_name, uid, parameters, custom_headers:custom_headers).value!
+    def get_shared_access_token_with_http_info(resource_group_name, service_name, user_id, parameters, custom_headers:nil)
+      get_shared_access_token_async(resource_group_name, service_name, user_id, parameters, custom_headers:custom_headers).value!
     end
 
     #
@@ -890,7 +904,7 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param uid [String] User identifier. Must be unique in the current API
+    # @param user_id [String] User identifier. Must be unique in the current API
     # Management service instance.
     # @param parameters [UserTokenParameters] Create Authorization Token
     # parameters.
@@ -899,16 +913,16 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @return [Concurrent::Promise] Promise object which holds the HTTP response.
     #
-    def get_shared_access_token_async(resource_group_name, service_name, uid, parameters, custom_headers:nil)
+    def get_shared_access_token_async(resource_group_name, service_name, user_id, parameters, custom_headers:nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'service_name is nil' if service_name.nil?
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MaxLength': '50'" if !service_name.nil? && service_name.length > 50
       fail ArgumentError, "'service_name' should satisfy the constraint - 'MinLength': '1'" if !service_name.nil? && service_name.length < 1
       fail ArgumentError, "'service_name' should satisfy the constraint - 'Pattern': '^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'" if !service_name.nil? && service_name.match(Regexp.new('^^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$$')).nil?
-      fail ArgumentError, 'uid is nil' if uid.nil?
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MaxLength': '80'" if !uid.nil? && uid.length > 80
-      fail ArgumentError, "'uid' should satisfy the constraint - 'MinLength': '1'" if !uid.nil? && uid.length < 1
-      fail ArgumentError, "'uid' should satisfy the constraint - 'Pattern': '(^[\w]+$)|(^[\w][\w\-]+[\w]$)'" if !uid.nil? && uid.match(Regexp.new('^(^[\w]+$)|(^[\w][\w\-]+[\w]$)$')).nil?
+      fail ArgumentError, 'user_id is nil' if user_id.nil?
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MaxLength': '80'" if !user_id.nil? && user_id.length > 80
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'MinLength': '1'" if !user_id.nil? && user_id.length < 1
+      fail ArgumentError, "'user_id' should satisfy the constraint - 'Pattern': '^[^*#&+:<>?]+$'" if !user_id.nil? && user_id.match(Regexp.new('^^[^*#&+:<>?]+$$')).nil?
       fail ArgumentError, 'parameters is nil' if parameters.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
@@ -926,13 +940,13 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
       request_content = @client.serialize(request_mapper,  parameters)
       request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil
 
-      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{uid}/token'
+      path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/users/{userId}/token'
 
       request_url = @base_url || @client.base_url
 
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'uid' => uid,'subscriptionId' => @client.subscription_id},
+          path_params: {'resourceGroupName' => resource_group_name,'serviceName' => service_name,'userId' => user_id,'subscriptionId' => @client.subscription_id},
           query_params: {'api-version' => @client.api_version},
           body: request_content,
           headers: request_headers.merge(custom_headers || {}),
@@ -950,6 +964,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -1038,6 +1054,8 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
         end
 
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
+        result.correlation_request_id = http_response['x-ms-correlation-request-id'] unless http_response['x-ms-correlation-request-id'].nil?
+        result.client_request_id = http_response['x-ms-client-request-id'] unless http_response['x-ms-client-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
@@ -1060,32 +1078,32 @@ module Azure::ApiManagement::Mgmt::V2018_06_01_preview
     #
     # @param resource_group_name [String] The name of the resource group.
     # @param service_name [String] The name of the API Management service.
-    # @param filter [String] | Field            | Supported operators    |
-    # Supported functions               |
-    # |------------------|------------------------|-----------------------------------|
-    # | id               | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | firstName        | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | lastName         | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | email            | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
-    # | state            | eq                     | N/A
-    # |
-    # | registrationDate | ge, le, eq, ne, gt, lt | N/A
-    # |
-    # | note             | ge, le, eq, ne, gt, lt | substringof, contains,
-    # startswith, endswith |
+    # @param filter [String] | Field       | Supported operators    | Supported
+    # functions               |
+    # |-------------|------------------------|-----------------------------------|
+    #
+    # |name | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |firstName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |lastName | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |email | ge, le, eq, ne, gt, lt | substringof, contains, startswith,
+    # endswith|
+    # |state | eq |    |
+    # |registrationDate | ge, le, eq, ne, gt, lt |    |
+    # |note | ge, le, eq, ne, gt, lt | substringof, contains, startswith, endswith|
+    # |groups |     |    |
+    #
     # @param top [Integer] Number of records to return.
     # @param skip [Integer] Number of records to skip.
+    # @param expand_groups [Boolean]
     # @param custom_headers [Hash{String => String}] A hash of custom headers that
     # will be added to the HTTP request.
     #
     # @return [UserCollection] which provide lazy access to pages of the response.
     #
-    def list_by_service_as_lazy(resource_group_name, service_name, filter:nil, top:nil, skip:nil, custom_headers:nil)
-      response = list_by_service_async(resource_group_name, service_name, filter:filter, top:top, skip:skip, custom_headers:custom_headers).value!
+    def list_by_service_as_lazy(resource_group_name, service_name, filter:nil, top:nil, skip:nil, expand_groups:nil, custom_headers:nil)
+      response = list_by_service_async(resource_group_name, service_name, filter:filter, top:top, skip:skip, expand_groups:expand_groups, custom_headers:custom_headers).value!
       unless response.nil?
         page = response.body
         page.next_method = Proc.new do |next_page_link|