Skip to content

Commit 2e7d496

Browse files
author
SDKAuto
committed
CodeGen from PR 18728 in Azure/azure-rest-api-specs
Merge 7607db5c751edfa8137bf8838fce8fec1e78fbc9 into ad5110c7ba2113d5f77946338231f45ac4d09c82
1 parent 705a502 commit 2e7d496

File tree

14 files changed

+135
-75
lines changed

14 files changed

+135
-75
lines changed

‎sdk/digitaltwins/arm-digitaltwins/CHANGELOG.md‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
# Release History
2-
3-
## 3.1.0-beta.2 (Unreleased)
4-
5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
12-
13-
## 3.1.0-beta.1 (2022-03-02)
2+
3+
## 3.1.0 (2022-06-08)
144

155
**Features**
166

@@ -43,6 +33,7 @@
4333
- Added Enum KnownConnectionType
4434
- Added Enum KnownCreatedByType
4535
- Added Enum KnownTimeSeriesDatabaseConnectionState
36+
- Enum KnownEndpointProvisioningState has a new value Updating
4637

4738

4839
## 3.0.0 (2022-01-13)

‎sdk/digitaltwins/arm-digitaltwins/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Azure Digital Twins Client for managing DigitalTwinsInstance
66

77
[Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/digitaltwins/arm-digitaltwins) |
88
[Package (NPM)](https://www.npmjs.com/package/@azure/arm-digitaltwins) |
9-
[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-digitaltwins?view=azure-node-preview) |
9+
[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-digitaltwins) |
1010
[Samples](https://github.com/Azure-Samples/azure-samples-js-management)
1111

1212
## Getting started

‎sdk/digitaltwins/arm-digitaltwins/_meta.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"commit": "4042a47cff72c950d35dd72149895b044ed79713",
2+
"commit": "92a72d1d7b4192fe8b066ae5ffd1df90905e9bf6",
33
"readme": "specification/digitaltwins/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\digitaltwins\\resource-manager\\readme.md --use=@autorest/[email protected]beta.16 --generate-sample=true",
4+
"autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --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/digitaltwins/resource-manager/readme.md --use=@autorest/[email protected]alpha.19.20220425.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"use": "@autorest/[email protected]"
6+
"release_tool": "@azure-tools/[email protected]",
7+
"use": "@autorest/[email protected]"
78
}

‎sdk/digitaltwins/arm-digitaltwins/package.json‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for AzureDigitalTwinsManagementClient.",
6-
"version": "3.1.0-beta.2",
6+
"version": "3.1.0",
77
"engines": {
88
"node": ">=12.0.0"
99
},
1010
"dependencies": {
1111
"@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.0.0",
14+
"@azure/core-client": "^1.5.0",
1515
"@azure/core-auth": "^1.3.0",
16-
"@azure/core-rest-pipeline": "^1.1.0",
16+
"@azure/core-rest-pipeline": "^1.8.0",
1717
"tslib": "^2.2.0"
1818
},
1919
"keywords": [
@@ -40,9 +40,11 @@
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
4242
"@azure/identity": "^2.0.1",
43-
"@azure-tools/test-recorder": "^1.0.0",
43+
"@azure-tools/test-recorder": "^2.0.0",
44+
"@azure-tools/test-credential": "^1.0.0",
4445
"mocha": "^7.1.1",
45-
"cross-env": "^7.0.2"
46+
"cross-env": "^7.0.2",
47+
"@azure/dev-tool": "^1.0.0"
4648
},
4749
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/digitaltwins/arm-digitaltwins",
4850
"repository": {
@@ -93,7 +95,7 @@
9395
"unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
9496
"unit-test:browser": "echo skipped",
9597
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
96-
"integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js",
98+
"integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
9799
"integration-test:browser": "echo skipped",
98100
"docs": "echo skipped"
99101
},
@@ -106,13 +108,5 @@
106108
}
107109
]
108110
},
109-
"autoPublish": true,
110-
"//sampleConfiguration": {
111-
"productName": "",
112-
"productSlugs": [
113-
"azure"
114-
],
115-
"disableDocsMs": true,
116-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-digitaltwins?view=azure-node-preview"
117-
}
118-
}
111+
"autoPublish": true
112+
}

‎sdk/digitaltwins/arm-digitaltwins/review/arm-digitaltwins.api.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,8 @@ export enum KnownEndpointProvisioningState {
438438
// (undocumented)
439439
Suspending = "Suspending",
440440
// (undocumented)
441+
Updating = "Updating",
442+
// (undocumented)
441443
Warning = "Warning"
442444
}
443445

@@ -528,6 +530,8 @@ export enum KnownTimeSeriesDatabaseConnectionState {
528530
// (undocumented)
529531
Suspending = "Suspending",
530532
// (undocumented)
533+
Updating = "Updating",
534+
// (undocumented)
531535
Warning = "Warning"
532536
}
533537

‎sdk/digitaltwins/arm-digitaltwins/src/azureDigitalTwinsManagementClient.ts‎

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
*/
88

99
import * as coreClient from "@azure/core-client";
10+
import * as coreRestPipeline from "@azure/core-rest-pipeline";
11+
import {
12+
PipelineRequest,
13+
PipelineResponse,
14+
SendRequest
15+
} from "@azure/core-rest-pipeline";
1016
import * as coreAuth from "@azure/core-auth";
1117
import {
1218
DigitalTwinsImpl,
@@ -58,7 +64,7 @@ export class AzureDigitalTwinsManagementClient extends coreClient.ServiceClient
5864
credential: credentials
5965
};
6066

61-
const packageDetails = `azsdk-js-arm-digitaltwins/3.1.0-beta.2`;
67+
const packageDetails = `azsdk-js-arm-digitaltwins/3.1.0`;
6268
const userAgentPrefix =
6369
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
6470
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -73,15 +79,39 @@ export class AzureDigitalTwinsManagementClient extends coreClient.ServiceClient
7379
userAgentOptions: {
7480
userAgentPrefix
7581
},
76-
baseUri: options.endpoint || "https://management.azure.com"
82+
baseUri:
83+
options.endpoint ?? options.baseUri ?? "https://management.azure.com"
7784
};
7885
super(optionsWithDefaults);
86+
87+
if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
88+
const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
89+
const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
90+
(pipelinePolicy) =>
91+
pipelinePolicy.name ===
92+
coreRestPipeline.bearerTokenAuthenticationPolicyName
93+
);
94+
if (!bearerTokenAuthenticationPolicyFound) {
95+
this.pipeline.removePolicy({
96+
name: coreRestPipeline.bearerTokenAuthenticationPolicyName
97+
});
98+
this.pipeline.addPolicy(
99+
coreRestPipeline.bearerTokenAuthenticationPolicy({
100+
scopes: `${optionsWithDefaults.baseUri}/.default`,
101+
challengeCallbacks: {
102+
authorizeRequestOnChallenge:
103+
coreClient.authorizeRequestOnClaimChallenge
104+
}
105+
})
106+
);
107+
}
108+
}
79109
// Parameter assignments
80110
this.subscriptionId = subscriptionId;
81111

