From b1a8d38912ebbc0ecdc51f0c51c3a77b1ac91b72 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Sun, 25 Apr 2021 08:46:49 +0000 Subject: [PATCH] CodeGen from PR 14114 in Azure/azure-rest-api-specs Merge 6925836c56f73e1258b817a7f678c1d6292906ff into 7cca3c6f2b72f4b41e80645cd988a99388dd4f12 --- .../src/Generated/Models/EntityReference.cs | 5 ++-- .../src/Generated/Models/ExcelDataset.cs | 25 ++++++++++++------- .../IntegrationRuntimeEntityReferenceType.cs | 1 + .../IntegrationRuntimeSsisProperties.cs | 11 +++++++- ...kageLocation.cs => SSISPackageLocation.cs} | 0 .../SdkInfo_DataFactoryManagementClient.cs | 14 +++-------- 6 files changed, 33 insertions(+), 23 deletions(-) rename sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/{SsisPackageLocation.cs => SSISPackageLocation.cs} (100%) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs index 426eaad1140a..11c52c9cad13 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs @@ -31,7 +31,7 @@ public EntityReference() /// /// The type of this referenced entity. Possible /// values include: 'IntegrationRuntimeReference', - /// 'LinkedServiceReference' + /// 'LinkedServiceReference', 'CredentialReference' /// The name of this referenced /// entity. public EntityReference(string type = default(string), string referenceName = default(string)) @@ -48,7 +48,8 @@ public EntityReference() /// /// Gets or sets the type of this referenced entity. Possible values - /// include: 'IntegrationRuntimeReference', 'LinkedServiceReference' + /// include: 'IntegrationRuntimeReference', 'LinkedServiceReference', + /// 'CredentialReference' /// [JsonProperty(PropertyName = "type")] public string Type { get; set; } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelDataset.cs index 7d28d92594b3..694dba9ab678 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExcelDataset.cs @@ -38,8 +38,6 @@ public ExcelDataset() /// /// Linked service reference. /// The location of the excel storage. - /// The sheet of excel file. Type: string (or - /// Expression with resultType string). /// Unmatched properties from the /// message are deserialized this collection /// Dataset description. @@ -54,6 +52,11 @@ public ExcelDataset() /// describing the Dataset. /// The folder that this Dataset is in. If not /// specified, Dataset will appear at the root level. + /// The sheet name of excel file. Type: string + /// (or Expression with resultType string). + /// The sheet index of excel file and default + /// value is 0. Type: integer (or Expression with resultType + /// integer) /// The partial data of one sheet. Type: string (or /// Expression with resultType string). /// When used as input, treat the first @@ -64,11 +67,12 @@ public ExcelDataset() /// json dataset. /// The null value string. Type: string (or /// Expression with resultType string). - public ExcelDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, object sheetName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object range = default(object), object firstRowAsHeader = default(object), DatasetCompression compression = default(DatasetCompression), object nullValue = default(object)) + public ExcelDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object sheetName = default(object), object sheetIndex = default(object), object range = default(object), object firstRowAsHeader = default(object), DatasetCompression compression = default(DatasetCompression), object nullValue = default(object)) : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Location = location; SheetName = sheetName; + SheetIndex = sheetIndex; Range = range; FirstRowAsHeader = firstRowAsHeader; Compression = compression; @@ -88,12 +92,19 @@ public ExcelDataset() public DatasetLocation Location { get; set; } /// - /// Gets or sets the sheet of excel file. Type: string (or Expression - /// with resultType string). + /// Gets or sets the sheet name of excel file. Type: string (or + /// Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.sheetName")] public object SheetName { get; set; } + /// + /// Gets or sets the sheet index of excel file and default value is 0. + /// Type: integer (or Expression with resultType integer) + /// + [JsonProperty(PropertyName = "typeProperties.sheetIndex")] + public object SheetIndex { get; set; } + /// /// Gets or sets the partial data of one sheet. Type: string (or /// Expression with resultType string). @@ -136,10 +147,6 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Location"); } - if (SheetName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "SheetName"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs index 590bfe94be08..5651c1f48d6e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs @@ -18,5 +18,6 @@ public static class IntegrationRuntimeEntityReferenceType { public const string IntegrationRuntimeReference = "IntegrationRuntimeReference"; public const string LinkedServiceReference = "LinkedServiceReference"; + public const string CredentialReference = "CredentialReference"; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs index 839739aad639..b423a3142696 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs @@ -50,7 +50,9 @@ public IntegrationRuntimeSsisProperties() /// script properties for a SSIS integration runtime. /// Package stores for the SSIS Integration /// Runtime. - public IntegrationRuntimeSsisProperties(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeSsisCatalogInfo catalogInfo = default(IntegrationRuntimeSsisCatalogInfo), string licenseType = default(string), IntegrationRuntimeCustomSetupScriptProperties customSetupScriptProperties = default(IntegrationRuntimeCustomSetupScriptProperties), IntegrationRuntimeDataProxyProperties dataProxyProperties = default(IntegrationRuntimeDataProxyProperties), string edition = default(string), IList expressCustomSetupProperties = default(IList), IList packageStores = default(IList)) + /// The user-assigned managed identity + /// reference. + public IntegrationRuntimeSsisProperties(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeSsisCatalogInfo catalogInfo = default(IntegrationRuntimeSsisCatalogInfo), string licenseType = default(string), IntegrationRuntimeCustomSetupScriptProperties customSetupScriptProperties = default(IntegrationRuntimeCustomSetupScriptProperties), IntegrationRuntimeDataProxyProperties dataProxyProperties = default(IntegrationRuntimeDataProxyProperties), string edition = default(string), IList expressCustomSetupProperties = default(IList), IList packageStores = default(IList), EntityReference managedCredential = default(EntityReference)) { AdditionalProperties = additionalProperties; CatalogInfo = catalogInfo; @@ -60,6 +62,7 @@ public IntegrationRuntimeSsisProperties() Edition = edition; ExpressCustomSetupProperties = expressCustomSetupProperties; PackageStores = packageStores; + ManagedCredential = managedCredential; CustomInit(); } @@ -123,6 +126,12 @@ public IntegrationRuntimeSsisProperties() [JsonProperty(PropertyName = "packageStores")] public IList PackageStores { get; set; } + /// + /// Gets or sets the user-assigned managed identity reference. + /// + [JsonProperty(PropertyName = "managedCredential")] + public EntityReference ManagedCredential { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs similarity index 100% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs index 2011a9871690..ac665f5acd05 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -34,22 +34,14 @@ public static IEnumerable> ApiInfo_DataFactoryMana new Tuple("DataFactory", "Operations", "2018-06-01"), new Tuple("DataFactory", "PipelineRuns", "2018-06-01"), new Tuple("DataFactory", "Pipelines", "2018-06-01"), + new Tuple("DataFactory", "PrivateEndpointConnection", "2018-06-01"), new Tuple("DataFactory", "TriggerRuns", "2018-06-01"), new Tuple("DataFactory", "Triggers", "2018-06-01"), new Tuple("DataFactory", "managedPrivateEndpoints", "2018-06-01"), + new Tuple("DataFactory", "privateEndPointConnections", "2018-06-01"), + new Tuple("DataFactory", "privateLinkResources", "2018-06-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Projects\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "fce3400431eff281bddd04bed9727e63765b8da0"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -