Skip to content

Commit d29b8af

Browse files
author
SDKAuto
committed
CodeGen from PR 19273 in Azure/azure-rest-api-specs
Merge b91ffac4f3b4981092c1d868dfffd85590e476b8 into 2e59fa3ef47822961f3bde711183859729fc9970
1 parent 9067ea6 commit d29b8af

File tree

5 files changed

+94
-29
lines changed

5 files changed

+94
-29
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "d90729bbada2b4f784f2737ab4b4e39693a7aab8",
3-
"readme": "specification\\iothub\\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:\\work\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\iothub\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220408.1 --generate-sample=true",
2+
"commit": "072dca0080f39db3099eb21cf610456e62c16fb2",
3+
"readme": "specification/iothub/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=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/iothub/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220425.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/js-sdk-release-tools@2.2.6",
7-
"use": "@autorest/typescript@6.0.0-alpha.19.20220408.1"
8-
}
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.3.1",
7+
"use": "@autorest/typescript@6.0.0-alpha.19.20220425.1"
8+
}

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

Lines changed: 8 additions & 14 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 IotHubClient.",
6-
"version": "6.1.2",
6+
"version": "6.1.3",
77
"engines": {
88
"node": ">=12.0.0"
99
},
@@ -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/iothub/arm-iothub",
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-iothub?view=azure-node-preview"
117-
}
118-
}
111+
"autoPublish": true
112+
}

‎sdk/iothub/arm-iothub/src/iotHubClient.ts‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88

99
import * as coreClient from "@azure/core-client";
1010
import * as coreRestPipeline from "@azure/core-rest-pipeline";
11+
import {
12+
PipelineRequest,
13+
PipelineResponse,
14+
SendRequest
15+
} from "@azure/core-rest-pipeline";
1116
import * as coreAuth from "@azure/core-auth";
1217
import {
1318
OperationsImpl,
@@ -61,7 +66,7 @@ export class IotHubClient extends coreClient.ServiceClient {
6166
credential: credentials
6267
};
6368

64-
const packageDetails = `azsdk-js-arm-iothub/6.1.2`;
69+
const packageDetails = `azsdk-js-arm-iothub/6.1.3`;
6570
const userAgentPrefix =
6671
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
6772
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -118,6 +123,35 @@ export class IotHubClient extends coreClient.ServiceClient {
118123
this
119124
);
120125
this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this);
126+
this.addCustomApiVersionPolicy(options.apiVersion);
127+
}
128+
129+
/** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
130+
private addCustomApiVersionPolicy(apiVersion?: string) {
131+
if (!apiVersion) {
132+
return;
133+
}
134+
const apiVersionPolicy = {
135+
name: "CustomApiVersionPolicy",
136+
async sendRequest(
137+
request: PipelineRequest,
138+
next: SendRequest
139+
): Promise<PipelineResponse> {
140+
const param = request.url.split("?");
141+
if (param.length > 1) {
142+
const newParams = param[1].split("&").map((item) => {
143+
if (item.indexOf("api-version") > -1) {
144+
return item.replace(/(?<==).*$/, apiVersion);
145+
} else {
146+
return item;
147+
}
148+
});
149+
request.url = param[0] + "?" + newParams.join("&");
150+
}
151+
return next(request);
152+
}
153+
};
154+
this.pipeline.addPolicy(apiVersionPolicy);
121155
}
122156

123157
operations: Operations;

‎sdk/iothub/arm-iothub/test/sampleTest.ts‎

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/iothub/arm-iothub/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-iothub": [
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)