Skip to content

Commit 25d95ab

Browse files
author
SDKAuto
committed
CodeGen from PR 23479 in Azure/azure-rest-api-specs
Merge 30467997bc7c92669a1d4ed3ed56116d9d666931 into 4b17bff0ac8be6195cedad3cb98fb32e88d0f7bb
1 parent 2c8d731 commit 25d95ab

File tree

9 files changed

+136
-44
lines changed

9 files changed

+136
-44
lines changed

sdk/datafactory/arm-datafactory/CHANGELOG.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
# Release History
2+
3+
## 12.0.0 (2023-04-18)
4+
5+
**Features**
26

3-
## 11.1.1 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
7+
- Added Interface IntegrationRuntimeDataFlowPropertiesCustomPropertiesItem
8+
- Interface IntegrationRuntimeDataFlowProperties has a new optional parameter customProperties
9+
- Interface SetVariableActivity has a new optional parameter setSystemVariable
1010

11-
### Other Changes
11+
**Breaking Changes**
1212

13+
- Type of parameter enablePartitionDiscovery of interface AzureBlobFSReadSettings is changed from boolean to any
14+
- Type of parameter enablePartitionDiscovery of interface AzureDataLakeStoreReadSettings is changed from boolean to any
15+
16+
1317
## 11.1.0 (2023-03-02)
1418

1519
**Features**
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "a60468a0c5e2beb054680ae488fb9f92699f0a0d",
2+
"commit": "84e89244be5b233eb4d3bb0b4d7d75728ab60324",
33
"readme": "specification/datafactory/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\datafactory\\resource-manager\\readme.md --use=@autorest/[email protected].9 --generate-sample=true",
4+
"autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/datafactory/resource-manager/readme.md --use=@autorest/[email protected].10",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/js-sdk-release-tools@2.6.2",
7-
"use": "@autorest/[email protected].9"
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.7.0",
7+
"use": "@autorest/[email protected].10"
88
}

sdk/datafactory/arm-datafactory/package.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for DataFactoryManagementClient.",
6-
"version": "11.1.1",
6+
"version": "12.0.0",
77
"engines": {
88
"node": ">=14.0.0"
99
},
@@ -111,13 +111,5 @@
111111
]
112112
},
113113
"autoPublish": true,
114-
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/datafactory/arm-datafactory",
115-
"//sampleConfiguration": {
116-
"productName": "",
117-
"productSlugs": [
118-
"azure"
119-
],
120-
"disableDocsMs": true,
121-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-datafactory?view=azure-node-preview"
122-
}
123-
}
114+
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/datafactory/arm-datafactory"
115+
}