82112
// Assigning values to Constant parameters
83113
this.$host = options.$host || "https://management.azure.com";
84-
this.apiVersion = options.apiVersion || "2021-06-30-preview";
114+
this.apiVersion = options.apiVersion || "2022-05-31";
85115
this.digitalTwins = new DigitalTwinsImpl(this);
86116
this.digitalTwinsEndpoint = new DigitalTwinsEndpointImpl(this);
87117
this.operations = new OperationsImpl(this);
@@ -90,6 +120,35 @@ export class AzureDigitalTwinsManagementClient extends coreClient.ServiceClient
90120
this.timeSeriesDatabaseConnections = new TimeSeriesDatabaseConnectionsImpl(
91121
this
92122
);
123+
this.addCustomApiVersionPolicy(options.apiVersion);
124+
}
125+
126+
/** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
127+
private addCustomApiVersionPolicy(apiVersion?: string) {
128+
if (!apiVersion) {
129+
return;
130+
}
131+
const apiVersionPolicy = {
132+
name: "CustomApiVersionPolicy",
133+
async sendRequest(
134+
request: PipelineRequest,
135+
next: SendRequest
136+
): Promise<PipelineResponse> {
137+
const param = request.url.split("?");
138+
if (param.length > 1) {
139+
const newParams = param[1].split("&").map((item) => {
140+
if (item.indexOf("api-version") > -1) {
141+
return item.replace(/(?<==).*$/, apiVersion);
142+
} else {
143+
return item;
144+
}
145+
});
146+
request.url = param[0] + "?" + newParams.join("&");
147+
}
148+
return next(request);
149+
}
150+
};
151+
this.pipeline.addPolicy(apiVersionPolicy);
93152
}
94153

95154
digitalTwins: DigitalTwins;

‎sdk/digitaltwins/arm-digitaltwins/src/models/index.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ export type EndpointType = string;
633633
export enum KnownEndpointProvisioningState {
634634
Provisioning = "Provisioning",
635635
Deleting = "Deleting",
636+
Updating = "Updating",
636637
Succeeded = "Succeeded",
637638
Failed = "Failed",
638639
Canceled = "Canceled",
@@ -651,6 +652,7 @@ export enum KnownEndpointProvisioningState {
651652
* ### Known values supported by the service
652653
* **Provisioning** \
653654
* **Deleting** \
655+
* **Updating** \
654656
* **Succeeded** \
655657
* **Failed** \
656658
* **Canceled** \
@@ -713,6 +715,7 @@ export type ConnectionType = string;
713715
export enum KnownTimeSeriesDatabaseConnectionState {
714716
Provisioning = "Provisioning",
715717
Deleting = "Deleting",
718+
Updating = "Updating",
716719
Succeeded = "Succeeded",
717720
Failed = "Failed",
718721
Canceled = "Canceled",
@@ -731,6 +734,7 @@ export enum KnownTimeSeriesDatabaseConnectionState {
731734
* ### Known values supported by the service
732735
* **Provisioning** \
733736
* **Deleting** \
737+
* **Updating** \
734738
* **Succeeded** \
735739
* **Failed** \
736740
* **Canceled** \

‎sdk/digitaltwins/arm-digitaltwins/src/models/parameters.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const $host: OperationURLParameter = {
4747
export const apiVersion: OperationQueryParameter = {
4848
parameterPath: "apiVersion",
4949
mapper: {
50-
defaultValue: "2021-06-30-preview",
50+
defaultValue: "2022-05-31",
5151
isConstant: true,
5252
serializedName: "api-version",
5353
type: {

‎sdk/digitaltwins/arm-digitaltwins/src/operations/digitalTwins.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,12 @@ export class DigitalTwinsImpl implements DigitalTwins {
227227
{ resourceGroupName, resourceName, digitalTwinsCreate, options },
228228
createOrUpdateOperationSpec
229229
);
230-
return new LroEngine(lro, {
230+
const poller = new LroEngine(lro, {
231231
resumeFrom: options?.resumeFrom,
232232
intervalInMs: options?.updateIntervalInMs
233233
});
234+
await poller.poll();
235+
return poller;
234236
}
235237

236238
/**
@@ -324,10 +326,12 @@ export class DigitalTwinsImpl implements DigitalTwins {
324326
},
325327
updateOperationSpec
326328
);
327-
return new LroEngine(lro, {
329+
const poller = new LroEngine(lro, {
328330
resumeFrom: options?.resumeFrom,
329331
intervalInMs: options?.updateIntervalInMs
330332
});
333+
await poller.poll();
334+
return poller;
331335
}
332336

333337
/**
@@ -412,10 +416,12 @@ export class DigitalTwinsImpl implements DigitalTwins {
412416
{ resourceGroupName, resourceName, options },
413417
deleteOperationSpec
414418
);
415-
return new LroEngine(lro, {
419+
const poller = new LroEngine(lro, {
416420
resumeFrom: options?.resumeFrom,
417421
intervalInMs: options?.updateIntervalInMs
418422
});
423+
await poller.poll();
424+
return poller;
419425
}
420426

421427
/**

‎sdk/digitaltwins/arm-digitaltwins/src/operations/digitalTwinsEndpoint.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,12 @@ export class DigitalTwinsEndpointImpl implements DigitalTwinsEndpoint {
206206
},
207207
createOrUpdateOperationSpec
208208
);
209-
return new LroEngine(lro, {
209+
const poller = new LroEngine(lro, {
210210
resumeFrom: options?.resumeFrom,
211211
intervalInMs: options?.updateIntervalInMs
212212
});
213+
await poller.poll();
214+
return poller;
213215
}
214216

215217
/**
@@ -299,10 +301,12 @@ export class DigitalTwinsEndpointImpl implements DigitalTwinsEndpoint {
299301
{ resourceGroupName, resourceName, endpointName, options },
300302
deleteOperationSpec
301303
);
302-
return new LroEngine(lro, {
304+
const poller = new LroEngine(lro, {
303305
resumeFrom: options?.resumeFrom,
304306
intervalInMs: options?.updateIntervalInMs
305307
});
308+
await poller.poll();
309+
return poller;
306310
}
307311

308312
/**

0 commit comments

Comments
 (0)