Skip to content

Commit 3a95f94

Browse files
author
SDKAuto
committed
CodeGen from PR 18961 in Azure/azure-rest-api-specs
Merge 417b2ea6821a624fb97052a6536cc10f14fe588c into 228f16c8871629ffe1fcdebfca9a3e8b4d2ce4aa
1 parent 7e07abd commit 3a95f94

File tree

10 files changed

+227
-214
lines changed

10 files changed

+227
-214
lines changed

common/config/rush/pnpm-lock.yaml

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

rush.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* This is the main configuration file for Rush.
33
* For full documentation, please see https://rushjs.io
4-
*/ {
4+
*/{
55
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush.schema.json",
66
/**
77
* (Required) This specifies the version of the Rush engine to be used in this repo.
@@ -1695,6 +1695,11 @@
16951695
"packageName": "@azure/arm-servicelinker",
16961696
"projectFolder": "sdk/servicelinker/arm-servicelinker",
16971697
"versionPolicyName": "management"
1698+
},
1699+
{
1700+
"packageName": "@azure/arm-changes",
1701+
"projectFolder": "sdk/changes/arm-changes",
1702+
"versionPolicyName": "management"
16981703
}
16991704
]
1700-
}
1705+
}

sdk/managedapplications/arm-managedapplications/README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ ARM applications
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 { ApplicationClient } = require("@azure/arm-managedapplications");
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 ApplicationClient(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 ApplicationClient(credential, subscriptionId);
6554
```
6655

6756

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "a42f1b58607091c4f255ead152a8ef323fa0b280",
3-
"readme": "specification\\resources\\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\\resources\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220408.1 --generate-sample=true",
2+
"commit": "d8ea7da67c4e0f3c004662afda82f79abc881f57",
3+
"readme": "specification/resources/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/resources/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.6",
7-
"use": "@autorest/typescript@6.0.0-alpha.19.20220408.1"
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.3.0",
7+
"use": "@autorest/typescript@6.0.0-alpha.16.20220105.1"
88
}

sdk/managedapplications/arm-managedapplications/package.json

Lines changed: 12 additions & 28 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 ApplicationClient.",
6-
"version": "2.0.2",
6+
"version": "2.0.3",
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.5.0",
14+
"@azure/core-client": "^1.0.0",
1515
"@azure/core-auth": "^1.3.0",
16-
"@azure/core-rest-pipeline": "^1.8.0",
16+
"@azure/core-rest-pipeline": "^1.1.0",
1717
"tslib": "^2.2.0"
1818
},
1919
"keywords": [
@@ -28,14 +28,14 @@
2828
"module": "./dist-esm/src/index.js",
2929
"types": "./types/arm-managedapplications.d.ts",
3030
"devDependencies": {
31-
"@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",
31+
"@microsoft/api-extractor": "^7.18.11",
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/applicationClient.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-managedapplications?view=azure-node-preview"
117-
}
118-
}
101+
"autoPublish": true
102+
}

sdk/managedapplications/arm-managedapplications/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/managedapplications/arm-managedapplications/src/applicationClient.ts

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

99
import * as coreClient from "@azure/core-client";
10-
import * as coreRestPipeline from "@azure/core-rest-pipeline";
1110
import * as coreAuth from "@azure/core-auth";
1211
import { PagedAsyncIterableIterator } from "@azure/core-paging";
1312
import { ApplicationsImpl, ApplicationDefinitionsImpl } from "./operations";
@@ -56,7 +55,7 @@ export class ApplicationClient extends coreClient.ServiceClient {
5655
credential: credentials
5756
};
5857

59-
const packageDetails = `azsdk-js-arm-managedapplications/2.0.2`;
58+
const packageDetails = `azsdk-js-arm-managedapplications/2.0.3`;
6059
const userAgentPrefix =
6160
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
6261
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -71,33 +70,9 @@ export class ApplicationClient extends coreClient.ServiceClient {
7170
userAgentOptions: {
7271
userAgentPrefix
7372
},
74-
baseUri:
75-
options.endpoint ?? options.baseUri ?? "https://management.azure.com"
73+
baseUri: options.endpoint || "https://management.azure.com"
7674
};
7775
super(optionsWithDefaults);
78-
79-
if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
80-
const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
81-
const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
82-
(pipelinePolicy) =>
83-
pipelinePolicy.name ===
84-
coreRestPipeline.bearerTokenAuthenticationPolicyName
85-
);
86-
if (!bearerTokenAuthenticationPolicyFound) {
87-
this.pipeline.removePolicy({
88-
name: coreRestPipeline.bearerTokenAuthenticationPolicyName
89-
});
90-
this.pipeline.addPolicy(
91-
coreRestPipeline.bearerTokenAuthenticationPolicy({
92-
scopes: `${optionsWithDefaults.baseUri}/.default`,
93-
challengeCallbacks: {
94-
authorizeRequestOnChallenge:
95-
coreClient.authorizeRequestOnClaimChallenge
96-
}
97-
})
98-
);
99-
}
100-
}
10176
// Parameter assignments
10277
this.subscriptionId = subscriptionId;
10378

sdk/managedapplications/arm-managedapplications/src/operations/applicationDefinitions.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,10 @@ export class ApplicationDefinitionsImpl implements ApplicationDefinitions {
170170
{ resourceGroupName, applicationDefinitionName, options },
171171
deleteOperationSpec
172172
);
173-
const poller = new LroEngine(lro, {
173+
return new LroEngine(lro, {
174174
resumeFrom: options?.resumeFrom,
175175
intervalInMs: options?.updateIntervalInMs
176176
});
177-
await poller.poll();
178-
return poller;
179177
}
180178

181179
/**
@@ -259,12 +257,10 @@ export class ApplicationDefinitionsImpl implements ApplicationDefinitions {
259257
{ resourceGroupName, applicationDefinitionName, parameters, options },
260258
createOrUpdateOperationSpec
261259
);
262-
const poller = new LroEngine(lro, {
260+
return new LroEngine(lro, {
263261
resumeFrom: options?.resumeFrom,
264262
intervalInMs: options?.updateIntervalInMs
265263
});
266-
await poller.poll();
267-
return poller;
268264
}
269265

270266
/**
@@ -376,12 +372,10 @@ export class ApplicationDefinitionsImpl implements ApplicationDefinitions {
376372
{ resourceGroupName, applicationDefinitionName, options },
377373
deleteByIdOperationSpec
378374
);
379-
const poller = new LroEngine(lro, {
375+
return new LroEngine(lro, {
380376
resumeFrom: options?.resumeFrom,
381377
intervalInMs: options?.updateIntervalInMs
382378
});
383-
await poller.poll();
384-
return poller;
385379
}
386380

387381
/**
@@ -465,12 +459,10 @@ export class ApplicationDefinitionsImpl implements ApplicationDefinitions {
465459
{ resourceGroupName, applicationDefinitionName, parameters, options },
466460
createOrUpdateByIdOperationSpec
467461
);
468-
const poller = new LroEngine(lro, {
462+
return new LroEngine(lro, {
469463
resumeFrom: options?.resumeFrom,
470464
intervalInMs: options?.updateIntervalInMs
471465
});
472-
await poller.poll();
473-
return poller;
474466
}
475467

476468
/**

0 commit comments

Comments
 (0)