diff --git a/sdk/resourcemanager/ci.mgmt.yml b/sdk/resourcemanager/ci.mgmt.yml index d8bf790b5988..f28c28a5d39c 100644 --- a/sdk/resourcemanager/ci.mgmt.yml +++ b/sdk/resourcemanager/ci.mgmt.yml @@ -79,7 +79,6 @@ trigger: - sdk/dnsresolver/Azure.ResourceManager.DnsResolver - sdk/dynatrace/Azure.ResourceManager.Dynatrace - sdk/edgeorder/Azure.ResourceManager.EdgeOrder - - sdk/iotoperations/Azure.ResourceManager.IotOperations - sdk/edgezones/Azure.ResourceManager.EdgeZones - sdk/elastic/Azure.ResourceManager.Elastic - sdk/elasticsan/Azure.ResourceManager.ElasticSan @@ -108,6 +107,7 @@ trigger: - sdk/iot/Azure.ResourceManager.IotFirmwareDefense - sdk/iotcentral/Azure.ResourceManager.IotCentral - sdk/iothub/Azure.ResourceManager.IotHub + - sdk/iotoperations/Azure.ResourceManager.IotOperations - sdk/keyvault/Azure.ResourceManager.KeyVault - sdk/kubernetesconfiguration/Azure.ResourceManager.KubernetesConfiguration - sdk/kusto/Azure.ResourceManager.Kusto @@ -285,7 +285,6 @@ pr: - sdk/dnsresolver/Azure.ResourceManager.DnsResolver - sdk/dynatrace/Azure.ResourceManager.Dynatrace - sdk/edgeorder/Azure.ResourceManager.EdgeOrder - - sdk/iotoperations/Azure.ResourceManager.IotOperations - sdk/edgezones/Azure.ResourceManager.EdgeZones - sdk/elastic/Azure.ResourceManager.Elastic - sdk/elasticsan/Azure.ResourceManager.ElasticSan @@ -314,6 +313,7 @@ pr: - sdk/iot/Azure.ResourceManager.IotFirmwareDefense - sdk/iotcentral/Azure.ResourceManager.IotCentral - sdk/iothub/Azure.ResourceManager.IotHub + - sdk/iotoperations/Azure.ResourceManager.IotOperations - sdk/keyvault/Azure.ResourceManager.KeyVault - sdk/kubernetesconfiguration/Azure.ResourceManager.KubernetesConfiguration - sdk/kusto/Azure.ResourceManager.Kusto diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 2ca0501b60bd..4e749e6b85b1 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -12,6 +12,8 @@ trigger: - sdk/storage/Azure.Storage.DataMovement/ - sdk/storage/Azure.Storage.DataMovement.Blobs/ - sdk/storage/Azure.Storage.DataMovement.Files/ + exclude: + - sdk/storage/Azure.ResourceManager.Storage/ - sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/ exclude: - sdk/storage/Azure.ResourceManager.Storage/ diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/samples/Generated/Samples/Sample_SynapseBigDataPoolInfoCollection.cs b/sdk/synapse/Azure.ResourceManager.Synapse/samples/Generated/Samples/Sample_SynapseBigDataPoolInfoCollection.cs index e3e5647857c1..137308683108 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/samples/Generated/Samples/Sample_SynapseBigDataPoolInfoCollection.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/samples/Generated/Samples/Sample_SynapseBigDataPoolInfoCollection.cs @@ -62,7 +62,7 @@ public async Task CreateOrUpdate_CreateOrUpdateABigDataPool() Content = "", Filename = "requirements.txt", }, - SparkVersion = "2.4", + SparkVersion = "3.3", DefaultSparkLogFolder = "/logs", NodeSize = BigDataPoolNodeSize.Medium, NodeSizeFamily = BigDataPoolNodeSizeFamily.MemoryOptimized, diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/samples/Generated/Samples/Sample_SynapseSqlPoolResource.cs b/sdk/synapse/Azure.ResourceManager.Synapse/samples/Generated/Samples/Sample_SynapseSqlPoolResource.cs index c194424ac45b..ca5e44922b7c 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/samples/Generated/Samples/Sample_SynapseSqlPoolResource.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/samples/Generated/Samples/Sample_SynapseSqlPoolResource.cs @@ -176,34 +176,6 @@ public async Task Resume_ResumeASQLAnalyticsPool() Console.WriteLine($"Succeeded: {result}"); } - [Test] - [Ignore("Only validating compilation of examples")] - public async Task Rename_RenameASQLAnalyticsPool() - { - // Generated from example definition: specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/RenameSqlPool.json - // this example is just showing the usage of "SqlPools_Rename" operation, for the dependent resources, they will have to be created separately. - - // get your azure access token, for more details of how Azure SDK get your access token, please refer to https://learn.microsoft.com/en-us/dotnet/azure/sdk/authentication?tabs=command-line - TokenCredential cred = new DefaultAzureCredential(); - // authenticate your client - ArmClient client = new ArmClient(cred); - - // this example assumes you already have this SynapseSqlPoolResource created on azure - // for more information of creating SynapseSqlPoolResource, please refer to the document of SynapseSqlPoolResource - string subscriptionId = "00000000-1111-2222-3333-444444444444"; - string resourceGroupName = "Default-SQL-SouthEastAsia"; - string workspaceName = "testsvr"; - string sqlPoolName = "testdb"; - ResourceIdentifier synapseSqlPoolResourceId = SynapseSqlPoolResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, workspaceName, sqlPoolName); - SynapseSqlPoolResource synapseSqlPool = client.GetSynapseSqlPoolResource(synapseSqlPoolResourceId); - - // invoke the operation - SynapseResourceMoveDefinition synapseResourceMoveDefinition = new SynapseResourceMoveDefinition(new ResourceIdentifier("/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Synapse/workspaces/testsvr/sqlPools/newtestdb")); - await synapseSqlPool.RenameAsync(synapseResourceMoveDefinition); - - Console.WriteLine("Succeeded"); - } - [Test] [Ignore("Only validating compilation of examples")] public async Task CreateSqlPoolRestorePoint_CreatesSqlPoolRestorePoint() diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/ArmSynapseModelFactory.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/ArmSynapseModelFactory.cs index e4b4aa2638e9..99fa8067885c 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/ArmSynapseModelFactory.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/ArmSynapseModelFactory.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Net; using Azure.Core; @@ -1657,12 +1658,11 @@ public static SynapseDedicatedSqlMinimalTlsSettingData SynapseDedicatedSqlMinima /// Enable or Disable AzureADOnlyAuthentication on All Workspace subresource. /// Is trustedServiceBypassEnabled for the workspace. /// A new instance for mocking. - public static SynapseWorkspaceData SynapseWorkspaceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary tags = null, AzureLocation location = default, ManagedServiceIdentity identity = null, SynapseDataLakeStorageAccountDetails defaultDataLakeStorage = null, string sqlAdministratorLoginPassword = null, string managedResourceGroupName = null, string provisioningState = null, string sqlAdministratorLogin = null, string virtualNetworkComputeSubnetId = null, IDictionary connectivityEndpoints = null, string managedVirtualNetwork = null, IEnumerable privateEndpointConnections = null, SynapseEncryptionDetails encryption = null, Guid? workspaceUid = null, IReadOnlyDictionary extraProperties = null, SynapseManagedVirtualNetworkSettings managedVirtualNetworkSettings = null, SynapseWorkspaceRepositoryConfiguration workspaceRepositoryConfiguration = null, ResourceIdentifier purviewResourceId = null, ResourceIdentifier adlaResourceId = null, WorkspacePublicNetworkAccess? publicNetworkAccess = null, Guid? initialWorkspaceAdminObjectId = null, IReadOnlyDictionary settings = null, bool? isAadOnlyAuthenticationEnabled = null, bool? isTrustedServiceBypassEnabled = null) + public static SynapseWorkspaceData SynapseWorkspaceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary tags = null, AzureLocation location = default, ManagedServiceIdentity identity = null, SynapseDataLakeStorageAccountDetails defaultDataLakeStorage = null, string sqlAdministratorLoginPassword = null, string managedResourceGroupName = null, string provisioningState = null, string sqlAdministratorLogin = null, string virtualNetworkComputeSubnetId = null, IReadOnlyDictionary connectivityEndpoints = null, string managedVirtualNetwork = null, IEnumerable privateEndpointConnections = null, SynapseEncryptionDetails encryption = null, Guid? workspaceUid = null, BinaryData extraProperties = null, SynapseManagedVirtualNetworkSettings managedVirtualNetworkSettings = null, SynapseWorkspaceRepositoryConfiguration workspaceRepositoryConfiguration = null, ResourceIdentifier purviewResourceId = null, ResourceIdentifier adlaResourceId = null, WorkspacePublicNetworkAccess? publicNetworkAccess = null, Guid? initialWorkspaceAdminObjectId = null, IReadOnlyDictionary settings = null, bool? isAadOnlyAuthenticationEnabled = null, bool? isTrustedServiceBypassEnabled = null) { tags ??= new Dictionary(); connectivityEndpoints ??= new Dictionary(); privateEndpointConnections ??= new List(); - extraProperties ??= new Dictionary(); settings ??= new Dictionary(); return new SynapseWorkspaceData( @@ -2741,8 +2741,11 @@ public static SynapseManagedIntegrationRuntimeOperationResult SynapseManagedInte /// The estimated time when the self-hosted integration runtime will be updated. /// The service region of the integration runtime. /// The newer versions on download center. + /// + /// + /// An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay. /// A new instance for mocking. - public static SynapseSelfHostedIntegrationRuntimeStatus SynapseSelfHostedIntegrationRuntimeStatus(string dataFactoryName = null, SynapseIntegrationRuntimeState? state = null, IReadOnlyDictionary additionalProperties = null, DateTimeOffset? createOn = null, string taskQueueId = null, string nodeCommunicationChannelEncryptionMode = null, SynapseIntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption = null, string version = null, IEnumerable nodes = null, DateTimeOffset? scheduledUpdateOn = null, string updateDelayOffset = null, string localTimeZoneOffset = null, IReadOnlyDictionary capabilities = null, IEnumerable serviceUrls = null, SynapseIntegrationRuntimeAutoUpdate? autoUpdate = null, string versionStatus = null, IEnumerable links = null, string pushedVersion = null, string latestVersion = null, DateTimeOffset? autoUpdateEta = null, string serviceRegion = null, IEnumerable newerVersions = null) + public static SynapseSelfHostedIntegrationRuntimeStatus SynapseSelfHostedIntegrationRuntimeStatus(string dataFactoryName = null, SynapseIntegrationRuntimeState? state = null, IReadOnlyDictionary additionalProperties = null, DateTimeOffset? createOn = null, string taskQueueId = null, string nodeCommunicationChannelEncryptionMode = null, SynapseIntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption = null, string version = null, IEnumerable nodes = null, DateTimeOffset? scheduledUpdateOn = null, string updateDelayOffset = null, string localTimeZoneOffset = null, IReadOnlyDictionary capabilities = null, IEnumerable serviceUrls = null, SynapseIntegrationRuntimeAutoUpdate? autoUpdate = null, string versionStatus = null, IEnumerable links = null, string pushedVersion = null, string latestVersion = null, DateTimeOffset? autoUpdateEta = null, string serviceRegion = null, IEnumerable newerVersions = null, int? osType = null, int? targetFramework = null, SelfContainedInteractiveAuthoringState? selfContainedInteractiveAuthoringEnabled = null) { additionalProperties ??= new Dictionary(); nodes ??= new List(); @@ -2774,7 +2777,10 @@ public static SynapseSelfHostedIntegrationRuntimeStatus SynapseSelfHostedIntegra latestVersion, autoUpdateEta, serviceRegion, - newerVersions?.ToList()); + newerVersions?.ToList(), + osType, + targetFramework, + selfContainedInteractiveAuthoringEnabled); } /// Initializes a new instance of . @@ -3116,5 +3122,35 @@ public static SynapseEventGridDataConnection SynapseEventGridDataConnection(Reso blobStorageEventType, provisioningState); } + + /// Initializes a new instance of . + /// The workspace name which the integration runtime belong to. + /// The state of integration runtime. + /// Additional Properties. + /// The time at which the integration runtime was created, in ISO8601 format. + /// The task queue id of the integration runtime. + /// The node communication Channel encryption mode. + /// It is used to set the encryption mode for node-node communication channel (when more than 2 self-hosted integration runtime nodes exist). + /// Version of the integration runtime. + /// The list of nodes for this integration runtime. + /// The date at which the integration runtime will be scheduled to update, in ISO8601 format. + /// The time in the date scheduled by service to update the integration runtime, e.g., PT03H is 3 hours. + /// The local time zone offset in hours. + /// Object with additional information about integration runtime capabilities. + /// The URLs for the services used in integration runtime backend service. + /// Whether Self-hosted integration runtime auto update has been turned on. + /// Status of the integration runtime version. + /// The list of linked integration runtimes that are created to share with this integration runtime. + /// 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. + /// The service region of the integration runtime. + /// The newer versions on download center. + /// A new instance for mocking. + [EditorBrowsable(EditorBrowsableState.Never)] + public static SynapseSelfHostedIntegrationRuntimeStatus SynapseSelfHostedIntegrationRuntimeStatus(string dataFactoryName, SynapseIntegrationRuntimeState? state, IReadOnlyDictionary additionalProperties, DateTimeOffset? createOn, string taskQueueId, string nodeCommunicationChannelEncryptionMode, SynapseIntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption, string version, IEnumerable nodes, DateTimeOffset? scheduledUpdateOn, string updateDelayOffset, string localTimeZoneOffset, IReadOnlyDictionary capabilities, IEnumerable serviceUrls, SynapseIntegrationRuntimeAutoUpdate? autoUpdate, string versionStatus, IEnumerable links, string pushedVersion, string latestVersion, DateTimeOffset? autoUpdateEta, string serviceRegion, IEnumerable newerVersions) + { + return SynapseSelfHostedIntegrationRuntimeStatus(dataFactoryName: dataFactoryName, state: state, additionalProperties: additionalProperties, createOn: createOn, taskQueueId: taskQueueId, nodeCommunicationChannelEncryptionMode: nodeCommunicationChannelEncryptionMode, internalChannelEncryption: internalChannelEncryption, version: version, nodes: nodes, scheduledUpdateOn: scheduledUpdateOn, updateDelayOffset: updateDelayOffset, localTimeZoneOffset: localTimeZoneOffset, capabilities: capabilities, serviceUrls: serviceUrls, autoUpdate: autoUpdate, versionStatus: versionStatus, links: links, pushedVersion: pushedVersion, latestVersion: latestVersion, autoUpdateEta: autoUpdateEta, serviceRegion: serviceRegion, newerVersions: newerVersions, osType: default, targetFramework: default, selfContainedInteractiveAuthoringEnabled: default); + } } } diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/BigDataPoolLibraryInfo.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/BigDataPoolLibraryInfo.Serialization.cs index 61859a0093bf..49d72c8cf375 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/BigDataPoolLibraryInfo.Serialization.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/BigDataPoolLibraryInfo.Serialization.cs @@ -49,7 +49,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit writer.WritePropertyName("containerName"u8); writer.WriteStringValue(ContainerName); } - if (Optional.IsDefined(UploadedOn)) + if (options.Format != "W" && Optional.IsDefined(UploadedOn)) { writer.WritePropertyName("uploadedTimestamp"u8); writer.WriteStringValue(UploadedOn.Value, "O"); diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/BigDataPoolLibraryInfo.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/BigDataPoolLibraryInfo.cs index 9a71d28ecfe1..79da16608326 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/BigDataPoolLibraryInfo.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/BigDataPoolLibraryInfo.cs @@ -78,7 +78,7 @@ internal BigDataPoolLibraryInfo(string name, string path, string containerName, /// Storage blob container name. public string ContainerName { get; set; } /// The last update time of the library. - public DateTimeOffset? UploadedOn { get; set; } + public DateTimeOffset? UploadedOn { get; } /// Type of the library. public string LibraryInfoType { get; set; } /// Provisioning status of the library/package. diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseResourceMoveDefinition.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/CopyComputeScaleProperties.Serialization.cs similarity index 50% rename from sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseResourceMoveDefinition.Serialization.cs rename to sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/CopyComputeScaleProperties.Serialization.cs index 805c1bdf0d23..01ccbb0473f8 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseResourceMoveDefinition.Serialization.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/CopyComputeScaleProperties.Serialization.cs @@ -13,11 +13,11 @@ namespace Azure.ResourceManager.Synapse.Models { - public partial class SynapseResourceMoveDefinition : IUtf8JsonSerializable, IJsonModel + public partial class CopyComputeScaleProperties : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -28,14 +28,22 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode /// The client options for reading and writing models. protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(SynapseResourceMoveDefinition)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(CopyComputeScaleProperties)} does not support writing '{format}' format."); } - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); + if (Optional.IsDefined(DataIntegrationUnit)) + { + writer.WritePropertyName("dataIntegrationUnit"u8); + writer.WriteNumberValue(DataIntegrationUnit.Value); + } + if (Optional.IsDefined(TimeToLive)) + { + writer.WritePropertyName("timeToLive"u8); + writer.WriteNumberValue(TimeToLive.Value); + } if (options.Format != "W" && _serializedAdditionalRawData != null) { foreach (var item in _serializedAdditionalRawData) @@ -53,19 +61,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - SynapseResourceMoveDefinition IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + CopyComputeScaleProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(SynapseResourceMoveDefinition)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(CopyComputeScaleProperties)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeSynapseResourceMoveDefinition(document.RootElement, options); + return DeserializeCopyComputeScaleProperties(document.RootElement, options); } - internal static SynapseResourceMoveDefinition DeserializeSynapseResourceMoveDefinition(JsonElement element, ModelReaderWriterOptions options = null) + internal static CopyComputeScaleProperties DeserializeCopyComputeScaleProperties(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -73,14 +81,28 @@ internal static SynapseResourceMoveDefinition DeserializeSynapseResourceMoveDefi { return null; } - ResourceIdentifier id = default; + int? dataIntegrationUnit = default; + int? timeToLive = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("id"u8)) + if (property.NameEquals("dataIntegrationUnit"u8)) { - id = new ResourceIdentifier(property.Value.GetString()); + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + dataIntegrationUnit = property.Value.GetInt32(); + continue; + } + if (property.NameEquals("timeToLive"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + timeToLive = property.Value.GetInt32(); continue; } if (options.Format != "W") @@ -89,38 +111,38 @@ internal static SynapseResourceMoveDefinition DeserializeSynapseResourceMoveDefi } } serializedAdditionalRawData = rawDataDictionary; - return new SynapseResourceMoveDefinition(id, serializedAdditionalRawData); + return new CopyComputeScaleProperties(dataIntegrationUnit, timeToLive, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options); default: - throw new FormatException($"The model {nameof(SynapseResourceMoveDefinition)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(CopyComputeScaleProperties)} does not support writing '{options.Format}' format."); } } - SynapseResourceMoveDefinition IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + CopyComputeScaleProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeSynapseResourceMoveDefinition(document.RootElement, options); + return DeserializeCopyComputeScaleProperties(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(SynapseResourceMoveDefinition)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(CopyComputeScaleProperties)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseResourceMoveDefinition.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/CopyComputeScaleProperties.cs similarity index 58% rename from sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseResourceMoveDefinition.cs rename to sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/CopyComputeScaleProperties.cs index eabf80e4af11..40e9a25b3c95 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseResourceMoveDefinition.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/CopyComputeScaleProperties.cs @@ -7,12 +7,11 @@ using System; using System.Collections.Generic; -using Azure.Core; namespace Azure.ResourceManager.Synapse.Models { - /// Contains the information necessary to perform a resource move (rename). - public partial class SynapseResourceMoveDefinition + /// CopyComputeScale properties for managed integration runtime. + public partial class CopyComputeScaleProperties { /// /// Keeps track of any properties unknown to the library. @@ -46,31 +45,25 @@ public partial class SynapseResourceMoveDefinition /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . - /// The target ID for the resource. - /// is null. - public SynapseResourceMoveDefinition(ResourceIdentifier id) + /// Initializes a new instance of . + public CopyComputeScaleProperties() { - Argument.AssertNotNull(id, nameof(id)); - - Id = id; } - /// Initializes a new instance of . - /// The target ID for the resource. + /// Initializes a new instance of . + /// DIU number setting reserved for copy activity execution. Supported values are multiples of 4 in range 4-256. + /// Time to live (in minutes) setting of integration runtime which will execute copy activity. /// Keeps track of any properties unknown to the library. - internal SynapseResourceMoveDefinition(ResourceIdentifier id, IDictionary serializedAdditionalRawData) + internal CopyComputeScaleProperties(int? dataIntegrationUnit, int? timeToLive, IDictionary serializedAdditionalRawData) { - Id = id; + DataIntegrationUnit = dataIntegrationUnit; + TimeToLive = timeToLive; _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal SynapseResourceMoveDefinition() - { - } - - /// The target ID for the resource. - public ResourceIdentifier Id { get; } + /// DIU number setting reserved for copy activity execution. Supported values are multiples of 4 in range 4-256. + public int? DataIntegrationUnit { get; set; } + /// Time to live (in minutes) setting of integration runtime which will execute copy activity. + public int? TimeToLive { get; set; } } } diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs new file mode 100644 index 000000000000..10376472b6b5 --- /dev/null +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/PipelineExternalComputeScaleProperties.Serialization.cs @@ -0,0 +1,163 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Azure.Core; + +namespace Azure.ResourceManager.Synapse.Models +{ + public partial class PipelineExternalComputeScaleProperties : IUtf8JsonSerializable, IJsonModel + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(PipelineExternalComputeScaleProperties)} does not support writing '{format}' format."); + } + + if (Optional.IsDefined(TimeToLive)) + { + 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); + } + if (options.Format != "W" && _serializedAdditionalRawData != null) + { + foreach (var item in _serializedAdditionalRawData) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + PipelineExternalComputeScaleProperties IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(PipelineExternalComputeScaleProperties)} does not support reading '{format}' format."); + } + + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializePipelineExternalComputeScaleProperties(document.RootElement, options); + } + + internal static PipelineExternalComputeScaleProperties DeserializePipelineExternalComputeScaleProperties(JsonElement element, ModelReaderWriterOptions options = null) + { + options ??= ModelSerializationExtensions.WireOptions; + + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + int? timeToLive = default; + int? numberOfPipelineNodes = default; + int? numberOfExternalNodes = default; + IDictionary serializedAdditionalRawData = default; + Dictionary rawDataDictionary = new Dictionary(); + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("timeToLive"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + 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; + } + if (options.Format != "W") + { + rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); + } + } + serializedAdditionalRawData = rawDataDictionary; + return new PipelineExternalComputeScaleProperties(timeToLive, numberOfPipelineNodes, numberOfExternalNodes, serializedAdditionalRawData); + } + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options); + default: + throw new FormatException($"The model {nameof(PipelineExternalComputeScaleProperties)} does not support writing '{options.Format}' format."); + } + } + + PipelineExternalComputeScaleProperties IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + { + using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializePipelineExternalComputeScaleProperties(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(PipelineExternalComputeScaleProperties)} does not support reading '{options.Format}' format."); + } + } + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + } +} diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/PipelineExternalComputeScaleProperties.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/PipelineExternalComputeScaleProperties.cs new file mode 100644 index 000000000000..2db3ff6f5075 --- /dev/null +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/PipelineExternalComputeScaleProperties.cs @@ -0,0 +1,73 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace Azure.ResourceManager.Synapse.Models +{ + /// PipelineExternalComputeScale properties for managed integration runtime. + public partial class PipelineExternalComputeScaleProperties + { + /// + /// Keeps track of any properties unknown to the library. + /// + /// To assign an object to the value of this property use . + /// + /// + /// To assign an already formatted json string to this property use . + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\"") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }) + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}") + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + private IDictionary _serializedAdditionalRawData; + + /// Initializes a new instance of . + public PipelineExternalComputeScaleProperties() + { + } + + /// Initializes a new instance of . + /// 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. + /// Keeps track of any properties unknown to the library. + internal PipelineExternalComputeScaleProperties(int? timeToLive, int? numberOfPipelineNodes, int? numberOfExternalNodes, IDictionary serializedAdditionalRawData) + { + TimeToLive = timeToLive; + NumberOfPipelineNodes = numberOfPipelineNodes; + NumberOfExternalNodes = numberOfExternalNodes; + _serializedAdditionalRawData = serializedAdditionalRawData; + } + + /// 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; } + } +} diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SelfContainedInteractiveAuthoringState.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SelfContainedInteractiveAuthoringState.Serialization.cs new file mode 100644 index 000000000000..2f6432bbc671 --- /dev/null +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SelfContainedInteractiveAuthoringState.Serialization.cs @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; + +namespace Azure.ResourceManager.Synapse.Models +{ + internal static partial class SelfContainedInteractiveAuthoringStateExtensions + { + public static bool ToSerialBoolean(this SelfContainedInteractiveAuthoringState value) => value switch + { + SelfContainedInteractiveAuthoringState.True => true, + SelfContainedInteractiveAuthoringState.False => false, + _ => throw new ArgumentOutOfRangeException(nameof(value), value, "Unknown SelfContainedInteractiveAuthoringState value.") + }; + + public static SelfContainedInteractiveAuthoringState ToSelfContainedInteractiveAuthoringState(this bool value) + { + if (value == true) return SelfContainedInteractiveAuthoringState.True; + if (value == false) return SelfContainedInteractiveAuthoringState.False; + throw new ArgumentOutOfRangeException(nameof(value), value, "Unknown SelfContainedInteractiveAuthoringState value."); + } + } +} diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SelfContainedInteractiveAuthoringState.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SelfContainedInteractiveAuthoringState.cs new file mode 100644 index 000000000000..18b6584f5bbd --- /dev/null +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SelfContainedInteractiveAuthoringState.cs @@ -0,0 +1,18 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +namespace Azure.ResourceManager.Synapse.Models +{ + /// An alternative option to ensure interactive authoring function when your self-hosted integration runtime is unable to establish a connection with Azure Relay. + public enum SelfContainedInteractiveAuthoringState + { + /// True. + True, + /// False. + False + } +} diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseIntegrationRuntimeComputeProperties.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseIntegrationRuntimeComputeProperties.Serialization.cs index 0b9fee190853..33d98c201e25 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseIntegrationRuntimeComputeProperties.Serialization.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseIntegrationRuntimeComputeProperties.Serialization.cs @@ -64,6 +64,16 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit writer.WritePropertyName("vNetProperties"u8); writer.WriteObjectValue(VnetProperties, options); } + if (Optional.IsDefined(CopyComputeScaleProperties)) + { + writer.WritePropertyName("copyComputeScaleProperties"u8); + writer.WriteObjectValue(CopyComputeScaleProperties, options); + } + if (Optional.IsDefined(PipelineExternalComputeScaleProperties)) + { + writer.WritePropertyName("pipelineExternalComputeScaleProperties"u8); + writer.WriteObjectValue(PipelineExternalComputeScaleProperties, options); + } foreach (var item in AdditionalProperties) { writer.WritePropertyName(item.Key); @@ -104,6 +114,8 @@ internal static SynapseIntegrationRuntimeComputeProperties DeserializeSynapseInt int? maxParallelExecutionsPerNode = default; SynapseIntegrationRuntimeDataFlowProperties dataFlowProperties = default; SynapseIntegrationRuntimeVnetProperties vNetProperties = default; + CopyComputeScaleProperties copyComputeScaleProperties = default; + PipelineExternalComputeScaleProperties pipelineExternalComputeScaleProperties = default; IDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -158,6 +170,24 @@ internal static SynapseIntegrationRuntimeComputeProperties DeserializeSynapseInt vNetProperties = SynapseIntegrationRuntimeVnetProperties.DeserializeSynapseIntegrationRuntimeVnetProperties(property.Value, options); continue; } + if (property.NameEquals("copyComputeScaleProperties"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + copyComputeScaleProperties = CopyComputeScaleProperties.DeserializeCopyComputeScaleProperties(property.Value, options); + continue; + } + if (property.NameEquals("pipelineExternalComputeScaleProperties"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + pipelineExternalComputeScaleProperties = PipelineExternalComputeScaleProperties.DeserializePipelineExternalComputeScaleProperties(property.Value, options); + continue; + } additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } additionalProperties = additionalPropertiesDictionary; @@ -168,6 +198,8 @@ internal static SynapseIntegrationRuntimeComputeProperties DeserializeSynapseInt maxParallelExecutionsPerNode, dataFlowProperties, vNetProperties, + copyComputeScaleProperties, + pipelineExternalComputeScaleProperties, additionalProperties); } diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseIntegrationRuntimeComputeProperties.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseIntegrationRuntimeComputeProperties.cs index 537e2bbe6262..06a41bdb62b9 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseIntegrationRuntimeComputeProperties.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseIntegrationRuntimeComputeProperties.cs @@ -27,8 +27,10 @@ public SynapseIntegrationRuntimeComputeProperties() /// Maximum parallel executions count per node for managed integration runtime. /// Data flow properties for managed integration runtime. /// VNet properties for managed integration runtime. + /// CopyComputeScale properties for managed integration runtime. + /// PipelineExternalComputeScale properties for managed integration runtime. /// Additional Properties. - internal SynapseIntegrationRuntimeComputeProperties(AzureLocation? location, string nodeSize, int? numberOfNodes, int? maxParallelExecutionsPerNode, SynapseIntegrationRuntimeDataFlowProperties dataFlowProperties, SynapseIntegrationRuntimeVnetProperties vnetProperties, IDictionary additionalProperties) + internal SynapseIntegrationRuntimeComputeProperties(AzureLocation? location, string nodeSize, int? numberOfNodes, int? maxParallelExecutionsPerNode, SynapseIntegrationRuntimeDataFlowProperties dataFlowProperties, SynapseIntegrationRuntimeVnetProperties vnetProperties, CopyComputeScaleProperties copyComputeScaleProperties, PipelineExternalComputeScaleProperties pipelineExternalComputeScaleProperties, IDictionary additionalProperties) { Location = location; NodeSize = nodeSize; @@ -36,6 +38,8 @@ internal SynapseIntegrationRuntimeComputeProperties(AzureLocation? location, str MaxParallelExecutionsPerNode = maxParallelExecutionsPerNode; DataFlowProperties = dataFlowProperties; VnetProperties = vnetProperties; + CopyComputeScaleProperties = copyComputeScaleProperties; + PipelineExternalComputeScaleProperties = pipelineExternalComputeScaleProperties; AdditionalProperties = additionalProperties; } @@ -51,6 +55,10 @@ internal SynapseIntegrationRuntimeComputeProperties(AzureLocation? location, str public SynapseIntegrationRuntimeDataFlowProperties DataFlowProperties { get; set; } /// VNet properties for managed integration runtime. public SynapseIntegrationRuntimeVnetProperties VnetProperties { get; set; } + /// CopyComputeScale properties for managed integration runtime. + public CopyComputeScaleProperties CopyComputeScaleProperties { get; set; } + /// PipelineExternalComputeScale properties for managed integration runtime. + public PipelineExternalComputeScaleProperties PipelineExternalComputeScaleProperties { get; set; } /// /// Additional Properties /// diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntime.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntime.Serialization.cs index 44609a0cdc2a..216d023a3b10 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntime.Serialization.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntime.Serialization.cs @@ -42,6 +42,11 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri writer.WritePropertyName("linkedInfo"u8); writer.WriteObjectValue(LinkedInfo, options); } + if (Optional.IsDefined(SelfContainedInteractiveAuthoringEnabled)) + { + writer.WritePropertyName("selfContainedInteractiveAuthoringEnabled"u8); + writer.WriteStringValue(SelfContainedInteractiveAuthoringEnabled.Value.ToSerialBoolean()); + } writer.WriteEndObject(); foreach (var item in AdditionalProperties) { @@ -80,6 +85,7 @@ internal static SynapseSelfHostedIntegrationRuntime DeserializeSynapseSelfHosted IntegrationRuntimeType type = default; string description = default; SynapseLinkedIntegrationRuntimeType linkedInfo = default; + SelfContainedInteractiveAuthoringState? selfContainedInteractiveAuthoringEnabled = default; IDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -112,13 +118,22 @@ internal static SynapseSelfHostedIntegrationRuntime DeserializeSynapseSelfHosted linkedInfo = SynapseLinkedIntegrationRuntimeType.DeserializeSynapseLinkedIntegrationRuntimeType(property0.Value, options); continue; } + if (property0.NameEquals("selfContainedInteractiveAuthoringEnabled"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + selfContainedInteractiveAuthoringEnabled = property0.Value.GetBoolean().ToSelfContainedInteractiveAuthoringState(); + continue; + } } continue; } additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } additionalProperties = additionalPropertiesDictionary; - return new SynapseSelfHostedIntegrationRuntime(type, description, additionalProperties, linkedInfo); + return new SynapseSelfHostedIntegrationRuntime(type, description, additionalProperties, linkedInfo, selfContainedInteractiveAuthoringEnabled); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntime.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntime.cs index bb6a3c18b170..05fb2ae3dbf7 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntime.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntime.cs @@ -28,9 +28,11 @@ public SynapseSelfHostedIntegrationRuntime() /// 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 SynapseSelfHostedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary additionalProperties, SynapseLinkedIntegrationRuntimeType 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 SynapseSelfHostedIntegrationRuntime(IntegrationRuntimeType integrationRuntimeType, string description, IDictionary additionalProperties, SynapseLinkedIntegrationRuntimeType linkedInfo, SelfContainedInteractiveAuthoringState? selfContainedInteractiveAuthoringEnabled) : base(integrationRuntimeType, description, additionalProperties) { LinkedInfo = linkedInfo; + SelfContainedInteractiveAuthoringEnabled = selfContainedInteractiveAuthoringEnabled; IntegrationRuntimeType = integrationRuntimeType; } @@ -40,5 +42,7 @@ internal SynapseSelfHostedIntegrationRuntime(IntegrationRuntimeType integrationR /// The available derived classes include and . /// public SynapseLinkedIntegrationRuntimeType 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 SelfContainedInteractiveAuthoringState? SelfContainedInteractiveAuthoringEnabled { get; set; } } } diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntimeStatus.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntimeStatus.Serialization.cs index 746c485c8325..135801488eba 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntimeStatus.Serialization.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntimeStatus.Serialization.cs @@ -158,6 +158,21 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri } writer.WriteEndArray(); } + if (options.Format != "W" && Optional.IsDefined(OSType)) + { + writer.WritePropertyName("osType"u8); + writer.WriteNumberValue(OSType.Value); + } + if (options.Format != "W" && Optional.IsDefined(TargetFramework)) + { + writer.WritePropertyName("targetFramework"u8); + writer.WriteNumberValue(TargetFramework.Value); + } + if (options.Format != "W" && Optional.IsDefined(SelfContainedInteractiveAuthoringEnabled)) + { + writer.WritePropertyName("selfContainedInteractiveAuthoringEnabled"u8); + writer.WriteStringValue(SelfContainedInteractiveAuthoringEnabled.Value.ToSerialBoolean()); + } writer.WriteEndObject(); foreach (var item in AdditionalProperties) { @@ -215,6 +230,9 @@ internal static SynapseSelfHostedIntegrationRuntimeStatus DeserializeSynapseSelf DateTimeOffset? autoUpdateEta = default; string serviceRegion = default; IReadOnlyList newerVersions = default; + int? osType = default; + int? targetFramework = default; + SelfContainedInteractiveAuthoringState? selfContainedInteractiveAuthoringEnabled = default; IReadOnlyDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -407,6 +425,33 @@ internal static SynapseSelfHostedIntegrationRuntimeStatus DeserializeSynapseSelf newerVersions = array; continue; } + if (property0.NameEquals("osType"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + osType = property0.Value.GetInt32(); + continue; + } + if (property0.NameEquals("targetFramework"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + targetFramework = property0.Value.GetInt32(); + continue; + } + if (property0.NameEquals("selfContainedInteractiveAuthoringEnabled"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + selfContainedInteractiveAuthoringEnabled = property0.Value.GetBoolean().ToSelfContainedInteractiveAuthoringState(); + continue; + } } continue; } @@ -436,7 +481,10 @@ internal static SynapseSelfHostedIntegrationRuntimeStatus DeserializeSynapseSelf latestVersion, autoUpdateEta, serviceRegion, - newerVersions ?? new ChangeTrackingList()); + newerVersions ?? new ChangeTrackingList(), + osType, + targetFramework, + selfContainedInteractiveAuthoringEnabled); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntimeStatus.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntimeStatus.cs index 725b300ded45..05237f9f6b5d 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntimeStatus.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseSelfHostedIntegrationRuntimeStatus.cs @@ -48,7 +48,10 @@ internal SynapseSelfHostedIntegrationRuntimeStatus() /// The estimated time when the self-hosted integration runtime will be updated. /// The service region of the integration runtime. /// The newer versions on download center. - internal SynapseSelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, SynapseIntegrationRuntimeState? state, IReadOnlyDictionary additionalProperties, DateTimeOffset? createOn, string taskQueueId, string nodeCommunicationChannelEncryptionMode, SynapseIntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption, string version, IReadOnlyList nodes, DateTimeOffset? scheduledUpdateOn, string updateDelayOffset, string localTimeZoneOffset, IReadOnlyDictionary capabilities, IReadOnlyList serviceUrls, SynapseIntegrationRuntimeAutoUpdate? autoUpdate, string versionStatus, IReadOnlyList links, string pushedVersion, string latestVersion, DateTimeOffset? autoUpdateEta, string serviceRegion, IReadOnlyList newerVersions) : 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 SynapseSelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtimeType, string dataFactoryName, SynapseIntegrationRuntimeState? state, IReadOnlyDictionary additionalProperties, DateTimeOffset? createOn, string taskQueueId, string nodeCommunicationChannelEncryptionMode, SynapseIntegrationRuntimeInternalChannelEncryptionMode? internalChannelEncryption, string version, IReadOnlyList nodes, DateTimeOffset? scheduledUpdateOn, string updateDelayOffset, string localTimeZoneOffset, IReadOnlyDictionary capabilities, IReadOnlyList serviceUrls, SynapseIntegrationRuntimeAutoUpdate? autoUpdate, string versionStatus, IReadOnlyList links, string pushedVersion, string latestVersion, DateTimeOffset? autoUpdateEta, string serviceRegion, IReadOnlyList newerVersions, int? osType, int? targetFramework, SelfContainedInteractiveAuthoringState? selfContainedInteractiveAuthoringEnabled) : base(runtimeType, dataFactoryName, state, additionalProperties) { CreateOn = createOn; TaskQueueId = taskQueueId; @@ -69,6 +72,9 @@ internal SynapseSelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtim AutoUpdateEta = autoUpdateEta; ServiceRegion = serviceRegion; NewerVersions = newerVersions; + OSType = osType; + TargetFramework = targetFramework; + SelfContainedInteractiveAuthoringEnabled = selfContainedInteractiveAuthoringEnabled; RuntimeType = runtimeType; } @@ -110,5 +116,11 @@ internal SynapseSelfHostedIntegrationRuntimeStatus(IntegrationRuntimeType runtim public string ServiceRegion { get; } /// The newer versions on download center. public IReadOnlyList NewerVersions { get; } + /// Gets the os type. + public int? OSType { get; } + /// Gets the target framework. + public int? TargetFramework { 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 SelfContainedInteractiveAuthoringState? SelfContainedInteractiveAuthoringEnabled { get; } } } diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseWorkspaceRepositoryConfiguration.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseWorkspaceRepositoryConfiguration.cs index 05322d6ae24c..cba1db69c750 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseWorkspaceRepositoryConfiguration.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/Models/SynapseWorkspaceRepositoryConfiguration.cs @@ -52,7 +52,7 @@ public SynapseWorkspaceRepositoryConfiguration() /// Initializes a new instance of . /// Type of workspace repositoryID configuration. Example WorkspaceVSTSConfiguration, WorkspaceGitHubConfiguration. - /// GitHub Enterprise host name. For example: https://github.mydomain.com. + /// GitHub Enterprise host name. For example: `https://github.mydomain.com`. /// Account name. /// VSTS project name. /// Repository name. @@ -77,7 +77,7 @@ internal SynapseWorkspaceRepositoryConfiguration(string workspaceRepositoryConfi /// Type of workspace repositoryID configuration. Example WorkspaceVSTSConfiguration, WorkspaceGitHubConfiguration. public string WorkspaceRepositoryConfigurationType { get; set; } - /// GitHub Enterprise host name. For example: https://github.mydomain.com. + /// GitHub Enterprise host name. For example: `https://github.mydomain.com`. public string HostName { get; set; } /// Account name. public string AccountName { get; set; } diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/RestOperations/SqlPoolsRestOperations.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/RestOperations/SqlPoolsRestOperations.cs index 20339bf60e34..9db725285a41 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/RestOperations/SqlPoolsRestOperations.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/RestOperations/SqlPoolsRestOperations.cs @@ -716,105 +716,6 @@ public Response Resume(string subscriptionId, string resourceGroupName, string w } } - internal RequestUriBuilder CreateRenameRequestUri(string subscriptionId, string resourceGroupName, string workspaceName, string sqlPoolName, SynapseResourceMoveDefinition synapseResourceMoveDefinition) - { - var uri = new RawRequestUriBuilder(); - uri.Reset(_endpoint); - uri.AppendPath("/subscriptions/", false); - uri.AppendPath(subscriptionId, true); - uri.AppendPath("/resourceGroups/", false); - uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Microsoft.Synapse/workspaces/", false); - uri.AppendPath(workspaceName, true); - uri.AppendPath("/sqlPools/", false); - uri.AppendPath(sqlPoolName, true); - uri.AppendPath("/move", false); - uri.AppendQuery("api-version", _apiVersion, true); - return uri; - } - - internal HttpMessage CreateRenameRequest(string subscriptionId, string resourceGroupName, string workspaceName, string sqlPoolName, SynapseResourceMoveDefinition synapseResourceMoveDefinition) - { - var message = _pipeline.CreateMessage(); - var request = message.Request; - request.Method = RequestMethod.Post; - var uri = new RawRequestUriBuilder(); - uri.Reset(_endpoint); - uri.AppendPath("/subscriptions/", false); - uri.AppendPath(subscriptionId, true); - uri.AppendPath("/resourceGroups/", false); - uri.AppendPath(resourceGroupName, true); - uri.AppendPath("/providers/Microsoft.Synapse/workspaces/", false); - uri.AppendPath(workspaceName, true); - uri.AppendPath("/sqlPools/", false); - uri.AppendPath(sqlPoolName, true); - uri.AppendPath("/move", false); - uri.AppendQuery("api-version", _apiVersion, true); - request.Uri = uri; - request.Headers.Add("Content-Type", "application/json"); - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(synapseResourceMoveDefinition, ModelSerializationExtensions.WireOptions); - request.Content = content; - _userAgent.Apply(message); - return message; - } - - /// Rename a SQL pool. - /// The ID of the target subscription. - /// The name of the resource group. The name is case insensitive. - /// The name of the workspace. - /// SQL pool name. - /// The resource move definition for renaming this Sql pool. - /// The cancellation token to use. - /// , , , or is null. - /// , , or is an empty string, and was expected to be non-empty. - public async Task RenameAsync(string subscriptionId, string resourceGroupName, string workspaceName, string sqlPoolName, SynapseResourceMoveDefinition synapseResourceMoveDefinition, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId)); - Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName)); - Argument.AssertNotNullOrEmpty(workspaceName, nameof(workspaceName)); - Argument.AssertNotNullOrEmpty(sqlPoolName, nameof(sqlPoolName)); - Argument.AssertNotNull(synapseResourceMoveDefinition, nameof(synapseResourceMoveDefinition)); - - using var message = CreateRenameRequest(subscriptionId, resourceGroupName, workspaceName, sqlPoolName, synapseResourceMoveDefinition); - await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); - switch (message.Response.Status) - { - case 200: - return message.Response; - default: - throw new RequestFailedException(message.Response); - } - } - - /// Rename a SQL pool. - /// The ID of the target subscription. - /// The name of the resource group. The name is case insensitive. - /// The name of the workspace. - /// SQL pool name. - /// The resource move definition for renaming this Sql pool. - /// The cancellation token to use. - /// , , , or is null. - /// , , or is an empty string, and was expected to be non-empty. - public Response Rename(string subscriptionId, string resourceGroupName, string workspaceName, string sqlPoolName, SynapseResourceMoveDefinition synapseResourceMoveDefinition, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId)); - Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName)); - Argument.AssertNotNullOrEmpty(workspaceName, nameof(workspaceName)); - Argument.AssertNotNullOrEmpty(sqlPoolName, nameof(sqlPoolName)); - Argument.AssertNotNull(synapseResourceMoveDefinition, nameof(synapseResourceMoveDefinition)); - - using var message = CreateRenameRequest(subscriptionId, resourceGroupName, workspaceName, sqlPoolName, synapseResourceMoveDefinition); - _pipeline.Send(message, cancellationToken); - switch (message.Response.Status) - { - case 200: - return message.Response; - default: - throw new RequestFailedException(message.Response); - } - } - internal RequestUriBuilder CreateListByWorkspaceNextPageRequestUri(string nextLink, string subscriptionId, string resourceGroupName, string workspaceName) { var uri = new RawRequestUriBuilder(); diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseLibraryData.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseLibraryData.Serialization.cs index 9870d63c6b55..1f9b69e56dfd 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseLibraryData.Serialization.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseLibraryData.Serialization.cs @@ -58,7 +58,7 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri writer.WritePropertyName("containerName"u8); writer.WriteStringValue(ContainerName); } - if (Optional.IsDefined(UploadedOn)) + if (options.Format != "W" && Optional.IsDefined(UploadedOn)) { writer.WritePropertyName("uploadedTimestamp"u8); writer.WriteStringValue(UploadedOn.Value, "O"); diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseLibraryData.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseLibraryData.cs index 536c1370ccb4..7cdc4e86afad 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseLibraryData.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseLibraryData.cs @@ -89,7 +89,7 @@ internal SynapseLibraryData(ResourceIdentifier id, string name, ResourceType res /// Storage blob container name. public string ContainerName { get; set; } /// The last update time of the library. - public DateTimeOffset? UploadedOn { get; set; } + public DateTimeOffset? UploadedOn { get; } /// Type of the library. public string TypePropertiesType { get; set; } /// Provisioning status of the library/package. diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapsePrivateLinkHubResource.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapsePrivateLinkHubResource.cs index c98c541b85b8..a9141f12c53a 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapsePrivateLinkHubResource.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapsePrivateLinkHubResource.cs @@ -338,7 +338,7 @@ public virtual async Task DeleteAsync(WaitUntil waitUntil, Cancell try { var response = await _synapsePrivateLinkHubPrivateLinkHubsRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false); - var operation = new SynapseArmOperation(_synapsePrivateLinkHubPrivateLinkHubsClientDiagnostics, Pipeline, _synapsePrivateLinkHubPrivateLinkHubsRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location); + var operation = new SynapseArmOperation(_synapsePrivateLinkHubPrivateLinkHubsClientDiagnostics, Pipeline, _synapsePrivateLinkHubPrivateLinkHubsRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.AzureAsyncOperation); if (waitUntil == WaitUntil.Completed) await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false); return operation; @@ -380,7 +380,7 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel try { var response = _synapsePrivateLinkHubPrivateLinkHubsRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken); - var operation = new SynapseArmOperation(_synapsePrivateLinkHubPrivateLinkHubsClientDiagnostics, Pipeline, _synapsePrivateLinkHubPrivateLinkHubsRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location); + var operation = new SynapseArmOperation(_synapsePrivateLinkHubPrivateLinkHubsClientDiagnostics, Pipeline, _synapsePrivateLinkHubPrivateLinkHubsRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.AzureAsyncOperation); if (waitUntil == WaitUntil.Completed) operation.WaitForCompletionResponse(cancellationToken); return operation; diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseSqlPoolResource.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseSqlPoolResource.cs index 9a790a49b3f0..c2533d32db93 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseSqlPoolResource.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseSqlPoolResource.cs @@ -1241,90 +1241,6 @@ public virtual ArmOperation Resume(WaitUntil waitUntil, Cancellation } } - /// - /// Rename a SQL pool. - /// - /// - /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/move - /// - /// - /// Operation Id - /// SqlPools_Rename - /// - /// - /// Default Api Version - /// 2021-06-01 - /// - /// - /// Resource - /// - /// - /// - /// - /// The resource move definition for renaming this Sql pool. - /// The cancellation token to use. - /// is null. - public virtual async Task RenameAsync(SynapseResourceMoveDefinition synapseResourceMoveDefinition, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(synapseResourceMoveDefinition, nameof(synapseResourceMoveDefinition)); - - using var scope = _synapseSqlPoolSqlPoolsClientDiagnostics.CreateScope("SynapseSqlPoolResource.Rename"); - scope.Start(); - try - { - var response = await _synapseSqlPoolSqlPoolsRestClient.RenameAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, synapseResourceMoveDefinition, cancellationToken).ConfigureAwait(false); - return response; - } - catch (Exception e) - { - scope.Failed(e); - throw; - } - } - - /// - /// Rename a SQL pool. - /// - /// - /// Request Path - /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/move - /// - /// - /// Operation Id - /// SqlPools_Rename - /// - /// - /// Default Api Version - /// 2021-06-01 - /// - /// - /// Resource - /// - /// - /// - /// - /// The resource move definition for renaming this Sql pool. - /// The cancellation token to use. - /// is null. - public virtual Response Rename(SynapseResourceMoveDefinition synapseResourceMoveDefinition, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(synapseResourceMoveDefinition, nameof(synapseResourceMoveDefinition)); - - using var scope = _synapseSqlPoolSqlPoolsClientDiagnostics.CreateScope("SynapseSqlPoolResource.Rename"); - scope.Start(); - try - { - var response = _synapseSqlPoolSqlPoolsRestClient.Rename(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, synapseResourceMoveDefinition, cancellationToken); - return response; - } - catch (Exception e) - { - scope.Failed(e); - throw; - } - } - /// /// Creates a restore point for a data warehouse. /// diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseWorkspaceData.Serialization.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseWorkspaceData.Serialization.cs index ca4160deea3d..9d15fdadffc4 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseWorkspaceData.Serialization.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseWorkspaceData.Serialization.cs @@ -75,7 +75,7 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri writer.WritePropertyName("virtualNetworkProfile"u8); writer.WriteObjectValue(VirtualNetworkProfile, options); } - if (Optional.IsCollectionDefined(ConnectivityEndpoints)) + if (options.Format != "W" && Optional.IsCollectionDefined(ConnectivityEndpoints)) { writer.WritePropertyName("connectivityEndpoints"u8); writer.WriteStartObject(); @@ -111,28 +111,17 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri writer.WritePropertyName("workspaceUID"u8); writer.WriteStringValue(WorkspaceUid.Value); } - if (options.Format != "W" && Optional.IsCollectionDefined(ExtraProperties)) + if (options.Format != "W" && Optional.IsDefined(ExtraProperties)) { writer.WritePropertyName("extraProperties"u8); - writer.WriteStartObject(); - foreach (var item in ExtraProperties) - { - writer.WritePropertyName(item.Key); - if (item.Value == null) - { - writer.WriteNullValue(); - continue; - } #if NET6_0_OR_GREATER - writer.WriteRawValue(item.Value); + writer.WriteRawValue(ExtraProperties); #else - using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions)) - { - JsonSerializer.Serialize(writer, document.RootElement); - } -#endif + using (JsonDocument document = JsonDocument.Parse(ExtraProperties, ModelSerializationExtensions.JsonDocumentOptions)) + { + JsonSerializer.Serialize(writer, document.RootElement); } - writer.WriteEndObject(); +#endif } if (Optional.IsDefined(ManagedVirtualNetworkSettings)) { @@ -233,12 +222,12 @@ internal static SynapseWorkspaceData DeserializeSynapseWorkspaceData(JsonElement string provisioningState = default; string sqlAdministratorLogin = default; VirtualNetworkProfile virtualNetworkProfile = default; - IDictionary connectivityEndpoints = default; + IReadOnlyDictionary connectivityEndpoints = default; string managedVirtualNetwork = default; IList privateEndpointConnections = default; SynapseEncryptionDetails encryption = default; Guid? workspaceUID = default; - IReadOnlyDictionary extraProperties = default; + BinaryData extraProperties = default; SynapseManagedVirtualNetworkSettings managedVirtualNetworkSettings = default; SynapseWorkspaceRepositoryConfiguration workspaceRepositoryConfiguration = default; PurviewConfiguration purviewConfiguration = default; @@ -409,19 +398,7 @@ internal static SynapseWorkspaceData DeserializeSynapseWorkspaceData(JsonElement { continue; } - Dictionary dictionary = new Dictionary(); - foreach (var property1 in property0.Value.EnumerateObject()) - { - if (property1.Value.ValueKind == JsonValueKind.Null) - { - dictionary.Add(property1.Name, null); - } - else - { - dictionary.Add(property1.Name, BinaryData.FromString(property1.Value.GetRawText())); - } - } - extraProperties = dictionary; + extraProperties = BinaryData.FromString(property0.Value.GetRawText()); continue; } if (property0.NameEquals("managedVirtualNetworkSettings"u8)) @@ -545,7 +522,7 @@ internal static SynapseWorkspaceData DeserializeSynapseWorkspaceData(JsonElement privateEndpointConnections ?? new ChangeTrackingList(), encryption, workspaceUID, - extraProperties ?? new ChangeTrackingDictionary(), + extraProperties, managedVirtualNetworkSettings, workspaceRepositoryConfiguration, purviewConfiguration, diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseWorkspaceData.cs b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseWorkspaceData.cs index f3e6287a1560..8d72c5036021 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseWorkspaceData.cs +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/Generated/SynapseWorkspaceData.cs @@ -57,7 +57,6 @@ public SynapseWorkspaceData(AzureLocation location) : base(location) { ConnectivityEndpoints = new ChangeTrackingDictionary(); PrivateEndpointConnections = new ChangeTrackingList(); - ExtraProperties = new ChangeTrackingDictionary(); Settings = new ChangeTrackingDictionary(); } @@ -91,7 +90,7 @@ public SynapseWorkspaceData(AzureLocation location) : base(location) /// Enable or Disable AzureADOnlyAuthentication on All Workspace subresource. /// Is trustedServiceBypassEnabled for the workspace. /// Keeps track of any properties unknown to the library. - internal SynapseWorkspaceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary tags, AzureLocation location, ManagedServiceIdentity identity, SynapseDataLakeStorageAccountDetails defaultDataLakeStorage, string sqlAdministratorLoginPassword, string managedResourceGroupName, string provisioningState, string sqlAdministratorLogin, VirtualNetworkProfile virtualNetworkProfile, IDictionary connectivityEndpoints, string managedVirtualNetwork, IList privateEndpointConnections, SynapseEncryptionDetails encryption, Guid? workspaceUid, IReadOnlyDictionary extraProperties, SynapseManagedVirtualNetworkSettings managedVirtualNetworkSettings, SynapseWorkspaceRepositoryConfiguration workspaceRepositoryConfiguration, PurviewConfiguration purviewConfiguration, ResourceIdentifier adlaResourceId, WorkspacePublicNetworkAccess? publicNetworkAccess, CspWorkspaceAdminProperties cspWorkspaceAdminProperties, IReadOnlyDictionary settings, bool? isAadOnlyAuthenticationEnabled, bool? isTrustedServiceBypassEnabled, IDictionary serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location) + internal SynapseWorkspaceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary tags, AzureLocation location, ManagedServiceIdentity identity, SynapseDataLakeStorageAccountDetails defaultDataLakeStorage, string sqlAdministratorLoginPassword, string managedResourceGroupName, string provisioningState, string sqlAdministratorLogin, VirtualNetworkProfile virtualNetworkProfile, IReadOnlyDictionary connectivityEndpoints, string managedVirtualNetwork, IList privateEndpointConnections, SynapseEncryptionDetails encryption, Guid? workspaceUid, BinaryData extraProperties, SynapseManagedVirtualNetworkSettings managedVirtualNetworkSettings, SynapseWorkspaceRepositoryConfiguration workspaceRepositoryConfiguration, PurviewConfiguration purviewConfiguration, ResourceIdentifier adlaResourceId, WorkspacePublicNetworkAccess? publicNetworkAccess, CspWorkspaceAdminProperties cspWorkspaceAdminProperties, IReadOnlyDictionary settings, bool? isAadOnlyAuthenticationEnabled, bool? isTrustedServiceBypassEnabled, IDictionary serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location) { Identity = identity; DefaultDataLakeStorage = defaultDataLakeStorage; @@ -150,7 +149,7 @@ public string VirtualNetworkComputeSubnetId } /// Connectivity endpoints. - public IDictionary ConnectivityEndpoints { get; } + public IReadOnlyDictionary ConnectivityEndpoints { get; } /// Setting this to 'default' will ensure that all compute for this workspace is in a virtual network managed on behalf of the user. public string ManagedVirtualNetwork { get; set; } /// Private endpoint connections to the workspace. @@ -162,7 +161,7 @@ public string VirtualNetworkComputeSubnetId /// /// Workspace level configs and feature flags /// - /// To assign an object to the value of this property use . + /// To assign an object to this property use . /// /// /// To assign an already formatted json string to this property use . @@ -189,7 +188,7 @@ public string VirtualNetworkComputeSubnetId /// /// /// - public IReadOnlyDictionary ExtraProperties { get; } + public BinaryData ExtraProperties { get; } /// Managed Virtual Network Settings. public SynapseManagedVirtualNetworkSettings ManagedVirtualNetworkSettings { get; set; } /// Git integration settings. diff --git a/sdk/synapse/Azure.ResourceManager.Synapse/src/autorest.md b/sdk/synapse/Azure.ResourceManager.Synapse/src/autorest.md index d1b1fe5473e6..30aa35e8c791 100644 --- a/sdk/synapse/Azure.ResourceManager.Synapse/src/autorest.md +++ b/sdk/synapse/Azure.ResourceManager.Synapse/src/autorest.md @@ -9,7 +9,7 @@ csharp: true library-name: Synapse namespace: Azure.ResourceManager.Synapse # The readme.md in swagger repo contains invalid setting for C# sdk -# require: https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/readme.md +# require: /mnt/vss/_work/1/s/azure-rest-api-specs/specification/synapse/resource-manager/readme.md tag: package-composite-v2 output-folder: $(this-folder)/Generated clear-output-folder: true @@ -546,20 +546,20 @@ These settings apply only when --tag=package-composite-v2 is specified on the co ```yaml $(tag) == 'package-composite-v2' input-file: - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/azureADOnlyAuthentication.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/checkNameAvailability.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/firewallRule.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/keys.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/operations.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/privateEndpointConnections.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/privateLinkResources.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/privatelinkhub.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlPool.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlServer.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/workspace.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/library.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sparkConfiguration.json - - https://github.com/Azure/azure-rest-api-specs/blob/340d577969b7bff5ad0488d79543314bc17daa50/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/kustoPool.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/azureADOnlyAuthentication.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/checkNameAvailability.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/firewallRule.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/keys.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/operations.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/privateEndpointConnections.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/privateLinkResources.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/privatelinkhub.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlPool.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/sqlServer.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/workspace.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/library.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/integrationRuntime.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sparkConfiguration.json + - https://github.com/Azure/azure-rest-api-specs/blob/0a84f4aba30ba4050bf73302c3a5a521997c889d/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/kustoPool.json ```