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..a85ae1a1d0b4 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 @@ -8728,6 +8728,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 { } } 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..a85ae1a1d0b4 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 @@ -8728,6 +8728,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 { } } 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/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/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/