Skip to content

Commit 862153a

Browse files
author
SDKAuto
committed
CodeGen from PR 22565 in Azure/azure-rest-api-specs
Merge 2c15ed796e8702f9544ce5501501511c3e522af7 into 2f545bf51d046c377a7957a7c53e1d260c9d7343
1 parent 2461696 commit 862153a

19 files changed

+243
-231
lines changed

common/config/rush/pnpm-lock.yaml

Lines changed: 8 additions & 8 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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Release History
22

3+
## 11.1.0 (2023-02-20)
4+
5+
**Features**
6+
7+
- Interface AzureBlobFSLinkedService has a new optional parameter sasToken
8+
- Interface AzureBlobFSLinkedService has a new optional parameter sasUri
9+
10+
311
## 11.0.0 (2023-02-10)
412

513
**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": "7f8e5fad3b626706a8ade15be9e2aaef9721970d",
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].5",
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].5"
88
}

sdk/datafactory/arm-datafactory/package.json

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for DataFactoryManagementClient.",
6-
"version": "11.0.0",
6+
"version": "11.1.0",
77
"engines": {
88
"node": ">=14.0.0"
99
},
1010
"dependencies": {
11-
"@azure/core-lro": "^2.5.0",
11+
"@azure/core-lro": "^2.2.0",
1212
"@azure/abort-controller": "^1.0.0",
1313
"@azure/core-paging": "^1.2.0",
14-
"@azure/core-client": "^1.7.0",
14+
"@azure/core-client": "^1.6.1",
1515
"@azure/core-auth": "^1.3.0",
1616
"@azure/core-rest-pipeline": "^1.8.0",
1717
"tslib": "^2.2.0"
@@ -29,17 +29,16 @@
2929
"types": "./types/arm-datafactory.d.ts",
3030
"devDependencies": {
3131
"@microsoft/api-extractor": "^7.31.1",
32-
"@rollup/plugin-commonjs": "^24.0.0",
33-
"@rollup/plugin-json": "^6.0.0",
34-
"@rollup/plugin-multi-entry": "^6.0.0",
32+
"@rollup/plugin-commonjs": "^21.0.1",
33+
"@rollup/plugin-json": "^4.1.0",
34+
"@rollup/plugin-multi-entry": "^4.1.0",
3535
"@rollup/plugin-node-resolve": "^13.1.3",
36-
"mkdirp": "^2.1.2",
36+
"mkdirp": "^1.0.4",
3737
"rollup": "^2.66.1",
3838
"rollup-plugin-sourcemaps": "^0.6.3",
3939
"typescript": "~4.8.0",
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
42-
"dotenv": "^16.0.0",
4342
"@azure/identity": "^2.0.1",
4443
"@azure-tools/test-recorder": "^2.0.0",
4544
"@azure-tools/test-credential": "^1.0.0",
@@ -50,6 +49,7 @@
5049
"@types/node": "^14.0.0",
5150
"@azure/dev-tool": "^1.0.0"
5251
},
52+
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/datafactory/arm-datafactory",
5353
"repository": {
5454
"type": "git",
5555
"url": "https://github.com/Azure/azure-sdk-for-js.git"
@@ -110,14 +110,5 @@
110110
}
111111
]
112112
},
113-
"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-
}
113+
"autoPublish": true
123114
}

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
import * as coreAuth from '@azure/core-auth';
88
import * as coreClient from '@azure/core-client';
9-
import { OperationState } from '@azure/core-lro';
109
import { PagedAsyncIterableIterator } from '@azure/core-paging';
11-
import { SimplePollerLike } from '@azure/core-lro';
10+
import { PollerLike } from '@azure/core-lro';
11+
import { PollOperationState } from '@azure/core-lro';
1212

