Skip to content

Commit 5b6856e

Browse files
author
SDKAuto
committed
CodeGen from PR 23013 in Azure/azure-rest-api-specs
Merge b65c41cec6087e7a0a7cbef8fdd69aa65a3d2117 into 10c740b7224771c889cfb92f128168f5a0568c26
1 parent f424c1b commit 5b6856e

File tree

10 files changed

+206
-130
lines changed

10 files changed

+206
-130
lines changed

common/config/rush/pnpm-lock.yaml

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/datafactory/arm-datafactory/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Release History
22

3+
## 12.0.0 (2023-03-10)
4+
5+
**Features**
6+
7+
- Added Interface Reference
8+
- Added Type Alias ReferenceUnion
9+
- Interface AzureBlobFSLinkedService has a new optional parameter sasToken
10+
- Interface AzureBlobFSLinkedService has a new optional parameter sasUri
11+
12+
**Breaking Changes**
13+
14+
- Type of parameter type of interface LinkedServiceReference is changed from Type to "LinkedServiceReference"
15+
- Removed Enum KnownType
16+
17+
318
## 11.0.0 (2023-02-10)
419

520
**Features**
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "33a7dbc1743fdacb8e2259011a035154a98cad66",
2+
"commit": "493d1ee200ec7abb4314609224c8e323e963a6fa",
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].8 --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].9",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
66
"release_tool": "@azure-tools/[email protected]",
7-
"use": "@autorest/[email protected].8"
7+
"use": "@autorest/[email protected].9"
88
}

sdk/datafactory/arm-datafactory/package.json

Lines changed: 4 additions & 12 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.0.0",
6+
"version": "12.0.0",
77
"engines": {
88
"node": ">=14.0.0"
99
},
@@ -41,7 +41,7 @@
4141
"rimraf": "^3.0.0",
4242
"dotenv": "^16.0.0",
4343
"@azure/identity": "^2.0.1",
44-
"@azure-tools/test-recorder": "^3.0.0",
44+
"@azure-tools/test-recorder": "^2.0.0",
4545
"@azure-tools/test-credential": "^1.0.0",
4646
"mocha": "^7.1.1",
4747
"@types/chai": "^4.2.8",
@@ -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: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,15 @@ export interface AzureBlobFSLinkedService extends LinkedService {
401401
azureCloudType?: any;
402402
credential?: CredentialReference;
403403
encryptedCredential?: any;
404+
sasToken?: SecretBaseUnion;
405+
sasUri?: any;
404406
servicePrincipalCredential?: SecretBaseUnion;
405407
servicePrincipalCredentialType?: any;
406408
servicePrincipalId?: any;
407409
servicePrincipalKey?: SecretBaseUnion;
408410
tenant?: any;
409411
type: "AzureBlobFS";
410-
url: any;
412+
url?: any;
411413
}
412414

413415
// @public
@@ -3796,7 +3798,7 @@ export interface IntegrationRuntimeOutboundNetworkDependenciesEndpointsResponse
37963798
}
37973799

