Skip to content

Commit d2bff64

Browse files
author
SDKAuto
committed
CodeGen from PR 18617 in Azure/azure-rest-api-specs
Merge 516f99c1713156f39f9d91d67ca625189ad8702a into d48ca7ed92cbb4f972eb6214bdb3200edaf78369
1 parent 9d5f582 commit d2bff64

File tree

11 files changed

+159
-105
lines changed

11 files changed

+159
-105
lines changed

‎common/config/rush/pnpm-lock.yaml‎

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

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ The Container Service Client.
1616
- [LTS versions of Node.js](https://nodejs.org/about/releases/)
1717
- Latest versions of Safari, Chrome, Edge and Firefox.
1818

19-
See our [support policy](https://github.com/Azure/azure-sdk-for-js/blob/main/SUPPORT.md) for more details.
20-
2119
### Prerequisites
2220

2321
- An [Azure subscription][azure_sub].
@@ -51,17 +49,8 @@ For more information about how to create an Azure AD Application check out [this
5149
```javascript
5250
const { ContainerServiceClient } = require("@azure/arm-containerservice");
5351
const { DefaultAzureCredential } = require("@azure/identity");
54-
// For client-side applications running in the browser, use InteractiveBrowserCredential instead of DefaultAzureCredential. See https://aka.ms/azsdk/js/identity/examples for more details.
55-
5652
const subscriptionId = "00000000-0000-0000-0000-000000000000";
5753
const client = new ContainerServiceClient(new DefaultAzureCredential(), subscriptionId);
58-
59-
// For client-side applications running in the browser, use this code instead:
60-
// const credential = new InteractiveBrowserCredential({
61-
// tenantId: "<YOUR_TENANT_ID>",
62-
// clientId: "<YOUR_CLIENT_ID>"
63-
// });
64-
// const client = new ContainerServiceClient(credential, subscriptionId);
6554
```
6655

6756

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "82fdf284eea880a8e027c354911a814999a77178",
2+
"commit": "25c45a0749dd649f1426a1bc65952043fde69385",
33
"readme": "specification/containerservice/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\\containerservice\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-beta.17 --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/containerservice/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220105.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/js-sdk-release-tools@2.2.0",
7-
"use": "@autorest/typescript@6.0.0-beta.17"
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.2.6",
7+
"use": "@autorest/typescript@6.0.0-alpha.16.20220105.1"
88
}

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

Lines changed: 9 additions & 25 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 ContainerServiceClient.",
6-
"version": "15.2.1",
6+
"version": "15.2.2",
77
"engines": {
88
"node": ">=12.0.0"
99
},
@@ -29,13 +29,13 @@
2929
"types": "./types/arm-containerservice.d.ts",
3030
"devDependencies": {
3131
"@microsoft/api-extractor": "^7.18.11",
32-
"@rollup/plugin-commonjs": "^21.0.1",
33-
"@rollup/plugin-json": "^4.1.0",
34-
"@rollup/plugin-multi-entry": "^4.1.0",
35-
"@rollup/plugin-node-resolve": "^13.1.3",
32+
"@rollup/plugin-commonjs": "11.0.2",
33+
"@rollup/plugin-json": "^4.0.0",
34+
"@rollup/plugin-multi-entry": "^3.0.0",
35+
"@rollup/plugin-node-resolve": "^8.0.0",
3636
"mkdirp": "^1.0.4",
37-
"rollup": "^2.66.1",
38-
"rollup-plugin-sourcemaps": "^0.6.3",
37+
"rollup": "^1.16.3",
38+
"rollup-plugin-sourcemaps": "^0.4.2",
3939
"typescript": "~4.2.0",
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
@@ -98,21 +98,5 @@
9898
"docs": "echo skipped"
9999
},
100100
"sideEffects": false,
101-
"//metadata": {
102-
"constantPaths": [
103-
{
104-
"path": "src/containerServiceClient.ts",
105-
"prefix": "packageDetails"
106-
}
107-
]
108-
},
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-containerservice?view=azure-node-preview"
117-
}
118-
}
101+
"autoPublish": true
102+
}

‎sdk/containerservice/arm-containerservice/rollup.config.js‎

Lines changed: 72 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,62 @@ import json from "@rollup/plugin-json";
1414

1515
import nodeBuiltins from "builtin-modules";
1616

17+
/**
18+
* Gets the proper configuration needed for rollup's commonJS plugin for @opentelemetry/api.
19+
*
20+
* NOTE: this manual configuration is only needed because OpenTelemetry uses an
21+
* __exportStar downleveled helper function to declare its exports which confuses
22+
* rollup's automatic discovery mechanism.
23+
*
24+
* @returns an object reference that can be `...`'d into your cjs() configuration.
25+
*/
26+
export function openTelemetryCommonJs() {
27+
const namedExports = {};
28+
29+
for (const key of [
30+
"@opentelemetry/api",
31+
"@azure/core-tracing/node_modules/@opentelemetry/api"
32+
]) {
33+
namedExports[key] = [
34+
"SpanKind",
35+
"TraceFlags",
36+
"getSpan",
37+
"setSpan",
38+
"SpanStatusCode",
39+
"getSpanContext",
40+
"setSpanContext"
41+
];
42+
}
43+
44+
const releasedOpenTelemetryVersions = ["0.10.2", "1.0.0-rc.0"];
45+
46+
for (const version of releasedOpenTelemetryVersions) {
47+
namedExports[
48+
// working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path.
49+
`../../../common/temp/node_modules/.pnpm/@opentelemetry/api@${version}/node_modules/@opentelemetry/api/build/src/index.js`
50+
] = [
51+
"SpanKind",
52+
"TraceFlags",
53+
"getSpan",
54+
"setSpan",
55+
"StatusCode",
56+
"CanonicalCode",
57+
"getSpanContext",
58+
"setSpanContext"
59+
];
60+
}
61+
62+
return namedExports;
63+
}
64+
1765
// #region Warning Handler
1866

