From f5c49d5f352d25fe6dda99817a697cf67c9bdbca Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 12 Oct 2023 20:36:14 +0000 Subject: [PATCH 01/15] Update deps and pipelines to "next" --- eng/pipelines/templates/steps/npm-install.yml | 4 ++-- eng/pipelines/typespec-validation-all.yml | 3 +++ eng/pipelines/typespec-validation.yml | 3 +++ package.json | 22 +++++++++---------- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/eng/pipelines/templates/steps/npm-install.yml b/eng/pipelines/templates/steps/npm-install.yml index 6ea32a5642da..f7ddf8e49df2 100644 --- a/eng/pipelines/templates/steps/npm-install.yml +++ b/eng/pipelines/templates/steps/npm-install.yml @@ -2,8 +2,8 @@ steps: - script: npm --version --loglevel info displayName: npm --version - - script: npm ci - displayName: npm ci + - script: npm install --no-package-lock + displayName: npm install --no-package-lock - script: npm ls -a displayName: npm ls -a diff --git a/eng/pipelines/typespec-validation-all.yml b/eng/pipelines/typespec-validation-all.yml index 305d5b8de581..88d5213f355a 100644 --- a/eng/pipelines/typespec-validation-all.yml +++ b/eng/pipelines/typespec-validation-all.yml @@ -36,6 +36,9 @@ jobs: vmImage: $(OSVmImage) steps: + - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge origin/main + displayName: git merge origin/main + - template: /eng/pipelines/templates/steps/npm-install.yml - pwsh: | diff --git a/eng/pipelines/typespec-validation.yml b/eng/pipelines/typespec-validation.yml index f394233a5325..a717d9821953 100644 --- a/eng/pipelines/typespec-validation.yml +++ b/eng/pipelines/typespec-validation.yml @@ -7,6 +7,9 @@ jobs: vmImage: ubuntu-22.04 steps: + - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge origin/main + displayName: git merge origin/main + - template: /eng/pipelines/templates/steps/npm-install.yml - pwsh: | diff --git a/package.json b/package.json index df56d8f7acf6..beb2296b48bb 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/typespec-apiview": "0.4.4", - "@azure-tools/typespec-autorest": "0.35.0", - "@azure-tools/typespec-azure-core": "0.35.0", - "@azure-tools/typespec-azure-resource-manager": "0.35.0", - "@azure-tools/typespec-client-generator-core": "0.35.0", - "@azure-tools/typespec-providerhub": "0.35.0", - "@typespec/compiler": "0.49.0", - "@typespec/http": "0.49.0", - "@typespec/openapi": "0.49.0", - "@typespec/rest": "0.49.0", - "@typespec/versioning": "0.49.0", + "@azure-tools/typespec-autorest": "next", + "@azure-tools/typespec-azure-core": "next", + "@azure-tools/typespec-azure-resource-manager": "next", + "@azure-tools/typespec-client-generator-core": "next", + "@azure-tools/typespec-providerhub": "next", + "@typespec/compiler": "next", + "@typespec/http": "next", + "@typespec/lint": "next", + "@typespec/openapi": "next", + "@typespec/rest": "next", + "@typespec/versioning": "next", "@azure/avocado": "^0.8.4", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "~3.0.3", From 7c815c29edd07296034ee21cd0a7c000fa72a33b Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 12 Oct 2023 23:10:08 -0700 Subject: [PATCH 02/15] [typespec-next] React to Azure/typespec-azure#3586 (#26209) - React to Azure/typespec-azure#3586 - Related to Azure/typespec-azure#3587 and Azure/typespec-azure#3589 --- .../cognitiveservices/OpenAI.Inference/client.tsp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/specification/cognitiveservices/OpenAI.Inference/client.tsp b/specification/cognitiveservices/OpenAI.Inference/client.tsp index 6a68b5b38d5e..d74a592bcdcd 100644 --- a/specification/cognitiveservices/OpenAI.Inference/client.tsp +++ b/specification/cognitiveservices/OpenAI.Inference/client.tsp @@ -5,15 +5,17 @@ using Azure.ClientGenerator.Core; // Azure-specific long-running operations should be treated as implementation details that are wrapped into // appropriately merged public surface. -@@internal(Azure.OpenAI.beginAzureBatchImageGeneration); -@@internal(Azure.OpenAI.getAzureBatchImageGenerationOperationStatus); +@@access(Azure.OpenAI.beginAzureBatchImageGeneration, Access.internal); +@@access(Azure.OpenAI.getAzureBatchImageGenerationOperationStatus, + Access.internal +); // Azure-specific Chat Completions with extensions should be handled by clients as a conditional selection within the // shared Chat Completions route, with the selection gated by the presence or non-presence of additional child // configuration options on the request payload options model. -@@internal(Azure.OpenAI.getChatCompletionsWithAzureExtensions); +@@access(Azure.OpenAI.getChatCompletionsWithAzureExtensions, Access.internal); // Some models from routes with suppressed visibility are still desired for custom public surface. -@@include(Azure.OpenAI.ImageGenerationOptions); -@@include(Azure.OpenAI.ImageLocation); -@@include(Azure.OpenAI.ImageGenerations); +@@usage(Azure.OpenAI.ImageGenerationOptions, Usage.input | Usage.output); +@@usage(Azure.OpenAI.ImageLocation, Usage.input | Usage.output); +@@usage(Azure.OpenAI.ImageGenerations, Usage.input | Usage.output); From a7d352ab37f500f166bbfe4e1c48b1a803691105 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 19 Oct 2023 09:21:58 +0000 Subject: [PATCH 03/15] React to azure/typespec-azure#3692 --- .../2023-06-15-preview/azure.codesigning.json | 12 +++++++++--- .../preview/2022-11-01-preview/widgets.json | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/specification/codesigning/data-plane/Azure.CodeSigning/preview/2023-06-15-preview/azure.codesigning.json b/specification/codesigning/data-plane/Azure.CodeSigning/preview/2023-06-15-preview/azure.codesigning.json index 23b28db1c3d9..4be8817cbfee 100644 --- a/specification/codesigning/data-plane/Azure.CodeSigning/preview/2023-06-15-preview/azure.codesigning.json +++ b/specification/codesigning/data-plane/Azure.CodeSigning/preview/2023-06-15-preview/azure.codesigning.json @@ -382,7 +382,8 @@ "type": "string", "description": "Enum describing allowed operation states.", "enum": [ - "InProgress", + "NotStarted", + "Running", "Succeeded", "Failed", "Canceled" @@ -392,8 +393,13 @@ "modelAsString": true, "values": [ { - "name": "InProgress", - "value": "InProgress", + "name": "NotStarted", + "value": "NotStarted", + "description": "The operation has not started." + }, + { + "name": "Running", + "value": "Running", "description": "The operation is in progress." }, { diff --git a/specification/contosowidgetmanager/data-plane/Azure.Contoso.WidgetManager/preview/2022-11-01-preview/widgets.json b/specification/contosowidgetmanager/data-plane/Azure.Contoso.WidgetManager/preview/2022-11-01-preview/widgets.json index 65d37b6ed740..09b9e8562daf 100644 --- a/specification/contosowidgetmanager/data-plane/Azure.Contoso.WidgetManager/preview/2022-11-01-preview/widgets.json +++ b/specification/contosowidgetmanager/data-plane/Azure.Contoso.WidgetManager/preview/2022-11-01-preview/widgets.json @@ -403,7 +403,8 @@ "type": "string", "description": "Enum describing allowed operation states.", "enum": [ - "InProgress", + "NotStarted", + "Running", "Succeeded", "Failed", "Canceled" @@ -413,8 +414,13 @@ "modelAsString": true, "values": [ { - "name": "InProgress", - "value": "InProgress", + "name": "NotStarted", + "value": "NotStarted", + "description": "The operation has not started." + }, + { + "name": "Running", + "value": "Running", "description": "The operation is in progress." }, { From a5b9504a79ee9ab9d8d5d13318a7b3c9c3140c28 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 30 Oct 2023 17:40:14 -0700 Subject: [PATCH 04/15] [typespec-next] Pin packages to LKG (#26476) --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index beb2296b48bb..8f697faa4f8c 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/typespec-autorest": "next", - "@azure-tools/typespec-azure-core": "next", - "@azure-tools/typespec-azure-resource-manager": "next", - "@azure-tools/typespec-client-generator-core": "next", - "@azure-tools/typespec-providerhub": "next", - "@typespec/compiler": "next", - "@typespec/http": "next", - "@typespec/lint": "next", - "@typespec/openapi": "next", - "@typespec/rest": "next", - "@typespec/versioning": "next", + "@azure-tools/typespec-autorest": "0.36.0-dev.7", + "@azure-tools/typespec-azure-core": "0.36.0-dev.6", + "@azure-tools/typespec-azure-resource-manager": "0.36.0-dev.3", + "@azure-tools/typespec-client-generator-core": "0.36.0-dev.6", + "@azure-tools/typespec-providerhub": "0.36.0-dev.2", + "@typespec/compiler": "0.50.0-dev.9", + "@typespec/http": "0.50.0-dev.2", + "@typespec/lint": "0.50.0-dev.0", + "@typespec/openapi": "0.50.0-dev.2", + "@typespec/rest": "0.50.0-dev.2", + "@typespec/versioning": "0.50.0-dev.3", "@azure/avocado": "^0.8.4", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "~3.0.3", From 9d7a51b103a5eb9830f63186b45b613bdc4c11e7 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 30 Oct 2023 18:01:18 -0700 Subject: [PATCH 05/15] [typespec-next] Upgrade packages to latest working (#26477) --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 8f697faa4f8c..0d5ff7247655 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/typespec-autorest": "0.36.0-dev.7", - "@azure-tools/typespec-azure-core": "0.36.0-dev.6", - "@azure-tools/typespec-azure-resource-manager": "0.36.0-dev.3", - "@azure-tools/typespec-client-generator-core": "0.36.0-dev.6", - "@azure-tools/typespec-providerhub": "0.36.0-dev.2", + "@azure-tools/typespec-autorest": "next", + "@azure-tools/typespec-azure-core": "next", + "@azure-tools/typespec-azure-resource-manager": "next", + "@azure-tools/typespec-client-generator-core": "next", + "@azure-tools/typespec-providerhub": "next", "@typespec/compiler": "0.50.0-dev.9", - "@typespec/http": "0.50.0-dev.2", - "@typespec/lint": "0.50.0-dev.0", - "@typespec/openapi": "0.50.0-dev.2", - "@typespec/rest": "0.50.0-dev.2", - "@typespec/versioning": "0.50.0-dev.3", + "@typespec/http": "next", + "@typespec/lint": "next", + "@typespec/openapi": "next", + "@typespec/rest": "next", + "@typespec/versioning": "next", "@azure/avocado": "^0.8.4", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "~3.0.3", From f10569db31d2d98f3525a15680774a49cbd44d78 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Mon, 30 Oct 2023 18:04:38 -0700 Subject: [PATCH 06/15] [typespec-next] Upgrade compiler to 0.50.0-dev.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d5ff7247655..b7fae2297120 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@azure-tools/typespec-azure-resource-manager": "next", "@azure-tools/typespec-client-generator-core": "next", "@azure-tools/typespec-providerhub": "next", - "@typespec/compiler": "0.50.0-dev.9", + "@typespec/compiler": "0.50.0-dev.10", "@typespec/http": "next", "@typespec/lint": "next", "@typespec/openapi": "next", From 6ad591443e363651be1ee76aa3399fcdd8ade24f Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 1 Nov 2023 23:06:31 +0000 Subject: [PATCH 07/15] [typespec-next] Unpin compiler --- package-lock.json | 56 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b855494a479..2df2501f2aa8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,18 +6,18 @@ "": { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/typespec-apiview": "0.4.4", - "@azure-tools/typespec-autorest": "0.35.2", - "@azure-tools/typespec-azure-core": "0.35.1", - "@azure-tools/typespec-azure-resource-manager": "0.35.0", - "@azure-tools/typespec-client-generator-core": "0.35.0", - "@azure-tools/typespec-providerhub": "0.35.0", + "@azure-tools/typespec-autorest": "next", + "@azure-tools/typespec-azure-core": "next", + "@azure-tools/typespec-azure-resource-manager": "next", + "@azure-tools/typespec-client-generator-core": "next", + "@azure-tools/typespec-providerhub": "next", "@azure/avocado": "^0.8.4", - "@typespec/compiler": "0.49.0", - "@typespec/http": "0.49.0", - "@typespec/openapi": "0.49.0", - "@typespec/rest": "0.49.0", - "@typespec/versioning": "0.49.0", + "@typespec/compiler": "0.50.0-dev.10", + "@typespec/http": "next", + "@typespec/lint": "next", + "@typespec/openapi": "next", + "@typespec/rest": "next", + "@typespec/versioning": "next", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "~3.0.3", "typescript": "~5.1.3" @@ -61,19 +61,6 @@ "node": "^16.17.0 || ^18.3.0 || ^20.0.0" } }, - "node_modules/@azure-tools/typespec-apiview": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-apiview/-/typespec-apiview-0.4.4.tgz", - "integrity": "sha512-9F8+wx7Nl5USPDo2d9QClDjZyDLXNF/kJ23lb50goIuskePsFBzlb4KlaUc3Xehy7kPanR/E4zH9f0lLm2tGXg==", - "dev": true, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@typespec/compiler": ">=0.40 <1.0", - "@typespec/versioning": ">=0.40 <1.0" - } - }, "node_modules/@azure-tools/typespec-autorest": { "version": "0.35.2", "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.35.2.tgz", @@ -611,9 +598,9 @@ "dev": true }, "node_modules/@typespec/compiler": { - "version": "0.49.0", - "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.49.0.tgz", - "integrity": "sha512-wu0BzCnG6K8GArO1Mo0UIAVvsGnip+Dce3uBuPcW6mGSAv6Y0NljWBHp8dAJNs+uv45wFWpdkZFQvjr3SNUDJw==", + "version": "0.50.0-dev.10", + "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.50.0-dev.10.tgz", + "integrity": "sha512-56RPJmZYaAvOsLHwg1VBLw7Znb+57Wm0UECR0jOYfsJfHfN23uIdvk5i19RviKZ1p1ETuIP23oa7rnHzWxm4EQ==", "dev": true, "dependencies": { "@babel/code-frame": "~7.22.13", @@ -635,7 +622,7 @@ "tsp-server": "cmd/tsp-server.js" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } }, "node_modules/@typespec/compiler/node_modules/ansi-styles": { @@ -750,6 +737,19 @@ "@typespec/compiler": "~0.49.0" } }, + "node_modules/@typespec/lint": { + "version": "0.50.0-dev.0", + "resolved": "https://registry.npmjs.org/@typespec/lint/-/lint-0.50.0-dev.0.tgz", + "integrity": "sha512-5f9oEAupXyBQJfvuyF7q+nH55JufNzcY+DK9zNa71ANdQHGNKsm+rfm/vB6lp0s96OtLmvUido6SQKRWbra/YA==", + "deprecated": "This package has been deprecated. Linting functionality is now built-in the typespec compiler.", + "dev": true, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "@typespec/compiler": "~0.49.0 || >=0.50.0-dev <0.50.0" + } + }, "node_modules/@typespec/openapi": { "version": "0.49.0", "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.49.0.tgz", diff --git a/package.json b/package.json index b7fae2297120..beb2296b48bb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@azure-tools/typespec-azure-resource-manager": "next", "@azure-tools/typespec-client-generator-core": "next", "@azure-tools/typespec-providerhub": "next", - "@typespec/compiler": "0.50.0-dev.10", + "@typespec/compiler": "next", "@typespec/http": "next", "@typespec/lint": "next", "@typespec/openapi": "next", From 0ce78c820961fc6bb80b9538d6d5d0218784e06c Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 1 Nov 2023 19:30:18 -0700 Subject: [PATCH 08/15] [typespec-next] Pin compiler to 0.50.0-dev.10 (#26519) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index beb2296b48bb..b7fae2297120 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@azure-tools/typespec-azure-resource-manager": "next", "@azure-tools/typespec-client-generator-core": "next", "@azure-tools/typespec-providerhub": "next", - "@typespec/compiler": "next", + "@typespec/compiler": "0.50.0-dev.10", "@typespec/http": "next", "@typespec/lint": "next", "@typespec/openapi": "next", From 3ae11f0ea4818cc6e994564377e36355d6cad262 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 2 Nov 2023 13:53:44 -0700 Subject: [PATCH 09/15] [typespec-next] Unpin compiler (#26535) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b7fae2297120..beb2296b48bb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@azure-tools/typespec-azure-resource-manager": "next", "@azure-tools/typespec-client-generator-core": "next", "@azure-tools/typespec-providerhub": "next", - "@typespec/compiler": "0.50.0-dev.10", + "@typespec/compiler": "next", "@typespec/http": "next", "@typespec/lint": "next", "@typespec/openapi": "next", From f1c5ecc110f6a7fd5fca2b5ab7416a76f065c906 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 7 Nov 2023 06:52:39 +0000 Subject: [PATCH 10/15] Pin typespec-azure-core to 0.36.0-dev.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index beb2296b48bb..238d65dbb3b4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "azure-rest-api-specs", "devDependencies": { "@azure-tools/typespec-autorest": "next", - "@azure-tools/typespec-azure-core": "next", + "@azure-tools/typespec-azure-core": "0.36.0-dev.7", "@azure-tools/typespec-azure-resource-manager": "next", "@azure-tools/typespec-client-generator-core": "next", "@azure-tools/typespec-providerhub": "next", From e5a3a081ec6ce5e83148c73a59bdf0f338e63c2b Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 7 Nov 2023 20:09:17 +0000 Subject: [PATCH 11/15] Upgrade typespec-azure-core to PR fixing crash --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 238d65dbb3b4..7393b3b3c3be 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "azure-rest-api-specs", "devDependencies": { "@azure-tools/typespec-autorest": "next", - "@azure-tools/typespec-azure-core": "0.36.0-dev.7", + "@azure-tools/typespec-azure-core": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvMzI0MDQ4OC9hcnRpZmFjdE5hbWUvcGFja2FnZXM1/content?format=file&subPath=%2Fazure-tools-typespec-azure-core-0.36.0-pr-3851.20231107.6.tgz", "@azure-tools/typespec-azure-resource-manager": "next", "@azure-tools/typespec-client-generator-core": "next", "@azure-tools/typespec-providerhub": "next", From 4e14218c1749cc21212f27f5e77554a063f5f201 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 9 Nov 2023 01:50:52 +0000 Subject: [PATCH 12/15] Revert "Update deps and pipelines to "next"" This reverts commit f5c49d5f352d25fe6dda99817a697cf67c9bdbca. --- eng/pipelines/templates/steps/npm-install.yml | 4 ++-- eng/pipelines/typespec-validation-all.yml | 3 --- eng/pipelines/typespec-validation.yml | 3 --- package.json | 22 +++++++++---------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/eng/pipelines/templates/steps/npm-install.yml b/eng/pipelines/templates/steps/npm-install.yml index f7ddf8e49df2..6ea32a5642da 100644 --- a/eng/pipelines/templates/steps/npm-install.yml +++ b/eng/pipelines/templates/steps/npm-install.yml @@ -2,8 +2,8 @@ steps: - script: npm --version --loglevel info displayName: npm --version - - script: npm install --no-package-lock - displayName: npm install --no-package-lock + - script: npm ci + displayName: npm ci - script: npm ls -a displayName: npm ls -a diff --git a/eng/pipelines/typespec-validation-all.yml b/eng/pipelines/typespec-validation-all.yml index 88d5213f355a..305d5b8de581 100644 --- a/eng/pipelines/typespec-validation-all.yml +++ b/eng/pipelines/typespec-validation-all.yml @@ -36,9 +36,6 @@ jobs: vmImage: $(OSVmImage) steps: - - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge origin/main - displayName: git merge origin/main - - template: /eng/pipelines/templates/steps/npm-install.yml - pwsh: | diff --git a/eng/pipelines/typespec-validation.yml b/eng/pipelines/typespec-validation.yml index a717d9821953..f394233a5325 100644 --- a/eng/pipelines/typespec-validation.yml +++ b/eng/pipelines/typespec-validation.yml @@ -7,9 +7,6 @@ jobs: vmImage: ubuntu-22.04 steps: - - script: git -c user.name="azure-sdk" -c user.email="azuresdk@microsoft.com" merge origin/main - displayName: git merge origin/main - - template: /eng/pipelines/templates/steps/npm-install.yml - pwsh: | diff --git a/package.json b/package.json index 7393b3b3c3be..df56d8f7acf6 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/typespec-autorest": "next", - "@azure-tools/typespec-azure-core": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvMzI0MDQ4OC9hcnRpZmFjdE5hbWUvcGFja2FnZXM1/content?format=file&subPath=%2Fazure-tools-typespec-azure-core-0.36.0-pr-3851.20231107.6.tgz", - "@azure-tools/typespec-azure-resource-manager": "next", - "@azure-tools/typespec-client-generator-core": "next", - "@azure-tools/typespec-providerhub": "next", - "@typespec/compiler": "next", - "@typespec/http": "next", - "@typespec/lint": "next", - "@typespec/openapi": "next", - "@typespec/rest": "next", - "@typespec/versioning": "next", + "@azure-tools/typespec-apiview": "0.4.4", + "@azure-tools/typespec-autorest": "0.35.0", + "@azure-tools/typespec-azure-core": "0.35.0", + "@azure-tools/typespec-azure-resource-manager": "0.35.0", + "@azure-tools/typespec-client-generator-core": "0.35.0", + "@azure-tools/typespec-providerhub": "0.35.0", + "@typespec/compiler": "0.49.0", + "@typespec/http": "0.49.0", + "@typespec/openapi": "0.49.0", + "@typespec/rest": "0.49.0", + "@typespec/versioning": "0.49.0", "@azure/avocado": "^0.8.4", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "~3.0.3", From ac0117cdf3da841a7ef5e95b4fd4ce37f3592964 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 9 Nov 2023 03:48:00 +0000 Subject: [PATCH 13/15] Update packages --- package-lock.json | 194 +++++++++++++++++++++++----------------------- package.json | 20 ++--- 2 files changed, 107 insertions(+), 107 deletions(-) diff --git a/package-lock.json b/package-lock.json index 18d02317cdbf..3d32dba5f260 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,18 +6,18 @@ "": { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/typespec-autorest": "next", - "@azure-tools/typespec-azure-core": "next", - "@azure-tools/typespec-azure-resource-manager": "next", - "@azure-tools/typespec-client-generator-core": "next", - "@azure-tools/typespec-providerhub": "next", + "@azure-tools/typespec-apiview": "0.4.4", + "@azure-tools/typespec-autorest": "0.36.0", + "@azure-tools/typespec-azure-core": "0.36.0", + "@azure-tools/typespec-azure-resource-manager": "0.36.0", + "@azure-tools/typespec-client-generator-core": "0.36.0", + "@azure-tools/typespec-providerhub": "0.36.0", "@azure/avocado": "^0.8.4", - "@typespec/compiler": "0.50.0-dev.10", - "@typespec/http": "next", - "@typespec/lint": "next", - "@typespec/openapi": "next", - "@typespec/rest": "next", - "@typespec/versioning": "next", + "@typespec/compiler": "0.50.0", + "@typespec/http": "0.50.0", + "@typespec/openapi": "0.50.0", + "@typespec/rest": "0.50.0", + "@typespec/versioning": "0.50.0", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "~3.0.3", "typescript": "~5.1.3" @@ -61,87 +61,100 @@ "node": "^16.17.0 || ^18.3.0 || ^20.0.0" } }, - "node_modules/@azure-tools/typespec-autorest": { - "version": "0.35.2", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.35.2.tgz", - "integrity": "sha512-4WAQhR/uFT613wsmeDiotf8t25zcgLwTrecg8vhU8Wcx0plHoM3k6VqpRUNP5hruPs/+hzzcY/hZu6zaqRt2VA==", + "node_modules/@azure-tools/typespec-apiview": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-apiview/-/typespec-apiview-0.4.4.tgz", + "integrity": "sha512-9F8+wx7Nl5USPDo2d9QClDjZyDLXNF/kJ23lb50goIuskePsFBzlb4KlaUc3Xehy7kPanR/E4zH9f0lLm2tGXg==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "~0.35.1", - "@typespec/compiler": "~0.49.0", - "@typespec/http": "~0.49.0", - "@typespec/openapi": "~0.49.0", - "@typespec/rest": "~0.49.0", - "@typespec/versioning": "~0.49.0" + "@typespec/compiler": ">=0.40 <1.0", + "@typespec/versioning": ">=0.40 <1.0" + } + }, + "node_modules/@azure-tools/typespec-autorest": { + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.36.0.tgz", + "integrity": "sha512-TKinde1Ij56kEq8hEYJh4N69iOdR6IhjAIwWQsPcT61gPaTB87PiBMZoLiYUAx8zSV6OlYhwXQRR0u2o9tsilw==", + "dev": true, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@azure-tools/typespec-azure-core": "~0.36.0", + "@typespec/compiler": "~0.50.0", + "@typespec/http": "~0.50.0", + "@typespec/openapi": "~0.50.0", + "@typespec/rest": "~0.50.0", + "@typespec/versioning": "~0.50.0" } }, "node_modules/@azure-tools/typespec-azure-core": { - "version": "0.35.1", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.35.1.tgz", - "integrity": "sha512-qZFF8ONnHucSFnistot4TlbLAd0nidIpP7J0CNWWLNQ4jhPwVO+NbqJ9Ntz5aTsDy+dJocq0pl1nCBvkTNnPuQ==", + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.36.0.tgz", + "integrity": "sha512-qyUSHJSDM4ftD1Z0nvkk0FrC86vLyYuYrPdi3wQVj+ReJZJts+7l9PVOXor05pfD9GT5ocRINndpGF7jokiqhg==", "dev": true, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.49.0", - "@typespec/http": "~0.49.0", - "@typespec/rest": "~0.49.0" + "@typespec/compiler": "~0.50.0", + "@typespec/http": "~0.50.0", + "@typespec/rest": "~0.50.0" } }, "node_modules/@azure-tools/typespec-azure-resource-manager": { - "version": "0.35.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.35.0.tgz", - "integrity": "sha512-jQfpa+1LdfbXskDtGvMG1T/R/2n6oag5wRTmL/k1cPJIvNXg76OBy+AASt6Ls3V5MJW6+G09M58ocKmRSQiRpw==", + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.36.0.tgz", + "integrity": "sha512-7ZlRLj5ccuxwylwMO07wMYmnz1OHMeW8qv45GjJBhK2f5pdiUIlhH2M6B3LaBc8Cs43YBC/dJgDqVB3+32CYBw==", "dev": true, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": "~0.35.0", - "@azure-tools/typespec-azure-core": "~0.35.0", - "@typespec/compiler": "~0.49.0", - "@typespec/http": "~0.49.0", - "@typespec/openapi": "~0.49.0", - "@typespec/rest": "~0.49.0", - "@typespec/versioning": "~0.49.0" + "@azure-tools/typespec-autorest": "~0.36.0", + "@azure-tools/typespec-azure-core": "~0.36.0", + "@typespec/compiler": "~0.50.0", + "@typespec/http": "~0.50.0", + "@typespec/openapi": "~0.50.0", + "@typespec/rest": "~0.50.0", + "@typespec/versioning": "~0.50.0" } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.35.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.35.0.tgz", - "integrity": "sha512-3uItmYVhZVmPKCe+s8UZKAubUsjtTbgqVQI4wNayLuAovB9OrWmq09Wq1XEWFHPboGf+4Irehe/feTDnSHA+UA==", + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.36.0.tgz", + "integrity": "sha512-l3DA2nkU3UqxT8fntIdd4QuUhosyRYNA+Ah1PiMvnNfjzFNjy1pTWiFZI7+P3bYR1MfDFCHAzq52Az371Ulu0w==", "dev": true, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.49.0", - "@typespec/http": "~0.49.0", - "@typespec/rest": "~0.49.0", - "@typespec/versioning": "~0.49.0" + "@typespec/compiler": "~0.50.0", + "@typespec/http": "~0.50.0", + "@typespec/rest": "~0.50.0", + "@typespec/versioning": "~0.50.0" } }, "node_modules/@azure-tools/typespec-providerhub": { - "version": "0.35.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-providerhub/-/typespec-providerhub-0.35.0.tgz", - "integrity": "sha512-Aca6qBWx9ezLz4C2rN/H9RBZh6OcnDbYD3yu4PKSx+V6+k/EiLv8RYFy2eM9Bo4RjjPvvRrdJ22q+qcP0xUr1g==", + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-providerhub/-/typespec-providerhub-0.36.0.tgz", + "integrity": "sha512-TIN9I9AuVDW4PpzCZItwRSMUqYve5MUUVqqGasrciB+MKg/e5L52TR5T5QMJH79s5cDzORHnjBejhNKtlIYyzQ==", "dev": true, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": "~0.35.0", - "@azure-tools/typespec-azure-core": "~0.35.0", - "@azure-tools/typespec-azure-resource-manager": "~0.35.0", - "@typespec/compiler": "~0.49.0", - "@typespec/http": "~0.49.0", - "@typespec/openapi": "~0.49.0", - "@typespec/rest": "~0.49.0", - "@typespec/versioning": "~0.49.0" + "@azure-tools/typespec-autorest": "~0.36.0", + "@azure-tools/typespec-azure-core": "~0.36.0", + "@azure-tools/typespec-azure-resource-manager": "~0.36.0", + "@typespec/compiler": "~0.50.0", + "@typespec/http": "~0.50.0", + "@typespec/openapi": "~0.50.0", + "@typespec/rest": "~0.50.0", + "@typespec/versioning": "~0.50.0" } }, "node_modules/@azure-tools/typespec-validation": { @@ -598,9 +611,9 @@ "dev": true }, "node_modules/@typespec/compiler": { - "version": "0.50.0-dev.10", - "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.50.0-dev.10.tgz", - "integrity": "sha512-56RPJmZYaAvOsLHwg1VBLw7Znb+57Wm0UECR0jOYfsJfHfN23uIdvk5i19RviKZ1p1ETuIP23oa7rnHzWxm4EQ==", + "version": "0.50.0", + "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.50.0.tgz", + "integrity": "sha512-CLNPxyGahfdxPPvtHdexwFXCPzfjeN7qjCiRjJmUeJV2Qd+nf8Sps+mwyqflw1v7q1GTpgB9kURMsWV/+NgTdw==", "dev": true, "dependencies": { "@babel/code-frame": "~7.22.13", @@ -726,66 +739,53 @@ } }, "node_modules/@typespec/http": { - "version": "0.49.0", - "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.49.0.tgz", - "integrity": "sha512-MvDJ0s7CjeA/nmutQ4PSTYOj0Gy+78PNd/xe4W5II5w4Kb32Q1vT/oWI2bVZ9G5MkTugKK9P6jmfzwY7EiHksg==", - "dev": true, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@typespec/compiler": "~0.49.0" - } - }, - "node_modules/@typespec/lint": { - "version": "0.50.0-dev.0", - "resolved": "https://registry.npmjs.org/@typespec/lint/-/lint-0.50.0-dev.0.tgz", - "integrity": "sha512-5f9oEAupXyBQJfvuyF7q+nH55JufNzcY+DK9zNa71ANdQHGNKsm+rfm/vB6lp0s96OtLmvUido6SQKRWbra/YA==", - "deprecated": "This package has been deprecated. Linting functionality is now built-in the typespec compiler.", + "version": "0.50.0", + "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.50.0.tgz", + "integrity": "sha512-kTRg/TXo2Pn2qZZ/xvjBuA75w3zLk6MIcLMEqQhXDRVhpVCSqPStReZtKBV/YCJ1DvMVnu3mcA7+HqQ4PxrZhQ==", "dev": true, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.49.0 || >=0.50.0-dev <0.50.0" + "@typespec/compiler": "~0.50.0" } }, "node_modules/@typespec/openapi": { - "version": "0.49.0", - "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.49.0.tgz", - "integrity": "sha512-2TQfnGKtiiKYD1eMiRAcEwDByaBf5WgvcIlLWpWJk/nmcKr6ZeOzUDj5V1fGiiY+/1sI0C0qGCz8PIxcvLa9kw==", + "version": "0.50.0", + "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.50.0.tgz", + "integrity": "sha512-aOg3y4XxRl6bI/DR+OR1GFZD+1s9ygH0Z8jarHc3wSNnh4gLmAZ8RYmPFPzwULhvck/EYw+P9R0kcYpX8iC+Lw==", "dev": true, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.49.0", - "@typespec/http": "~0.49.0" + "@typespec/compiler": "~0.50.0", + "@typespec/http": "~0.50.0" } }, "node_modules/@typespec/rest": { - "version": "0.49.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.49.0.tgz", - "integrity": "sha512-C5Ym3Dal5MzDkDIAzTekLsGtPDzRSC9cbiagq4LQfFtzfUPA8tJlJOnD8txTw/XIaFg0hvAPNgTZSa+xtiXskQ==", + "version": "0.50.0", + "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.50.0.tgz", + "integrity": "sha512-nkFfPh4z9z2a46f6HgjuZM7e2+k5bgPDshuwQjjo82mEuSqrMUaeaUs5nx63L2FmacvIvhAvRrd3f8kMpBD5vw==", "dev": true, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.49.0", - "@typespec/http": "~0.49.0" + "@typespec/compiler": "~0.50.0", + "@typespec/http": "~0.50.0" } }, "node_modules/@typespec/versioning": { - "version": "0.49.0", - "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.49.0.tgz", - "integrity": "sha512-SuRcEB0yaD/wPwaXweIRr+lNDB4hgZwFxHi84y7De1xlntutRl+NeRgWd+K4yVS6tpyNHzcqK6Z7bBD30yQK/w==", + "version": "0.50.0", + "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.50.0.tgz", + "integrity": "sha512-lEJUBMFqhLWTL2eqnOEwFSnopWs06YmS6Fo3SI3UtGHiTU2EneWHk+BnhSplbOmFEQ7XTVlj0QxZ4/TaE0GgPw==", "dev": true, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.49.0" + "@typespec/compiler": "~0.50.0" } }, "node_modules/ajv": { diff --git a/package.json b/package.json index df56d8f7acf6..4714be80755a 100644 --- a/package.json +++ b/package.json @@ -2,16 +2,16 @@ "name": "azure-rest-api-specs", "devDependencies": { "@azure-tools/typespec-apiview": "0.4.4", - "@azure-tools/typespec-autorest": "0.35.0", - "@azure-tools/typespec-azure-core": "0.35.0", - "@azure-tools/typespec-azure-resource-manager": "0.35.0", - "@azure-tools/typespec-client-generator-core": "0.35.0", - "@azure-tools/typespec-providerhub": "0.35.0", - "@typespec/compiler": "0.49.0", - "@typespec/http": "0.49.0", - "@typespec/openapi": "0.49.0", - "@typespec/rest": "0.49.0", - "@typespec/versioning": "0.49.0", + "@azure-tools/typespec-autorest": "0.36.0", + "@azure-tools/typespec-azure-core": "0.36.0", + "@azure-tools/typespec-azure-resource-manager": "0.36.0", + "@azure-tools/typespec-client-generator-core": "0.36.0", + "@azure-tools/typespec-providerhub": "0.36.0", + "@typespec/compiler": "0.50.0", + "@typespec/http": "0.50.0", + "@typespec/openapi": "0.50.0", + "@typespec/rest": "0.50.0", + "@typespec/versioning": "0.50.0", "@azure/avocado": "^0.8.4", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "~3.0.3", From 37a10a3616e6ae26889abd239cab31cda2152826 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 9 Nov 2023 04:00:12 +0000 Subject: [PATCH 14/15] [JobRouter] Convert "@internal" to "@access" --- .../Communication.JobRouter/client.tsp | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/specification/communication/Communication.JobRouter/client.tsp b/specification/communication/Communication.JobRouter/client.tsp index 44cd6d66f373..baa0ecdf9eff 100644 --- a/specification/communication/Communication.JobRouter/client.tsp +++ b/specification/communication/Communication.JobRouter/client.tsp @@ -16,8 +16,8 @@ namespace ClientForAcsJobRouter; service: AzureCommunicationRoutingService, }) interface JobRouterAdministrationRestClient { - @internal("csharp") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "java") upsertDistributionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.upsertDistributionPolicy; getDistributionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getDistributionPolicy; @@ -26,8 +26,8 @@ interface JobRouterAdministrationRestClient { deleteDistributionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteDistributionPolicy; - @internal("csharp") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "java") upsertClassificationPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.upsertClassificationPolicy; getClassificationPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getClassificationPolicy; @@ -36,8 +36,8 @@ interface JobRouterAdministrationRestClient { deleteClassificationPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteClassificationPolicy; - @internal("csharp") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "java") upsertExceptionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.upsertExceptionPolicy; getExceptionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getExceptionPolicy; @@ -46,8 +46,8 @@ interface JobRouterAdministrationRestClient { deleteExceptionPolicy is AzureCommunicationRoutingService.JobRouterAdministrationOperations.deleteExceptionPolicy; - @internal("csharp") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "java") upsertQueue is AzureCommunicationRoutingService.JobRouterAdministrationOperations.upsertQueue; getQueue is AzureCommunicationRoutingService.JobRouterAdministrationOperations.getQueue; @@ -62,32 +62,32 @@ interface JobRouterAdministrationRestClient { service: AzureCommunicationRoutingService, }) interface JobRouterRestClient { - @internal("csharp") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "java") upsertJob is AzureCommunicationRoutingService.JobRouterOperations.upsertJob; getJob is AzureCommunicationRoutingService.JobRouterOperations.getJob; deleteJob is AzureCommunicationRoutingService.JobRouterOperations.deleteJob; - @internal("csharp") - @internal("python") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "python") + @access(Access.internal, "java") reclassify is AzureCommunicationRoutingService.JobRouterOperations.reclassify; - @internal("csharp") - @internal("python") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "python") + @access(Access.internal, "java") cancel is AzureCommunicationRoutingService.JobRouterOperations.cancel; - @internal("csharp") - @internal("python") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "python") + @access(Access.internal, "java") complete is AzureCommunicationRoutingService.JobRouterOperations.complete; - @internal("csharp") - @internal("python") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "python") + @access(Access.internal, "java") close is AzureCommunicationRoutingService.JobRouterOperations.close; listJobs is AzureCommunicationRoutingService.JobRouterOperations.listJobs; @@ -96,22 +96,22 @@ interface JobRouterRestClient { #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Need to revist how to correctly define singletons https://github.com/Azure/azure-rest-api-specs/issues/25605#issuecomment-1736265997" getQueuePosition is AzureCommunicationRoutingService.JobRouterOperations.getInQueuePosition; - @internal("csharp") + @access(Access.internal, "csharp") unassign is AzureCommunicationRoutingService.JobRouterOperations.unassign; accept is AzureCommunicationRoutingService.JobRouterOperations.accept; - @internal("csharp") - @internal("python") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "python") + @access(Access.internal, "java") decline is AzureCommunicationRoutingService.JobRouterOperations.decline; #suppress "@azure-tools/typespec-azure-core/no-explicit-routes-resource-ops" "Need to revist how to correctly define singletons https://github.com/Azure/azure-rest-api-specs/issues/25605#issuecomment-1736265997" #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Need to revist how to correctly define singletons https://github.com/Azure/azure-rest-api-specs/issues/25605#issuecomment-1736265997" getQueueStatistics is AzureCommunicationRoutingService.JobRouterOperations.getQueueStatistics; - @internal("csharp") - @internal("java") + @access(Access.internal, "csharp") + @access(Access.internal, "java") upsertWorker is AzureCommunicationRoutingService.JobRouterOperations.upsertWorker; getWorker is AzureCommunicationRoutingService.JobRouterOperations.getWorker; From d7d3d347cd6fdb63b476c0851594be712caeb383 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 9 Nov 2023 05:36:03 +0000 Subject: [PATCH 15/15] Disable new linter rule in specs with violations --- .../confidentialledger/Microsoft.ManagedCcf/tspconfig.yaml | 2 ++ specification/riskiq/Easm/tspconfig.yaml | 2 ++ specification/sphere/Sphere.Management/tspconfig.yaml | 2 ++ .../translation/Azure.AI.TextTranslation/tspconfig.yaml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/specification/confidentialledger/Microsoft.ManagedCcf/tspconfig.yaml b/specification/confidentialledger/Microsoft.ManagedCcf/tspconfig.yaml index b7a6551a18f0..8395af1c8ddd 100644 --- a/specification/confidentialledger/Microsoft.ManagedCcf/tspconfig.yaml +++ b/specification/confidentialledger/Microsoft.ManagedCcf/tspconfig.yaml @@ -4,6 +4,8 @@ emit: linter: extends: - "@azure-tools/typespec-azure-core/all" + disable: + "@azure-tools/typespec-azure-core/composition-over-inheritance": "New rule" options: "@azure-tools/typespec-autorest": diff --git a/specification/riskiq/Easm/tspconfig.yaml b/specification/riskiq/Easm/tspconfig.yaml index 54c224af20ca..bcfd5e572d15 100644 --- a/specification/riskiq/Easm/tspconfig.yaml +++ b/specification/riskiq/Easm/tspconfig.yaml @@ -6,6 +6,8 @@ emit: linter: extends: - "@azure-tools/typespec-azure-core/all" + disable: + "@azure-tools/typespec-azure-core/composition-over-inheritance": "New rule" options: "@azure-tools/typespec-autorest": azure-resource-provider-folder: "data-plane" diff --git a/specification/sphere/Sphere.Management/tspconfig.yaml b/specification/sphere/Sphere.Management/tspconfig.yaml index 62b3cb7614c9..b5e7cb788b74 100644 --- a/specification/sphere/Sphere.Management/tspconfig.yaml +++ b/specification/sphere/Sphere.Management/tspconfig.yaml @@ -3,6 +3,8 @@ emit: linter: extends: - "@azure-tools/typespec-azure-resource-manager/all" + disable: + "@azure-tools/typespec-azure-core/composition-over-inheritance": "New rule" options: '@azure-tools/typespec-autorest': emitter-output-dir: "{project-root}/.." diff --git a/specification/translation/Azure.AI.TextTranslation/tspconfig.yaml b/specification/translation/Azure.AI.TextTranslation/tspconfig.yaml index 9521468fe5cc..363c16bad2fd 100644 --- a/specification/translation/Azure.AI.TextTranslation/tspconfig.yaml +++ b/specification/translation/Azure.AI.TextTranslation/tspconfig.yaml @@ -14,6 +14,8 @@ emit: linter: extends: - "@azure-tools/typespec-azure-core/all" + disable: + "@azure-tools/typespec-azure-core/composition-over-inheritance": "New rule" options: "@azure-tools/typespec-autorest": azure-resource-provider-folder: "data-plane"