Skip to content

Commit fc1d1c8

Browse files
author
SDKAuto
committed
CodeGen from PR 19103 in Azure/azure-rest-api-specs
Merge 6b087b74897dfc76d09018683489a49e22cc9709 into 4640dfc655f8641962814663fd03fd667e5c1a88
1 parent bbc4e39 commit fc1d1c8

File tree

5 files changed

+118
-29
lines changed

5 files changed

+118
-29
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "515a036fd42e59b65e94c8480b3a850d0b192bfc",
2+
"commit": "3d4655f732ecffac548fb876b3a9af22488dd22b",
33
"readme": "specification/containerinstance/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\\containerinstance\\resource-manager\\readme.md --use=@autorest/[email protected].18.20220329.1 --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/containerinstance/resource-manager/readme.md --use=@autorest/[email protected].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.1",
7-
"use": "@autorest/[email protected].18.20220329.1"
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.3.0",
7+
"use": "@autorest/[email protected].19.20220425.1"
88
}

‎sdk/containerinstance/arm-containerinstance/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 ContainerInstanceManagementClient.",
6-
"version": "8.1.1",
6+
"version": "8.1.2",
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/containerinstance/arm-containerinstance",
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-containerinstance?view=azure-node-preview"
117-
}
118-
}
111+
"autoPublish": true
112+
}

‎sdk/containerinstance/arm-containerinstance/src/containerInstanceManagementClient.ts‎

Lines changed: 59 additions & 1 deletion
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
ContainerGroupsImpl,
@@ -55,7 +61,7 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient
5561
credential: credentials
5662
};
5763

58-
const packageDetails = `azsdk-js-arm-containerinstance/8.1.1`;
64+
const packageDetails = `azsdk-js-arm-containerinstance/8.1.2`;
5965
const userAgentPrefix =
6066
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
6167
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -74,6 +80,29 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient
7480
options.endpoint ?? options.baseUri ?? "https://management.azure.com"
7581
};
7682
super(optionsWithDefaults);
83+
84+
if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
85+
const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
86+
const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
87+
(pipelinePolicy) =>
88+
pipelinePolicy.name ===
89+
coreRestPipeline.bearerTokenAuthenticationPolicyName
90+
);
91+
if (!bearerTokenAuthenticationPolicyFound) {
92+
this.pipeline.removePolicy({
93+
name: coreRestPipeline.bearerTokenAuthenticationPolicyName
94+
});
95+
this.pipeline.addPolicy(
96+
coreRestPipeline.bearerTokenAuthenticationPolicy({
97+
scopes: `${optionsWithDefaults.baseUri}/.default`,
98+
challengeCallbacks: {
99+
authorizeRequestOnChallenge:
100+
coreClient.authorizeRequestOnClaimChallenge
101+
}
102+
})
103+
);
104+
}
105+
}
77106
// Parameter assignments
78107
this.subscriptionId = subscriptionId;
79108

@@ -84,6 +113,35 @@ export class ContainerInstanceManagementClient extends coreClient.ServiceClient
84113
this.operations = new OperationsImpl(this);
85114
this.location = new LocationImpl(this);
86115
this.containers = new ContainersImpl(this);
116+
this.addCustomApiVersionPolicy(options.apiVersion);
117+
}
118+
119+
/** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
120+
private addCustomApiVersionPolicy(apiVersion?: string) {
121+
if (!apiVersion) {
122+
return;
123+
}
124+
const apiVersionPolicy = {
125+
name: "CustomApiVersionPolicy",
126+
async sendRequest(
127+
request: PipelineRequest,
128+
next: SendRequest
129+
): Promise<PipelineResponse> {
130+
const param = request.url.split("?");
131+
if (param.length > 1) {
132+
const newParams = param[1].split("&").map((item) => {
133+
if (item.indexOf("api-version") > -1) {
134+
return item.replace(/(?<==).*$/, apiVersion);
135+
} else {
136+
return item;
137+
}
138+
});
139+
request.url = param[0] + "?" + newParams.join("&");
140+
}
141+
return next(request);
142+
}
143+
};
144+
this.pipeline.addPolicy(apiVersionPolicy);
87145
}
88146

89147
containerGroups: ContainerGroups;

‎sdk/containerinstance/arm-containerinstance/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/containerinstance/arm-containerinstance/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-containerinstance": [
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)