1967
/**
20-
* A function that can determine whether a rollup warning should be ignored. If
68+
* A function that can determine whether a rollupwarning should be ignored. If
2169
* the function returns `true`, then the warning will not be displayed.
2270
*/
2371

24-
function ignoreNiseSinonEval(warning) {
72+
function ignoreNiseSinonEvalWarnings(warning) {
2573
return (
2674
warning.code === "EVAL" &&
2775
warning.id &&
@@ -30,14 +78,17 @@ function ignoreNiseSinonEval(warning) {
3078
);
3179
}
3280

33-
function ignoreChaiCircularDependency(warning) {
81+
function ignoreChaiCircularDependencyWarnings(warning) {
3482
return (
3583
warning.code === "CIRCULAR_DEPENDENCY" &&
3684
warning.importer && warning.importer.includes("node_modules/chai") === true
3785
);
3886
}
3987

40-
const warningInhibitors = [ignoreChaiCircularDependency, ignoreNiseSinonEval];
88+
const warningInhibitors = [
89+
ignoreChaiCircularDependencyWarnings,
90+
ignoreNiseSinonEvalWarnings
91+
];
4192

4293
/**
4394
* Construct a warning handler for the shared rollup configuration
@@ -71,7 +122,22 @@ function makeBrowserTestConfig() {
71122
nodeResolve({
72123
mainFields: ["module", "browser"]
73124
}),
74-
cjs(),
125+
cjs({
126+
namedExports: {
127+
// Chai's strange internal architecture makes it impossible to statically
128+
// analyze its exports.
129+
chai: [
130+
"version",
131+
"use",
132+
"util",
133+
"config",
134+
"expect",
135+
"should",
136+
"assert"
137+
],
138+
...openTelemetryCommonJs()
139+
}
140+
}),
75141
json(),
76142
sourcemaps()
77143
//viz({ filename: "dist-test/browser-stats.html", sourcemap: true })
@@ -107,7 +173,7 @@ export function makeConfig(pkg, options) {
107173
],
108174
output: { file: "dist/index.js", format: "cjs", sourcemap: true },
109175
preserveSymlinks: false,
110-
plugins: [sourcemaps(), nodeResolve()]
176+
plugins: [sourcemaps(), nodeResolve(), cjs()]
111177
};
112178

113179
const config = [baseConfig];

‎sdk/containerservice/arm-containerservice/src/containerServiceClient.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export class ContainerServiceClient extends coreClient.ServiceClient {
6262
credential: credentials
6363
};
6464

65-
const packageDetails = `azsdk-js-arm-containerservice/15.2.1`;
65+
const packageDetails = `azsdk-js-arm-containerservice/15.2.2`;
6666
const userAgentPrefix =
6767
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
6868
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -77,8 +77,7 @@ export class ContainerServiceClient extends coreClient.ServiceClient {
7777
userAgentOptions: {
7878
userAgentPrefix
7979
},
80-
baseUri:
81-
options.endpoint ?? options.baseUri ?? "https://management.azure.com"
80+
baseUri: options.endpoint || "https://management.azure.com"
8281
};
8382
super(optionsWithDefaults);
8483
// Parameter assignments

‎sdk/containerservice/arm-containerservice/src/operations/agentPools.ts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,10 @@ export class AgentPoolsImpl implements AgentPools {
204204
{ resourceGroupName, resourceName, agentPoolName, parameters, options },
205205
createOrUpdateOperationSpec
206206
);
207-
const poller = new LroEngine(lro, {
207+
return new LroEngine(lro, {
208208
resumeFrom: options?.resumeFrom,
209209
intervalInMs: options?.updateIntervalInMs
210210
});
211-
await poller.poll();
212-
return poller;
213211
}
214212

215213
/**
@@ -294,12 +292,10 @@ export class AgentPoolsImpl implements AgentPools {
294292
{ resourceGroupName, resourceName, agentPoolName, options },
295293
deleteOperationSpec
296294
);
297-
const poller = new LroEngine(lro, {
295+
return new LroEngine(lro, {
298296
resumeFrom: options?.resumeFrom,
299297
intervalInMs: options?.updateIntervalInMs
300298
});
301-
await poller.poll();
302-
return poller;
303299
}
304300

305301
/**
@@ -421,12 +417,10 @@ export class AgentPoolsImpl implements AgentPools {
421417
{ resourceGroupName, resourceName, agentPoolName, options },
422418
upgradeNodeImageVersionOperationSpec
423419
);
424-
const poller = new LroEngine(lro, {
420+
return new LroEngine(lro, {
425421
resumeFrom: options?.resumeFrom,
426422
intervalInMs: options?.updateIntervalInMs
427423
});
428-
await poller.poll();
429-
return poller;
430424
}
431425

432426
/**

0 commit comments

Comments
 (0)