Skip to content

Commit add2b51

Browse files
colawwjcolawwj
authored
refresh-first-batch (Azure#21228)
* refresh-first-batch * update * update * update
1 parent 1c6cd23 commit add2b51

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+575
-298
lines changed

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

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

‎sdk/apimanagement/arm-apimanagement/CHANGELOG.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
# Release History
22

3-
## 8.0.1 (Unreleased)
3+
## 8.0.1 (2022-04-06)
44

5-
### Features Added
5+
**features**
66

7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
7+
- Bug fix
128

139
## 8.0.0 (2021-12-13)
1410

‎sdk/apimanagement/arm-apimanagement/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021 Microsoft
3+
Copyright (c) 2022 Microsoft
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ApiManagement 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+
1921
### Prerequisites
2022

2123
- An [Azure subscription][azure_sub].
@@ -49,8 +51,17 @@ For more information about how to create an Azure AD Application check out [this
4951
```javascript
5052
const { ApiManagementClient } = require("@azure/arm-apimanagement");
5153
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+
5256
const subscriptionId = "00000000-0000-0000-0000-000000000000";
5357
const client = new ApiManagementClient(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 ApiManagementClient(credential, subscriptionId);
5465
```
5566

5667

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"commit": "b8cae07c799a07f2e779a9e301f639e9b85124b1",
3-
"readme": "specification/apimanagement/resource-manager/readme.md",
4-
"autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/apimanagement/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211130.1",
3+
"readme": "specification\\apimanagement\\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\\apimanagement\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.18.20220329.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"use": "@autorest/typescript@6.0.0-alpha.16.20211130.1"
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.2.1",
7+
"use": "@autorest/typescript@6.0.0-alpha.18.20220329.1"
78
}

‎sdk/apimanagement/arm-apimanagement/api-extractor.json‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
33
"mainEntryPointFilePath": "./dist-esm/src/index.d.ts",
4-
"docModel": { "enabled": true },
5-
"apiReport": { "enabled": true, "reportFolder": "./review" },
4+
"docModel": {
5+
"enabled": true
6+
},
7+
"apiReport": {
8+
"enabled": true,
9+
"reportFolder": "./review"
10+
},
611
"dtsRollup": {
712
"enabled": true,
813
"untrimmedFilePath": "",
914
"publicTrimmedFilePath": "./types/arm-apimanagement.d.ts"
1015
},
1116
"messages": {
12-
"tsdocMessageReporting": { "default": { "logLevel": "none" } },
17+
"tsdocMessageReporting": {
18+
"default": {
19+
"logLevel": "none"
20+
}
21+
},
1322
"extractorMessageReporting": {
14-
"ae-missing-release-tag": { "logLevel": "none" },
15-
"ae-unresolved-link": { "logLevel": "none" }
23+
"ae-missing-release-tag": {
24+
"logLevel": "none"
25+
},
26+
"ae-unresolved-link": {
27+
"logLevel": "none"
28+
}
1629
}
1730
}
18-
}
31+
}

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
"devDependencies": {
3131
"@microsoft/api-extractor": "^7.18.11",
3232
"@rollup/plugin-commonjs": "^21.0.1",
33-
"@rollup/plugin-json": "^4.0.0",
34-
"@rollup/plugin-multi-entry": "^3.0.0",
35-
"@rollup/plugin-node-resolve": "^8.0.0",
33+
"@rollup/plugin-json": "^4.1.0",
34+
"@rollup/plugin-multi-entry": "^4.1.0",
35+
"@rollup/plugin-node-resolve": "^13.1.3",
3636
"mkdirp": "^1.0.4",
37-
"rollup": "^2.0.0",
38-
"rollup-plugin-sourcemaps": "^0.4.2",
37+
"rollup": "^2.66.1",
38+
"rollup-plugin-sourcemaps": "^0.6.3",
3939
"typescript": "~4.2.0",
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
@@ -98,5 +98,13 @@
9898
"docs": "echo skipped"
9999
},
100100
"sideEffects": false,
101+
"//metadata": {
102+
"constantPaths": [
103+
{
104+
"path": "src/apiManagementClient.ts",
105+
"prefix": "packageDetails"
106+
}
107+
]
108+
},
101109
"autoPublish": true
102110
}

