Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SDKs/Cdn/AzSdk.RP.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>Cdn_2017-10-12;</AzureApiTag>
<AzureApiTag>Cdn_2019-04-15;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions src/SDKs/Cdn/Management.Cdn/Generated/CdnManagementClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ private void Initialize()
Operations = new Operations(this);
EdgeNodes = new EdgeNodesOperations(this);
BaseUri = new System.Uri("https://management.azure.com");
ApiVersion = "2017-10-12";
ApiVersion = "2019-04-15";
AcceptLanguage = "en-US";
LongRunningOperationRetryTimeout = 30;
GenerateClientRequestId = true;
Expand Down Expand Up @@ -393,10 +393,10 @@ private void Initialize()
new Iso8601TimeSpanConverter()
}
};
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<DeliveryRuleAction>("name"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DeliveryRuleAction>("name"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<DeliveryRuleCondition>("name"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DeliveryRuleCondition>("name"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<DeliveryRuleAction>("name"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DeliveryRuleAction>("name"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CustomDomainHttpsParameters>("certificateSource"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CustomDomainHttpsParameters>("certificateSource"));
CustomInitialize();
Expand Down
31 changes: 1 addition & 30 deletions src/SDKs/Cdn/Management.Cdn/Generated/CustomDomainsOperations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -772,28 +772,6 @@ internal CustomDomainsOperations(CdnManagementClient client)
return _result;
}

public async Task<AzureOperationResponse<CustomDomain>> EnableCustomHttpsWithHttpMessagesAsync(
string resourceGroupName,
string profileName,
string endpointName,
string customDomainName,
CustomDomainHttpsParameters customDomainHttpsParameters = default(CustomDomainHttpsParameters),
Dictionary<string, List<string>> customHeaders = null,
CancellationToken cancellationToken = default(CancellationToken))
{
// Send request
AzureOperationResponse<CustomDomain> _response = await BeginEnableCustomHttpsWithHttpMessagesAsync(
resourceGroupName,
profileName,
endpointName,
customDomainName,
customDomainHttpsParameters,
customHeaders,
cancellationToken)
.ConfigureAwait(false);
return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
}

/// <summary>
/// Enable https delivery of the custom domain.
/// </summary>
Expand Down Expand Up @@ -835,14 +813,7 @@ public async Task<AzureOperationResponse<CustomDomain>> EnableCustomHttpsWithHtt
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<AzureOperationResponse<CustomDomain>> BeginEnableCustomHttpsWithHttpMessagesAsync(
string resourceGroupName,
string profileName,
string endpointName,
string customDomainName,
CustomDomainHttpsParameters customDomainHttpsParameters = default(CustomDomainHttpsParameters),
Dictionary<string, List<string>> customHeaders = null,
CancellationToken cancellationToken = default(CancellationToken))
public async Task<AzureOperationResponse<CustomDomain>> EnableCustomHttpsWithHttpMessagesAsync(string resourceGroupName, string profileName, string endpointName, string customDomainName, CustomDomainHttpsParameters customDomainHttpsParameters = default(CustomDomainHttpsParameters), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
{
if (resourceGroupName == null)
{
Expand Down
23 changes: 23 additions & 0 deletions src/SDKs/Cdn/Management.Cdn/Generated/Models/CacheBehavior.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// <auto-generated>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for
// license information.
//
// Code generated by Microsoft (R) AutoRest Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>

namespace Microsoft.Azure.Management.Cdn.Models
{

/// <summary>
/// Defines values for CacheBehavior.
/// </summary>
public static class CacheBehavior
{
public const string BypassCache = "BypassCache";
public const string Override = "Override";
public const string SetIfMissing = "SetIfMissing";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ public CacheExpirationActionParameters()
/// Initializes a new instance of the CacheExpirationActionParameters
/// class.
/// </summary>
/// <param name="cacheBehavior">Caching behavior for the requests that
/// include query strings. Possible values include: 'BypassCache',
/// 'Override', 'SetIfMissing'</param>
/// <param name="cacheBehavior">Caching behavior for the requests.
/// Possible values include: 'BypassCache', 'Override',
/// 'SetIfMissing'</param>
/// <param name="cacheDuration">The duration for which the content
/// needs to be cached. Allowed format is [d.]hh:mm:ss</param>
public CacheExpirationActionParameters(string cacheBehavior, string cacheDuration = default(string))
Expand All @@ -48,7 +48,7 @@ public CacheExpirationActionParameters()
/// </summary>
static CacheExpirationActionParameters()
{
Odatatype = "Microsoft.Azure.Cdn.Models.DeliveryRuleCacheExpirationActionParameters";
Odatatype = "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheExpirationActionParameters";
CacheType = "All";
}

Expand All @@ -58,9 +58,8 @@ static CacheExpirationActionParameters()
partial void CustomInit();

/// <summary>
/// Gets or sets caching behavior for the requests that include query
/// strings. Possible values include: 'BypassCache', 'Override',
/// 'SetIfMissing'
/// Gets or sets caching behavior for the requests. Possible values
/// include: 'BypassCache', 'Override', 'SetIfMissing'
/// </summary>
[JsonProperty(PropertyName = "cacheBehavior")]
public string CacheBehavior { get; set; }
Expand Down
30 changes: 21 additions & 9 deletions src/SDKs/Cdn/Management.Cdn/Generated/Models/DeliveryRule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public DeliveryRule()
/// <summary>
/// Initializes a new instance of the DeliveryRule class.
/// </summary>
/// <param name="name">Name of the rule</param>
/// <param name="order">The order in which the rules are applied for
/// the endpoint. Possible values {0,1,2,3,………}. A rule with a lesser
/// order will be applied before a rule with a greater order. Rule with
Expand All @@ -41,11 +42,12 @@ public DeliveryRule()
/// the conditions of a rule are satisfied.</param>
/// <param name="conditions">A list of conditions that must be matched
/// for the actions to be executed</param>
public DeliveryRule(int order, IList<DeliveryRuleAction> actions, IList<DeliveryRuleCondition> conditions = default(IList<DeliveryRuleCondition>))
public DeliveryRule(string name, int order, IList<DeliveryRuleAction> actions, IList<DeliveryRuleCondition> conditions = default(IList<DeliveryRuleCondition>))
{
Name = name;
Order = order;
Actions = actions;
Conditions = conditions;
Actions = actions;
CustomInit();
}

Expand All @@ -54,6 +56,12 @@ public DeliveryRule()
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets name of the rule
/// </summary>
[JsonProperty(PropertyName = "name")]
public string Name { get; set; }

/// <summary>
/// Gets or sets the order in which the rules are applied for the
/// endpoint. Possible values {0,1,2,3,………}. A rule with a lesser order
Expand All @@ -64,20 +72,20 @@ public DeliveryRule()
[JsonProperty(PropertyName = "order")]
public int Order { get; set; }

/// <summary>
/// Gets or sets a list of actions that are executed when all the
/// conditions of a rule are satisfied.
/// </summary>
[JsonProperty(PropertyName = "actions")]
public IList<DeliveryRuleAction> Actions { get; set; }

/// <summary>
/// Gets or sets a list of conditions that must be matched for the
/// actions to be executed
/// </summary>
[JsonProperty(PropertyName = "conditions")]
public IList<DeliveryRuleCondition> Conditions { get; set; }

/// <summary>
/// Gets or sets a list of actions that are executed when all the
/// conditions of a rule are satisfied.
/// </summary>
[JsonProperty(PropertyName = "actions")]
public IList<DeliveryRuleAction> Actions { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
Expand All @@ -86,6 +94,10 @@ public DeliveryRule()
/// </exception>
public virtual void Validate()
{
if (Name == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "Name");
}
if (Actions == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "Actions");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// <auto-generated>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for
// license information.
//
// Code generated by Microsoft (R) AutoRest Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>

namespace Microsoft.Azure.Management.Cdn.Models
{
using Microsoft.Rest;
using Newtonsoft.Json;
using System.Linq;

/// <summary>
/// Defines the IsDevice condition for the delivery rule.
/// </summary>
[Newtonsoft.Json.JsonObject("IsDevice")]
public partial class DeliveryRuleIsDeviceCondition : DeliveryRuleCondition
{
/// <summary>
/// Initializes a new instance of the DeliveryRuleIsDeviceCondition
/// class.
/// </summary>
public DeliveryRuleIsDeviceCondition()
{
Parameters = new IsDeviceMatchConditionParameters();
CustomInit();
}

/// <summary>
/// Initializes a new instance of the DeliveryRuleIsDeviceCondition
/// class.
/// </summary>
/// <param name="parameters">Defines the parameters for the
/// condition.</param>
public DeliveryRuleIsDeviceCondition(IsDeviceMatchConditionParameters parameters)
{
Parameters = parameters;
CustomInit();
}

/// <summary>
/// An initialization method that performs custom operations like setting defaults
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets defines the parameters for the condition.
/// </summary>
[JsonProperty(PropertyName = "parameters")]
public IsDeviceMatchConditionParameters Parameters { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="ValidationException">
/// Thrown if validation fails
/// </exception>
public virtual void Validate()
{
if (Parameters == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "Parameters");
}
if (Parameters != null)
{
Parameters.Validate();
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// <auto-generated>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for
// license information.
//
// Code generated by Microsoft (R) AutoRest Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>

namespace Microsoft.Azure.Management.Cdn.Models
{
using Microsoft.Rest;
using Newtonsoft.Json;
using System.Linq;

/// <summary>
/// Defines the PostArgs condition for the delivery rule.
/// </summary>
[Newtonsoft.Json.JsonObject("PostArgs")]
public partial class DeliveryRulePostArgsCondition : DeliveryRuleCondition
{
/// <summary>
/// Initializes a new instance of the DeliveryRulePostArgsCondition
/// class.
/// </summary>
public DeliveryRulePostArgsCondition()
{
Parameters = new PostArgsMatchConditionParameters();
CustomInit();
}

/// <summary>
/// Initializes a new instance of the DeliveryRulePostArgsCondition
/// class.
/// </summary>
/// <param name="parameters">Defines the parameters for the
/// condition.</param>
public DeliveryRulePostArgsCondition(PostArgsMatchConditionParameters parameters)
{
Parameters = parameters;
CustomInit();
}

/// <summary>
/// An initialization method that performs custom operations like setting defaults
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets defines the parameters for the condition.
/// </summary>
[JsonProperty(PropertyName = "parameters")]
public PostArgsMatchConditionParameters Parameters { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="ValidationException">
/// Thrown if validation fails
/// </exception>
public virtual void Validate()
{
if (Parameters == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "Parameters");
}
if (Parameters != null)
{
Parameters.Validate();
}
}
}
}
Loading