Skip to content

Commit 0b61d16

Browse files
committed
Merge branch 'cdn-2024-06-01-preview' of https://github.com/ZianWang02/azure-rest-api-specs into cdn-2024-06-01-preview
2 parents 5db05a1 + 7091be1 commit 0b61d16

File tree

818 files changed

+73791
-1478
lines changed

Some content is hidden

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

818 files changed

+73791
-1478
lines changed

.github/PULL_REQUEST_TEMPLATE/control_plane_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ If one or multiple validation error/warning suppression(s) is detected in your P
5252
## Getting help
5353

5454
- First, please carefully read through this PR description, from top to bottom. Please fill out the `Purpose of this PR` and `Due diligence checklist`.
55-
- If you don't have permissions to remove or add labels to the PR, request `write access` per [aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories](https://aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories")
55+
- If you don't have permissions to remove or add labels to the PR, request `write access` per [aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories](https://aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories)
5656
- To understand what you must do next to merge this PR, see the `Next Steps to Merge` comment. It will appear within few minutes of submitting this PR and will continue to be up-to-date with current PR state.
5757
- For guidance on fixing this PR CI check failures, see the hyperlinks provided in given failure
5858
and https://aka.ms/ci-fix.

.github/PULL_REQUEST_TEMPLATE/data_plane_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The [Azure API Review Board](https://aka.ms/azsdk/onboarding/restapischedule) is
7676
## Getting help
7777

7878
- First, please carefully read through this PR description, from top to bottom.
79-
- If you don't have permissions to remove or add labels to the PR, request `write access` per [aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories](https://aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories")
79+
- If you don't have permissions to remove or add labels to the PR, request `write access` per [aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories](https://aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories)
8080
- To understand what you must do next to merge this PR, see the `Next Steps to Merge` comment. It will appear within few minutes of submitting this PR and will continue to be up-to-date with current PR state.
8181
- For guidance on fixing this PR CI check failures, see the hyperlinks provided in given failure
8282
and https://aka.ms/ci-fix.

.github/workflows/tsp-client-test.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches:
66
- main
77
pull_request:
8+
branches:
9+
- main
810
paths:
911
- package-lock.json
1012
- package.json

cSpell.json

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@
448448
{
449449
"filename": "**/specification/netapp/**/*.json",
450450
"words": [
451-
"SVMs"
451+
"SVMs",
452+
"kibibytes"
452453
]
453454
},
454455
{
@@ -1157,6 +1158,15 @@
11571158
"mpga"
11581159
]
11591160
},
1161+
{
1162+
"filename": "**/specification/cognitiveservices/data-plane/AzureOpenAI/inference/stable/**/*.json",
1163+
"words": [
1164+
"flac",
1165+
"FLAC",
1166+
"mpga",
1167+
"rerank"
1168+
]
1169+
},
11601170
{
11611171
"filename": "**/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-01-01-preview/appplatform.json",
11621172
"words": [
@@ -1175,6 +1185,14 @@
11751185
"timerange"
11761186
]
11771187
},
1188+
{
1189+
"filename": "**/specification/healthdataaiservices/**/*.json",
1190+
"words": [
1191+
"deidentification",
1192+
"deidentify",
1193+
"surrogation"
1194+
]
1195+
},
11781196
{
11791197
"filename": "**/specification/search/data-plane/Azure.Search/**/*.json",
11801198
"words": [

eng/tools/suppressions/test/e2e/emptySuppressionsYaml/suppressions.yaml

Whitespace-only changes.

eng/tools/suppressions/test/e2e/noSuppressionsYaml/placeholder.txt

Whitespace-only changes.

eng/tools/suppressions/test/e2e/suppressFooJson/bar.json

Whitespace-only changes.

eng/tools/suppressions/test/e2e/suppressFooJson/foo.json

Whitespace-only changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- tool: TestTool
2+
path: foo.json
3+
reason: test
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import { expect, test } from "vitest";
2+
import { Suppression, getSuppressions } from "../src/suppressions.js";
3+
import { join } from "path";
4+
5+
async function getTestSuppressions(
6+
path: string,
7+
tool: string = "TestTool",
8+
): Promise<Suppression[]> {
9+
return await getSuppressions(tool, join(__dirname, "e2e", path));
10+
}
11+
12+
test.concurrent("no suppressions.yaml", async () => {
13+
const suppressions: Suppression[] = await getTestSuppressions("noSuppressionsYaml");
14+
expect(suppressions).toEqual([]);
15+
});
16+
17+
test.concurrent("empty suppressions.yaml", async () => {
18+
const suppressions: Suppression[] = await getTestSuppressions("emptySuppressionsYaml");
19+
expect(suppressions).toEqual([]);
20+
});
21+
22+
test.concurrent("suppress foo.json, get foo.json", async () => {
23+
const suppressions: Suppression[] = await getTestSuppressions(
24+
join("suppressFooJson", "foo.json"),
25+
);
26+
expect(suppressions).toEqual([
27+
{
28+
tool: "TestTool",
29+
paths: ["foo.json"],
30+
reason: "test",
31+
},
32+
]);
33+
});
34+
35+
test.concurrent("suppress foo.json, get bar.json", async () => {
36+
const suppressions: Suppression[] = await getTestSuppressions(
37+
join("suppressFooJson", "bar.json"),
38+
);
39+
expect(suppressions).toEqual([]);
40+
});
41+
42+
test.concurrent("suppress foo.json, get foo.json w/ different tool", async () => {
43+
const suppressions: Suppression[] = await getTestSuppressions(
44+
join("suppressFooJson", "foo.json"),
45+
"TestTool2",
46+
);
47+
expect(suppressions).toEqual([]);
48+
});

0 commit comments

Comments
 (0)