diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementClient.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementClient.cs index b8a22a0c536b7..e3df3c941456e 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementClient.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementClient.cs @@ -750,7 +750,7 @@ private void Initialize() UserConfirmationPassword = new UserConfirmationPasswordOperations(this); ApiExport = new ApiExportOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2020-12-01"; + ApiVersion = "2021-04-01-preview"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementServiceOperations.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementServiceOperations.cs index 5ee512b2ae5c2..2d4cd38c0393a 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementServiceOperations.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementServiceOperations.cs @@ -62,8 +62,7 @@ internal ApiManagementServiceOperations(ApiManagementClient client) /// The name of the API Management service. /// /// - /// Parameters supplied to the Restore API Management service from backup - /// operation. + /// Parameters supplied to the ApiManagementService_Restore operation. /// /// /// The headers that will be added to request. @@ -1352,8 +1351,7 @@ internal ApiManagementServiceOperations(ApiManagementClient client) /// The name of the API Management service. /// /// - /// Parameters supplied to the Restore API Management service from backup - /// operation. + /// Parameters supplied to the ApiManagementService_Restore operation. /// /// /// Headers that will be added to request. @@ -1378,6 +1376,10 @@ internal ApiManagementServiceOperations(ApiManagementClient client) /// public async Task> BeginRestoreWithHttpMessagesAsync(string resourceGroupName, string serviceName, ApiManagementServiceBackupRestoreParameters parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } if (resourceGroupName == null) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); @@ -1401,6 +1403,10 @@ internal ApiManagementServiceOperations(ApiManagementClient client) throw new ValidationException(ValidationRules.Pattern, "serviceName", "^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$"); } } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (parameters == null) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); @@ -1409,14 +1415,6 @@ internal ApiManagementServiceOperations(ApiManagementClient client) { parameters.Validate(); } - if (Client.ApiVersion == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); - } - if (Client.SubscriptionId == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); - } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1433,9 +1431,9 @@ internal ApiManagementServiceOperations(ApiManagementClient client) // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/restore").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{serviceName}", System.Uri.EscapeDataString(serviceName)); - _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); if (Client.ApiVersion != null) { @@ -1604,6 +1602,10 @@ internal ApiManagementServiceOperations(ApiManagementClient client) /// public async Task> BeginBackupWithHttpMessagesAsync(string resourceGroupName, string serviceName, ApiManagementServiceBackupRestoreParameters parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } if (resourceGroupName == null) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); @@ -1627,6 +1629,10 @@ internal ApiManagementServiceOperations(ApiManagementClient client) throw new ValidationException(ValidationRules.Pattern, "serviceName", "^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$"); } } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (parameters == null) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); @@ -1635,14 +1641,6 @@ internal ApiManagementServiceOperations(ApiManagementClient client) { parameters.Validate(); } - if (Client.ApiVersion == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); - } - if (Client.SubscriptionId == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); - } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1659,9 +1657,9 @@ internal ApiManagementServiceOperations(ApiManagementClient client) // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/backup").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{serviceName}", System.Uri.EscapeDataString(serviceName)); - _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); if (Client.ApiVersion != null) { diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementServiceOperationsExtensions.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementServiceOperationsExtensions.cs index 6dd43949c63ab..8c9efb41c5e63 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementServiceOperationsExtensions.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/ApiManagementServiceOperationsExtensions.cs @@ -36,8 +36,7 @@ public static partial class ApiManagementServiceOperationsExtensions /// The name of the API Management service. /// /// - /// Parameters supplied to the Restore API Management service from backup - /// operation. + /// Parameters supplied to the ApiManagementService_Restore operation. /// public static ApiManagementServiceResource Restore(this IApiManagementServiceOperations operations, string resourceGroupName, string serviceName, ApiManagementServiceBackupRestoreParameters parameters) { @@ -59,8 +58,7 @@ public static ApiManagementServiceResource Restore(this IApiManagementServiceOpe /// The name of the API Management service. /// /// - /// Parameters supplied to the Restore API Management service from backup - /// operation. + /// Parameters supplied to the ApiManagementService_Restore operation. /// /// /// The cancellation token. @@ -534,8 +532,7 @@ public static ApiManagementServiceGetDomainOwnershipIdentifierResult GetDomainOw /// The name of the API Management service. /// /// - /// Parameters supplied to the Restore API Management service from backup - /// operation. + /// Parameters supplied to the ApiManagementService_Restore operation. /// public static ApiManagementServiceResource BeginRestore(this IApiManagementServiceOperations operations, string resourceGroupName, string serviceName, ApiManagementServiceBackupRestoreParameters parameters) { @@ -557,8 +554,7 @@ public static ApiManagementServiceResource BeginRestore(this IApiManagementServi /// The name of the API Management service. /// /// - /// Parameters supplied to the Restore API Management service from backup - /// operation. + /// Parameters supplied to the ApiManagementService_Restore operation. /// /// /// The cancellation token. diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/IApiManagementServiceOperations.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/IApiManagementServiceOperations.cs index ab91018ecdb06..9159198755c62 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/IApiManagementServiceOperations.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/IApiManagementServiceOperations.cs @@ -36,8 +36,7 @@ public partial interface IApiManagementServiceOperations /// The name of the API Management service. /// /// - /// Parameters supplied to the Restore API Management service from - /// backup operation. + /// Parameters supplied to the ApiManagementService_Restore operation. /// /// /// The headers that will be added to request. @@ -349,8 +348,7 @@ public partial interface IApiManagementServiceOperations /// The name of the API Management service. /// /// - /// Parameters supplied to the Restore API Management service from - /// backup operation. + /// Parameters supplied to the ApiManagementService_Restore operation. /// /// /// The headers that will be added to request. diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/AccessType.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/AccessType.cs new file mode 100644 index 0000000000000..80c25d9f2c0be --- /dev/null +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/AccessType.cs @@ -0,0 +1,32 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ApiManagement.Models +{ + + /// + /// Defines values for AccessType. + /// + public static class AccessType + { + /// + /// Use access key. + /// + public const string AccessKey = "AccessKey"; + /// + /// Use system assigned managed identity. + /// + public const string SystemAssignedManagedIdentity = "SystemAssignedManagedIdentity"; + /// + /// Use user assigned managed identity. + /// + public const string UserAssignedManagedIdentity = "UserAssignedManagedIdentity"; + } +} diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/AdditionalLocation.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/AdditionalLocation.cs index bd8c57af87bb3..21a1fe294300e 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/AdditionalLocation.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/AdditionalLocation.cs @@ -47,6 +47,10 @@ public AdditionalLocation() /// Internal Virtual Network in a particular additional location. /// Available only for Basic, Standard, Premium and Isolated /// SKU. + /// Public Standard SKU IP V4 based IP + /// address to be associated with Virtual Network deployed service in + /// the location. Supported only for Premium SKU being deployed in + /// Virtual Network. /// Virtual network /// configuration for the location. /// Gateway URL of the API Management @@ -54,13 +58,14 @@ public AdditionalLocation() /// Property only valid for an Api /// Management service deployed in multiple locations. This can be used /// to disable the gateway in this additional location. - public AdditionalLocation(string location, ApiManagementServiceSkuProperties sku, IList zones = default(IList), IList publicIPAddresses = default(IList), IList privateIPAddresses = default(IList), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), string gatewayRegionalUrl = default(string), bool? disableGateway = default(bool?)) + public AdditionalLocation(string location, ApiManagementServiceSkuProperties sku, IList zones = default(IList), IList publicIPAddresses = default(IList), IList privateIPAddresses = default(IList), string publicIpAddressId = default(string), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), string gatewayRegionalUrl = default(string), bool? disableGateway = default(bool?)) { Location = location; Sku = sku; Zones = zones; PublicIPAddresses = publicIPAddresses; PrivateIPAddresses = privateIPAddresses; + PublicIpAddressId = publicIpAddressId; VirtualNetworkConfiguration = virtualNetworkConfiguration; GatewayRegionalUrl = gatewayRegionalUrl; DisableGateway = disableGateway; @@ -109,6 +114,14 @@ public AdditionalLocation() [JsonProperty(PropertyName = "privateIPAddresses")] public IList PrivateIPAddresses { get; private set; } + /// + /// Gets or sets public Standard SKU IP V4 based IP address to be + /// associated with Virtual Network deployed service in the location. + /// Supported only for Premium SKU being deployed in Virtual Network. + /// + [JsonProperty(PropertyName = "publicIpAddressId")] + public string PublicIpAddressId { get; set; } + /// /// Gets or sets virtual network configuration for the location. /// diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContactInformation.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContactInformation.cs new file mode 100644 index 0000000000000..a6264926030be --- /dev/null +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContactInformation.cs @@ -0,0 +1,74 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ApiManagement.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// API contact information + /// + public partial class ApiContactInformation + { + /// + /// Initializes a new instance of the ApiContactInformation class. + /// + public ApiContactInformation() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ApiContactInformation class. + /// + /// The identifying name of the contact + /// person/organization + /// The URL pointing to the contact information. MUST + /// be in the format of a URL + /// The email address of the contact + /// person/organization. MUST be in the format of an email + /// address + public ApiContactInformation(string name = default(string), string url = default(string), string email = default(string)) + { + Name = name; + Url = url; + Email = email; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the identifying name of the contact + /// person/organization + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets the URL pointing to the contact information. MUST be + /// in the format of a URL + /// + [JsonProperty(PropertyName = "url")] + public string Url { get; set; } + + /// + /// Gets or sets the email address of the contact person/organization. + /// MUST be in the format of an email address + /// + [JsonProperty(PropertyName = "email")] + public string Email { get; set; } + + } +} diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContract.cs index c9ef93de9951e..cf80fcdf82ba4 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContract.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Api details. + /// API details. /// [Rest.Serialization.JsonTransformation] public partial class ApiContract : Resource @@ -50,23 +50,27 @@ public ApiContract() /// Protocols over which /// API is made available. /// Type of API. Possible values include: 'http', - /// 'soap' - /// Describes the Revision of the Api. If no + /// 'soap', 'websocket', 'graphql' + /// Describes the revision of the API. If no /// value is provided, default revision 1 is created - /// Indicates the Version identifier of the + /// Indicates the version identifier of the /// API if the API is versioned /// Indicates if API revision is current api /// revision. /// Indicates if API revision is accessible via /// the gateway. - /// Description of the Api + /// Description of the API /// Revision. - /// Description of the Api + /// Description of the API /// Version. /// A resource identifier for the related /// ApiVersionSet. /// Specifies whether an API or /// Product subscription is required for accessing the API. + /// A URL to the Terms of Service for + /// the API. MUST be in the format of a URL. + /// Contact information for the API. + /// License information for the API. /// API identifier of the source API. /// API name. Must be 1 to 300 characters /// long. @@ -76,7 +80,7 @@ public ApiContract() /// Describes on which protocols the operations /// in this API can be invoked. /// Version set details - public ApiContract(string path, string id = default(string), string name = default(string), string type = default(string), string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string sourceApiId = default(string), string displayName = default(string), string serviceUrl = default(string), IList protocols = default(IList), ApiVersionSetContractDetails apiVersionSet = default(ApiVersionSetContractDetails)) + public ApiContract(string path, string id = default(string), string name = default(string), string type = default(string), string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string termsOfServiceUrl = default(string), ApiContactInformation contact = default(ApiContactInformation), ApiLicenseInformation license = default(ApiLicenseInformation), string sourceApiId = default(string), string displayName = default(string), string serviceUrl = default(string), IList protocols = default(IList), ApiVersionSetContractDetails apiVersionSet = default(ApiVersionSetContractDetails)) : base(id, name, type) { Description = description; @@ -91,6 +95,9 @@ public ApiContract() ApiVersionDescription = apiVersionDescription; ApiVersionSetId = apiVersionSetId; SubscriptionRequired = subscriptionRequired; + TermsOfServiceUrl = termsOfServiceUrl; + Contact = contact; + License = license; SourceApiId = sourceApiId; DisplayName = displayName; ServiceUrl = serviceUrl; @@ -126,20 +133,21 @@ public ApiContract() public SubscriptionKeyParameterNamesContract SubscriptionKeyParameterNames { get; set; } /// - /// Gets or sets type of API. Possible values include: 'http', 'soap' + /// Gets or sets type of API. Possible values include: 'http', 'soap', + /// 'websocket', 'graphql' /// [JsonProperty(PropertyName = "properties.type")] public string ApiType { get; set; } /// - /// Gets or sets describes the Revision of the Api. If no value is + /// Gets or sets describes the revision of the API. If no value is /// provided, default revision 1 is created /// [JsonProperty(PropertyName = "properties.apiRevision")] public string ApiRevision { get; set; } /// - /// Gets or sets indicates the Version identifier of the API if the API + /// Gets or sets indicates the version identifier of the API if the API /// is versioned /// [JsonProperty(PropertyName = "properties.apiVersion")] @@ -158,13 +166,13 @@ public ApiContract() public bool? IsOnline { get; private set; } /// - /// Gets or sets description of the Api Revision. + /// Gets or sets description of the API Revision. /// [JsonProperty(PropertyName = "properties.apiRevisionDescription")] public string ApiRevisionDescription { get; set; } /// - /// Gets or sets description of the Api Version. + /// Gets or sets description of the API Version. /// [JsonProperty(PropertyName = "properties.apiVersionDescription")] public string ApiVersionDescription { get; set; } @@ -182,6 +190,25 @@ public ApiContract() [JsonProperty(PropertyName = "properties.subscriptionRequired")] public bool? SubscriptionRequired { get; set; } + /// + /// Gets or sets A URL to the Terms of Service for the API. MUST be in + /// the format of a URL. + /// + [JsonProperty(PropertyName = "properties.termsOfServiceUrl")] + public string TermsOfServiceUrl { get; set; } + + /// + /// Gets or sets contact information for the API. + /// + [JsonProperty(PropertyName = "properties.contact")] + public ApiContactInformation Contact { get; set; } + + /// + /// Gets or sets license information for the API. + /// + [JsonProperty(PropertyName = "properties.license")] + public ApiLicenseInformation License { get; set; } + /// /// Gets or sets API identifier of the source API. /// @@ -215,7 +242,7 @@ public ApiContract() /// API can be invoked. /// [JsonProperty(PropertyName = "properties.protocols")] - public IList Protocols { get; set; } + public IList Protocols { get; set; } /// /// Gets or sets version set details diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContractProperties.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContractProperties.cs index abfb457626dd7..b8b5782ec9070 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContractProperties.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiContractProperties.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Api Entity Properties + /// API Entity Properties /// public partial class ApiContractProperties : ApiEntityBaseContract { @@ -44,23 +44,27 @@ public ApiContractProperties() /// Protocols over which /// API is made available. /// Type of API. Possible values include: 'http', - /// 'soap' - /// Describes the Revision of the Api. If no + /// 'soap', 'websocket', 'graphql' + /// Describes the revision of the API. If no /// value is provided, default revision 1 is created - /// Indicates the Version identifier of the + /// Indicates the version identifier of the /// API if the API is versioned /// Indicates if API revision is current api /// revision. /// Indicates if API revision is accessible via /// the gateway. - /// Description of the Api + /// Description of the API /// Revision. - /// Description of the Api + /// Description of the API /// Version. /// A resource identifier for the related /// ApiVersionSet. /// Specifies whether an API or /// Product subscription is required for accessing the API. + /// A URL to the Terms of Service for + /// the API. MUST be in the format of a URL. + /// Contact information for the API. + /// License information for the API. /// API identifier of the source API. /// API name. Must be 1 to 300 characters /// long. @@ -70,8 +74,8 @@ public ApiContractProperties() /// Describes on which protocols the operations /// in this API can be invoked. /// Version set details - public ApiContractProperties(string path, string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string sourceApiId = default(string), string displayName = default(string), string serviceUrl = default(string), IList protocols = default(IList), ApiVersionSetContractDetails apiVersionSet = default(ApiVersionSetContractDetails)) - : base(description, authenticationSettings, subscriptionKeyParameterNames, apiType, apiRevision, apiVersion, isCurrent, isOnline, apiRevisionDescription, apiVersionDescription, apiVersionSetId, subscriptionRequired) + public ApiContractProperties(string path, string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string termsOfServiceUrl = default(string), ApiContactInformation contact = default(ApiContactInformation), ApiLicenseInformation license = default(ApiLicenseInformation), string sourceApiId = default(string), string displayName = default(string), string serviceUrl = default(string), IList protocols = default(IList), ApiVersionSetContractDetails apiVersionSet = default(ApiVersionSetContractDetails)) + : base(description, authenticationSettings, subscriptionKeyParameterNames, apiType, apiRevision, apiVersion, isCurrent, isOnline, apiRevisionDescription, apiVersionDescription, apiVersionSetId, subscriptionRequired, termsOfServiceUrl, contact, license) { SourceApiId = sourceApiId; DisplayName = displayName; @@ -120,7 +124,7 @@ public ApiContractProperties() /// API can be invoked. /// [JsonProperty(PropertyName = "protocols")] - public IList Protocols { get; set; } + public IList Protocols { get; set; } /// /// Gets or sets version set details diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiCreateOrUpdateParameter.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiCreateOrUpdateParameter.cs index 80b4ad63367b4..1a911eefb4372 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiCreateOrUpdateParameter.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiCreateOrUpdateParameter.cs @@ -46,23 +46,27 @@ public ApiCreateOrUpdateParameter() /// Protocols over which /// API is made available. /// Type of API. Possible values include: 'http', - /// 'soap' - /// Describes the Revision of the Api. If no + /// 'soap', 'websocket', 'graphql' + /// Describes the revision of the API. If no /// value is provided, default revision 1 is created - /// Indicates the Version identifier of the + /// Indicates the version identifier of the /// API if the API is versioned /// Indicates if API revision is current api /// revision. /// Indicates if API revision is accessible via /// the gateway. - /// Description of the Api + /// Description of the API /// Revision. - /// Description of the Api + /// Description of the API /// Version. /// A resource identifier for the related /// ApiVersionSet. /// Specifies whether an API or /// Product subscription is required for accessing the API. + /// A URL to the Terms of Service for + /// the API. MUST be in the format of a URL. + /// Contact information for the API. + /// License information for the API. /// API identifier of the source API. /// API name. Must be 1 to 300 characters /// long. @@ -77,14 +81,16 @@ public ApiCreateOrUpdateParameter() /// getting imported. Possible values include: 'wadl-xml', /// 'wadl-link-json', 'swagger-json', 'swagger-link-json', 'wsdl', /// 'wsdl-link', 'openapi', 'openapi+json', 'openapi-link', - /// 'openapi+json-link' + /// 'openapi+json-link', 'graphql-link' /// Criteria to limit import of WSDL to a /// subset of the document. - /// Type of Api to create. - /// * `http` creates a SOAP to REST API - /// * `soap` creates a SOAP pass-through API. Possible values include: - /// 'SoapToRest', 'SoapPassThrough' - public ApiCreateOrUpdateParameter(string path, string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string sourceApiId = default(string), string displayName = default(string), string serviceUrl = default(string), IList protocols = default(IList), ApiVersionSetContractDetails apiVersionSet = default(ApiVersionSetContractDetails), string value = default(string), string format = default(string), ApiCreateOrUpdatePropertiesWsdlSelector wsdlSelector = default(ApiCreateOrUpdatePropertiesWsdlSelector), string soapApiType = default(string)) + /// Type of API to create. + /// * `http` creates a REST API + /// * `soap` creates a SOAP pass-through API + /// * `websocket` creates websocket API + /// * `graphql` creates GraphQL API. Possible values include: + /// 'SoapToRest', 'SoapPassThrough', 'WebSocket', 'GraphQL' + public ApiCreateOrUpdateParameter(string path, string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string termsOfServiceUrl = default(string), ApiContactInformation contact = default(ApiContactInformation), ApiLicenseInformation license = default(ApiLicenseInformation), string sourceApiId = default(string), string displayName = default(string), string serviceUrl = default(string), IList protocols = default(IList), ApiVersionSetContractDetails apiVersionSet = default(ApiVersionSetContractDetails), string value = default(string), string format = default(string), ApiCreateOrUpdatePropertiesWsdlSelector wsdlSelector = default(ApiCreateOrUpdatePropertiesWsdlSelector), string soapApiType = default(string)) { Description = description; AuthenticationSettings = authenticationSettings; @@ -98,6 +104,9 @@ public ApiCreateOrUpdateParameter() ApiVersionDescription = apiVersionDescription; ApiVersionSetId = apiVersionSetId; SubscriptionRequired = subscriptionRequired; + TermsOfServiceUrl = termsOfServiceUrl; + Contact = contact; + License = license; SourceApiId = sourceApiId; DisplayName = displayName; ServiceUrl = serviceUrl; @@ -137,20 +146,21 @@ public ApiCreateOrUpdateParameter() public SubscriptionKeyParameterNamesContract SubscriptionKeyParameterNames { get; set; } /// - /// Gets or sets type of API. Possible values include: 'http', 'soap' + /// Gets or sets type of API. Possible values include: 'http', 'soap', + /// 'websocket', 'graphql' /// [JsonProperty(PropertyName = "properties.type")] public string ApiType { get; set; } /// - /// Gets or sets describes the Revision of the Api. If no value is + /// Gets or sets describes the revision of the API. If no value is /// provided, default revision 1 is created /// [JsonProperty(PropertyName = "properties.apiRevision")] public string ApiRevision { get; set; } /// - /// Gets or sets indicates the Version identifier of the API if the API + /// Gets or sets indicates the version identifier of the API if the API /// is versioned /// [JsonProperty(PropertyName = "properties.apiVersion")] @@ -169,13 +179,13 @@ public ApiCreateOrUpdateParameter() public bool? IsOnline { get; private set; } /// - /// Gets or sets description of the Api Revision. + /// Gets or sets description of the API Revision. /// [JsonProperty(PropertyName = "properties.apiRevisionDescription")] public string ApiRevisionDescription { get; set; } /// - /// Gets or sets description of the Api Version. + /// Gets or sets description of the API Version. /// [JsonProperty(PropertyName = "properties.apiVersionDescription")] public string ApiVersionDescription { get; set; } @@ -193,6 +203,25 @@ public ApiCreateOrUpdateParameter() [JsonProperty(PropertyName = "properties.subscriptionRequired")] public bool? SubscriptionRequired { get; set; } + /// + /// Gets or sets A URL to the Terms of Service for the API. MUST be in + /// the format of a URL. + /// + [JsonProperty(PropertyName = "properties.termsOfServiceUrl")] + public string TermsOfServiceUrl { get; set; } + + /// + /// Gets or sets contact information for the API. + /// + [JsonProperty(PropertyName = "properties.contact")] + public ApiContactInformation Contact { get; set; } + + /// + /// Gets or sets license information for the API. + /// + [JsonProperty(PropertyName = "properties.license")] + public ApiLicenseInformation License { get; set; } + /// /// Gets or sets API identifier of the source API. /// @@ -226,7 +255,7 @@ public ApiCreateOrUpdateParameter() /// API can be invoked. /// [JsonProperty(PropertyName = "properties.protocols")] - public IList Protocols { get; set; } + public IList Protocols { get; set; } /// /// Gets or sets version set details @@ -244,7 +273,8 @@ 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+json-link' + /// 'openapi', 'openapi+json', 'openapi-link', 'openapi+json-link', + /// 'graphql-link' /// [JsonProperty(PropertyName = "properties.format")] public string Format { get; set; } @@ -257,10 +287,12 @@ public ApiCreateOrUpdateParameter() public ApiCreateOrUpdatePropertiesWsdlSelector WsdlSelector { get; set; } /// - /// Gets or sets type of Api to create. - /// * `http` creates a SOAP to REST API - /// * `soap` creates a SOAP pass-through API. Possible values include: - /// 'SoapToRest', 'SoapPassThrough' + /// Gets or sets type of API to create. + /// * `http` creates a REST API + /// * `soap` creates a SOAP pass-through API + /// * `websocket` creates websocket API + /// * `graphql` creates GraphQL API. Possible values include: + /// 'SoapToRest', 'SoapPassThrough', 'WebSocket', 'GraphQL' /// [JsonProperty(PropertyName = "properties.apiType")] public string SoapApiType { get; set; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiEntityBaseContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiEntityBaseContract.cs index 3a36440534594..8af67e6d588c2 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiEntityBaseContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiEntityBaseContract.cs @@ -37,24 +37,28 @@ public ApiEntityBaseContract() /// Protocols over which /// API is made available. /// Type of API. Possible values include: 'http', - /// 'soap' - /// Describes the Revision of the Api. If no + /// 'soap', 'websocket', 'graphql' + /// Describes the revision of the API. If no /// value is provided, default revision 1 is created - /// Indicates the Version identifier of the + /// Indicates the version identifier of the /// API if the API is versioned /// Indicates if API revision is current api /// revision. /// Indicates if API revision is accessible via /// the gateway. - /// Description of the Api + /// Description of the API /// Revision. - /// Description of the Api + /// Description of the API /// Version. /// A resource identifier for the related /// ApiVersionSet. /// Specifies whether an API or /// Product subscription is required for accessing the API. - public ApiEntityBaseContract(string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?)) + /// A URL to the Terms of Service for + /// the API. MUST be in the format of a URL. + /// Contact information for the API. + /// License information for the API. + public ApiEntityBaseContract(string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string termsOfServiceUrl = default(string), ApiContactInformation contact = default(ApiContactInformation), ApiLicenseInformation license = default(ApiLicenseInformation)) { Description = description; AuthenticationSettings = authenticationSettings; @@ -68,6 +72,9 @@ public ApiEntityBaseContract() ApiVersionDescription = apiVersionDescription; ApiVersionSetId = apiVersionSetId; SubscriptionRequired = subscriptionRequired; + TermsOfServiceUrl = termsOfServiceUrl; + Contact = contact; + License = license; CustomInit(); } @@ -97,20 +104,21 @@ public ApiEntityBaseContract() public SubscriptionKeyParameterNamesContract SubscriptionKeyParameterNames { get; set; } /// - /// Gets or sets type of API. Possible values include: 'http', 'soap' + /// Gets or sets type of API. Possible values include: 'http', 'soap', + /// 'websocket', 'graphql' /// [JsonProperty(PropertyName = "type")] public string ApiType { get; set; } /// - /// Gets or sets describes the Revision of the Api. If no value is + /// Gets or sets describes the revision of the API. If no value is /// provided, default revision 1 is created /// [JsonProperty(PropertyName = "apiRevision")] public string ApiRevision { get; set; } /// - /// Gets or sets indicates the Version identifier of the API if the API + /// Gets or sets indicates the version identifier of the API if the API /// is versioned /// [JsonProperty(PropertyName = "apiVersion")] @@ -129,13 +137,13 @@ public ApiEntityBaseContract() public bool? IsOnline { get; private set; } /// - /// Gets or sets description of the Api Revision. + /// Gets or sets description of the API Revision. /// [JsonProperty(PropertyName = "apiRevisionDescription")] public string ApiRevisionDescription { get; set; } /// - /// Gets or sets description of the Api Version. + /// Gets or sets description of the API Version. /// [JsonProperty(PropertyName = "apiVersionDescription")] public string ApiVersionDescription { get; set; } @@ -153,6 +161,25 @@ public ApiEntityBaseContract() [JsonProperty(PropertyName = "subscriptionRequired")] public bool? SubscriptionRequired { get; set; } + /// + /// Gets or sets A URL to the Terms of Service for the API. MUST be in + /// the format of a URL. + /// + [JsonProperty(PropertyName = "termsOfServiceUrl")] + public string TermsOfServiceUrl { get; set; } + + /// + /// Gets or sets contact information for the API. + /// + [JsonProperty(PropertyName = "contact")] + public ApiContactInformation Contact { get; set; } + + /// + /// Gets or sets license information for the API. + /// + [JsonProperty(PropertyName = "license")] + public ApiLicenseInformation License { get; set; } + /// /// Validate the object. /// diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiExportResult.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiExportResult.cs index cb2027f46a8f6..8845669fc1e78 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiExportResult.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiExportResult.cs @@ -30,12 +30,12 @@ public ApiExportResult() /// Initializes a new instance of the ApiExportResult class. /// /// ResourceId of the API which was exported. - /// Format in which the Api Details + /// Format in which the API Details /// are exported to the Storage Blob with Sas Key valid for 5 minutes. /// Possible values include: 'Swagger', 'Wsdl', 'Wadl', /// 'OpenApi' /// The object defining the schema of the exported - /// Api Detail + /// API Detail public ApiExportResult(string id = default(string), string exportResultFormat = default(string), ApiExportResultValue value = default(ApiExportResultValue)) { Id = id; @@ -56,7 +56,7 @@ public ApiExportResult() public string Id { get; set; } /// - /// Gets or sets format in which the Api Details are exported to the + /// Gets or sets format in which the API Details are exported to the /// Storage Blob with Sas Key valid for 5 minutes. Possible values /// include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi' /// @@ -64,7 +64,7 @@ public ApiExportResult() public string ExportResultFormat { get; set; } /// - /// Gets or sets the object defining the schema of the exported Api + /// Gets or sets the object defining the schema of the exported API /// Detail /// [JsonProperty(PropertyName = "value")] diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiExportResultValue.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiExportResultValue.cs index 95f6644dfc5c9..3b0f2b3a31b6f 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiExportResultValue.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiExportResultValue.cs @@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// The object defining the schema of the exported Api Detail + /// The object defining the schema of the exported API Detail /// public partial class ApiExportResultValue { diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiLicenseInformation.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiLicenseInformation.cs new file mode 100644 index 0000000000000..885625460020a --- /dev/null +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiLicenseInformation.cs @@ -0,0 +1,61 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ApiManagement.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// API license information + /// + public partial class ApiLicenseInformation + { + /// + /// Initializes a new instance of the ApiLicenseInformation class. + /// + public ApiLicenseInformation() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ApiLicenseInformation class. + /// + /// The license name used for the API + /// A URL to the license used for the API. MUST be in + /// the format of a URL + public ApiLicenseInformation(string name = default(string), string url = default(string)) + { + Name = name; + Url = url; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the license name used for the API + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets a URL to the license used for the API. MUST be in the + /// format of a URL + /// + [JsonProperty(PropertyName = "url")] + public string Url { get; set; } + + } +} diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBackupRestoreParameters.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBackupRestoreParameters.cs index 1e4d4935c9809..5f07c540f4e20 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBackupRestoreParameters.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBackupRestoreParameters.cs @@ -33,20 +33,29 @@ public ApiManagementServiceBackupRestoreParameters() /// Initializes a new instance of the /// ApiManagementServiceBackupRestoreParameters class. /// - /// Azure Cloud Storage account (used to - /// place/retrieve the backup) name. - /// Azure Cloud Storage account (used to - /// place/retrieve the backup) access key. - /// Azure Cloud Storage blob container name - /// used to place/retrieve the backup. + /// The name of the Azure storage account + /// (used to place/retrieve the backup). + /// The name of the blob container (used to + /// place/retrieve the backup). /// The name of the backup file to - /// create. - public ApiManagementServiceBackupRestoreParameters(string storageAccount, string accessKey, string containerName, string backupName) + /// create/retrieve. + /// The type of access to be used for the + /// storage account. Possible values include: 'AccessKey', + /// 'SystemAssignedManagedIdentity', + /// 'UserAssignedManagedIdentity' + /// Storage account access key. Required only + /// if `accessType` is set to `AccessKey`. + /// The Client ID of user assigned managed + /// identity. Required only if `accessType` is set to + /// `UserAssignedManagedIdentity`. + public ApiManagementServiceBackupRestoreParameters(string storageAccount, string containerName, string backupName, string accessType = default(string), string accessKey = default(string), string clientId = default(string)) { StorageAccount = storageAccount; - AccessKey = accessKey; ContainerName = containerName; BackupName = backupName; + AccessType = accessType; + AccessKey = accessKey; + ClientId = clientId; CustomInit(); } @@ -56,32 +65,48 @@ public ApiManagementServiceBackupRestoreParameters(string storageAccount, string partial void CustomInit(); /// - /// Gets or sets azure Cloud Storage account (used to place/retrieve - /// the backup) name. + /// Gets or sets the name of the Azure storage account (used to + /// place/retrieve the backup). /// [JsonProperty(PropertyName = "storageAccount")] public string StorageAccount { get; set; } /// - /// Gets or sets azure Cloud Storage account (used to place/retrieve - /// the backup) access key. - /// - [JsonProperty(PropertyName = "accessKey")] - public string AccessKey { get; set; } - - /// - /// Gets or sets azure Cloud Storage blob container name used to - /// place/retrieve the backup. + /// Gets or sets the name of the blob container (used to place/retrieve + /// the backup). /// [JsonProperty(PropertyName = "containerName")] public string ContainerName { get; set; } /// - /// Gets or sets the name of the backup file to create. + /// Gets or sets the name of the backup file to create/retrieve. /// [JsonProperty(PropertyName = "backupName")] public string BackupName { get; set; } + /// + /// Gets or sets the type of access to be used for the storage account. + /// Possible values include: 'AccessKey', + /// 'SystemAssignedManagedIdentity', 'UserAssignedManagedIdentity' + /// + [JsonProperty(PropertyName = "accessType")] + public string AccessType { get; set; } + + /// + /// Gets or sets storage account access key. Required only if + /// `accessType` is set to `AccessKey`. + /// + [JsonProperty(PropertyName = "accessKey")] + public string AccessKey { get; set; } + + /// + /// Gets or sets the Client ID of user assigned managed identity. + /// Required only if `accessType` is set to + /// `UserAssignedManagedIdentity`. + /// + [JsonProperty(PropertyName = "clientId")] + public string ClientId { get; set; } + /// /// Validate the object. /// @@ -94,10 +119,6 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "StorageAccount"); } - if (AccessKey == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "AccessKey"); - } if (ContainerName == null) { throw new ValidationException(ValidationRules.CannotBeNull, "ContainerName"); diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBaseProperties.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBaseProperties.cs index 9c56553e638e6..c64ca061525c7 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBaseProperties.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceBaseProperties.cs @@ -68,6 +68,10 @@ public ApiManagementServiceBaseProperties() /// addresses of the API Management service in Primary region which is /// deployed in an Internal Virtual Network. Available only for Basic, /// Standard, Premium and Isolated SKU. + /// Public Standard SKU IP V4 based IP + /// address to be associated with Virtual Network deployed service in + /// the region. Supported only for Developer and Premium SKU being + /// deployed in Virtual Network. /// Virtual network /// configuration of the API Management service. /// Additional datacenter locations @@ -134,7 +138,7 @@ public ApiManagementServiceBaseProperties() /// Undelete Api Management Service if it was /// previously soft-deleted. If this flag is specified and set to True /// all other properties will be ignored. - 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), string developerPortalUrl = default(string), IList hostnameConfigurations = default(IList), IList publicIPAddresses = default(IList), IList privateIPAddresses = default(IList), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList additionalLocations = default(IList), IDictionary customProperties = default(IDictionary), IList certificates = default(IList), bool? enableClientCertificate = default(bool?), bool? disableGateway = default(bool?), string virtualNetworkType = default(string), ApiVersionConstraint apiVersionConstraint = default(ApiVersionConstraint), bool? restore = default(bool?)) + 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), string developerPortalUrl = default(string), IList hostnameConfigurations = default(IList), IList publicIPAddresses = default(IList), IList privateIPAddresses = default(IList), string publicIpAddressId = default(string), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList additionalLocations = default(IList), IDictionary customProperties = default(IDictionary), IList certificates = default(IList), bool? enableClientCertificate = default(bool?), bool? disableGateway = default(bool?), string virtualNetworkType = default(string), ApiVersionConstraint apiVersionConstraint = default(ApiVersionConstraint), bool? restore = default(bool?)) { NotificationSenderEmail = notificationSenderEmail; ProvisioningState = provisioningState; @@ -149,6 +153,7 @@ public ApiManagementServiceBaseProperties() HostnameConfigurations = hostnameConfigurations; PublicIPAddresses = publicIPAddresses; PrivateIPAddresses = privateIPAddresses; + PublicIpAddressId = publicIpAddressId; VirtualNetworkConfiguration = virtualNetworkConfiguration; AdditionalLocations = additionalLocations; CustomProperties = customProperties; @@ -257,6 +262,15 @@ public ApiManagementServiceBaseProperties() [JsonProperty(PropertyName = "privateIPAddresses")] public IList PrivateIPAddresses { get; private set; } + /// + /// Gets or sets public Standard SKU IP V4 based IP address to be + /// associated with Virtual Network deployed service in the region. + /// Supported only for Developer and Premium SKU being deployed in + /// Virtual Network. + /// + [JsonProperty(PropertyName = "publicIpAddressId")] + public string PublicIpAddressId { get; set; } + /// /// Gets or sets virtual network configuration of the API Management /// service. diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceResource.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceResource.cs index 08d4384bb709a..503f0abc44cd9 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceResource.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceResource.cs @@ -80,6 +80,10 @@ public ApiManagementServiceResource() /// addresses of the API Management service in Primary region which is /// deployed in an Internal Virtual Network. Available only for Basic, /// Standard, Premium and Isolated SKU. + /// Public Standard SKU IP V4 based IP + /// address to be associated with Virtual Network deployed service in + /// the region. Supported only for Developer and Premium SKU being + /// deployed in Virtual Network. /// Virtual network /// configuration of the API Management service. /// Additional datacenter locations @@ -151,7 +155,7 @@ public ApiManagementServiceResource() /// ETag of the resource. /// A list of availability zones denoting where the /// resource needs to come from. - public ApiManagementServiceResource(string publisherEmail, string publisherName, ApiManagementServiceSkuProperties sku, string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), 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), string developerPortalUrl = default(string), IList hostnameConfigurations = default(IList), IList publicIPAddresses = default(IList), IList privateIPAddresses = default(IList), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList additionalLocations = default(IList), IDictionary customProperties = default(IDictionary), IList certificates = default(IList), bool? enableClientCertificate = default(bool?), bool? disableGateway = default(bool?), string virtualNetworkType = default(string), ApiVersionConstraint apiVersionConstraint = default(ApiVersionConstraint), bool? restore = default(bool?), ApiManagementServiceIdentity identity = default(ApiManagementServiceIdentity), string etag = default(string), IList zones = default(IList)) + public ApiManagementServiceResource(string publisherEmail, string publisherName, ApiManagementServiceSkuProperties sku, string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), 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), string developerPortalUrl = default(string), IList hostnameConfigurations = default(IList), IList publicIPAddresses = default(IList), IList privateIPAddresses = default(IList), string publicIpAddressId = default(string), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList additionalLocations = default(IList), IDictionary customProperties = default(IDictionary), IList certificates = default(IList), bool? enableClientCertificate = default(bool?), bool? disableGateway = default(bool?), string virtualNetworkType = default(string), ApiVersionConstraint apiVersionConstraint = default(ApiVersionConstraint), bool? restore = default(bool?), ApiManagementServiceIdentity identity = default(ApiManagementServiceIdentity), string etag = default(string), IList zones = default(IList)) : base(id, name, type, tags) { NotificationSenderEmail = notificationSenderEmail; @@ -167,6 +171,7 @@ public ApiManagementServiceResource() HostnameConfigurations = hostnameConfigurations; PublicIPAddresses = publicIPAddresses; PrivateIPAddresses = privateIPAddresses; + PublicIpAddressId = publicIpAddressId; VirtualNetworkConfiguration = virtualNetworkConfiguration; AdditionalLocations = additionalLocations; CustomProperties = customProperties; @@ -282,6 +287,15 @@ public ApiManagementServiceResource() [JsonProperty(PropertyName = "properties.privateIPAddresses")] public IList PrivateIPAddresses { get; private set; } + /// + /// Gets or sets public Standard SKU IP V4 based IP address to be + /// associated with Virtual Network deployed service in the region. + /// Supported only for Developer and Premium SKU being deployed in + /// Virtual Network. + /// + [JsonProperty(PropertyName = "properties.publicIpAddressId")] + public string PublicIpAddressId { get; set; } + /// /// Gets or sets virtual network configuration of the API Management /// service. diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceUpdateParameters.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceUpdateParameters.cs index 47145e4df0a85..a16051736d4e9 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceUpdateParameters.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiManagementServiceUpdateParameters.cs @@ -75,6 +75,10 @@ public ApiManagementServiceUpdateParameters() /// addresses of the API Management service in Primary region which is /// deployed in an Internal Virtual Network. Available only for Basic, /// Standard, Premium and Isolated SKU. + /// Public Standard SKU IP V4 based IP + /// address to be associated with Virtual Network deployed service in + /// the region. Supported only for Developer and Premium SKU being + /// deployed in Virtual Network. /// Virtual network /// configuration of the API Management service. /// Additional datacenter locations @@ -148,7 +152,7 @@ public ApiManagementServiceUpdateParameters() /// Managed service identity of the Api /// Management service. /// ETag of the resource. - public ApiManagementServiceUpdateParameters(string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), 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), string developerPortalUrl = default(string), IList hostnameConfigurations = default(IList), IList publicIPAddresses = default(IList), IList privateIPAddresses = default(IList), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList additionalLocations = default(IList), IDictionary customProperties = default(IDictionary), IList certificates = default(IList), bool? enableClientCertificate = default(bool?), bool? disableGateway = default(bool?), string virtualNetworkType = default(string), ApiVersionConstraint apiVersionConstraint = default(ApiVersionConstraint), bool? restore = default(bool?), 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 tags = default(IDictionary), 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), string developerPortalUrl = default(string), IList hostnameConfigurations = default(IList), IList publicIPAddresses = default(IList), IList privateIPAddresses = default(IList), string publicIpAddressId = default(string), VirtualNetworkConfiguration virtualNetworkConfiguration = default(VirtualNetworkConfiguration), IList additionalLocations = default(IList), IDictionary customProperties = default(IDictionary), IList certificates = default(IList), bool? enableClientCertificate = default(bool?), bool? disableGateway = default(bool?), string virtualNetworkType = default(string), ApiVersionConstraint apiVersionConstraint = default(ApiVersionConstraint), bool? restore = default(bool?), 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; @@ -164,6 +168,7 @@ public ApiManagementServiceUpdateParameters() HostnameConfigurations = hostnameConfigurations; PublicIPAddresses = publicIPAddresses; PrivateIPAddresses = privateIPAddresses; + PublicIpAddressId = publicIpAddressId; VirtualNetworkConfiguration = virtualNetworkConfiguration; AdditionalLocations = additionalLocations; CustomProperties = customProperties; @@ -277,6 +282,15 @@ public ApiManagementServiceUpdateParameters() [JsonProperty(PropertyName = "properties.privateIPAddresses")] public IList PrivateIPAddresses { get; private set; } + /// + /// Gets or sets public Standard SKU IP V4 based IP address to be + /// associated with Virtual Network deployed service in the region. + /// Supported only for Developer and Premium SKU being deployed in + /// Virtual Network. + /// + [JsonProperty(PropertyName = "properties.publicIpAddressId")] + public string PublicIpAddressId { get; set; } + /// /// Gets or sets virtual network configuration of the API Management /// service. diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiTagResourceContractProperties.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiTagResourceContractProperties.cs index eb956160cc204..7f916cbc7b82e 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiTagResourceContractProperties.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiTagResourceContractProperties.cs @@ -41,23 +41,27 @@ public ApiTagResourceContractProperties() /// Protocols over which /// API is made available. /// Type of API. Possible values include: 'http', - /// 'soap' - /// Describes the Revision of the Api. If no + /// 'soap', 'websocket', 'graphql' + /// Describes the revision of the API. If no /// value is provided, default revision 1 is created - /// Indicates the Version identifier of the + /// Indicates the version identifier of the /// API if the API is versioned /// Indicates if API revision is current api /// revision. /// Indicates if API revision is accessible via /// the gateway. - /// Description of the Api + /// Description of the API /// Revision. - /// Description of the Api + /// Description of the API /// Version. /// A resource identifier for the related /// ApiVersionSet. /// Specifies whether an API or /// Product subscription is required for accessing the API. + /// A URL to the Terms of Service for + /// the API. MUST be in the format of a URL. + /// Contact information for the API. + /// License information for the API. /// API identifier in the form /apis/{apiId}. /// API name. /// Absolute URL of the backend service @@ -69,8 +73,8 @@ public ApiTagResourceContractProperties() /// API. /// Describes on which protocols the operations /// in this API can be invoked. - public ApiTagResourceContractProperties(string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string id = default(string), string name = default(string), string serviceUrl = default(string), string path = default(string), IList protocols = default(IList)) - : base(description, authenticationSettings, subscriptionKeyParameterNames, apiType, apiRevision, apiVersion, isCurrent, isOnline, apiRevisionDescription, apiVersionDescription, apiVersionSetId, subscriptionRequired) + public ApiTagResourceContractProperties(string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string termsOfServiceUrl = default(string), ApiContactInformation contact = default(ApiContactInformation), ApiLicenseInformation license = default(ApiLicenseInformation), string id = default(string), string name = default(string), string serviceUrl = default(string), string path = default(string), IList protocols = default(IList)) + : base(description, authenticationSettings, subscriptionKeyParameterNames, apiType, apiRevision, apiVersion, isCurrent, isOnline, apiRevisionDescription, apiVersionDescription, apiVersionSetId, subscriptionRequired, termsOfServiceUrl, contact, license) { Id = id; Name = name; @@ -118,7 +122,7 @@ public ApiTagResourceContractProperties() /// API can be invoked. /// [JsonProperty(PropertyName = "protocols")] - public IList Protocols { get; set; } + public IList Protocols { get; set; } /// /// Validate the object. diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiType.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiType.cs index ec3f85b9d795d..8d5f06e3252b3 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiType.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiType.cs @@ -18,5 +18,7 @@ public static class ApiType { public const string Http = "http"; public const string Soap = "soap"; + public const string Websocket = "websocket"; + public const string Graphql = "graphql"; } } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiUpdateContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiUpdateContract.cs index 7701cc20b045c..540536ceb0edc 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiUpdateContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiUpdateContract.cs @@ -41,23 +41,27 @@ public ApiUpdateContract() /// Protocols over which /// API is made available. /// Type of API. Possible values include: 'http', - /// 'soap' - /// Describes the Revision of the Api. If no + /// 'soap', 'websocket', 'graphql' + /// Describes the revision of the API. If no /// value is provided, default revision 1 is created - /// Indicates the Version identifier of the + /// Indicates the version identifier of the /// API if the API is versioned /// Indicates if API revision is current api /// revision. /// Indicates if API revision is accessible via /// the gateway. - /// Description of the Api + /// Description of the API /// Revision. - /// Description of the Api + /// Description of the API /// Version. /// A resource identifier for the related /// ApiVersionSet. /// Specifies whether an API or /// Product subscription is required for accessing the API. + /// A URL to the Terms of Service for + /// the API. MUST be in the format of a URL. + /// Contact information for the API. + /// License information for the API. /// API name. /// Absolute URL of the backend service /// implementing this API. @@ -68,7 +72,7 @@ public ApiUpdateContract() /// API. /// Describes on which protocols the operations /// in this API can be invoked. - public ApiUpdateContract(string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string displayName = default(string), string serviceUrl = default(string), string path = default(string), IList protocols = default(IList)) + public ApiUpdateContract(string description = default(string), AuthenticationSettingsContract authenticationSettings = default(AuthenticationSettingsContract), SubscriptionKeyParameterNamesContract subscriptionKeyParameterNames = default(SubscriptionKeyParameterNamesContract), string apiType = default(string), string apiRevision = default(string), string apiVersion = default(string), bool? isCurrent = default(bool?), bool? isOnline = default(bool?), string apiRevisionDescription = default(string), string apiVersionDescription = default(string), string apiVersionSetId = default(string), bool? subscriptionRequired = default(bool?), string termsOfServiceUrl = default(string), ApiContactInformation contact = default(ApiContactInformation), ApiLicenseInformation license = default(ApiLicenseInformation), string displayName = default(string), string serviceUrl = default(string), string path = default(string), IList protocols = default(IList)) { Description = description; AuthenticationSettings = authenticationSettings; @@ -82,6 +86,9 @@ public ApiUpdateContract() ApiVersionDescription = apiVersionDescription; ApiVersionSetId = apiVersionSetId; SubscriptionRequired = subscriptionRequired; + TermsOfServiceUrl = termsOfServiceUrl; + Contact = contact; + License = license; DisplayName = displayName; ServiceUrl = serviceUrl; Path = path; @@ -115,20 +122,21 @@ public ApiUpdateContract() public SubscriptionKeyParameterNamesContract SubscriptionKeyParameterNames { get; set; } /// - /// Gets or sets type of API. Possible values include: 'http', 'soap' + /// Gets or sets type of API. Possible values include: 'http', 'soap', + /// 'websocket', 'graphql' /// [JsonProperty(PropertyName = "properties.type")] public string ApiType { get; set; } /// - /// Gets or sets describes the Revision of the Api. If no value is + /// Gets or sets describes the revision of the API. If no value is /// provided, default revision 1 is created /// [JsonProperty(PropertyName = "properties.apiRevision")] public string ApiRevision { get; set; } /// - /// Gets or sets indicates the Version identifier of the API if the API + /// Gets or sets indicates the version identifier of the API if the API /// is versioned /// [JsonProperty(PropertyName = "properties.apiVersion")] @@ -147,13 +155,13 @@ public ApiUpdateContract() public bool? IsOnline { get; private set; } /// - /// Gets or sets description of the Api Revision. + /// Gets or sets description of the API Revision. /// [JsonProperty(PropertyName = "properties.apiRevisionDescription")] public string ApiRevisionDescription { get; set; } /// - /// Gets or sets description of the Api Version. + /// Gets or sets description of the API Version. /// [JsonProperty(PropertyName = "properties.apiVersionDescription")] public string ApiVersionDescription { get; set; } @@ -171,6 +179,25 @@ public ApiUpdateContract() [JsonProperty(PropertyName = "properties.subscriptionRequired")] public bool? SubscriptionRequired { get; set; } + /// + /// Gets or sets A URL to the Terms of Service for the API. MUST be in + /// the format of a URL. + /// + [JsonProperty(PropertyName = "properties.termsOfServiceUrl")] + public string TermsOfServiceUrl { get; set; } + + /// + /// Gets or sets contact information for the API. + /// + [JsonProperty(PropertyName = "properties.contact")] + public ApiContactInformation Contact { get; set; } + + /// + /// Gets or sets license information for the API. + /// + [JsonProperty(PropertyName = "properties.license")] + public ApiLicenseInformation License { get; set; } + /// /// Gets or sets API name. /// @@ -198,7 +225,7 @@ public ApiUpdateContract() /// API can be invoked. /// [JsonProperty(PropertyName = "properties.protocols")] - public IList Protocols { get; set; } + public IList Protocols { get; set; } /// /// Validate the object. diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetContract.cs index 9a242f5d3ff65..ac6314e8307ba 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetContract.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Api Version Set Contract details. + /// API Version Set Contract details. /// [Rest.Serialization.JsonTransformation] public partial class ApiVersionSetContract : Resource diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetEntityBase.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetEntityBase.cs index ae233adb00adc..fd59ab2b0fdf3 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetEntityBase.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetEntityBase.cs @@ -15,7 +15,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Api Version set base parameters + /// API Version set base parameters /// public partial class ApiVersionSetEntityBase { diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetUpdateParameters.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetUpdateParameters.cs index 127c91590c7ef..d14e191fa8b05 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetUpdateParameters.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ApiVersionSetUpdateParameters.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Parameters to update or create an Api Version Set Contract. + /// Parameters to update or create an API Version Set Contract. /// [Rest.Serialization.JsonTransformation] public partial class ApiVersionSetUpdateParameters diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendBaseParameters.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendBaseParameters.cs index d10de360a431f..cabae888e7137 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendBaseParameters.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendBaseParameters.cs @@ -34,7 +34,7 @@ public BackendBaseParameters() /// Backend Description. /// Management Uri of the Resource in External /// System. This url can be the Arm Resource Id of Logic Apps, Function - /// Apps or Api Apps. + /// Apps or API Apps. /// Backend Properties contract /// Backend Credentials Contract /// Properties @@ -72,7 +72,7 @@ public BackendBaseParameters() /// /// Gets or sets management Uri of the Resource in External System. /// This url can be the Arm Resource Id of Logic Apps, Function Apps or - /// Api Apps. + /// API Apps. /// [JsonProperty(PropertyName = "resourceId")] public string ResourceId { get; set; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendContract.cs index 3662dbc928270..c1ce5dbcfea7d 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendContract.cs @@ -43,7 +43,7 @@ public BackendContract() /// Backend Description. /// Management Uri of the Resource in External /// System. This url can be the Arm Resource Id of Logic Apps, Function - /// Apps or Api Apps. + /// Apps or API Apps. /// Backend Properties contract /// Backend Credentials Contract /// Properties @@ -84,7 +84,7 @@ public BackendContract() /// /// Gets or sets management Uri of the Resource in External System. /// This url can be the Arm Resource Id of Logic Apps, Function Apps or - /// Api Apps. + /// API Apps. /// [JsonProperty(PropertyName = "properties.resourceId")] public string ResourceId { get; set; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendUpdateParameters.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendUpdateParameters.cs index 10414d288d8b9..99eb58fe66687 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendUpdateParameters.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/BackendUpdateParameters.cs @@ -36,7 +36,7 @@ public BackendUpdateParameters() /// Backend Description. /// Management Uri of the Resource in External /// System. This url can be the Arm Resource Id of Logic Apps, Function - /// Apps or Api Apps. + /// Apps or API Apps. /// Backend Properties contract /// Backend Credentials Contract /// Properties @@ -79,7 +79,7 @@ public BackendUpdateParameters() /// /// Gets or sets management Uri of the Resource in External System. /// This url can be the Arm Resource Id of Logic Apps, Function Apps or - /// Api Apps. + /// API Apps. /// [JsonProperty(PropertyName = "properties.resourceId")] public string ResourceId { get; set; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/CertificateSource.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/CertificateSource.cs new file mode 100644 index 0000000000000..3e582f6772c45 --- /dev/null +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/CertificateSource.cs @@ -0,0 +1,24 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ApiManagement.Models +{ + + /// + /// Defines values for CertificateSource. + /// + public static class CertificateSource + { + public const string Managed = "Managed"; + public const string KeyVault = "KeyVault"; + public const string Custom = "Custom"; + public const string BuiltIn = "BuiltIn"; + } +} diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/CertificateStatus.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/CertificateStatus.cs new file mode 100644 index 0000000000000..499020643c7b3 --- /dev/null +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/CertificateStatus.cs @@ -0,0 +1,23 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ApiManagement.Models +{ + + /// + /// Defines values for CertificateStatus. + /// + public static class CertificateStatus + { + public const string Completed = "Completed"; + public const string Failed = "Failed"; + public const string InProgress = "InProgress"; + } +} diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ContentFormat.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ContentFormat.cs index 12f48c4c9ba75..5943bbdaa3340 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ContentFormat.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ContentFormat.cs @@ -64,5 +64,10 @@ public static class ContentFormat /// internet address. /// public const string OpenapijsonLink = "openapi+json-link"; + /// + /// The GraphQL API endpoint hosted on a publicly accessible internet + /// address. + /// + public const string GraphqlLink = "graphql-link"; } } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/DeletedServiceContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/DeletedServiceContract.cs index 923423de0aa10..6a7cccedb10e4 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/DeletedServiceContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/DeletedServiceContract.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Deleted Api Management Service information. + /// Deleted API Management Service information. /// [Rest.Serialization.JsonTransformation] public partial class DeletedServiceContract : Resource @@ -45,7 +45,7 @@ public DeletedServiceContract() /// UTC Timestamp when the service was /// soft-deleted. The date conforms to the following format: /// yyyy-MM-ddTHH:mm:ssZ as specified by the ISO 8601 standard. - /// Api Management Service Master + /// API Management Service Master /// Location. public DeletedServiceContract(string id = default(string), string name = default(string), string type = default(string), string serviceId = default(string), System.DateTime? scheduledPurgeDate = default(System.DateTime?), System.DateTime? deletionDate = default(System.DateTime?), string location = default(string)) : base(id, name, type) @@ -85,7 +85,7 @@ public DeletedServiceContract() public System.DateTime? DeletionDate { get; set; } /// - /// Gets api Management Service Master Location. + /// Gets API Management Service Master Location. /// [JsonProperty(PropertyName = "location")] public string Location { get; private set; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/EmailTemplateContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/EmailTemplateContract.cs index 6ba6bb8c0a518..9e735ad2970f5 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/EmailTemplateContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/EmailTemplateContract.cs @@ -45,7 +45,7 @@ public EmailTemplateContract() /// Description of the Email /// Template. /// Whether the template is the default - /// template provided by Api Management or has been edited. + /// template provided by API Management or has been edited. /// Email Template Parameter values. public EmailTemplateContract(string subject, string body, string id = default(string), string name = default(string), string type = default(string), string title = default(string), string description = default(string), bool? isDefault = default(bool?), IList parameters = default(IList)) : base(id, name, type) @@ -89,7 +89,7 @@ public EmailTemplateContract() public string Description { get; set; } /// - /// Gets whether the template is the default template provided by Api + /// Gets whether the template is the default template provided by API /// Management or has been edited. /// [JsonProperty(PropertyName = "properties.isDefault")] diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ExportResultFormat.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ExportResultFormat.cs index f26777e685bb1..40a47c233fa17 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ExportResultFormat.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ExportResultFormat.cs @@ -17,21 +17,21 @@ namespace Microsoft.Azure.Management.ApiManagement.Models public static class ExportResultFormat { /// - /// The Api Definition is exported in OpenApi Specification 2.0 format + /// The API Definition is exported in OpenAPI Specification 2.0 format /// to the Storage Blob. /// public const string Swagger = "swagger-link-json"; /// - /// The Api Definition is exported in WSDL Schema to Storage Blob. This + /// The API Definition is exported in WSDL Schema to Storage Blob. This /// is only supported for APIs of Type `soap` /// public const string Wsdl = "wsdl-link+xml"; /// - /// Export the Api Definition in WADL Schema to Storage Blob. + /// Export the API Definition in WADL Schema to Storage Blob. /// public const string Wadl = "wadl-link-json"; /// - /// Export the Api Definition in OpenApi Specification 3.0 to Storage + /// Export the API Definition in OpenAPI Specification 3.0 to Storage /// Blob. /// public const string OpenApi = "openapi-link"; diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/HostnameConfiguration.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/HostnameConfiguration.cs index e59d20fe3ab65..60b910374f2bf 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/HostnameConfiguration.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/HostnameConfiguration.cs @@ -56,7 +56,11 @@ public HostnameConfiguration() /// negotiate client certificate on the hostname. Default Value is /// false. /// Certificate information. - public HostnameConfiguration(string type, string hostName, string keyVaultId = default(string), string identityClientId = default(string), string encodedCertificate = default(string), string certificatePassword = default(string), bool? defaultSslBinding = default(bool?), bool? negotiateClientCertificate = default(bool?), CertificateInformation certificate = default(CertificateInformation)) + /// Certificate Source. Possible values + /// include: 'Managed', 'KeyVault', 'Custom', 'BuiltIn' + /// Certificate Status. Possible values + /// include: 'Completed', 'Failed', 'InProgress' + public HostnameConfiguration(string type, string hostName, string keyVaultId = default(string), string identityClientId = default(string), string encodedCertificate = default(string), string certificatePassword = default(string), bool? defaultSslBinding = default(bool?), bool? negotiateClientCertificate = default(bool?), CertificateInformation certificate = default(CertificateInformation), string certificateSource = default(string), string certificateStatus = default(string)) { Type = type; HostName = hostName; @@ -67,6 +71,8 @@ public HostnameConfiguration() DefaultSslBinding = defaultSslBinding; NegotiateClientCertificate = negotiateClientCertificate; Certificate = certificate; + CertificateSource = certificateSource; + CertificateStatus = certificateStatus; CustomInit(); } @@ -142,6 +148,20 @@ public HostnameConfiguration() [JsonProperty(PropertyName = "certificate")] public CertificateInformation Certificate { get; set; } + /// + /// Gets or sets certificate Source. Possible values include: + /// 'Managed', 'KeyVault', 'Custom', 'BuiltIn' + /// + [JsonProperty(PropertyName = "certificateSource")] + public string CertificateSource { get; set; } + + /// + /// Gets or sets certificate Status. Possible values include: + /// 'Completed', 'Failed', 'InProgress' + /// + [JsonProperty(PropertyName = "certificateStatus")] + public string CertificateStatus { get; set; } + /// /// Validate the object. /// diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/KeyVaultContractCreateProperties.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/KeyVaultContractCreateProperties.cs index fdbe073ca243c..a93de81cfc121 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/KeyVaultContractCreateProperties.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/KeyVaultContractCreateProperties.cs @@ -33,7 +33,7 @@ public KeyVaultContractCreateProperties() /// /// Key vault secret identifier for /// fetching secret. Providing a versioned secret will prevent - /// auto-refresh. This requires Api Management service to be configured + /// auto-refresh. This requires API Management service to be configured /// with aka.ms/apimmsi /// SystemAssignedIdentity or /// UserAssignedIdentity Client Id which will be used to access key @@ -53,7 +53,7 @@ public KeyVaultContractCreateProperties() /// /// Gets or sets key vault secret identifier for fetching secret. /// Providing a versioned secret will prevent auto-refresh. This - /// requires Api Management service to be configured with + /// requires API Management service to be configured with /// aka.ms/apimmsi /// [JsonProperty(PropertyName = "secretIdentifier")] diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/KeyVaultContractProperties.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/KeyVaultContractProperties.cs index af91d8a0f22b8..ffdefe3b070e7 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/KeyVaultContractProperties.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/KeyVaultContractProperties.cs @@ -31,7 +31,7 @@ public KeyVaultContractProperties() /// /// Key vault secret identifier for /// fetching secret. Providing a versioned secret will prevent - /// auto-refresh. This requires Api Management service to be configured + /// auto-refresh. This requires API Management service to be configured /// with aka.ms/apimmsi /// SystemAssignedIdentity or /// UserAssignedIdentity Client Id which will be used to access key diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationContract.cs index 0855e59a37557..a79d4f0d0a358 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationContract.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Api Operation details. + /// API Operation details. /// [Rest.Serialization.JsonTransformation] public partial class OperationContract : Resource diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationEntityBaseContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationEntityBaseContract.cs index ab95926fea771..936877fe071a0 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationEntityBaseContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationEntityBaseContract.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Api Operation Entity Base Contract details. + /// API Operation Entity Base Contract details. /// public partial class OperationEntityBaseContract { diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationTagResourceContractProperties.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationTagResourceContractProperties.cs index b056dedafdfe1..b05c1058411a6 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationTagResourceContractProperties.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationTagResourceContractProperties.cs @@ -34,9 +34,9 @@ public OperationTagResourceContractProperties() /// Identifier of the operation in form /// /operations/{operationId}. /// Operation name. - /// Api Name. - /// Api Revision. - /// Api Version. + /// API Name. + /// API Revision. + /// API Version. /// Operation Description. /// A Valid HTTP Operation Method. Typical Http /// Methods like GET, PUT, POST but not limited by only them. @@ -75,19 +75,19 @@ public OperationTagResourceContractProperties() public string Name { get; private set; } /// - /// Gets api Name. + /// Gets API Name. /// [JsonProperty(PropertyName = "apiName")] public string ApiName { get; private set; } /// - /// Gets api Revision. + /// Gets API Revision. /// [JsonProperty(PropertyName = "apiRevision")] public string ApiRevision { get; private set; } /// - /// Gets api Version. + /// Gets API Version. /// [JsonProperty(PropertyName = "apiVersion")] public string ApiVersion { get; private set; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationUpdateContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationUpdateContract.cs index 36308b97b2a8b..5c475efee7447 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationUpdateContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/OperationUpdateContract.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Api Operation Update Contract details. + /// API Operation Update Contract details. /// [Rest.Serialization.JsonTransformation] public partial class OperationUpdateContract diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ParameterContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ParameterContract.cs index e699fd2443a12..8d242341de7af 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ParameterContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/ParameterContract.cs @@ -39,7 +39,9 @@ public ParameterContract() /// Specifies whether parameter is required or /// not. /// Parameter values. - public ParameterContract(string name, string type, string description = default(string), string defaultValue = default(string), bool? required = default(bool?), IList values = default(IList)) + /// Schema identifier. + /// Type name defined by the schema. + public ParameterContract(string name, string type, string description = default(string), string defaultValue = default(string), bool? required = default(bool?), IList values = default(IList), string schemaId = default(string), string typeName = default(string)) { Name = name; Description = description; @@ -47,6 +49,8 @@ public ParameterContract() DefaultValue = defaultValue; Required = required; Values = values; + SchemaId = schemaId; + TypeName = typeName; CustomInit(); } @@ -91,6 +95,18 @@ public ParameterContract() [JsonProperty(PropertyName = "values")] public IList Values { get; set; } + /// + /// Gets or sets schema identifier. + /// + [JsonProperty(PropertyName = "schemaId")] + public string SchemaId { get; set; } + + /// + /// Gets or sets type name defined by the schema. + /// + [JsonProperty(PropertyName = "typeName")] + public string TypeName { get; set; } + /// /// Validate the object. /// diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/PortalRevisionContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/PortalRevisionContract.cs index 5997b9f7f07f5..0d79266d024f0 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/PortalRevisionContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/PortalRevisionContract.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.ApiManagement.Models using System.Linq; /// - /// Portal revisions contract details. + /// Portal Revision's contract details. /// [Rest.Serialization.JsonTransformation] public partial class PortalRevisionContract : Resource @@ -39,12 +39,12 @@ public PortalRevisionContract() /// Portal revision description. /// Portal revision publishing status /// details. - /// Portal revision publishing status. Possible + /// Status of the portal's revision. Possible /// values include: 'pending', 'publishing', 'completed', /// 'failed' - /// Indicates if the Portal Revision is + /// Indicates if the portal's revision is /// public. - /// Portal revision creation date and + /// Portal's revision creation date and /// time. /// Last updated date and time. public PortalRevisionContract(string id = default(string), string name = default(string), string type = default(string), string description = default(string), string statusDetails = default(string), string status = default(string), bool? isCurrent = default(bool?), System.DateTime? createdDateTime = default(System.DateTime?), System.DateTime? updatedDateTime = default(System.DateTime?)) @@ -77,20 +77,20 @@ public PortalRevisionContract() public string StatusDetails { get; private set; } /// - /// Gets portal revision publishing status. Possible values include: + /// Gets status of the portal's revision. Possible values include: /// 'pending', 'publishing', 'completed', 'failed' /// [JsonProperty(PropertyName = "properties.status")] public string Status { get; private set; } /// - /// Gets or sets indicates if the Portal Revision is public. + /// Gets or sets indicates if the portal's revision is public. /// [JsonProperty(PropertyName = "properties.isCurrent")] public bool? IsCurrent { get; set; } /// - /// Gets portal revision creation date and time. + /// Gets portal's revision creation date and time. /// [JsonProperty(PropertyName = "properties.createdDateTime")] public System.DateTime? CreatedDateTime { get; private set; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/PortalRevisionStatus.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/PortalRevisionStatus.cs index fb095551b2e1b..e10323f961244 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/PortalRevisionStatus.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/PortalRevisionStatus.cs @@ -17,19 +17,19 @@ namespace Microsoft.Azure.Management.ApiManagement.Models public static class PortalRevisionStatus { /// - /// Portal revision publishing is pending + /// Portal's revision has been queued. /// public const string Pending = "pending"; /// - /// Portal revision is publishing + /// Portal's revision is being published. /// public const string Publishing = "publishing"; /// - /// Portal revision publishing completed + /// Portal's revision publishing completed. /// public const string Completed = "completed"; /// - /// Portal revision publishing failed + /// Portal's revision publishing failed. /// public const string Failed = "failed"; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/Protocol.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/Protocol.cs index 839a9c2e139b4..8b2096b0a8aee 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/Protocol.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/Protocol.cs @@ -10,51 +10,15 @@ namespace Microsoft.Azure.Management.ApiManagement.Models { - using Newtonsoft.Json; - using Newtonsoft.Json.Converters; - using System.Runtime; - using System.Runtime.Serialization; /// /// Defines values for Protocol. /// - [JsonConverter(typeof(StringEnumConverter))] - public enum Protocol + public static class Protocol { - [EnumMember(Value = "http")] - Http, - [EnumMember(Value = "https")] - Https - } - internal static class ProtocolEnumExtension - { - internal static string ToSerializedValue(this Protocol? value) - { - return value == null ? null : ((Protocol)value).ToSerializedValue(); - } - - internal static string ToSerializedValue(this Protocol value) - { - switch( value ) - { - case Protocol.Http: - return "http"; - case Protocol.Https: - return "https"; - } - return null; - } - - internal static Protocol? ParseProtocol(this string value) - { - switch( value ) - { - case "http": - return Protocol.Http; - case "https": - return Protocol.Https; - } - return null; - } + public const string Http = "http"; + public const string Https = "https"; + public const string Ws = "ws"; + public const string Wss = "wss"; } } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/SchemaContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/SchemaContract.cs index 55f15d39d2550..e7ce420e9e4fa 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/SchemaContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/SchemaContract.cs @@ -46,17 +46,13 @@ public SchemaContract() /// Resource name. /// Resource type for API Management /// resource. - /// Json escaped string defining the document - /// representing the Schema. Used for schemas other than - /// Swagger/OpenAPI. - /// Types definitions. Used for - /// Swagger/OpenAPI schemas only, null otherwise. - public SchemaContract(string contentType, string id = default(string), string name = default(string), string type = default(string), string value = default(string), object definitions = default(object)) + /// Create or update Properties of the Schema + /// Document. + public SchemaContract(string contentType, string id = default(string), string name = default(string), string type = default(string), object document = default(object)) : base(id, name, type) { ContentType = contentType; - Value = value; - Definitions = definitions; + Document = document; CustomInit(); } @@ -81,18 +77,10 @@ public SchemaContract() public string ContentType { get; set; } /// - /// Gets or sets json escaped string defining the document representing - /// the Schema. Used for schemas other than Swagger/OpenAPI. + /// Gets or sets create or update Properties of the Schema Document. /// - [JsonProperty(PropertyName = "properties.document.value")] - public string Value { get; set; } - - /// - /// Gets or sets types definitions. Used for Swagger/OpenAPI schemas - /// only, null otherwise. - /// - [JsonProperty(PropertyName = "properties.document.definitions")] - public object Definitions { get; set; } + [JsonProperty(PropertyName = "properties.document")] + public object Document { get; set; } /// /// Validate the object. diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/SoapApiType.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/SoapApiType.cs index 4b1af292544f1..0432e489d5c1a 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/SoapApiType.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/SoapApiType.cs @@ -21,8 +21,16 @@ public static class SoapApiType /// public const string SoapToRest = "http"; /// - /// Imports the Soap API having a SOAP front end. + /// Imports the SOAP API having a SOAP front end. /// public const string SoapPassThrough = "soap"; + /// + /// Imports the API having a Websocket front end. + /// + public const string WebSocket = "websocket"; + /// + /// Imports the API having a GraphQL front end. + /// + public const string GraphQL = "graphql"; } } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/TagResourceContract.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/TagResourceContract.cs index ccfdb809b4fc6..cd60ee590140d 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/TagResourceContract.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/Models/TagResourceContract.cs @@ -31,7 +31,7 @@ public TagResourceContract() /// Initializes a new instance of the TagResourceContract class. /// /// Tag associated with the resource. - /// Api associated with the tag. + /// API associated with the tag. /// Operation associated with the tag. /// Product associated with the tag. public TagResourceContract(TagTagResourceContractProperties tag, ApiTagResourceContractProperties api = default(ApiTagResourceContractProperties), OperationTagResourceContractProperties operation = default(OperationTagResourceContractProperties), ProductTagResourceContractProperties product = default(ProductTagResourceContractProperties)) @@ -55,7 +55,7 @@ public TagResourceContract() public TagTagResourceContractProperties Tag { get; set; } /// - /// Gets or sets api associated with the tag. + /// Gets or sets API associated with the tag. /// [JsonProperty(PropertyName = "api")] public ApiTagResourceContractProperties Api { get; set; } diff --git a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/SdkInfo_ApiManagementClient.cs b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/SdkInfo_ApiManagementClient.cs index 33354475b07af..6dda2dd101a63 100644 --- a/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/SdkInfo_ApiManagementClient.cs +++ b/sdk/apimanagement/Microsoft.Azure.Management.ApiManagement/src/Generated/SdkInfo_ApiManagementClient.cs @@ -19,78 +19,78 @@ public static IEnumerable> ApiInfo_ApiManagementCl { return new Tuple[] { - new Tuple("ApiManagement", "Api", "2020-12-01"), - new Tuple("ApiManagement", "ApiDiagnostic", "2020-12-01"), - new Tuple("ApiManagement", "ApiExport", "2020-12-01"), - new Tuple("ApiManagement", "ApiIssue", "2020-12-01"), - new Tuple("ApiManagement", "ApiIssueAttachment", "2020-12-01"), - new Tuple("ApiManagement", "ApiIssueComment", "2020-12-01"), - new Tuple("ApiManagement", "ApiManagementOperations", "2020-12-01"), - new Tuple("ApiManagement", "ApiManagementService", "2020-12-01"), - new Tuple("ApiManagement", "ApiManagementServiceSkus", "2020-12-01"), - new Tuple("ApiManagement", "ApiManagementSkus", "2020-12-01"), - new Tuple("ApiManagement", "ApiOperation", "2020-12-01"), - new Tuple("ApiManagement", "ApiOperationPolicy", "2020-12-01"), - new Tuple("ApiManagement", "ApiPolicy", "2020-12-01"), - new Tuple("ApiManagement", "ApiProduct", "2020-12-01"), - new Tuple("ApiManagement", "ApiRelease", "2020-12-01"), - new Tuple("ApiManagement", "ApiRevision", "2020-12-01"), - new Tuple("ApiManagement", "ApiSchema", "2020-12-01"), - new Tuple("ApiManagement", "ApiTagDescription", "2020-12-01"), - new Tuple("ApiManagement", "ApiVersionSet", "2020-12-01"), - new Tuple("ApiManagement", "AuthorizationServer", "2020-12-01"), - new Tuple("ApiManagement", "Backend", "2020-12-01"), - new Tuple("ApiManagement", "Cache", "2020-12-01"), - new Tuple("ApiManagement", "Certificate", "2020-12-01"), - new Tuple("ApiManagement", "ContentItem", "2020-12-01"), - new Tuple("ApiManagement", "ContentType", "2020-12-01"), - new Tuple("ApiManagement", "DelegationSettings", "2020-12-01"), - new Tuple("ApiManagement", "DeletedServices", "2020-12-01"), - new Tuple("ApiManagement", "Diagnostic", "2020-12-01"), - new Tuple("ApiManagement", "EmailTemplate", "2020-12-01"), - new Tuple("ApiManagement", "Gateway", "2020-12-01"), - new Tuple("ApiManagement", "GatewayApi", "2020-12-01"), - new Tuple("ApiManagement", "GatewayCertificateAuthority", "2020-12-01"), - new Tuple("ApiManagement", "GatewayHostnameConfiguration", "2020-12-01"), - new Tuple("ApiManagement", "Group", "2020-12-01"), - new Tuple("ApiManagement", "GroupUser", "2020-12-01"), - new Tuple("ApiManagement", "IdentityProvider", "2020-12-01"), - new Tuple("ApiManagement", "Issue", "2020-12-01"), - new Tuple("ApiManagement", "Logger", "2020-12-01"), - new Tuple("ApiManagement", "NamedValue", "2020-12-01"), - new Tuple("ApiManagement", "NetworkStatus", "2020-12-01"), - new Tuple("ApiManagement", "Notification", "2020-12-01"), - new Tuple("ApiManagement", "NotificationRecipientEmail", "2020-12-01"), - new Tuple("ApiManagement", "NotificationRecipientUser", "2020-12-01"), - new Tuple("ApiManagement", "OpenIdConnectProvider", "2020-12-01"), - new Tuple("ApiManagement", "Operation", "2020-12-01"), - new Tuple("ApiManagement", "Policy", "2020-12-01"), - new Tuple("ApiManagement", "PolicyDescription", "2020-12-01"), - new Tuple("ApiManagement", "PortalRevision", "2020-12-01"), - new Tuple("ApiManagement", "PortalSettings", "2020-12-01"), - new Tuple("ApiManagement", "Product", "2020-12-01"), - new Tuple("ApiManagement", "ProductApi", "2020-12-01"), - new Tuple("ApiManagement", "ProductGroup", "2020-12-01"), - new Tuple("ApiManagement", "ProductPolicy", "2020-12-01"), - new Tuple("ApiManagement", "ProductSubscriptions", "2020-12-01"), - new Tuple("ApiManagement", "QuotaByCounterKeys", "2020-12-01"), - new Tuple("ApiManagement", "QuotaByPeriodKeys", "2020-12-01"), - new Tuple("ApiManagement", "Region", "2020-12-01"), - new Tuple("ApiManagement", "Reports", "2020-12-01"), - new Tuple("ApiManagement", "SignInSettings", "2020-12-01"), - new Tuple("ApiManagement", "SignUpSettings", "2020-12-01"), - new Tuple("ApiManagement", "Subscription", "2020-12-01"), - new Tuple("ApiManagement", "Tag", "2020-12-01"), - new Tuple("ApiManagement", "TagResource", "2020-12-01"), - new Tuple("ApiManagement", "TenantAccess", "2020-12-01"), - new Tuple("ApiManagement", "TenantAccessGit", "2020-12-01"), - new Tuple("ApiManagement", "TenantConfiguration", "2020-12-01"), - new Tuple("ApiManagement", "TenantSettings", "2020-12-01"), - new Tuple("ApiManagement", "User", "2020-12-01"), - new Tuple("ApiManagement", "UserConfirmationPassword", "2020-12-01"), - new Tuple("ApiManagement", "UserGroup", "2020-12-01"), - new Tuple("ApiManagement", "UserIdentities", "2020-12-01"), - new Tuple("ApiManagement", "UserSubscription", "2020-12-01"), + new Tuple("ApiManagement", "Api", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiDiagnostic", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiExport", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiIssue", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiIssueAttachment", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiIssueComment", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiManagementOperations", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiManagementService", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiManagementServiceSkus", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiManagementSkus", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiOperation", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiOperationPolicy", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiPolicy", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiProduct", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiRelease", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiRevision", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiSchema", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiTagDescription", "2021-04-01-preview"), + new Tuple("ApiManagement", "ApiVersionSet", "2021-04-01-preview"), + new Tuple("ApiManagement", "AuthorizationServer", "2021-04-01-preview"), + new Tuple("ApiManagement", "Backend", "2021-04-01-preview"), + new Tuple("ApiManagement", "Cache", "2021-04-01-preview"), + new Tuple("ApiManagement", "Certificate", "2021-04-01-preview"), + new Tuple("ApiManagement", "ContentItem", "2021-04-01-preview"), + new Tuple("ApiManagement", "ContentType", "2021-04-01-preview"), + new Tuple("ApiManagement", "DelegationSettings", "2021-04-01-preview"), + new Tuple("ApiManagement", "DeletedServices", "2021-04-01-preview"), + new Tuple("ApiManagement", "Diagnostic", "2021-04-01-preview"), + new Tuple("ApiManagement", "EmailTemplate", "2021-04-01-preview"), + new Tuple("ApiManagement", "Gateway", "2021-04-01-preview"), + new Tuple("ApiManagement", "GatewayApi", "2021-04-01-preview"), + new Tuple("ApiManagement", "GatewayCertificateAuthority", "2021-04-01-preview"), + new Tuple("ApiManagement", "GatewayHostnameConfiguration", "2021-04-01-preview"), + new Tuple("ApiManagement", "Group", "2021-04-01-preview"), + new Tuple("ApiManagement", "GroupUser", "2021-04-01-preview"), + new Tuple("ApiManagement", "IdentityProvider", "2021-04-01-preview"), + new Tuple("ApiManagement", "Issue", "2021-04-01-preview"), + new Tuple("ApiManagement", "Logger", "2021-04-01-preview"), + new Tuple("ApiManagement", "NamedValue", "2021-04-01-preview"), + new Tuple("ApiManagement", "NetworkStatus", "2021-04-01-preview"), + new Tuple("ApiManagement", "Notification", "2021-04-01-preview"), + new Tuple("ApiManagement", "NotificationRecipientEmail", "2021-04-01-preview"), + new Tuple("ApiManagement", "NotificationRecipientUser", "2021-04-01-preview"), + new Tuple("ApiManagement", "OpenIdConnectProvider", "2021-04-01-preview"), + new Tuple("ApiManagement", "Operation", "2021-04-01-preview"), + new Tuple("ApiManagement", "Policy", "2021-04-01-preview"), + new Tuple("ApiManagement", "PolicyDescription", "2021-04-01-preview"), + new Tuple("ApiManagement", "PortalRevision", "2021-04-01-preview"), + new Tuple("ApiManagement", "PortalSettings", "2021-04-01-preview"), + new Tuple("ApiManagement", "Product", "2021-04-01-preview"), + new Tuple("ApiManagement", "ProductApi", "2021-04-01-preview"), + new Tuple("ApiManagement", "ProductGroup", "2021-04-01-preview"), + new Tuple("ApiManagement", "ProductPolicy", "2021-04-01-preview"), + new Tuple("ApiManagement", "ProductSubscriptions", "2021-04-01-preview"), + new Tuple("ApiManagement", "QuotaByCounterKeys", "2021-04-01-preview"), + new Tuple("ApiManagement", "QuotaByPeriodKeys", "2021-04-01-preview"), + new Tuple("ApiManagement", "Region", "2021-04-01-preview"), + new Tuple("ApiManagement", "Reports", "2021-04-01-preview"), + new Tuple("ApiManagement", "SignInSettings", "2021-04-01-preview"), + new Tuple("ApiManagement", "SignUpSettings", "2021-04-01-preview"), + new Tuple("ApiManagement", "Subscription", "2021-04-01-preview"), + new Tuple("ApiManagement", "Tag", "2021-04-01-preview"), + new Tuple("ApiManagement", "TagResource", "2021-04-01-preview"), + new Tuple("ApiManagement", "TenantAccess", "2021-04-01-preview"), + new Tuple("ApiManagement", "TenantAccessGit", "2021-04-01-preview"), + new Tuple("ApiManagement", "TenantConfiguration", "2021-04-01-preview"), + new Tuple("ApiManagement", "TenantSettings", "2021-04-01-preview"), + new Tuple("ApiManagement", "User", "2021-04-01-preview"), + new Tuple("ApiManagement", "UserConfirmationPassword", "2021-04-01-preview"), + new Tuple("ApiManagement", "UserGroup", "2021-04-01-preview"), + new Tuple("ApiManagement", "UserIdentities", "2021-04-01-preview"), + new Tuple("ApiManagement", "UserSubscription", "2021-04-01-preview"), }.AsEnumerable(); } }