1313
// @public
1414
export interface AccessPolicyResponse {
@@ -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
@@ -1791,9 +1793,9 @@ export interface DataFlowDebugResource extends SubResourceDebugResource {
17911793
// @public
17921794
export interface DataFlowDebugSession {
17931795
addDataFlow(resourceGroupName: string, factoryName: string, request: DataFlowDebugPackage, options?: DataFlowDebugSessionAddDataFlowOptionalParams): Promise<DataFlowDebugSessionAddDataFlowResponse>;
1794-
beginCreate(resourceGroupName: string, factoryName: string, request: CreateDataFlowDebugSessionRequest, options?: DataFlowDebugSessionCreateOptionalParams): Promise<SimplePollerLike<OperationState<DataFlowDebugSessionCreateResponse>, DataFlowDebugSessionCreateResponse>>;
1796+
beginCreate(resourceGroupName: string, factoryName: string, request: CreateDataFlowDebugSessionRequest, options?: DataFlowDebugSessionCreateOptionalParams): Promise<PollerLike<PollOperationState<DataFlowDebugSessionCreateResponse>, DataFlowDebugSessionCreateResponse>>;
17951797
beginCreateAndWait(resourceGroupName: string, factoryName: string, request: CreateDataFlowDebugSessionRequest, options?: DataFlowDebugSessionCreateOptionalParams): Promise<DataFlowDebugSessionCreateResponse>;
1796-
beginExecuteCommand(resourceGroupName: string, factoryName: string, request: DataFlowDebugCommandRequest, options?: DataFlowDebugSessionExecuteCommandOptionalParams): Promise<SimplePollerLike<OperationState<DataFlowDebugSessionExecuteCommandResponse>, DataFlowDebugSessionExecuteCommandResponse>>;
1798+
beginExecuteCommand(resourceGroupName: string, factoryName: string, request: DataFlowDebugCommandRequest, options?: DataFlowDebugSessionExecuteCommandOptionalParams): Promise<PollerLike<PollOperationState<DataFlowDebugSessionExecuteCommandResponse>, DataFlowDebugSessionExecuteCommandResponse>>;
17971799
beginExecuteCommandAndWait(resourceGroupName: string, factoryName: string, request: DataFlowDebugCommandRequest, options?: DataFlowDebugSessionExecuteCommandOptionalParams): Promise<DataFlowDebugSessionExecuteCommandResponse>;
17981800
delete(resourceGroupName: string, factoryName: string, request: DeleteDataFlowDebugSessionRequest, options?: DataFlowDebugSessionDeleteOptionalParams): Promise<void>;
17991801
listQueryByFactory(resourceGroupName: string, factoryName: string, options?: DataFlowDebugSessionQueryByFactoryOptionalParams): PagedAsyncIterableIterator<DataFlowDebugSessionInfo>;
@@ -3751,7 +3753,7 @@ export type IntegrationRuntimeNodesUpdateResponse = SelfHostedIntegrationRuntime
37513753

37523754
// @public
37533755
export interface IntegrationRuntimeObjectMetadata {
3754-
beginRefresh(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimeObjectMetadataRefreshOptionalParams): Promise<SimplePollerLike<OperationState<IntegrationRuntimeObjectMetadataRefreshResponse>, IntegrationRuntimeObjectMetadataRefreshResponse>>;
3756+
beginRefresh(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimeObjectMetadataRefreshOptionalParams): Promise<PollerLike<PollOperationState<IntegrationRuntimeObjectMetadataRefreshResponse>, IntegrationRuntimeObjectMetadataRefreshResponse>>;
37553757
beginRefreshAndWait(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimeObjectMetadataRefreshOptionalParams): Promise<IntegrationRuntimeObjectMetadataRefreshResponse>;
37563758
get(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimeObjectMetadataGetOptionalParams): Promise<IntegrationRuntimeObjectMetadataGetResponse>;
37573759
}
@@ -3816,9 +3818,9 @@ export interface IntegrationRuntimeResource extends SubResource {
38163818

38173819
// @public
38183820
export interface IntegrationRuntimes {
3819-
beginStart(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimesStartOptionalParams): Promise<SimplePollerLike<OperationState<IntegrationRuntimesStartResponse>, IntegrationRuntimesStartResponse>>;
3821+
beginStart(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimesStartOptionalParams): Promise<PollerLike<PollOperationState<IntegrationRuntimesStartResponse>, IntegrationRuntimesStartResponse>>;
38203822
beginStartAndWait(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimesStartOptionalParams): Promise<IntegrationRuntimesStartResponse>;
3821-
beginStop(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimesStopOptionalParams): Promise<SimplePollerLike<OperationState<void>, void>>;
3823+
beginStop(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimesStopOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
38223824
beginStopAndWait(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, options?: IntegrationRuntimesStopOptionalParams): Promise<void>;
38233825
createLinkedIntegrationRuntime(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, createLinkedIntegrationRuntimeRequest: CreateLinkedIntegrationRuntimeRequest, options?: IntegrationRuntimesCreateLinkedIntegrationRuntimeOptionalParams): Promise<IntegrationRuntimesCreateLinkedIntegrationRuntimeResponse>;
38243826
createOrUpdate(resourceGroupName: string, factoryName: string, integrationRuntimeName: string, integrationRuntime: IntegrationRuntimeResource, options?: IntegrationRuntimesCreateOrUpdateOptionalParams): Promise<IntegrationRuntimesCreateOrUpdateResponse>;
@@ -8012,13 +8014,13 @@ export type TriggerRuntimeState = string;
80128014

80138015
// @public
80148016
export interface Triggers {
8015-
beginStart(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersStartOptionalParams): Promise<SimplePollerLike<OperationState<void>, void>>;
8017+
beginStart(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersStartOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
80168018
beginStartAndWait(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersStartOptionalParams): Promise<void>;
8017-
beginStop(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersStopOptionalParams): Promise<SimplePollerLike<OperationState<void>, void>>;
8019+
beginStop(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersStopOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
80188020
beginStopAndWait(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersStopOptionalParams): Promise<void>;
8019-
beginSubscribeToEvents(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersSubscribeToEventsOptionalParams): Promise<SimplePollerLike<OperationState<TriggersSubscribeToEventsResponse>, TriggersSubscribeToEventsResponse>>;
8021+
beginSubscribeToEvents(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersSubscribeToEventsOptionalParams): Promise<PollerLike<PollOperationState<TriggersSubscribeToEventsResponse>, TriggersSubscribeToEventsResponse>>;
80208022
beginSubscribeToEventsAndWait(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersSubscribeToEventsOptionalParams): Promise<TriggersSubscribeToEventsResponse>;
8021-
beginUnsubscribeFromEvents(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersUnsubscribeFromEventsOptionalParams): Promise<SimplePollerLike<OperationState<TriggersUnsubscribeFromEventsResponse>, TriggersUnsubscribeFromEventsResponse>>;
8023+
beginUnsubscribeFromEvents(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersUnsubscribeFromEventsOptionalParams): Promise<PollerLike<PollOperationState<TriggersUnsubscribeFromEventsResponse>, TriggersUnsubscribeFromEventsResponse>>;
80228024
beginUnsubscribeFromEventsAndWait(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersUnsubscribeFromEventsOptionalParams): Promise<TriggersUnsubscribeFromEventsResponse>;
80238025
createOrUpdate(resourceGroupName: string, factoryName: string, triggerName: string, trigger: TriggerResource, options?: TriggersCreateOrUpdateOptionalParams): Promise<TriggersCreateOrUpdateResponse>;
80248026
delete(resourceGroupName: string, factoryName: string, triggerName: string, options?: TriggersDeleteOptionalParams): Promise<void>;

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/11.1.0`;
100100
const userAgentPrefix =
101101
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
102102
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`

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

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,29 @@
66
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
*/
88

9-
// Copyright (c) Microsoft Corporation.
10-
// Licensed under the MIT license.
11-
12-
import { AbortSignalLike } from "@azure/abort-controller";
139
import { LongRunningOperation, LroResponse } from "@azure/core-lro";
1410

15-
export function createLroSpec<T>(inputs: {
16-
sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>;
17-
args: Record<string, unknown>;
18-
spec: {
19-
readonly requestBody?: unknown;
20-
readonly path?: string;
21-
readonly httpMethod: string;
22-
} & Record<string, any>;
23-
}): LongRunningOperation<T> {
24-
const { args, spec, sendOperationFn } = inputs;
25-
return {
26-
requestMethod: spec.httpMethod,
27-
requestPath: spec.path!,
28-
sendInitialRequest: () => sendOperationFn(args, spec),
29-
sendPollRequest: (
30-
path: string,
31-
options?: { abortSignal?: AbortSignalLike }
32-
) => {
33-
const { requestBody, ...restSpec } = spec;
34-
return sendOperationFn(args, {
35-
...restSpec,
36-
httpMethod: "GET",
37-
path,
38-
abortSignal: options?.abortSignal
39-
});
40-
}
41-
};
11+
export class LroImpl<T> implements LongRunningOperation<T> {
12+
constructor(
13+
private sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>,
14+
private args: Record<string, unknown>,
15+
private spec: {
16+
readonly requestBody?: unknown;
17+
readonly path?: string;
18+
readonly httpMethod: string;
19+
} & Record<string, any>,
20+
public requestPath: string = spec.path!,
21+
public requestMethod: string = spec.httpMethod
22+
) {}
23+
public async sendInitialRequest(): Promise<LroResponse<T>> {
24+
return this.sendOperationFn(this.args, this.spec);
25+
}
26+
public async sendPollRequest(path: string): Promise<LroResponse<T>> {
27+
const { requestBody, ...restSpec } = this.spec;
28+
return this.sendOperationFn(this.args, {
29+
...restSpec,
30+
path,
31+
httpMethod: "GET"
32+
});
33+
}
4234
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4883,7 +4883,7 @@ export interface AzureBlobFSLinkedService extends LinkedService {
48834883
/** Polymorphic discriminator, which specifies the different types this object can be */
48844884
type: "AzureBlobFS";
48854885
/** Endpoint for the Azure Data Lake Storage Gen2 service. Type: string (or Expression with resultType string). */
4886-
url: any;
4886+
url?: any;
48874887
/** Account key for the Azure Data Lake Storage Gen2 service. Type: string (or Expression with resultType string). */
48884888
accountKey?: any;
48894889
/** 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 +4902,10 @@ export interface AzureBlobFSLinkedService extends LinkedService {
49024902
servicePrincipalCredentialType?: any;
49034903
/** 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. */
49044904
servicePrincipalCredential?: SecretBaseUnion;
4905+
/** SAS URI of the Azure Data Lake Storage Gen2 service. Type: string, SecureString or AzureKeyVaultSecretReference. */
4906+
sasUri?: any;
4907+
/** The Azure key vault secret reference of sasToken in sas uri. */
4908+
sasToken?: SecretBaseUnion;
49054909
}
49064910

49074911
/** Office365 linked service. */

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10399,7 +10399,6 @@ export const AzureBlobFSLinkedService: coreClient.CompositeMapper = {
1039910399
...LinkedService.type.modelProperties,
1040010400
url: {
1040110401
serializedName: "typeProperties.url",
10402-
required: true,
1040310402
type: {
1040410403
name: "any"
1040510404
}
@@ -10460,6 +10459,19 @@ export const AzureBlobFSLinkedService: coreClient.CompositeMapper = {
1046010459
name: "Composite",
1046110460
className: "SecretBase"
1046210461
}
10462+
},
10463+
sasUri: {
10464+
serializedName: "typeProperties.sasUri",
10465+
type: {
10466+
name: "any"
10467+
}
10468+
},
10469+
sasToken: {
10470+
serializedName: "typeProperties.sasToken",
10471+
type: {
10472+
name: "Composite",
10473+
className: "SecretBase"
10474+
}
1046310475
}
1046410476
}
1046510477
}

0 commit comments

Comments
 (0)