sdk/datafactory/arm-datafactory/review/arm-datafactory.api.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ export interface AzureBlobFSLocation extends DatasetLocation {
421421
// @public
422422
export interface AzureBlobFSReadSettings extends StoreReadSettings {
423423
deleteFilesAfterCompletion?: any;
424-
enablePartitionDiscovery?: boolean;
424+
enablePartitionDiscovery?: any;
425425
fileListPath?: any;
426426
modifiedDatetimeEnd?: any;
427427
modifiedDatetimeStart?: any;
@@ -661,7 +661,7 @@ export interface AzureDataLakeStoreLocation extends DatasetLocation {
661661
// @public
662662
export interface AzureDataLakeStoreReadSettings extends StoreReadSettings {
663663
deleteFilesAfterCompletion?: any;
664-
enablePartitionDiscovery?: boolean;
664+
enablePartitionDiscovery?: any;
665665
fileListPath?: any;
666666
listAfter?: any;
667667
listBefore?: any;
@@ -3661,9 +3661,16 @@ export interface IntegrationRuntimeDataFlowProperties {
36613661
cleanup?: boolean;
36623662
computeType?: DataFlowComputeType;
36633663
coreCount?: number;
3664+
customProperties?: IntegrationRuntimeDataFlowPropertiesCustomPropertiesItem[];
36643665
timeToLive?: number;
36653666
}
36663667

3668+
// @public (undocumented)
3669+
export interface IntegrationRuntimeDataFlowPropertiesCustomPropertiesItem {
3670+
name?: string;
3671+
value?: string;
3672+
}
3673+
36673674
// @public
36683675
export interface IntegrationRuntimeDataProxyProperties {
36693676
connectVia?: EntityReference;
@@ -7085,6 +7092,7 @@ export type ServicePrincipalCredentialType = string;
70857092

70867093
// @public
70877094
export interface SetVariableActivity extends ControlActivity {
7095+
setSystemVariable?: boolean;
70887096
type: "SetVariable";
70897097
value?: any;
70907098
variableName?: string;

sdk/datafactory/arm-datafactory/src/dataFactoryManagementClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export class DataFactoryManagementClient extends coreClient.ServiceClient {
9696
credential: credentials
9797
};
9898

99-
const packageDetails = `azsdk-js-arm-datafactory/11.1.1`;
99+
const packageDetails = `azsdk-js-arm-datafactory/12.0.0`;
100100
const userAgentPrefix =
101101
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
102102
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`

sdk/datafactory/arm-datafactory/src/models/index.ts

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2550,6 +2550,15 @@ export interface IntegrationRuntimeDataFlowProperties {
25502550
timeToLive?: number;
25512551
/** Cluster will not be recycled and it will be used in next data flow activity run until TTL (time to live) is reached if this is set as false. Default is true. */
25522552
cleanup?: boolean;
2553+
/** Custom properties are used to tune the data flow runtime performance. */
2554+
customProperties?: IntegrationRuntimeDataFlowPropertiesCustomPropertiesItem[];
2555+
}
2556+
2557+
export interface IntegrationRuntimeDataFlowPropertiesCustomPropertiesItem {
2558+
/** Name of custom property. */
2559+
name?: string;
2560+
/** Value of custom property. */
2561+
value?: string;
25532562
}
25542563

25552564
/** VNet properties for managed integration runtime. */
@@ -7928,8 +7937,8 @@ export interface AzureBlobFSReadSettings extends StoreReadSettings {
79287937
wildcardFileName?: any;
79297938
/** Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string). */
79307939
fileListPath?: any;
7931-
/** Indicates whether to enable partition discovery. */
7932-
enablePartitionDiscovery?: boolean;
7940+
/** Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean). */
7941+
enablePartitionDiscovery?: any;
79337942
/** Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string). */
79347943
partitionRootPath?: any;
79357944
/** Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). */
@@ -7956,8 +7965,8 @@ export interface AzureDataLakeStoreReadSettings extends StoreReadSettings {
79567965
listAfter?: any;
79577966
/** Lists files before the value (inclusive) based on file/folder names’ lexicographical order. Applies under the folderPath in data set, and filter files/sub-folders under the folderPath. Type: string (or Expression with resultType string). */
79587967
listBefore?: any;
7959-
/** Indicates whether to enable partition discovery. */
7960-
enablePartitionDiscovery?: boolean;
7968+
/** Indicates whether to enable partition discovery. Type: boolean (or Expression with resultType boolean). */
7969+
enablePartitionDiscovery?: any;
79617970
/** Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string). */
79627971
partitionRootPath?: any;
79637972
/** Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean). */
@@ -8248,7 +8257,7 @@ export interface AzureBlobFSWriteSettings extends StoreWriteSettings {
82488257
export interface AzureDataLakeStoreWriteSettings extends StoreWriteSettings {
82498258
/** Polymorphic discriminator, which specifies the different types this object can be */
82508259
type: "AzureDataLakeStoreWriteSettings";
8251-
/** Specifies the expiry time of the written files. The time is applied to the UTC time zone in the format of "2018-12-01T05:00:00Z". Default value is NULL. Type: integer (or Expression with resultType integer). */
8260+
/** Specifies the expiry time of the written files. The time is applied to the UTC time zone in the format of "2018-12-01T05:00:00Z". Default value is NULL. Type: string (or Expression with resultType string). */
82528261
expiryDateTime?: any;
82538262
}
82548263

@@ -9200,7 +9209,7 @@ export interface OracleSink extends CopySink {
92009209
export interface AzureDataLakeStoreSink extends CopySink {
92019210
/** Polymorphic discriminator, which specifies the different types this object can be */
92029211
type: "AzureDataLakeStoreSink";
9203-
/** The type of copy behavior for copy sink. */
9212+
/** The type of copy behavior for copy sink. Type: string (or Expression with resultType string). */
92049213
copyBehavior?: any;
92059214
/** Single File Parallel. */
92069215
enableAdlsSingleFileParallel?: any;
@@ -9210,7 +9219,7 @@ export interface AzureDataLakeStoreSink extends CopySink {
92109219
export interface AzureBlobFSSink extends CopySink {
92119220
/** Polymorphic discriminator, which specifies the different types this object can be */
92129221
type: "AzureBlobFSSink";
9213-
/** The type of copy behavior for copy sink. */
9222+
/** The type of copy behavior for copy sink. Type: string (or Expression with resultType string). */
92149223
copyBehavior?: any;
92159224
/** Specify the custom metadata to be added to sink data. Type: array of objects (or Expression with resultType array of objects). */
92169225
metadata?: MetadataItem[];
@@ -9548,8 +9557,10 @@ export interface SetVariableActivity extends ControlActivity {
95489557
type: "SetVariable";
95499558
/** Name of the variable whose value needs to be set. */
95509559
variableName?: string;
9551-
/** Value to be set. Could be a static value or Expression */
9560+
/** Value to be set. Could be a static value or Expression. */
95529561
value?: any;
9562+
/** If set to true, it sets the pipeline run return value. */
9563+
setSystemVariable?: boolean;
95539564
}
95549565

95559566
/** Append value for a Variable of type Array. */

sdk/datafactory/arm-datafactory/src/models/mappers.ts

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4356,6 +4356,40 @@ export const IntegrationRuntimeDataFlowProperties: coreClient.CompositeMapper =
43564356
type: {
43574357
name: "Boolean"
43584358
}
4359+
},
4360+
customProperties: {
4361+
serializedName: "customProperties",
4362+
type: {
4363+
name: "Sequence",
4364+
element: {
4365+
type: {
4366+
name: "Composite",
4367+
className:
4368+
"IntegrationRuntimeDataFlowPropertiesCustomPropertiesItem"
4369+
}
4370+
}
4371+
}
4372+
}
4373+
}
4374+
}
4375+
};
4376+
4377+
export const IntegrationRuntimeDataFlowPropertiesCustomPropertiesItem: coreClient.CompositeMapper = {
4378+
type: {
4379+
name: "Composite",
4380+
className: "IntegrationRuntimeDataFlowPropertiesCustomPropertiesItem",
4381+
modelProperties: {
4382+
name: {
4383+
serializedName: "name",
4384+
type: {
4385+
name: "String"
4386+
}
4387+
},
4388+
value: {
4389+
serializedName: "value",
4390+
type: {
4391+
name: "String"
4392+
}
43594393
}
43604394
}
43614395
}
@@ -18907,7 +18941,7 @@ export const AzureBlobFSReadSettings: coreClient.CompositeMapper = {
1890718941
enablePartitionDiscovery: {
1890818942
serializedName: "enablePartitionDiscovery",
1890918943
type: {
18910-
name: "Boolean"
18944+
name: "any"
1891118945
}
1891218946
},
1891318947
partitionRootPath: {
@@ -18987,7 +19021,7 @@ export const AzureDataLakeStoreReadSettings: coreClient.CompositeMapper = {
1898719021
enablePartitionDiscovery: {
1898819022
serializedName: "enablePartitionDiscovery",
1898919023
type: {
18990-
name: "Boolean"
19024+
name: "any"
1899119025
}
1899219026
},
1899319027
partitionRootPath: {
@@ -23238,6 +23272,12 @@ export const SetVariableActivity: coreClient.CompositeMapper = {
2323823272
type: {
2323923273
name: "any"
2324023274
}
23275+
},
23276+
setSystemVariable: {
23277+
serializedName: "typeProperties.setSystemVariable",
23278+
type: {
23279+
name: "Boolean"
23280+
}
2324123281
}
2324223282
}
2324323283
}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright (c) Microsoft Corporation.
3+
* Licensed under the MIT License.
4+
*
5+
* Code generated by Microsoft (R) AutoRest Code Generator.
6+
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
7+
*/
8+
9+
import {
10+
Recorder,
11+
RecorderStartOptions,
12+
env
13+
} from "@azure-tools/test-recorder";
14+
import { assert } from "chai";
15+
import { Context } from "mocha";
16+
17+
const replaceableVariables: Record<string, string> = {
18+
AZURE_CLIENT_ID: "azure_client_id",
19+
AZURE_CLIENT_SECRET: "azure_client_secret",
20+
AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
21+
SUBSCRIPTION_ID: "azure_subscription_id"
22+
};
23+
24+
const recorderOptions: RecorderStartOptions = {
25+
envSetupForPlayback: replaceableVariables
26+
};
27+
28+
describe("My test", () => {
29+
let recorder: Recorder;
30+
31+
beforeEach(async function(this: Context) {
32+
recorder = new Recorder(this.currentTest);
33+
await recorder.start(recorderOptions);
34+
});
35+
36+
afterEach(async function() {
37+
await recorder.stop();
38+
});
39+
40+
it("sample test", async function() {
41+
console.log("Hi, I'm a test!");
42+
});
43+
});

sdk/datafactory/arm-datafactory/tsconfig.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,11 @@
1515
],
1616
"declaration": true,
1717
"outDir": "./dist-esm",
18-
"importHelpers": true,
19-
"paths": {
20-
"@azure/arm-datafactory": [
21-
"./src/index"
22-
]
23-
}
18+
"importHelpers": true
2419
},
2520
"include": [
2621
"./src/**/*.ts",
27-
"./test/**/*.ts",
28-
"samples-dev/**/*.ts"
22+
"./test/**/*.ts"
2923
],
3024
"exclude": [
3125
"node_modules"

0 commit comments

Comments
 (0)