diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/api/Azure.ResourceManager.DataFactory.net8.0.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/api/Azure.ResourceManager.DataFactory.net8.0.cs index 799ca8e5a9d9..8e740faf3cb5 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/api/Azure.ResourceManager.DataFactory.net8.0.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/api/Azure.ResourceManager.DataFactory.net8.0.cs @@ -200,8 +200,6 @@ public static partial class DataFactoryExtensions public static Azure.Response ConfigureFactoryRepoInformation(this Azure.ResourceManager.Resources.SubscriptionResource subscriptionResource, Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.FactoryRepoContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static System.Threading.Tasks.Task> ConfigureFactoryRepoInformationAsync(this Azure.ResourceManager.Resources.SubscriptionResource subscriptionResource, Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.FactoryRepoContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static Azure.ResourceManager.DataFactory.DataFactoryCollection GetDataFactories(this Azure.ResourceManager.Resources.ResourceGroupResource resourceGroupResource) { throw null; } - public static Azure.Pageable GetDataFactories(this Azure.ResourceManager.Resources.SubscriptionResource subscriptionResource, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static Azure.AsyncPageable GetDataFactoriesAsync(this Azure.ResourceManager.Resources.SubscriptionResource subscriptionResource, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static Azure.Response GetDataFactory(this Azure.ResourceManager.Resources.ResourceGroupResource resourceGroupResource, string factoryName, string ifNoneMatch = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static System.Threading.Tasks.Task> GetDataFactoryAsync(this Azure.ResourceManager.Resources.ResourceGroupResource resourceGroupResource, string factoryName, string ifNoneMatch = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static Azure.ResourceManager.DataFactory.DataFactoryChangeDataCaptureResource GetDataFactoryChangeDataCaptureResource(this Azure.ResourceManager.ArmClient client, Azure.Core.ResourceIdentifier id) { throw null; } @@ -896,8 +894,6 @@ public partial class MockableDataFactorySubscriptionResource : Azure.ResourceMan protected MockableDataFactorySubscriptionResource() { } public virtual Azure.Response ConfigureFactoryRepoInformation(Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.FactoryRepoContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> ConfigureFactoryRepoInformationAsync(Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.FactoryRepoContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.Pageable GetDataFactories(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetDataFactoriesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response GetFeatureValueExposureControl(Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.ExposureControlContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> GetFeatureValueExposureControlAsync(Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.ExposureControlContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } } @@ -8728,6 +8724,9 @@ public partial class Office365LinkedService : Azure.ResourceManager.DataFactory. public Office365LinkedService(Azure.Core.Expressions.DataFactory.DataFactoryElement office365TenantId, Azure.Core.Expressions.DataFactory.DataFactoryElement servicePrincipalTenantId, Azure.Core.Expressions.DataFactory.DataFactoryElement servicePrincipalId, Azure.Core.Expressions.DataFactory.DataFactorySecret servicePrincipalKey) { } public string EncryptedCredential { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement Office365TenantId { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactoryElement ServicePrincipalCredentialType { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactorySecret ServicePrincipalEmbeddedCert { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactorySecret ServicePrincipalEmbeddedCertPassword { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement ServicePrincipalId { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactorySecret ServicePrincipalKey { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement ServicePrincipalTenantId { get { throw null; } set { } } @@ -11327,6 +11326,8 @@ public SnowflakeV2LinkedService(Azure.Core.Expressions.DataFactory.DataFactoryEl public Azure.Core.Expressions.DataFactory.DataFactorySecret Password { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactorySecret PrivateKey { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactorySecret PrivateKeyPassphrase { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactoryElement Role { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactoryElement Schema { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement Scope { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement TenantId { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement User { get { throw null; } set { } } 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 799ca8e5a9d9..8e740faf3cb5 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 @@ -200,8 +200,6 @@ public static partial class DataFactoryExtensions public static Azure.Response ConfigureFactoryRepoInformation(this Azure.ResourceManager.Resources.SubscriptionResource subscriptionResource, Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.FactoryRepoContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static System.Threading.Tasks.Task> ConfigureFactoryRepoInformationAsync(this Azure.ResourceManager.Resources.SubscriptionResource subscriptionResource, Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.FactoryRepoContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static Azure.ResourceManager.DataFactory.DataFactoryCollection GetDataFactories(this Azure.ResourceManager.Resources.ResourceGroupResource resourceGroupResource) { throw null; } - public static Azure.Pageable GetDataFactories(this Azure.ResourceManager.Resources.SubscriptionResource subscriptionResource, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static Azure.AsyncPageable GetDataFactoriesAsync(this Azure.ResourceManager.Resources.SubscriptionResource subscriptionResource, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static Azure.Response GetDataFactory(this Azure.ResourceManager.Resources.ResourceGroupResource resourceGroupResource, string factoryName, string ifNoneMatch = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static System.Threading.Tasks.Task> GetDataFactoryAsync(this Azure.ResourceManager.Resources.ResourceGroupResource resourceGroupResource, string factoryName, string ifNoneMatch = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public static Azure.ResourceManager.DataFactory.DataFactoryChangeDataCaptureResource GetDataFactoryChangeDataCaptureResource(this Azure.ResourceManager.ArmClient client, Azure.Core.ResourceIdentifier id) { throw null; } @@ -896,8 +894,6 @@ public partial class MockableDataFactorySubscriptionResource : Azure.ResourceMan protected MockableDataFactorySubscriptionResource() { } public virtual Azure.Response ConfigureFactoryRepoInformation(Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.FactoryRepoContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> ConfigureFactoryRepoInformationAsync(Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.FactoryRepoContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.Pageable GetDataFactories(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetDataFactoriesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual Azure.Response GetFeatureValueExposureControl(Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.ExposureControlContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> GetFeatureValueExposureControlAsync(Azure.Core.AzureLocation locationId, Azure.ResourceManager.DataFactory.Models.ExposureControlContent content, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } } @@ -8728,6 +8724,9 @@ public partial class Office365LinkedService : Azure.ResourceManager.DataFactory. public Office365LinkedService(Azure.Core.Expressions.DataFactory.DataFactoryElement office365TenantId, Azure.Core.Expressions.DataFactory.DataFactoryElement servicePrincipalTenantId, Azure.Core.Expressions.DataFactory.DataFactoryElement servicePrincipalId, Azure.Core.Expressions.DataFactory.DataFactorySecret servicePrincipalKey) { } public string EncryptedCredential { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement Office365TenantId { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactoryElement ServicePrincipalCredentialType { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactorySecret ServicePrincipalEmbeddedCert { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactorySecret ServicePrincipalEmbeddedCertPassword { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement ServicePrincipalId { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactorySecret ServicePrincipalKey { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement ServicePrincipalTenantId { get { throw null; } set { } } @@ -11327,6 +11326,8 @@ public SnowflakeV2LinkedService(Azure.Core.Expressions.DataFactory.DataFactoryEl public Azure.Core.Expressions.DataFactory.DataFactorySecret Password { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactorySecret PrivateKey { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactorySecret PrivateKeyPassphrase { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactoryElement Role { get { throw null; } set { } } + public Azure.Core.Expressions.DataFactory.DataFactoryElement Schema { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement Scope { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement TenantId { get { throw null; } set { } } public Azure.Core.Expressions.DataFactory.DataFactoryElement User { get { throw null; } set { } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/samples/Generated/Samples/Sample_SubscriptionResourceExtensions.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/samples/Generated/Samples/Sample_SubscriptionResourceExtensions.cs index 029e1067dec4..e310601a2e53 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/samples/Generated/Samples/Sample_SubscriptionResourceExtensions.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/samples/Generated/Samples/Sample_SubscriptionResourceExtensions.cs @@ -17,37 +17,6 @@ namespace Azure.ResourceManager.DataFactory.Samples { public partial class Sample_SubscriptionResourceExtensions { - [Test] - [Ignore("Only validating compilation of examples")] - public async Task GetDataFactories_FactoriesList() - { - // Generated from example definition: specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Factories_List.json - // this example is just showing the usage of "Factories_List" 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 SubscriptionResource created on azure - // for more information of creating SubscriptionResource, please refer to the document of SubscriptionResource - string subscriptionId = "12345678-1234-1234-1234-12345678abc"; - ResourceIdentifier subscriptionResourceId = SubscriptionResource.CreateResourceIdentifier(subscriptionId); - SubscriptionResource subscriptionResource = client.GetSubscriptionResource(subscriptionResourceId); - - // invoke the operation and iterate over the result - await foreach (DataFactoryResource item in subscriptionResource.GetDataFactoriesAsync()) - { - // the variable item is a resource, you could call other operations on this instance as well - // but just for demo, we get its data from this resource instance - DataFactoryData resourceData = item.Data; - // for demo we just print out the id - Console.WriteLine($"Succeeded on id: {resourceData.Id}"); - } - - Console.WriteLine("Succeeded"); - } - [Test] [Ignore("Only validating compilation of examples")] public async Task ConfigureFactoryRepoInformation_FactoriesConfigureFactoryRepo() diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Extensions/DataFactoryExtensions.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Extensions/DataFactoryExtensions.cs index 74939b054294..a7fa1adf7f64 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Extensions/DataFactoryExtensions.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Extensions/DataFactoryExtensions.cs @@ -375,78 +375,6 @@ public static Response GetDataFactory(this ResourceGroupRes return GetMockableDataFactoryResourceGroupResource(resourceGroupResource).GetDataFactory(factoryName, ifNoneMatch, cancellationToken); } - /// - /// Lists factories under the specified subscription. - /// - /// - /// Request Path - /// /subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/factories - /// - /// - /// Operation Id - /// Factories_List - /// - /// - /// Default Api Version - /// 2018-06-01 - /// - /// - /// Resource - /// - /// - /// - /// - /// Mocking - /// To mock this method, please mock instead. - /// - /// - /// The instance the method will execute against. - /// The cancellation token to use. - /// is null. - /// An async collection of that may take multiple service requests to iterate over. - public static AsyncPageable GetDataFactoriesAsync(this SubscriptionResource subscriptionResource, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(subscriptionResource, nameof(subscriptionResource)); - - return GetMockableDataFactorySubscriptionResource(subscriptionResource).GetDataFactoriesAsync(cancellationToken); - } - - /// - /// Lists factories under the specified subscription. - /// - /// - /// Request Path - /// /subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/factories - /// - /// - /// Operation Id - /// Factories_List - /// - /// - /// Default Api Version - /// 2018-06-01 - /// - /// - /// Resource - /// - /// - /// - /// - /// Mocking - /// To mock this method, please mock instead. - /// - /// - /// The instance the method will execute against. - /// The cancellation token to use. - /// is null. - /// A collection of that may take multiple service requests to iterate over. - public static Pageable GetDataFactories(this SubscriptionResource subscriptionResource, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(subscriptionResource, nameof(subscriptionResource)); - - return GetMockableDataFactorySubscriptionResource(subscriptionResource).GetDataFactories(cancellationToken); - } - /// /// Updates a factory's repo information. /// diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Extensions/MockableDataFactorySubscriptionResource.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Extensions/MockableDataFactorySubscriptionResource.cs index 26d7b48c8e23..0341ca6af197 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Extensions/MockableDataFactorySubscriptionResource.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Extensions/MockableDataFactorySubscriptionResource.cs @@ -8,7 +8,6 @@ using System; using System.Threading; using System.Threading.Tasks; -using Autorest.CSharp.Core; using Azure.Core; using Azure.Core.Pipeline; using Azure.ResourceManager.DataFactory.Models; @@ -46,66 +45,6 @@ private string GetApiVersionOrNull(ResourceType resourceType) return apiVersion; } - /// - /// Lists factories under the specified subscription. - /// - /// - /// Request Path - /// /subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/factories - /// - /// - /// Operation Id - /// Factories_List - /// - /// - /// Default Api Version - /// 2018-06-01 - /// - /// - /// Resource - /// - /// - /// - /// - /// The cancellation token to use. - /// An async collection of that may take multiple service requests to iterate over. - public virtual AsyncPageable GetDataFactoriesAsync(CancellationToken cancellationToken = default) - { - HttpMessage FirstPageRequest(int? pageSizeHint) => DataFactoryFactoriesRestClient.CreateListRequest(Id.SubscriptionId); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DataFactoryFactoriesRestClient.CreateListNextPageRequest(nextLink, Id.SubscriptionId); - return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DataFactoryResource(Client, DataFactoryData.DeserializeDataFactoryData(e)), DataFactoryFactoriesClientDiagnostics, Pipeline, "MockableDataFactorySubscriptionResource.GetDataFactories", "value", "nextLink", cancellationToken); - } - - /// - /// Lists factories under the specified subscription. - /// - /// - /// Request Path - /// /subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/factories - /// - /// - /// Operation Id - /// Factories_List - /// - /// - /// Default Api Version - /// 2018-06-01 - /// - /// - /// Resource - /// - /// - /// - /// - /// The cancellation token to use. - /// A collection of that may take multiple service requests to iterate over. - public virtual Pageable GetDataFactories(CancellationToken cancellationToken = default) - { - HttpMessage FirstPageRequest(int? pageSizeHint) => DataFactoryFactoriesRestClient.CreateListRequest(Id.SubscriptionId); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DataFactoryFactoriesRestClient.CreateListNextPageRequest(nextLink, Id.SubscriptionId); - return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DataFactoryResource(Client, DataFactoryData.DeserializeDataFactoryData(e)), DataFactoryFactoriesClientDiagnostics, Pipeline, "MockableDataFactorySubscriptionResource.GetDataFactories", "value", "nextLink", cancellationToken); - } - /// /// Updates a factory's repo information. /// diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/Office365LinkedService.Serialization.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/Office365LinkedService.Serialization.cs index 8f5a2c203e46..db23a6d19974 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/Office365LinkedService.Serialization.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/Office365LinkedService.Serialization.cs @@ -46,6 +46,21 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri JsonSerializer.Serialize(writer, ServicePrincipalId); writer.WritePropertyName("servicePrincipalKey"u8); JsonSerializer.Serialize(writer, ServicePrincipalKey); + if (Optional.IsDefined(ServicePrincipalCredentialType)) + { + writer.WritePropertyName("servicePrincipalCredentialType"u8); + JsonSerializer.Serialize(writer, ServicePrincipalCredentialType); + } + if (Optional.IsDefined(ServicePrincipalEmbeddedCert)) + { + writer.WritePropertyName("servicePrincipalEmbeddedCert"u8); + JsonSerializer.Serialize(writer, ServicePrincipalEmbeddedCert); + } + if (Optional.IsDefined(ServicePrincipalEmbeddedCertPassword)) + { + writer.WritePropertyName("servicePrincipalEmbeddedCertPassword"u8); + JsonSerializer.Serialize(writer, ServicePrincipalEmbeddedCertPassword); + } if (Optional.IsDefined(EncryptedCredential)) { writer.WritePropertyName("encryptedCredential"u8); @@ -96,6 +111,9 @@ internal static Office365LinkedService DeserializeOffice365LinkedService(JsonEle DataFactoryElement servicePrincipalTenantId = default; DataFactoryElement servicePrincipalId = default; DataFactorySecret servicePrincipalKey = default; + DataFactoryElement servicePrincipalCredentialType = default; + DataFactorySecret servicePrincipalEmbeddedCert = default; + DataFactorySecret servicePrincipalEmbeddedCertPassword = default; string encryptedCredential = default; IDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); @@ -189,6 +207,33 @@ internal static Office365LinkedService DeserializeOffice365LinkedService(JsonEle servicePrincipalKey = JsonSerializer.Deserialize(property0.Value.GetRawText()); continue; } + if (property0.NameEquals("servicePrincipalCredentialType"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + servicePrincipalCredentialType = JsonSerializer.Deserialize>(property0.Value.GetRawText()); + continue; + } + if (property0.NameEquals("servicePrincipalEmbeddedCert"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + servicePrincipalEmbeddedCert = JsonSerializer.Deserialize(property0.Value.GetRawText()); + continue; + } + if (property0.NameEquals("servicePrincipalEmbeddedCertPassword"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + servicePrincipalEmbeddedCertPassword = JsonSerializer.Deserialize(property0.Value.GetRawText()); + continue; + } if (property0.NameEquals("encryptedCredential"u8)) { encryptedCredential = property0.Value.GetString(); @@ -212,6 +257,9 @@ internal static Office365LinkedService DeserializeOffice365LinkedService(JsonEle servicePrincipalTenantId, servicePrincipalId, servicePrincipalKey, + servicePrincipalCredentialType, + servicePrincipalEmbeddedCert, + servicePrincipalEmbeddedCertPassword, encryptedCredential); } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/Office365LinkedService.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/Office365LinkedService.cs index 0404fa4c60ee..93110f014a6e 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/Office365LinkedService.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/Office365LinkedService.cs @@ -46,13 +46,19 @@ public Office365LinkedService(DataFactoryElement office365TenantId, Data /// Specify the tenant information under which your Azure AD web application resides. Type: string (or Expression with resultType string). /// Specify the application's client ID. Type: string (or Expression with resultType string). /// Specify the application's key. + /// The service principal credential type for authentication.'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. If not specified, 'ServicePrincipalKey' is in use. Type: string (or Expression with resultType string). + /// Specify the base64 encoded certificate of your application registered in Azure Active Directory. Type: string (or Expression with resultType string). + /// Specify the password of your certificate if your certificate has a password and you are using AadServicePrincipal authentication. Type: string (or Expression with resultType string). /// The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. - internal Office365LinkedService(string linkedServiceType, string linkedServiceVersion, IntegrationRuntimeReference connectVia, string description, IDictionary parameters, IList annotations, IDictionary additionalProperties, DataFactoryElement office365TenantId, DataFactoryElement servicePrincipalTenantId, DataFactoryElement servicePrincipalId, DataFactorySecret servicePrincipalKey, string encryptedCredential) : base(linkedServiceType, linkedServiceVersion, connectVia, description, parameters, annotations, additionalProperties) + internal Office365LinkedService(string linkedServiceType, string linkedServiceVersion, IntegrationRuntimeReference connectVia, string description, IDictionary parameters, IList annotations, IDictionary additionalProperties, DataFactoryElement office365TenantId, DataFactoryElement servicePrincipalTenantId, DataFactoryElement servicePrincipalId, DataFactorySecret servicePrincipalKey, DataFactoryElement servicePrincipalCredentialType, DataFactorySecret servicePrincipalEmbeddedCert, DataFactorySecret servicePrincipalEmbeddedCertPassword, string encryptedCredential) : base(linkedServiceType, linkedServiceVersion, connectVia, description, parameters, annotations, additionalProperties) { Office365TenantId = office365TenantId; ServicePrincipalTenantId = servicePrincipalTenantId; ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; + ServicePrincipalCredentialType = servicePrincipalCredentialType; + ServicePrincipalEmbeddedCert = servicePrincipalEmbeddedCert; + ServicePrincipalEmbeddedCertPassword = servicePrincipalEmbeddedCertPassword; EncryptedCredential = encryptedCredential; LinkedServiceType = linkedServiceType ?? "Office365"; } @@ -70,6 +76,12 @@ internal Office365LinkedService() public DataFactoryElement ServicePrincipalId { get; set; } /// Specify the application's key. public DataFactorySecret ServicePrincipalKey { get; set; } + /// The service principal credential type for authentication.'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. If not specified, 'ServicePrincipalKey' is in use. Type: string (or Expression with resultType string). + public DataFactoryElement ServicePrincipalCredentialType { get; set; } + /// Specify the base64 encoded certificate of your application registered in Azure Active Directory. Type: string (or Expression with resultType string). + public DataFactorySecret ServicePrincipalEmbeddedCert { get; set; } + /// Specify the password of your certificate if your certificate has a password and you are using AadServicePrincipal authentication. Type: string (or Expression with resultType string). + public DataFactorySecret ServicePrincipalEmbeddedCertPassword { get; set; } /// The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. public string EncryptedCredential { get; set; } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SnowflakeV2LinkedService.Serialization.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SnowflakeV2LinkedService.Serialization.cs index ebe1a2171787..36673896de1a 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SnowflakeV2LinkedService.Serialization.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SnowflakeV2LinkedService.Serialization.cs @@ -89,11 +89,21 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri writer.WritePropertyName("privateKeyPassphrase"u8); JsonSerializer.Serialize(writer, PrivateKeyPassphrase); } + if (Optional.IsDefined(Role)) + { + writer.WritePropertyName("role"u8); + JsonSerializer.Serialize(writer, Role); + } if (Optional.IsDefined(Host)) { writer.WritePropertyName("host"u8); JsonSerializer.Serialize(writer, Host); } + if (Optional.IsDefined(Schema)) + { + writer.WritePropertyName("schema"u8); + JsonSerializer.Serialize(writer, Schema); + } if (Optional.IsDefined(EncryptedCredential)) { writer.WritePropertyName("encryptedCredential"u8); @@ -152,7 +162,9 @@ internal static SnowflakeV2LinkedService DeserializeSnowflakeV2LinkedService(Jso DataFactoryElement scope = default; DataFactorySecret privateKey = default; DataFactorySecret privateKeyPassphrase = default; + DataFactoryElement role = default; DataFactoryElement host = default; + DataFactoryElement schema = default; string encryptedCredential = default; IDictionary additionalProperties = default; Dictionary additionalPropertiesDictionary = new Dictionary(); @@ -322,6 +334,15 @@ internal static SnowflakeV2LinkedService DeserializeSnowflakeV2LinkedService(Jso privateKeyPassphrase = JsonSerializer.Deserialize(property0.Value.GetRawText()); continue; } + if (property0.NameEquals("role"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + role = JsonSerializer.Deserialize>(property0.Value.GetRawText()); + continue; + } if (property0.NameEquals("host"u8)) { if (property0.Value.ValueKind == JsonValueKind.Null) @@ -331,6 +352,15 @@ internal static SnowflakeV2LinkedService DeserializeSnowflakeV2LinkedService(Jso host = JsonSerializer.Deserialize>(property0.Value.GetRawText()); continue; } + if (property0.NameEquals("schema"u8)) + { + if (property0.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + schema = JsonSerializer.Deserialize>(property0.Value.GetRawText()); + continue; + } if (property0.NameEquals("encryptedCredential"u8)) { encryptedCredential = property0.Value.GetString(); @@ -362,7 +392,9 @@ internal static SnowflakeV2LinkedService DeserializeSnowflakeV2LinkedService(Jso scope, privateKey, privateKeyPassphrase, + role, host, + schema, encryptedCredential); } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SnowflakeV2LinkedService.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SnowflakeV2LinkedService.cs index 7e2365d2318d..f8b9e7b6d07a 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SnowflakeV2LinkedService.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/Models/SnowflakeV2LinkedService.cs @@ -51,9 +51,11 @@ public SnowflakeV2LinkedService(DataFactoryElement accountIdentifier, Da /// The scope of the application registered in Azure Active Directory for AADServicePrincipal authentication. /// The Azure key vault secret reference of privateKey for KeyPair auth. /// The Azure key vault secret reference of private key password for KeyPair auth with encrypted private key. - /// The host name of the Snowflake account. + /// The default access control role to use in the Snowflake session. Type: string (or Expression with resultType string). + /// The host name of the Snowflake account. Type: string (or Expression with resultType string). + /// Schema name for connection. Type: string (or Expression with resultType string). /// The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. - internal SnowflakeV2LinkedService(string linkedServiceType, string linkedServiceVersion, IntegrationRuntimeReference connectVia, string description, IDictionary parameters, IList annotations, IDictionary additionalProperties, DataFactoryElement accountIdentifier, DataFactoryElement user, DataFactorySecret password, DataFactoryElement database, DataFactoryElement warehouse, SnowflakeAuthenticationType? authenticationType, DataFactoryElement clientId, DataFactorySecret clientSecret, DataFactoryElement tenantId, DataFactoryElement scope, DataFactorySecret privateKey, DataFactorySecret privateKeyPassphrase, DataFactoryElement host, string encryptedCredential) : base(linkedServiceType, linkedServiceVersion, connectVia, description, parameters, annotations, additionalProperties) + internal SnowflakeV2LinkedService(string linkedServiceType, string linkedServiceVersion, IntegrationRuntimeReference connectVia, string description, IDictionary parameters, IList annotations, IDictionary additionalProperties, DataFactoryElement accountIdentifier, DataFactoryElement user, DataFactorySecret password, DataFactoryElement database, DataFactoryElement warehouse, SnowflakeAuthenticationType? authenticationType, DataFactoryElement clientId, DataFactorySecret clientSecret, DataFactoryElement tenantId, DataFactoryElement scope, DataFactorySecret privateKey, DataFactorySecret privateKeyPassphrase, DataFactoryElement role, DataFactoryElement host, DataFactoryElement schema, string encryptedCredential) : base(linkedServiceType, linkedServiceVersion, connectVia, description, parameters, annotations, additionalProperties) { AccountIdentifier = accountIdentifier; User = user; @@ -67,7 +69,9 @@ internal SnowflakeV2LinkedService(string linkedServiceType, string linkedService Scope = scope; PrivateKey = privateKey; PrivateKeyPassphrase = privateKeyPassphrase; + Role = role; Host = host; + Schema = schema; EncryptedCredential = encryptedCredential; LinkedServiceType = linkedServiceType ?? "SnowflakeV2"; } @@ -101,8 +105,12 @@ internal SnowflakeV2LinkedService() public DataFactorySecret PrivateKey { get; set; } /// The Azure key vault secret reference of private key password for KeyPair auth with encrypted private key. public DataFactorySecret PrivateKeyPassphrase { get; set; } - /// The host name of the Snowflake account. + /// The default access control role to use in the Snowflake session. Type: string (or Expression with resultType string). + public DataFactoryElement Role { get; set; } + /// The host name of the Snowflake account. Type: string (or Expression with resultType string). public DataFactoryElement Host { get; set; } + /// Schema name for connection. Type: string (or Expression with resultType string). + public DataFactoryElement Schema { get; set; } /// The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. public string EncryptedCredential { get; set; } } diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/RestOperations/FactoriesRestOperations.cs b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/RestOperations/FactoriesRestOperations.cs index e1ddf733a5e2..ff1ace5e0a16 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/RestOperations/FactoriesRestOperations.cs +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/Generated/RestOperations/FactoriesRestOperations.cs @@ -36,84 +36,6 @@ public FactoriesRestOperations(HttpPipeline pipeline, string applicationId, Uri _userAgent = new TelemetryDetails(GetType().Assembly, applicationId); } - internal RequestUriBuilder CreateListRequestUri(string subscriptionId) - { - var uri = new RawRequestUriBuilder(); - uri.Reset(_endpoint); - uri.AppendPath("/subscriptions/", false); - uri.AppendPath(subscriptionId, true); - uri.AppendPath("/providers/Microsoft.DataFactory/factories", false); - uri.AppendQuery("api-version", _apiVersion, true); - return uri; - } - - internal HttpMessage CreateListRequest(string subscriptionId) - { - var message = _pipeline.CreateMessage(); - var request = message.Request; - request.Method = RequestMethod.Get; - var uri = new RawRequestUriBuilder(); - uri.Reset(_endpoint); - uri.AppendPath("/subscriptions/", false); - uri.AppendPath(subscriptionId, true); - uri.AppendPath("/providers/Microsoft.DataFactory/factories", false); - uri.AppendQuery("api-version", _apiVersion, true); - request.Uri = uri; - request.Headers.Add("Accept", "application/json"); - _userAgent.Apply(message); - return message; - } - - /// Lists factories under the specified subscription. - /// The subscription identifier. - /// The cancellation token to use. - /// is null. - /// is an empty string, and was expected to be non-empty. - public async Task> ListAsync(string subscriptionId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId)); - - using var message = CreateListRequest(subscriptionId); - await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); - switch (message.Response.Status) - { - case 200: - { - DataFactoryListResult value = default; - using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false); - value = DataFactoryListResult.DeserializeDataFactoryListResult(document.RootElement); - return Response.FromValue(value, message.Response); - } - default: - throw new RequestFailedException(message.Response); - } - } - - /// Lists factories under the specified subscription. - /// The subscription identifier. - /// The cancellation token to use. - /// is null. - /// is an empty string, and was expected to be non-empty. - public Response List(string subscriptionId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId)); - - using var message = CreateListRequest(subscriptionId); - _pipeline.Send(message, cancellationToken); - switch (message.Response.Status) - { - case 200: - { - DataFactoryListResult value = default; - using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions); - value = DataFactoryListResult.DeserializeDataFactoryListResult(document.RootElement); - return Response.FromValue(value, message.Response); - } - default: - throw new RequestFailedException(message.Response); - } - } - internal RequestUriBuilder CreateConfigureFactoryRepoRequestUri(string subscriptionId, AzureLocation locationId, FactoryRepoContent content) { var uri = new RawRequestUriBuilder(); @@ -890,82 +812,6 @@ public Response GetDataPlaneAccess(strin } } - internal RequestUriBuilder CreateListNextPageRequestUri(string nextLink, string subscriptionId) - { - var uri = new RawRequestUriBuilder(); - uri.Reset(_endpoint); - uri.AppendRawNextLink(nextLink, false); - return uri; - } - - internal HttpMessage CreateListNextPageRequest(string nextLink, string subscriptionId) - { - var message = _pipeline.CreateMessage(); - var request = message.Request; - request.Method = RequestMethod.Get; - var uri = new RawRequestUriBuilder(); - uri.Reset(_endpoint); - uri.AppendRawNextLink(nextLink, false); - request.Uri = uri; - request.Headers.Add("Accept", "application/json"); - _userAgent.Apply(message); - return message; - } - - /// Lists factories under the specified subscription. - /// The URL to the next page of results. - /// The subscription identifier. - /// The cancellation token to use. - /// or is null. - /// is an empty string, and was expected to be non-empty. - public async Task> ListNextPageAsync(string nextLink, string subscriptionId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(nextLink, nameof(nextLink)); - Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId)); - - using var message = CreateListNextPageRequest(nextLink, subscriptionId); - await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); - switch (message.Response.Status) - { - case 200: - { - DataFactoryListResult value = default; - using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false); - value = DataFactoryListResult.DeserializeDataFactoryListResult(document.RootElement); - return Response.FromValue(value, message.Response); - } - default: - throw new RequestFailedException(message.Response); - } - } - - /// Lists factories under the specified subscription. - /// The URL to the next page of results. - /// The subscription identifier. - /// The cancellation token to use. - /// or is null. - /// is an empty string, and was expected to be non-empty. - public Response ListNextPage(string nextLink, string subscriptionId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(nextLink, nameof(nextLink)); - Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId)); - - using var message = CreateListNextPageRequest(nextLink, subscriptionId); - _pipeline.Send(message, cancellationToken); - switch (message.Response.Status) - { - case 200: - { - DataFactoryListResult value = default; - using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions); - value = DataFactoryListResult.DeserializeDataFactoryListResult(document.RootElement); - return Response.FromValue(value, message.Response); - } - default: - throw new RequestFailedException(message.Response); - } - } - internal RequestUriBuilder CreateListByResourceGroupNextPageRequestUri(string nextLink, string subscriptionId, string resourceGroupName) { var uri = new RawRequestUriBuilder(); diff --git a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/autorest.md b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/autorest.md index 49c24bfa6c16..982c7476cbb7 100644 --- a/sdk/datafactory/Azure.ResourceManager.DataFactory/src/autorest.md +++ b/sdk/datafactory/Azure.ResourceManager.DataFactory/src/autorest.md @@ -8,7 +8,7 @@ azure-arm: true csharp: true library-name: DataFactory namespace: Azure.ResourceManager.DataFactory -require: https://github.com/Azure/azure-rest-api-specs/blob/87643ba491d34656ed9d08ddce7544d033c349eb/specification/datafactory/resource-manager/readme.md +require: /mnt/vss/_work/1/s/azure-rest-api-specs/specification/datafactory/resource-manager/readme.md output-folder: $(this-folder)/Generated clear-output-folder: true sample-gen: 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/