37983800
// @public
3799-
export interface IntegrationRuntimeReference {
3801+
export interface IntegrationRuntimeReference extends Reference {
38003802
parameters?: {
38013803
[propertyName: string]: any;
38023804
};
@@ -4870,11 +4872,6 @@ export enum KnownTumblingWindowFrequency {
48704872
Month = "Month"
48714873
}
48724874

4873-
// @public
4874-
export enum KnownType {
4875-
LinkedServiceReference = "LinkedServiceReference"
4876-
}
4877-
48784875
// @public
48794876
export enum KnownVariableType {
48804877
Array = "Array",
@@ -4967,12 +4964,12 @@ export interface LinkedServiceListResponse {
49674964
}
49684965

49694966
// @public
4970-
export interface LinkedServiceReference {
4967+
export interface LinkedServiceReference extends Reference {
49714968
parameters?: {
49724969
[propertyName: string]: any;
49734970
};
49744971
referenceName: string;
4975-
type: Type;
4972+
type: "LinkedServiceReference";
49764973
}
49774974

49784975
// @public
@@ -6398,6 +6395,14 @@ export interface RedshiftUnloadSettings {
63986395
s3LinkedServiceName: LinkedServiceReference;
63996396
}
64006397

6398+
// @public
6399+
export interface Reference {
6400+
type: "IntegrationRuntimeReference" | "LinkedServiceReference";
6401+
}
6402+
6403+
// @public (undocumented)
6404+
export type ReferenceUnion = Reference | IntegrationRuntimeReference | LinkedServiceReference;
6405+
64016406
// @public
64026407
export interface RelationalSource extends CopySource {
64036408
additionalColumns?: any;
@@ -8146,9 +8151,6 @@ export interface TwilioLinkedService extends LinkedService {
81468151
userName: any;
81478152
}
81488153

8149-
// @public
8150-
export type Type = string;
8151-
81528154
// @public
81538155
export interface TypeConversionSettings {
81548156
allowDataTruncation?: any;

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.0.0`;
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: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ export type LinkedServiceUnion =
141141
| SnowflakeLinkedService
142142
| SharePointOnlineListLinkedService
143143
| AzureSynapseArtifactsLinkedService;
144+
export type ReferenceUnion =
145+
| Reference
146+
| IntegrationRuntimeReference
147+
| LinkedServiceReference;
144148
export type DatasetUnion =
145149
| Dataset
146150
| AmazonS3Dataset
@@ -1372,14 +1376,10 @@ export interface LinkedService {
13721376
annotations?: any[];
13731377
}
13741378

1375-
/** Integration runtime reference type. */
1376-
export interface IntegrationRuntimeReference {
1377-
/** Type of integration runtime. */
1378-
type: "IntegrationRuntimeReference";
1379-
/** Reference integration runtime name. */
1380-
referenceName: string;
1381-
/** Arguments for integration runtime. */
1382-
parameters?: { [propertyName: string]: any };
1379+
/** Base reference type. */
1380+
export interface Reference {
1381+
/** Polymorphic discriminator, which specifies the different types this object can be */
1382+
type: "IntegrationRuntimeReference" | "LinkedServiceReference";
13831383
}
13841384

13851385
/** Definition of a single parameter for an entity. */
@@ -1516,16 +1516,6 @@ export interface Dataset {
15161516
folder?: DatasetFolder;
15171517
}
15181518

1519-
/** Linked service reference type. */
1520-
export interface LinkedServiceReference {
1521-
/** Linked service reference type. */
1522-
type: Type;
1523-
/** Reference LinkedService name. */
1524-
referenceName: string;
1525-
/** Arguments for LinkedService. */
1526-
parameters?: { [propertyName: string]: any };
1527-
}
1528-
15291519
/** The folder that this Dataset is in. If not specified, Dataset will appear at the root level. */
15301520
export interface DatasetFolder {
15311521
/** The name of the folder that this Dataset is in. */
@@ -4883,7 +4873,7 @@ export interface AzureBlobFSLinkedService extends LinkedService {
48834873
/** Polymorphic discriminator, which specifies the different types this object can be */
48844874
type: "AzureBlobFS";
48854875
/** Endpoint for the Azure Data Lake Storage Gen2 service. Type: string (or Expression with resultType string). */
4886-
url: any;
4876+
url?: any;
48874877
/** Account key for the Azure Data Lake Storage Gen2 service. Type: string (or Expression with resultType string). */
48884878
accountKey?: any;
48894879
/** The ID of the application used to authenticate against the Azure Data Lake Storage Gen2 account. Type: string (or Expression with resultType string). */
@@ -4902,6 +4892,10 @@ export interface AzureBlobFSLinkedService extends LinkedService {
49024892
servicePrincipalCredentialType?: any;
49034893
/** The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference. */
49044894
servicePrincipalCredential?: SecretBaseUnion;
4895+
/** SAS URI of the Azure Data Lake Storage Gen2 service. Type: string, SecureString or AzureKeyVaultSecretReference. */
4896+
sasUri?: any;
4897+
/** The Azure key vault secret reference of sasToken in sas uri. */
4898+
sasToken?: SecretBaseUnion;
49054899
}
49064900

49074901
/** Office365 linked service. */
@@ -6381,6 +6375,26 @@ export interface AzureSynapseArtifactsLinkedService extends LinkedService {
63816375
workspaceResourceId?: any;
63826376
}
63836377

6378+
/** Integration runtime reference type. */
6379+
export interface IntegrationRuntimeReference extends Reference {
6380+
/** Polymorphic discriminator, which specifies the different types this object can be */
6381+
type: "IntegrationRuntimeReference";
6382+
/** Reference integration runtime name. */
6383+
referenceName: string;
6384+
/** Arguments for integration runtime. */
6385+
parameters?: { [propertyName: string]: any };
6386+
}
6387+
6388+
/** Linked service reference type. */
6389+
export interface LinkedServiceReference extends Reference {
6390+
/** Polymorphic discriminator, which specifies the different types this object can be */
6391+
type: "LinkedServiceReference";
6392+
/** Reference LinkedService name. */
6393+
referenceName: string;
6394+
/** Arguments for LinkedService. */
6395+
parameters?: { [propertyName: string]: any };
6396+
}
6397+
63846398
/** A single Amazon Simple Storage Service (S3) object or a set of S3 objects. */
63856399
export interface AmazonS3Dataset extends Dataset {
63866400
/** Polymorphic discriminator, which specifies the different types this object can be */
@@ -11029,21 +11043,6 @@ export enum KnownParameterType {
1102911043
*/
1103011044
export type ParameterType = string;
1103111045

11032-
/** Known values of {@link Type} that the service accepts. */
11033-
export enum KnownType {
11034-
/** LinkedServiceReference */
11035-
LinkedServiceReference = "LinkedServiceReference"
11036-
}
11037-
11038-
/**
11039-
* Defines values for Type. \
11040-
* {@link KnownType} can be used interchangeably with Type,
11041-
* this enum contains the known values that the service supports.
11042-
* ### Known values supported by the service
11043-
* **LinkedServiceReference**
11044-
*/
11045-
export type Type = string;
11046-
1104711046
/** Known values of {@link DependencyCondition} that the service accepts. */
1104811047
export enum KnownDependencyCondition {
1104911048
/** Succeeded */

0 commit comments

Comments
 (0)