‎sdk/apimanagement/arm-apimanagement/review/arm-apimanagement.api.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2745,7 +2745,7 @@ export interface ContentItemCollection {
27452745
// @public
27462746
export type ContentItemContract = Resource & {
27472747
properties?: {
2748-
[propertyName: string]: Record<string, unknown>;
2748+
[propertyName: string]: any;
27492749
};
27502750
};
27512751

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

Lines changed: 6 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -14,62 +14,14 @@ 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-
6517
// #region Warning Handler
6618

6719
/**
68-
* A function that can determine whether a rollupwarning should be ignored. If
20+
* A function that can determine whether a rollup warning should be ignored. If
6921
* the function returns `true`, then the warning will not be displayed.
7022
*/
7123

72-
function ignoreNiseSinonEvalWarnings(warning) {
24+
function ignoreNiseSinonEval(warning) {
7325
return (
7426
warning.code === "EVAL" &&
7527
warning.id &&
@@ -78,17 +30,14 @@ function ignoreNiseSinonEvalWarnings(warning) {
7830
);
7931
}
8032

81-
function ignoreChaiCircularDependencyWarnings(warning) {
33+
function ignoreChaiCircularDependency(warning) {
8234
return (
8335
warning.code === "CIRCULAR_DEPENDENCY" &&
8436
warning.importer && warning.importer.includes("node_modules/chai") === true
8537
);
8638
}
8739

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

9342
/**
9443
* Construct a warning handler for the shared rollup configuration
@@ -122,22 +71,7 @@ function makeBrowserTestConfig() {
12271
nodeResolve({
12372
mainFields: ["module", "browser"]
12473
}),
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-
}),
74+
cjs(),
14175
json(),
14276
sourcemaps()
14377
//viz({ filename: "dist-test/browser-stats.html", sourcemap: true })
@@ -173,7 +107,7 @@ export function makeConfig(pkg, options) {
173107
],
174108
output: { file: "dist/index.js", format: "cjs", sourcemap: true },
175109
preserveSymlinks: false,
176-
plugins: [sourcemaps(), nodeResolve(), cjs()]
110+
plugins: [sourcemaps(), nodeResolve()]
177111
};
178112

179113
const config = [baseConfig];

‎sdk/apimanagement/arm-apimanagement/src/apiManagementClient.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export class ApiManagementClient extends coreClient.ServiceClient {
204204
credential: credentials
205205
};
206206

207-
const packageDetails = `azsdk-js-arm-apimanagement/8.0.0`;
207+
const packageDetails = `azsdk-js-arm-apimanagement/8.0.1`;
208208
const userAgentPrefix =
209209
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
210210
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -219,7 +219,8 @@ export class ApiManagementClient extends coreClient.ServiceClient {
219219
userAgentOptions: {
220220
userAgentPrefix
221221
},
222-
baseUri: options.endpoint || "https://management.azure.com"
222+
baseUri:
223+
options.endpoint ?? options.baseUri ?? "https://management.azure.com"
223224
};
224225
super(optionsWithDefaults);
225226
// Parameter assignments
@@ -380,11 +381,13 @@ export class ApiManagementClient extends coreClient.ServiceClient {
380381
},
381382
performConnectivityCheckAsyncOperationSpec
382383
);
383-
return new LroEngine(lro, {
384+
const poller = new LroEngine(lro, {
384385
resumeFrom: options?.resumeFrom,
385386
intervalInMs: options?.updateIntervalInMs,
386387
lroResourceLocationConfig: "location"
387388
});
389+
await poller.poll();
390+
return poller;
388391
}
389392

390393
/**

0 commit comments

Comments
 (0)