Added support for DeveloperPortal and Open Api Json format

eng/mgmt/mgmtmetadata/apimanagement_resource-manager.txt

@@ -1,11 +1,11 @@
-2019-07-23 23:04:04 UTC
+2020-02-11 05:53:16 UTC
 
 1) azure-rest-api-specs repository information
 GitHub user: Azure
 Branch:      master
-Commit:      2fcd0139889b923094b39a6aae015e1ea3604b68
+Commit:      26bdb0c40d9403e07980e41f054ec75f72225d52
 
 2) AutoRest information
 Requested version: latest
-Bootstrapper version:    C:\Users\sasolank\AppData\Roaming\npm `-- autorest@2.0.4283  
+Bootstrapper version:    C:\Users\sasolank\AppData\Roaming\npm `-- autorest@2.0.4413  
 Latest installed version:    

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Microsoft.Azure.Management.ApiManagment release notes
 
+### Changes in 4.12.0-preview
+
+- Added support for `developerPortal` endpoint in apimanagement service resource.
+- Added support for overriding the `common` tenant when configuring AAD identity provider.
+- Added support for specifying `httpCorrelationProtocol` and `verbosity` when configuring diagnostics on global and api level.
+- Added support for importing OpenApi 3.0 document in Json format.
+
 ### Changes in 4.11.0-preview
 
 - Removed id validation on `groups`, `apis`, `products`, `users` and `backend` to unblock existing customers to onboard to new sdks

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiExportOperations.cs

@@ -68,7 +68,7 @@ internal ApiExportOperations(ApiManagementClient client)
         /// <param name='format'>
         /// Format in which to export the Api Details to the Storage Blob with Sas Key
         /// valid for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl',
-        /// 'Openapi'
+        /// 'Openapi', 'OpenapiJson'
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiExportOperationsExtensions.cs

@@ -42,7 +42,7 @@ public static partial class ApiExportOperationsExtensions
             /// <param name='format'>
             /// Format in which to export the Api Details to the Storage Blob with Sas Key
             /// valid for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl',
