Skip to content

Commit 9361c63

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

File tree

10 files changed

+266
-187
lines changed

10 files changed

+266
-187
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/locks/arm-locks/CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Release History
22

3-
## 2.1.0 (2022-04-18)
3+
## 2.1.0 (2022-05-09)
44

55
**Features**
66

@@ -11,7 +11,6 @@
1111
- Added Type Alias CreatedByType
1212
- Interface ManagementLockObject has a new optional parameter systemData
1313
- Added Enum KnownCreatedByType
14-
- Bug fix
1514

1615

1716
## 2.0.0 (2021-12-07)

sdk/locks/arm-locks/README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Azure resources can be locked to prevent other users in your organization from d
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 { ManagementLockClient } = require("@azure/arm-locks");
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 ManagementLockClient(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 ManagementLockClient(credential, subscriptionId);
6554
```
6655

6756

sdk/locks/arm-locks/_meta.json

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/[email protected].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/[email protected].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/[email protected].19.20220408.1"
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.3.0",
7+
"use": "@autorest/[email protected].16.20220105.1"
88
}

sdk/locks/arm-locks/package.json

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
},
1010
"dependencies": {
1111
"@azure/core-paging": "^1.2.0",
12-
"@azure/core-client": "^1.5.0",
12+
"@azure/core-client": "^1.0.0",
1313
"@azure/core-auth": "^1.3.0",
14-
"@azure/core-rest-pipeline": "^1.8.0",
14+
"@azure/core-rest-pipeline": "^1.1.0",
1515
"tslib": "^2.2.0"
1616
},
1717
"keywords": [
@@ -26,14 +26,14 @@
2626
"module": "./dist-esm/src/index.js",
2727
"types": "./types/arm-locks.d.ts",
2828
"devDependencies": {
29-
"@microsoft/api-extractor": "7.18.11",
30-
"@rollup/plugin-commonjs": "^21.0.1",
31-
"@rollup/plugin-json": "^4.1.0",
32-
"@rollup/plugin-multi-entry": "^4.1.0",
33-
"@rollup/plugin-node-resolve": "^13.1.3",
29+
"@microsoft/api-extractor": "^7.18.11",
30+
"@rollup/plugin-commonjs": "11.0.2",
31+
"@rollup/plugin-json": "^4.0.0",
32+
"@rollup/plugin-multi-entry": "^3.0.0",
33+
"@rollup/plugin-node-resolve": "^8.0.0",
3434
"mkdirp": "^1.0.4",
35-
"rollup": "^2.66.1",
36-
"rollup-plugin-sourcemaps": "^0.6.3",
35+
"rollup": "^1.16.3",
36+
"rollup-plugin-sourcemaps": "^0.4.2",
3737
"typescript": "~4.2.0",
3838
"uglify-js": "^3.4.9",
3939
"rimraf": "^3.0.0",
@@ -96,21 +96,5 @@
9696
"docs": "echo skipped"
9797
},
9898
"sideEffects": false,
99-
"//metadata": {
100-
"constantPaths": [
101-
{
102-
"path": "src/managementLockClient.ts",
103-
"prefix": "packageDetails"
104-
}
105-
]
106-
},
107-
"autoPublish": true,
108-
"//sampleConfiguration": {
109-
"productName": "",
110-
"productSlugs": [
111-
"azure"
112-
],
113-
"disableDocsMs": true,
114-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-locks?view=azure-node-preview"
115-
}
116-
}
99+
"autoPublish": true
100+
}

sdk/locks/arm-locks/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/locks/arm-locks/src/managementLockClient.ts

Lines changed: 1 addition & 26 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 { AuthorizationOperationsImpl, ManagementLocksImpl } from "./operations";
1312
import {
@@ -63,33 +62,9 @@ export class ManagementLockClient extends coreClient.ServiceClient {
6362
userAgentOptions: {
6463
userAgentPrefix
6564
},
66-
baseUri:
67-
options.endpoint ?? options.baseUri ?? "https://management.azure.com"
65+
baseUri: options.endpoint || "https://management.azure.com"
6866
};
6967
super(optionsWithDefaults);
70-
71-
if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
72-
const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
73-
const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
74-
(pipelinePolicy) =>
75-
pipelinePolicy.name ===
76-
coreRestPipeline.bearerTokenAuthenticationPolicyName
77-
);
78-
if (!bearerTokenAuthenticationPolicyFound) {
79-
this.pipeline.removePolicy({
80-
name: coreRestPipeline.bearerTokenAuthenticationPolicyName
81-
});
82-
this.pipeline.addPolicy(
83-
coreRestPipeline.bearerTokenAuthenticationPolicy({
84-
scopes: `${optionsWithDefaults.baseUri}/.default`,
85-
challengeCallbacks: {
86-
authorizeRequestOnChallenge:
87-
coreClient.authorizeRequestOnClaimChallenge
88-
}
89-
})
90-
);
91-
}
92-
}
9368
// Parameter assignments
9469
this.subscriptionId = subscriptionId;
9570

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
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+
env,
11+
record,
12+
RecorderEnvironmentSetup,
13+
Recorder
14+
} from "@azure-tools/test-recorder";
15+
import * as assert from "assert";
16+
17+
const recorderEnvSetup: RecorderEnvironmentSetup = {
18+
replaceableVariables: {
19+
AZURE_CLIENT_ID: "azure_client_id",
20+
AZURE_CLIENT_SECRET: "azure_client_secret",
21+
AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
22+
SUBSCRIPTION_ID: "azure_subscription_id"
23+
},
24+
customizationsOnRecordings: [
25+
(recording: any): any =>
26+
recording.replace(
27+
/"access_token":"[^"]*"/g,
28+
`"access_token":"access_token"`
29+
)
30+
],
31+
queryParametersToSkip: []
32+
};
33+
34+
describe("My test", () => {
35+
let recorder: Recorder;
36+
37+
beforeEach(async function() {
38+
recorder = record(this, recorderEnvSetup);
39+
});
40+
41+
afterEach(async function() {
42+
await recorder.stop();
43+
});
44+
45+
it("sample test", async function() {
46+
console.log("Hi, I'm a test!");
47+
});
48+
});

sdk/locks/arm-locks/tsconfig.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,13 @@
1515
],
1616
"declaration": true,
1717
"outDir": "./dist-esm",
18-
"importHelpers": true,
19-
"paths": {
20-
"@azure/arm-locks": [
21-
"./src/index"
22-
]
23-
}
18+
"importHelpers": true
2419
},
2520
"include": [
2621
"./src/**/*.ts",
2722
"./test/**/*.ts",
28-
"samples-dev/**/*.ts",
2923
"./test/**/*.ts",
30-
"samples-dev/**/*.ts",
31-
"./test/**/*.ts",
32-
"samples-dev/**/*.ts"
24+
"./test/**/*.ts"
3325
],
3426
"exclude": [
3527
"node_modules"

0 commit comments

Comments
 (0)