diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/CHANGELOG.md b/sdk/datafactory/Azure.ResourceManager.DataFactory/CHANGELOG.md index e6d225c932615..fadef0634f308 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/CHANGELOG.md +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/CHANGELOG.md @@ -1,17 +1,15 @@ # Release History -## 1.0.0-beta.4 (Unreleased) +## 1.0.0-beta.4 (2023-09-26) ### Features Added -### Breaking Changes +- Upgraded API version. ### Bugs Fixed - Fixed an issue that exception throws when `Uri` type field is empty during deserialization of `SelfHostedIntegrationRuntimeStatus`. -### Other Changes - ## 1.0.0-beta.3 (2023-08-02) ### Features Added diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/api/Azure.ResourceManager.DataFactory.netstandard2.0.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/api/Azure.ResourceManager.DataFactory.netstandard2.0.cs index 75befcd49329f..d57c90b45d607 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/api/Azure.ResourceManager.DataFactory.netstandard2.0.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/api/Azure.ResourceManager.DataFactory.netstandard2.0.cs @@ -5504,6 +5504,8 @@ public partial class PipelineExternalComputeScaleProperties { public PipelineExternalComputeScaleProperties() { } public System.Collections.Generic.IDictionary AdditionalProperties { get { throw null; } } + public int? NumberOfExternalNodes { get { throw null; } set { } } + public int? NumberOfPipelineNodes { get { throw null; } set { } } public int? TimeToLive { get { throw null; } set { } } } public partial class PipelineVariableSpecification @@ -6373,6 +6375,7 @@ public SelfDependencyTumblingWindowTriggerReference(string offset) { } public partial class SelfHostedIntegrationRuntime : Azure.ResourceManager.DataFactory.Models.DataFactoryIntegrationRuntimeProperties { public SelfHostedIntegrationRuntime() { } + public bool? IsSelfContainedInteractiveAuthoringEnabled { get { throw null; } set { } } public Azure.ResourceManager.DataFactory.Models.LinkedIntegrationRuntimeType LinkedInfo { get { throw null; } set { } } } public partial class SelfHostedIntegrationRuntimeNode @@ -6429,6 +6432,7 @@ internal SelfHostedIntegrationRuntimeStatus() { } public System.Collections.Generic.IReadOnlyDictionary Capabilities { get { throw null; } } public System.DateTimeOffset? CreatedOn { get { throw null; } } public Azure.ResourceManager.DataFactory.Models.IntegrationRuntimeInternalChannelEncryptionMode? InternalChannelEncryption { get { throw null; } } + public bool? IsSelfContainedInteractiveAuthoringEnabled { get { throw null; } } public string LatestVersion { get { throw null; } } public System.Collections.Generic.IReadOnlyList Links { get { throw null; } } public System.TimeSpan? LocalTimeZoneOffset { get { throw null; } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs index edbc1b48e12c3..134f54ce15237 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs @@ -22,6 +22,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("timeToLive"u8); writer.WriteNumberValue(TimeToLive.Value); } + if (Optional.IsDefined(NumberOfPipelineNodes)) + { + writer.WritePropertyName("numberOfPipelineNodes"u8); + writer.WriteNumberValue(NumberOfPipelineNodes.Value); + } + if (Optional.IsDefined(NumberOfExternalNodes)) + { + writer.WritePropertyName("numberOfExternalNodes"u8); + writer.WriteNumberValue(NumberOfExternalNodes.Value); + } foreach (var item in AdditionalProperties) { writer.WritePropertyName(item.Key); @@ -41,6 +51,8 @@ internal static PipelineExternalComputeScaleProperties DeserializePipelineExtern return null; } Optional timeToLive = default; + Optional numberOfPipelineNodes = default; + Optional numberOfExternalNodes = default; IDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -54,10 +66,28 @@ internal static PipelineExternalComputeScaleProperties DeserializePipelineExtern timeToLive = property.Value.GetInt32(); continue; } + if (property.NameEquals("numberOfPipelineNodes"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + numberOfPipelineNodes = property.Value.GetInt32(); + continue; + } + if (property.NameEquals("numberOfExternalNodes"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + numberOfExternalNodes = property.Value.GetInt32(); + continue; + } additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } additionalProperties = additionalPropertiesDictionary; - return new PipelineExternalComputeScaleProperties(Optional.ToNullable(timeToLive), additionalProperties); + return new PipelineExternalComputeScaleProperties(Optional.ToNullable(timeToLive), Optional.ToNullable(numberOfPipelineNodes), Optional.ToNullable(numberOfExternalNodes), additionalProperties); } } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.cs index dffea819a6195..19c1f236c1f07 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/PipelineExternalComputeScaleProperties.cs @@ -22,15 +22,23 @@ public PipelineExternalComputeScaleProperties() /// Initializes a new instance of PipelineExternalComputeScaleProperties. /// Time to live (in minutes) setting of integration runtime which will execute pipeline and external activity. + /// Number of the pipeline nodes, which should be greater than 0 and less than 11. + /// Number of the the external nodes, which should be greater than 0 and less than 11. /// Additional Properties. - internal PipelineExternalComputeScaleProperties(int? timeToLive, IDictionary additionalProperties) + internal PipelineExternalComputeScaleProperties(int? timeToLive, int? numberOfPipelineNodes, int? numberOfExternalNodes, IDictionary additionalProperties) { TimeToLive = timeToLive; + NumberOfPipelineNodes = numberOfPipelineNodes; + NumberOfExternalNodes = numberOfExternalNodes; AdditionalProperties = additionalProperties; } /// Time to live (in minutes) setting of integration runtime which will execute pipeline and external activity. public int? TimeToLive { get; set; } + /// Number of the pipeline nodes, which should be greater than 0 and less than 11. + public int? NumberOfPipelineNodes { get; set; } + /// Number of the the external nodes, which should be greater than 0 and less than 11. + public int? NumberOfExternalNodes { get; set; } /// /// Additional Properties /// diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntime.Serialization.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntime.Serialization.cs index f6227f49d9ea8..3ae2ba5fa51cc 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntime.Serialization.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntime.Serialization.cs @@ -31,6 +31,11 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("linkedInfo"u8); writer.WriteObjectValue(LinkedInfo); } + if (Optional.IsDefined(IsSelfContainedInteractiveAuthoringEnabled)) + { + writer.WritePropertyName("selfContainedInteractiveAuthoringEnabled"u8); + writer.WriteBooleanValue(IsSelfContainedInteractiveAuthoringEnabled.Value); + } writer.WriteEndObject(); foreach (var item in AdditionalProperties) { @@ -53,6 +58,7 @@ internal static SelfHostedIntegrationRuntime DeserializeSelfHostedIntegrationRun IntegrationRuntimeType type = default; Optional description = default; Optional linkedInfo = default; + Optional selfContainedInteractiveAuthoringEnabled = default; IDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -85,13 +91,22 @@ internal static SelfHostedIntegrationRuntime DeserializeSelfHostedIntegrationRun linkedInfo = LinkedIntegrationRuntimeType.DeserializeLinkedIntegrationRuntimeType(property0.Value); continue; } + if (property0.NameEquals("selfContainedInteractiveAuthoringEnabled"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + selfContainedInteractiveAuthoringEnabled = property0.Value.GetBoolean(); + continue; + } } continue; } additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } additionalProperties = additionalPropertiesDictionary; - return new SelfHostedIntegrationRuntime(type, description.Value, additionalProperties, linkedInfo.Value); + return new SelfHostedIntegrationRuntime(type, description.Value, additionalProperties, linkedInfo.Value, Optional.ToNullable(selfContainedInteractiveAuthoringEnabled)); } } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntime.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntime.cs index fe0b6424d6089..bf65a9d72d21c 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntime.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntime.cs @@ -28,9 +28,11 @@ public SelfHostedIntegrationRuntime() /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include and . /// - internal SelfHostedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary additionalProperties, LinkedIntegrationRuntimeType linkedInfo) : base(integrationRuntimeType, description, additionalProperties) + /// An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay. + internal SelfHostedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary additionalProperties, LinkedIntegrationRuntimeType linkedInfo, bool? isSelfContainedInteractiveAuthoringEnabled) : base(integrationRuntimeType, description, additionalProperties) { LinkedInfo = linkedInfo; + IsSelfContainedInteractiveAuthoringEnabled = isSelfContainedInteractiveAuthoringEnabled; IntegrationRuntimeType = integrationRuntimeType; } @@ -40,5 +42,7 @@ internal SelfHostedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeT /// The available derived classes include and . /// public LinkedIntegrationRuntimeType LinkedInfo { get; set; } + /// An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay. + public bool? IsSelfContainedInteractiveAuthoringEnabled { get; set; } } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntimeStatus.Serialization.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntimeStatus.Serialization.cs index 8f02a7619dc43..9dbbeb6ddddf2 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntimeStatus.Serialization.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntimeStatus.Serialization.cs @@ -39,6 +39,7 @@ internal static SelfHostedIntegrationRuntimeStatus DeserializeSelfHostedIntegrat Optional pushedVersion = default; Optional latestVersion = default; Optional autoUpdateEta = default; + Optional selfContainedInteractiveAuthoringEnabled = default; IReadOnlyDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -219,13 +220,22 @@ internal static SelfHostedIntegrationRuntimeStatus DeserializeSelfHostedIntegrat autoUpdateEta = property0.Value.GetDateTimeOffset("O"); continue; } + if (property0.NameEquals("selfContainedInteractiveAuthoringEnabled"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + selfContainedInteractiveAuthoringEnabled = property0.Value.GetBoolean(); + continue; + } } continue; } additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } additionalProperties = additionalPropertiesDictionary; - return new SelfHostedIntegrationRuntimeStatus(type, dataFactoryName.Value, Optional.ToNullable(state), additionalProperties, Optional.ToNullable(createTime), Optional.ToNullable(taskQueueId), Optional.ToNullable(internalChannelEncryption), version.Value, Optional.ToList(nodes), Optional.ToNullable(scheduledUpdateDate), Optional.ToNullable(updateDelayOffset), Optional.ToNullable(localTimeZoneOffset), Optional.ToDictionary(capabilities), Optional.ToList(serviceUrls), Optional.ToNullable(autoUpdate), versionStatus.Value, Optional.ToList(links), pushedVersion.Value, latestVersion.Value, Optional.ToNullable(autoUpdateEta)); + return new SelfHostedIntegrationRuntimeStatus(type, dataFactoryName.Value, Optional.ToNullable(state), additionalProperties, Optional.ToNullable(createTime), Optional.ToNullable(taskQueueId), Optional.ToNullable(internalChannelEncryption), version.Value, Optional.ToList(nodes), Optional.ToNullable(scheduledUpdateDate), Optional.ToNullable(updateDelayOffset), Optional.ToNullable(localTimeZoneOffset), Optional.ToDictionary(capabilities), Optional.ToList(serviceUrls), Optional.ToNullable(autoUpdate), versionStatus.Value, Optional.ToList(links), pushedVersion.Value, latestVersion.Value, Optional.ToNullable(autoUpdateEta), Optional.ToNullable(selfContainedInteractiveAuthoringEnabled)); } } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs index f1af80f603cb7..ff3d33d40445e 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SelfHostedIntegrationRuntimeStatus.cs @@ -45,7 +45,8 @@ internal SelfHostedIntegrationRuntimeStatus() /// The version that the integration runtime is going to update to. /// The latest version on download center. /// The estimated time when the self-hosted integration runtime will be updated. - internal SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary additionalProperties, DateTimeOffset? createdOn, Guid? taskQueueId, IntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption, string version, IReadOnlyList nodes, DateTimeOffset? scheduledUpdateOn, TimeSpan? updateDelayOffset, TimeSpan? localTimeZoneOffset, IReadOnlyDictionary capabilities, IReadOnlyList serviceUriStringList, IntegrationRuntimeAutoUpdateState? autoUpdate, string versionStatus, IReadOnlyList links, string pushedVersion, string latestVersion, DateTimeOffset? autoUpdateEta) : base(runtimeType, dataFactoryName, state, additionalProperties) + /// An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay. + internal SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, IntegrationRuntimeState? state, IReadOnlyDictionary additionalProperties, DateTimeOffset? createdOn, Guid? taskQueueId, IntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption, string version, IReadOnlyList nodes, DateTimeOffset? scheduledUpdateOn, TimeSpan? updateDelayOffset, TimeSpan? localTimeZoneOffset, IReadOnlyDictionary capabilities, IReadOnlyList serviceUriStringList, IntegrationRuntimeAutoUpdateState? autoUpdate, string versionStatus, IReadOnlyList links, string pushedVersion, string latestVersion, DateTimeOffset? autoUpdateEta, bool? isSelfContainedInteractiveAuthoringEnabled) : base(runtimeType, dataFactoryName, state, additionalProperties) { CreatedOn = createdOn; TaskQueueId = taskQueueId; @@ -63,6 +64,7 @@ internal SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, PushedVersion = pushedVersion; LatestVersion = latestVersion; AutoUpdateEta = autoUpdateEta; + IsSelfContainedInteractiveAuthoringEnabled = isSelfContainedInteractiveAuthoringEnabled; RuntimeType = runtimeType; } @@ -98,5 +100,7 @@ internal SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, public string LatestVersion { get; } /// The estimated time when the self-hosted integration runtime will be updated. public DateTimeOffset? AutoUpdateEta { get; } + /// An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay. + public bool? IsSelfContainedInteractiveAuthoringEnabled { get; } } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/autorest.md b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/autorest.md index 43e391a961b1a..31a52edce5339 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/autorest.md +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/autorest.md @@ -9,7 +9,7 @@ generate-model-factory: false csharp: true library-name: DataFactory namespace: Azure.ResourceManager.DataFactory -require: https://github.com/Azure/azure-rest-api-specs/blob/6885351bec8d6a2cea85c5aa793e53616e5f517b/specification/datafactory/resource-manager/readme.md +require: https://github.com/Azure/azure-rest-api-specs/blob/24c9b5a8982cb081662b27ef8ab93da3389b0160/specification/datafactory/resource-manager/readme.md output-folder: $(this-folder)/Generated clear-output-folder: true sample-gen: @@ -214,8 +214,10 @@ rename-mapping: SecretBase: DataFactorySecret SecureInputOutputPolicy.secureInput: IsSecureInputEnabled SecureInputOutputPolicy.secureOutput: IsSecureOutputEnabled - SelfHostedIntegrationRuntimeStatus.typeProperties.createTime: CreatedOn + SelfHostedIntegrationRuntime.typeProperties.selfContainedInteractiveAuthoringEnabled: IsSelfContainedInteractiveAuthoringEnabled SelfHostedIntegrationRuntimeNode.expiryTime: ExpireOn + SelfHostedIntegrationRuntimeStatus.typeProperties.createTime: CreatedOn + SelfHostedIntegrationRuntimeStatus.typeProperties.selfContainedInteractiveAuthoringEnabled: IsSelfContainedInteractiveAuthoringEnabled SelfHostedIntegrationRuntimeStatus.typeProperties.taskQueueId: -|uuid SelfHostedIntegrationRuntimeStatus.typeProperties.serviceUrls: ServiceUriStringList SubResourceDebugResource: DataFactoryDebugInfo