-            /// 'Openapi'
+            /// 'Openapi', 'OpenapiJson'
             /// </param>
             public static ApiExportResult Get(this IApiExportOperations operations, string resourceGroupName, string serviceName, string apiId, string format)
             {
@@ -70,7 +70,7 @@ public static ApiExportResult Get(this IApiExportOperations operations, string r
             /// <param name='format'>
             /// Format in which to export the Api Details to the Storage Blob with Sas Key
             /// valid for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl',
-            /// 'Openapi'
+            /// 'Openapi', 'OpenapiJson'
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/IApiExportOperations.cs

@@ -42,7 +42,7 @@ public partial interface IApiExportOperations
         /// <param name='format'>
         /// Format in which to export the Api Details to the Storage Blob with
         /// Sas Key valid for 5 minutes. Possible values include: 'Swagger',
-        /// 'Wsdl', 'Wadl', 'Openapi'
+        /// 'Wsdl', 'Wadl', 'Openapi', 'OpenapiJson'
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiCreateOrUpdateParameter.cs

@@ -76,7 +76,8 @@ public ApiCreateOrUpdateParameter()
         /// <param name="format">Format of the Content in which the API is
         /// getting imported. Possible values include: 'wadl-xml',
         /// 'wadl-link-json', 'swagger-json', 'swagger-link-json', 'wsdl',
-        /// 'wsdl-link', 'openapi', 'openapi+json', 'openapi-link'</param>
+        /// 'wsdl-link', 'openapi', 'openapi+json', 'openapi-link',
+        /// 'openapi+json-link'</param>
         /// <param name="wsdlSelector">Criteria to limit import of WSDL to a
         /// subset of the document.</param>
         /// <param name="soapApiType">Type of Api to create.
@@ -243,7 +244,7 @@ public ApiCreateOrUpdateParameter()
         /// Gets or sets format of the Content in which the API is getting
         /// imported. Possible values include: 'wadl-xml', 'wadl-link-json',
         /// 'swagger-json', 'swagger-link-json', 'wsdl', 'wsdl-link',
-        /// 'openapi', 'openapi+json', 'openapi-link'
+        /// 'openapi', 'openapi+json', 'openapi-link', 'openapi+json-link'
         /// </summary>
         [JsonProperty(PropertyName = "properties.format")]
         public string Format { get; set; }

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBaseProperties.cs

@@ -54,6 +54,8 @@ public ApiManagementServiceBaseProperties()
         /// Management service.</param>
         /// <param name="managementApiUrl">Management API endpoint URL of the
         /// API Management service.</param>
+        /// <param name="developerPortalUrl">Developer Portal endpoint URL of
+        /// the API Management service.</param>
         /// <param name="scmUrl">SCM endpoint URL of the API Management
         /// service.</param>
         /// <param name="hostnameConfigurations">Custom hostname configuration
@@ -120,7 +122,7 @@ public ApiManagementServiceBaseProperties()
         /// Internal means that API Management deployment is setup inside a
         /// Virtual Network having an Intranet Facing Endpoint only. Possible
         /// values include: 'None', 'External', 'Internal'</param>
-        public ApiManagementServiceBaseProperties(string notificationSenderEmail = default(string), string provisioningState = default(string), string targetProvisioningState = default(string), System.DateTime? createdAtUtc = default(System.DateTime?), string gatewayUrl = default(string), string gatewayRegionalUrl = default(string), string portalUrl = default(string), string managementApiUrl = default(string), string scmUrl = default(string), IList<HostnameConfiguration> hostnameConfigurations = default(IList<HostnameConfiguration>), IList<string> publicIPAddresses = default(IList<string>), IList<string> privateIPAddresses = default(IList<string>), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList<AdditionalLocation> additionalLocations = default(IList<AdditionalLocation>), IDictionary<string, string> customProperties = default(IDictionary<string, string>), IList<CertificateConfiguration> certificates = default(IList<CertificateConfiguration>), bool? enableClientCertificate = default(bool?), string virtualNetworkType = default(string))
+        public ApiManagementServiceBaseProperties(string notificationSenderEmail = default(string), string provisioningState = default(string), string targetProvisioningState = default(string), System.DateTime? createdAtUtc = default(System.DateTime?), string gatewayUrl = default(string), string gatewayRegionalUrl = default(string), string portalUrl = default(string), string managementApiUrl = default(string), string developerPortalUrl = default(string), string scmUrl = default(string), IList<HostnameConfiguration> hostnameConfigurations = default(IList<HostnameConfiguration>), IList<string> publicIPAddresses = default(IList<string>), IList<string> privateIPAddresses = default(IList<string>), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList<AdditionalLocation> additionalLocations = default(IList<AdditionalLocation>), IDictionary<string, string> customProperties = default(IDictionary<string, string>), IList<CertificateConfiguration> certificates = default(IList<CertificateConfiguration>), bool? enableClientCertificate = default(bool?), string virtualNetworkType = default(string))
         {
             NotificationSenderEmail = notificationSenderEmail;
             ProvisioningState = provisioningState;
@@ -130,6 +132,7 @@ public ApiManagementServiceBaseProperties()
             GatewayRegionalUrl = gatewayRegionalUrl;
             PortalUrl = portalUrl;
             ManagementApiUrl = managementApiUrl;
+            DeveloperPortalUrl = developerPortalUrl;
             ScmUrl = scmUrl;
             HostnameConfigurations = hostnameConfigurations;
             PublicIPAddresses = publicIPAddresses;
@@ -203,6 +206,12 @@ public ApiManagementServiceBaseProperties()
         [JsonProperty(PropertyName = "managementApiUrl")]
         public string ManagementApiUrl { get; private set; }
 
+        /// <summary>
+        /// Gets developer Portal endpoint URL of the API Management service.
+        /// </summary>
+        [JsonProperty(PropertyName = "developerPortalUrl")]
+        public string DeveloperPortalUrl { get; private set; }
+
         /// <summary>
         /// Gets SCM endpoint URL of the API Management service.
         /// </summary>

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceResource.cs

@@ -66,6 +66,8 @@ public ApiManagementServiceResource()
         /// Management service.</param>
         /// <param name="managementApiUrl">Management API endpoint URL of the
         /// API Management service.</param>
+        /// <param name="developerPortalUrl">Developer Portal endpoint URL of
+        /// the API Management service.</param>
         /// <param name="scmUrl">SCM endpoint URL of the API Management
         /// service.</param>
         /// <param name="hostnameConfigurations">Custom hostname configuration
@@ -135,7 +137,7 @@ public ApiManagementServiceResource()
         /// <param name="identity">Managed service identity of the Api
         /// Management service.</param>
         /// <param name="etag">ETag of the resource.</param>
-        public ApiManagementServiceResource(string publisherEmail, string publisherName, ApiManagementServiceSkuProperties sku, string location, string id = default(string), string name = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string notificationSenderEmail = default(string), string provisioningState = default(string), string targetProvisioningState = default(string), System.DateTime? createdAtUtc = default(System.DateTime?), string gatewayUrl = default(string), string gatewayRegionalUrl = default(string), string portalUrl = default(string), string managementApiUrl = default(string), string scmUrl = default(string), IList<HostnameConfiguration> hostnameConfigurations = default(IList<HostnameConfiguration>), IList<string> publicIPAddresses = default(IList<string>), IList<string> privateIPAddresses = default(IList<string>), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList<AdditionalLocation> additionalLocations = default(IList<AdditionalLocation>), IDictionary<string, string> customProperties = default(IDictionary<string, string>), IList<CertificateConfiguration> certificates = default(IList<CertificateConfiguration>), bool? enableClientCertificate = default(bool?), string virtualNetworkType = default(string), ApiManagementServiceIdentity identity = default(ApiManagementServiceIdentity), string etag = default(string))
+        public ApiManagementServiceResource(string publisherEmail, string publisherName, ApiManagementServiceSkuProperties sku, string location, string id = default(string), string name = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string notificationSenderEmail = default(string), string provisioningState = default(string), string targetProvisioningState = default(string), System.DateTime? createdAtUtc = default(System.DateTime?), string gatewayUrl = default(string), string gatewayRegionalUrl = default(string), string portalUrl = default(string), string managementApiUrl = default(string), string developerPortalUrl = default(string), string scmUrl = default(string), IList<HostnameConfiguration> hostnameConfigurations = default(IList<HostnameConfiguration>), IList<string> publicIPAddresses = default(IList<string>), IList<string> privateIPAddresses = default(IList<string>), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList<AdditionalLocation> additionalLocations = default(IList<AdditionalLocation>), IDictionary<string, string> customProperties = default(IDictionary<string, string>), IList<CertificateConfiguration> certificates = default(IList<CertificateConfiguration>), bool? enableClientCertificate = default(bool?), string virtualNetworkType = default(string), ApiManagementServiceIdentity identity = default(ApiManagementServiceIdentity), string etag = default(string))
             : base(id, name, type, tags)
         {
             NotificationSenderEmail = notificationSenderEmail;
@@ -146,6 +148,7 @@ public ApiManagementServiceResource()
             GatewayRegionalUrl = gatewayRegionalUrl;
             PortalUrl = portalUrl;
             ManagementApiUrl = managementApiUrl;
+            DeveloperPortalUrl = developerPortalUrl;
             ScmUrl = scmUrl;
             HostnameConfigurations = hostnameConfigurations;
             PublicIPAddresses = publicIPAddresses;
@@ -225,6 +228,12 @@ public ApiManagementServiceResource()
         [JsonProperty(PropertyName = "properties.managementApiUrl")]
         public string ManagementApiUrl { get; private set; }
 
+        /// <summary>
+        /// Gets developer Portal endpoint URL of the API Management service.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.developerPortalUrl")]
+        public string DeveloperPortalUrl { get; private set; }
+
         /// <summary>
         /// Gets SCM endpoint URL of the API Management service.
         /// </summary>

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceUpdateParameters.cs

@@ -61,6 +61,8 @@ public ApiManagementServiceUpdateParameters()
         /// Management service.</param>
         /// <param name="managementApiUrl">Management API endpoint URL of the
         /// API Management service.</param>
+        /// <param name="developerPortalUrl">Developer Portal endpoint URL of
+        /// the API Management service.</param>
         /// <param name="scmUrl">SCM endpoint URL of the API Management
         /// service.</param>
         /// <param name="hostnameConfigurations">Custom hostname configuration
@@ -134,7 +136,7 @@ public ApiManagementServiceUpdateParameters()
         /// <param name="identity">Managed service identity of the Api
         /// Management service.</param>
         /// <param name="etag">ETag of the resource.</param>
-        public ApiManagementServiceUpdateParameters(string id = default(string), string name = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string notificationSenderEmail = default(string), string provisioningState = default(string), string targetProvisioningState = default(string), System.DateTime? createdAtUtc = default(System.DateTime?), string gatewayUrl = default(string), string gatewayRegionalUrl = default(string), string portalUrl = default(string), string managementApiUrl = default(string), string scmUrl = default(string), IList<HostnameConfiguration> hostnameConfigurations = default(IList<HostnameConfiguration>), IList<string> publicIPAddresses = default(IList<string>), IList<string> privateIPAddresses = default(IList<string>), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList<AdditionalLocation> additionalLocations = default(IList<AdditionalLocation>), IDictionary<string, string> customProperties = default(IDictionary<string, string>), IList<CertificateConfiguration> certificates = default(IList<CertificateConfiguration>), bool? enableClientCertificate = default(bool?), string virtualNetworkType = default(string), string publisherEmail = default(string), string publisherName = default(string), ApiManagementServiceSkuProperties sku = default(ApiManagementServiceSkuProperties), ApiManagementServiceIdentity identity = default(ApiManagementServiceIdentity), string etag = default(string))
+        public ApiManagementServiceUpdateParameters(string id = default(string), string name = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string notificationSenderEmail = default(string), string provisioningState = default(string), string targetProvisioningState = default(string), System.DateTime? createdAtUtc = default(System.DateTime?), string gatewayUrl = default(string), string gatewayRegionalUrl = default(string), string portalUrl = default(string), string managementApiUrl = default(string), string developerPortalUrl = default(string), string scmUrl = default(string), IList<HostnameConfiguration> hostnameConfigurations = default(IList<HostnameConfiguration>), IList<string> publicIPAddresses = default(IList<string>), IList<string> privateIPAddresses = default(IList<string>), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList<AdditionalLocation> additionalLocations = default(IList<AdditionalLocation>), IDictionary<string, string> customProperties = default(IDictionary<string, string>), IList<CertificateConfiguration> certificates = default(IList<CertificateConfiguration>), bool? enableClientCertificate = default(bool?), string virtualNetworkType = default(string), string publisherEmail = default(string), string publisherName = default(string), ApiManagementServiceSkuProperties sku = default(ApiManagementServiceSkuProperties), ApiManagementServiceIdentity identity = default(ApiManagementServiceIdentity), string etag = default(string))
             : base(id, name, type, tags)
         {
             NotificationSenderEmail = notificationSenderEmail;
@@ -145,6 +147,7 @@ public ApiManagementServiceUpdateParameters()
             GatewayRegionalUrl = gatewayRegionalUrl;
             PortalUrl = portalUrl;
             ManagementApiUrl = managementApiUrl;
+            DeveloperPortalUrl = developerPortalUrl;
             ScmUrl = scmUrl;
             HostnameConfigurations = hostnameConfigurations;
             PublicIPAddresses = publicIPAddresses;
@@ -223,6 +226,12 @@ public ApiManagementServiceUpdateParameters()
         [JsonProperty(PropertyName = "properties.managementApiUrl")]
         public string ManagementApiUrl { get; private set; }
 
+        /// <summary>
+        /// Gets developer Portal endpoint URL of the API Management service.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.developerPortalUrl")]
+        public string DeveloperPortalUrl { get; private set; }
+
         /// <summary>
         /// Gets SCM endpoint URL of the API Management service.
         /// </summary>

sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/AuthenticationSettingsContract.cs

@@ -33,15 +33,10 @@ public AuthenticationSettingsContract()
         /// </summary>
         /// <param name="oAuth2">OAuth2 Authentication settings</param>
         /// <param name="openid">OpenID Connect Authentication Settings</param>
-        /// <param name="subscriptionKeyRequired">Specifies whether
-        /// subscription key is required during call to this API, true - API is
-        /// included into closed products only, false - API is included into
-        /// open products alone, null - there is a mix of products.</param>
-        public AuthenticationSettingsContract(OAuth2AuthenticationSettingsContract oAuth2 = default(OAuth2AuthenticationSettingsContract), OpenIdAuthenticationSettingsContract openid = default(OpenIdAuthenticationSettingsContract), bool? subscriptionKeyRequired = default(bool?))
+        public AuthenticationSettingsContract(OAuth2AuthenticationSettingsContract oAuth2 = default(OAuth2AuthenticationSettingsContract), OpenIdAuthenticationSettingsContract openid = default(OpenIdAuthenticationSettingsContract))
         {
             OAuth2 = oAuth2;
             Openid = openid;
-            SubscriptionKeyRequired = subscriptionKeyRequired;
             CustomInit();
         }
 
@@ -62,14 +57,5 @@ public AuthenticationSettingsContract()
         [JsonProperty(PropertyName = "openid")]
         public OpenIdAuthenticationSettingsContract Openid { get; set; }
 
-        /// <summary>
-        /// Gets or sets specifies whether subscription key is required during
-        /// call to this API, true - API is included into closed products only,
-        /// false - API is included into open products alone, null - there is a
-        /// mix of products.
-        /// </summary>
-        [JsonProperty(PropertyName = "subscriptionKeyRequired")]
-        public bool? SubscriptionKeyRequired { get; set; }
-
     }
 }