From bc46fa408dfe4d27116999a09eb5a463be7bd726 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 12 Jul 2023 19:27:35 +0000 Subject: [PATCH 01/10] Update dependencies to "next" --- eng/pipelines/typespec-ci.yml | 15 +++++++++++++-- package.json | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/eng/pipelines/typespec-ci.yml b/eng/pipelines/typespec-ci.yml index 91574df6ec45..a194f13ae3d5 100644 --- a/eng/pipelines/typespec-ci.yml +++ b/eng/pipelines/typespec-ci.yml @@ -33,13 +33,24 @@ jobs: vmImage: ubuntu-22.04 steps: - - script: npm ci - displayName: npm ci + - script: git merge origin/main + displayName: git merge origin/main + + # Remove lockfile to update all packages to latest "next" version + - script: rm package-lock.json + displayName: rm package-lock.json + + - script: npm install + displayName: npm install - script: npm ls -a displayName: npm ls -a condition: succeededOrFailed() + - script: git restore package-lock.json + displayName: Revert package-lock.json + condition: succeededOrFailed() + - template: templates/steps/typespec-ci.yml parameters: Folder: specification/contosowidgetmanager/Contoso.WidgetManager diff --git a/package.json b/package.json index 04c8ab07c302..57d133201016 100644 --- a/package.json +++ b/package.json @@ -6,17 +6,17 @@ "@azure-tools/cadl-azure-core": "0.26.0", "@azure-tools/cadl-azure-resource-manager": "0.26.0", "@azure-tools/cadl-providerhub": "0.26.0", - "@azure-tools/typespec-apiview": "0.4.4", - "@azure-tools/typespec-autorest": "0.32.0", - "@azure-tools/typespec-azure-core": "0.32.0", - "@azure-tools/typespec-azure-resource-manager": "0.32.0", - "@azure-tools/typespec-client-generator-core": "0.32.0", - "@azure-tools/typespec-providerhub": "0.32.0", - "@typespec/compiler": "0.46.0", - "@typespec/http": "0.46.0", - "@typespec/openapi": "0.46.0", - "@typespec/rest": "0.46.0", - "@typespec/versioning": "0.46.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", "@types/prettier": "^2.7.2", "azure-rest-api-specs-eng-tools": "file:eng/tools", From fe2113ec4be9d8d52929eee0583d3c841ba3c189 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 28 Jul 2023 07:17:37 +0000 Subject: [PATCH 02/10] Update PR validation pipeline --- eng/pipelines/typespec-validation.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/typespec-validation.yml b/eng/pipelines/typespec-validation.yml index a5b0bed1e3c2..8d0438f9c272 100644 --- a/eng/pipelines/typespec-validation.yml +++ b/eng/pipelines/typespec-validation.yml @@ -13,13 +13,24 @@ jobs: vmImage: ubuntu-22.04 steps: - - script: npm ci - displayName: npm ci + - script: git merge origin/main + displayName: git merge origin/main + + # Remove lockfile to update all packages to latest "next" version + - script: rm package-lock.json + displayName: rm package-lock.json + + - script: npm install + displayName: npm install - script: npm ls -a displayName: npm ls -a condition: succeededOrFailed() + - script: git restore package-lock.json + displayName: Revert package-lock.json + condition: succeededOrFailed() + - pwsh: | $(Build.SourcesDirectory)/eng/scripts/Validate-TypeSpec.ps1 ` $(Build.SourcesDirectory) ` From 613140bb1db3320f7bcd0d7386ad49ef3040bcd5 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 28 Jul 2023 00:37:52 -0700 Subject: [PATCH 03/10] [typespec-next] React to Azure/typespec-azure#3326 (#25026) --- .../preview/2022-09-02-preview/fleets.json | 8 +++---- .../preview/2023-03-15-preview/fleets.json | 12 +++++----- .../2023-03-01-preview/containerstorage.json | 12 +++++----- .../2023-05-01-preview/TrafficController.json | 12 +++++----- .../2022-09-01-preview/azuresphere.json | 24 +++++++++---------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2022-09-02-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2022-09-02-preview/fleets.json index 0c8228d8dd2e..21c43ef5790f 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2022-09-02-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2022-09-02-preview/fleets.json @@ -269,13 +269,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Fleet' update operation succeeded", "schema": { "$ref": "#/definitions/Fleet" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Fleet' create operation succeeded", "schema": { "$ref": "#/definitions/Fleet" }, @@ -665,13 +665,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'FleetMember' update operation succeeded", "schema": { "$ref": "#/definitions/FleetMember" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'FleetMember' create operation succeeded", "schema": { "$ref": "#/definitions/FleetMember" }, diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-03-15-preview/fleets.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-03-15-preview/fleets.json index 415fdbc2001e..d14d3d59f4e0 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-03-15-preview/fleets.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/preview/2023-03-15-preview/fleets.json @@ -272,13 +272,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Fleet' update operation succeeded", "schema": { "$ref": "#/definitions/Fleet" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Fleet' create operation succeeded", "schema": { "$ref": "#/definitions/Fleet" }, @@ -668,13 +668,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'FleetMember' update operation succeeded", "schema": { "$ref": "#/definitions/FleetMember" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'FleetMember' create operation succeeded", "schema": { "$ref": "#/definitions/FleetMember" }, @@ -1035,13 +1035,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'UpdateRun' update operation succeeded", "schema": { "$ref": "#/definitions/UpdateRun" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'UpdateRun' create operation succeeded", "schema": { "$ref": "#/definitions/UpdateRun" }, diff --git a/specification/containerstorage/resource-manager/Microsoft.ContainerStorage/preview/2023-03-01-preview/containerstorage.json b/specification/containerstorage/resource-manager/Microsoft.ContainerStorage/preview/2023-03-01-preview/containerstorage.json index 0afc03d89d2b..17915723fefe 100644 --- a/specification/containerstorage/resource-manager/Microsoft.ContainerStorage/preview/2023-03-01-preview/containerstorage.json +++ b/specification/containerstorage/resource-manager/Microsoft.ContainerStorage/preview/2023-03-01-preview/containerstorage.json @@ -264,13 +264,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Pool' update operation succeeded", "schema": { "$ref": "#/definitions/Pool" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Pool' create operation succeeded", "schema": { "$ref": "#/definitions/Pool" }, @@ -598,13 +598,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'VolumeSnapshot' update operation succeeded", "schema": { "$ref": "#/definitions/VolumeSnapshot" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'VolumeSnapshot' create operation succeeded", "schema": { "$ref": "#/definitions/VolumeSnapshot" }, @@ -948,13 +948,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Volume' update operation succeeded", "schema": { "$ref": "#/definitions/Volume" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Volume' create operation succeeded", "schema": { "$ref": "#/definitions/Volume" }, diff --git a/specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/preview/2023-05-01-preview/TrafficController.json b/specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/preview/2023-05-01-preview/TrafficController.json index f094382d1f46..d84cb3fef21b 100644 --- a/specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/preview/2023-05-01-preview/TrafficController.json +++ b/specification/servicenetworking/resource-manager/Microsoft.ServiceNetworking/preview/2023-05-01-preview/TrafficController.json @@ -252,13 +252,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'TrafficController' update operation succeeded", "schema": { "$ref": "#/definitions/TrafficController" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'TrafficController' create operation succeeded", "schema": { "$ref": "#/definitions/TrafficController" }, @@ -553,13 +553,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Association' update operation succeeded", "schema": { "$ref": "#/definitions/Association" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Association' create operation succeeded", "schema": { "$ref": "#/definitions/Association" }, @@ -870,13 +870,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Frontend' update operation succeeded", "schema": { "$ref": "#/definitions/Frontend" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Frontend' create operation succeeded", "schema": { "$ref": "#/definitions/Frontend" }, diff --git a/specification/sphere/resource-manager/Microsoft.AzureSphere/preview/2022-09-01-preview/azuresphere.json b/specification/sphere/resource-manager/Microsoft.AzureSphere/preview/2022-09-01-preview/azuresphere.json index 9a3713ef8493..216a568ba9a5 100644 --- a/specification/sphere/resource-manager/Microsoft.AzureSphere/preview/2022-09-01-preview/azuresphere.json +++ b/specification/sphere/resource-manager/Microsoft.AzureSphere/preview/2022-09-01-preview/azuresphere.json @@ -264,13 +264,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Catalog' update operation succeeded", "schema": { "$ref": "#/definitions/Catalog" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Catalog' create operation succeeded", "schema": { "$ref": "#/definitions/Catalog" }, @@ -855,13 +855,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Image' update operation succeeded", "schema": { "$ref": "#/definitions/Image" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Image' create operation succeeded", "schema": { "$ref": "#/definitions/Image" }, @@ -1366,13 +1366,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Product' update operation succeeded", "schema": { "$ref": "#/definitions/Product" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Product' create operation succeeded", "schema": { "$ref": "#/definitions/Product" }, @@ -1792,13 +1792,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'DeviceGroup' update operation succeeded", "schema": { "$ref": "#/definitions/DeviceGroup" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'DeviceGroup' create operation succeeded", "schema": { "$ref": "#/definitions/DeviceGroup" }, @@ -2344,13 +2344,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Deployment' update operation succeeded", "schema": { "$ref": "#/definitions/Deployment" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Deployment' create operation succeeded", "schema": { "$ref": "#/definitions/Deployment" }, @@ -2662,13 +2662,13 @@ ], "responses": { "200": { - "description": "ARM operation completed successfully.", + "description": "Resource 'Device' update operation succeeded", "schema": { "$ref": "#/definitions/Device" } }, "201": { - "description": "ARM create operation completed successfully.", + "description": "Resource 'Device' create operation succeeded", "schema": { "$ref": "#/definitions/Device" }, From 1354c2abbf5adb986031f4aca02dc046b32940a0 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Fri, 4 Aug 2023 18:50:56 +0000 Subject: [PATCH 04/10] Resolve merge conflicts in cotnainerstorage.json --- .../preview/2023-07-01-preview/containerstorage.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/containerstorage/resource-manager/Microsoft.ContainerStorage/preview/2023-07-01-preview/containerstorage.json b/specification/containerstorage/resource-manager/Microsoft.ContainerStorage/preview/2023-07-01-preview/containerstorage.json index 1b54d2dcf913..9c95de1b7e94 100644 --- a/specification/containerstorage/resource-manager/Microsoft.ContainerStorage/preview/2023-07-01-preview/containerstorage.json +++ b/specification/containerstorage/resource-manager/Microsoft.ContainerStorage/preview/2023-07-01-preview/containerstorage.json @@ -274,13 +274,13 @@ ], "responses": { "200": { - "description": "Resource 'Pool' update operation succeeded", + "description": "ARM update operation completed successfully", "schema": { "$ref": "#/definitions/Pool" } }, "201": { - "description": "Resource 'Pool' create operation succeeded", + "description": "ARM create operation completed successfully.", "schema": { "$ref": "#/definitions/Pool" }, @@ -616,13 +616,13 @@ ], "responses": { "200": { - "description": "Resource 'VolumeSnapshot' update operation succeeded", + "description": "ARM update operation completed successfully", "schema": { "$ref": "#/definitions/Snapshot" } }, "201": { - "description": "Resource 'VolumeSnapshot' create operation succeeded", + "description": "ARM create operation completed successfully.", "schema": { "$ref": "#/definitions/Snapshot" }, @@ -882,13 +882,13 @@ ], "responses": { "200": { - "description": "Resource 'Volume' update operation succeeded", + "description": "ARM update operation completed successfully", "schema": { "$ref": "#/definitions/Volume" } }, "201": { - "description": "Resource 'Volume' create operation succeeded", + "description": "ARM create operation completed successfully.", "schema": { "$ref": "#/definitions/Volume" }, From 16fdc616994fe01538fcd4143dc7588a23fb73c4 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 8 Aug 2023 18:52:46 +0000 Subject: [PATCH 05/10] [typespec-next] React to Azure/typespec-azure#3364 and Azure/typespec-azure#3152 --- .../2023-06-15-preview/azure.codesigning.json | 46 ++++--- .../preview/2023-06-01-preview/generated.json | 3 +- .../preview/2023-07-01-preview/generated.json | 3 +- .../2023-04-30-preview/contentsafety.json | 86 ++++++------ .../preview/2023-03-01-preview/openapi.json | 6 +- .../preview/2023-06-01-preview/mccfgov.json | 129 ++++++++++-------- .../preview/2022-11-01-preview/widgets.json | 49 ++++--- 7 files changed, 175 insertions(+), 147 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 7f465fb6d205..37f5606f538c 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 @@ -137,7 +137,8 @@ "Submit a codesign operation.": { "$ref": "./examples/CertificateProfileOperations_Sign.json" } - } + }, + "x-ms-long-running-operation": true } }, "/codesigningaccounts/{codeSigningAccountName}/certificateprofiles/{certificateProfileName}/sign/{operationId}": { @@ -241,26 +242,7 @@ "200": { "description": "The request has succeeded.", "schema": { - "type": "object", - "description": "Paged collection of ExtendedKeyUsage items", - "properties": { - "value": { - "type": "array", - "description": "The ExtendedKeyUsage items on this page", - "items": { - "$ref": "#/definitions/ExtendedKeyUsage" - }, - "x-ms-identifiers": [] - }, - "nextLink": { - "type": "string", - "format": "uri", - "description": "The link to the next page of items" - } - }, - "required": [ - "value" - ] + "$ref": "#/definitions/PagedExtendedKeyUsage" } }, "default": { @@ -561,6 +543,28 @@ "ekus" ] }, + "PagedExtendedKeyUsage": { + "type": "object", + "description": "Paged collection of ExtendedKeyUsage items", + "properties": { + "value": { + "type": "array", + "description": "The ExtendedKeyUsage items on this page", + "items": { + "$ref": "#/definitions/ExtendedKeyUsage" + }, + "x-ms-identifiers": [] + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, "SignatureAlgorithm": { "type": "string", "description": "Algorithms supported for signing.", diff --git a/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-06-01-preview/generated.json b/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-06-01-preview/generated.json index cc8535b5e200..11e9951bedbe 100644 --- a/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-06-01-preview/generated.json +++ b/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-06-01-preview/generated.json @@ -260,7 +260,8 @@ "Starts the generation of a batch of images from a text caption": { "$ref": "./examples/start_generate_image.json" } - } + }, + "x-ms-long-running-operation": true } }, "/operations/images/{operationId}": { diff --git a/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-07-01-preview/generated.json b/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-07-01-preview/generated.json index 2ddf16cdaf9b..b5092f933e68 100644 --- a/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-07-01-preview/generated.json +++ b/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-07-01-preview/generated.json @@ -260,7 +260,8 @@ "Starts the generation of a batch of images from a text caption": { "$ref": "./examples/start_generate_image.json" } - } + }, + "x-ms-long-running-operation": true } }, "/operations/images/{operationId}": { diff --git a/specification/cognitiveservices/data-plane/ContentSafety/preview/2023-04-30-preview/contentsafety.json b/specification/cognitiveservices/data-plane/ContentSafety/preview/2023-04-30-preview/contentsafety.json index 7da0f7f59584..095e19424bb6 100644 --- a/specification/cognitiveservices/data-plane/ContentSafety/preview/2023-04-30-preview/contentsafety.json +++ b/specification/cognitiveservices/data-plane/ContentSafety/preview/2023-04-30-preview/contentsafety.json @@ -106,26 +106,7 @@ "200": { "description": "The request has succeeded.", "schema": { - "type": "object", - "description": "Paged collection of TextBlocklist items", - "properties": { - "value": { - "type": "array", - "description": "The TextBlocklist items on this page", - "items": { - "$ref": "#/definitions/TextBlocklist" - }, - "x-ms-identifiers": [] - }, - "nextLink": { - "type": "string", - "format": "uri", - "description": "The link to the next page of items" - } - }, - "required": [ - "value" - ] + "$ref": "#/definitions/PagedTextBlocklist" } }, "default": { @@ -437,26 +418,7 @@ "200": { "description": "The request has succeeded.", "schema": { - "type": "object", - "description": "Paged collection of TextBlockItem items", - "properties": { - "value": { - "type": "array", - "description": "The TextBlockItem items on this page", - "items": { - "$ref": "#/definitions/TextBlockItem" - }, - "x-ms-identifiers": [] - }, - "nextLink": { - "type": "string", - "format": "uri", - "description": "The link to the next page of items" - } - }, - "required": [ - "value" - ] + "$ref": "#/definitions/PagedTextBlockItem" } }, "default": { @@ -829,6 +791,50 @@ } } }, + "PagedTextBlockItem": { + "type": "object", + "description": "Paged collection of TextBlockItem items", + "properties": { + "value": { + "type": "array", + "description": "The TextBlockItem items on this page", + "items": { + "$ref": "#/definitions/TextBlockItem" + }, + "x-ms-identifiers": [] + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, + "PagedTextBlocklist": { + "type": "object", + "description": "Paged collection of TextBlocklist items", + "properties": { + "value": { + "type": "array", + "description": "The TextBlocklist items on this page", + "items": { + "$ref": "#/definitions/TextBlocklist" + }, + "x-ms-identifiers": [] + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, "RemoveBlockItemsOptions": { "type": "object", "description": "The request of removing blockItems from text blocklist.", diff --git a/specification/cognitiveservices/data-plane/HealthInsights/preview/2023-03-01-preview/openapi.json b/specification/cognitiveservices/data-plane/HealthInsights/preview/2023-03-01-preview/openapi.json index 95b328914fd6..f843cc3e4725 100644 --- a/specification/cognitiveservices/data-plane/HealthInsights/preview/2023-03-01-preview/openapi.json +++ b/specification/cognitiveservices/data-plane/HealthInsights/preview/2023-03-01-preview/openapi.json @@ -129,7 +129,8 @@ "Creates an Onco Phenotype job with the given request body.": { "$ref": "./examples/SuccessfulOncoPhenotypeRequest.json" } - } + }, + "x-ms-long-running-operation": true } }, "/oncophenotype/jobs/{jobId}": { @@ -254,7 +255,8 @@ "Creates a Trial Matcher job with the given request body.": { "$ref": "./examples/SuccessfulTrialMatcherRequest.json" } - } + }, + "x-ms-long-running-operation": true } }, "/trialmatcher/jobs/{jobId}": { diff --git a/specification/confidentialledger/data-plane/Microsoft.ManagedCcf/preview/2023-06-01-preview/mccfgov.json b/specification/confidentialledger/data-plane/Microsoft.ManagedCcf/preview/2023-06-01-preview/mccfgov.json index 382570ddf7e8..3ddab8760664 100644 --- a/specification/confidentialledger/data-plane/Microsoft.ManagedCcf/preview/2023-06-01-preview/mccfgov.json +++ b/specification/confidentialledger/data-plane/Microsoft.ManagedCcf/preview/2023-06-01-preview/mccfgov.json @@ -33,26 +33,7 @@ "200": { "description": "The request has succeeded.", "schema": { - "type": "object", - "description": "Paged collection of Proposal items", - "properties": { - "value": { - "type": "array", - "description": "The Proposal items on this page", - "items": { - "$ref": "#/definitions/Proposals.Proposal" - }, - "x-ms-identifiers": [] - }, - "nextLink": { - "type": "string", - "format": "uri", - "description": "The link to the next page of items" - } - }, - "required": [ - "value" - ] + "$ref": "#/definitions/PagedProposal" }, "headers": { "x-ms-ccf-transaction-id": { @@ -916,26 +897,7 @@ "200": { "description": "The request has succeeded.", "schema": { - "type": "object", - "description": "Paged collection of Member items", - "properties": { - "value": { - "type": "array", - "description": "The Member items on this page", - "items": { - "$ref": "#/definitions/ServiceState.Member" - }, - "x-ms-identifiers": [] - }, - "nextLink": { - "type": "string", - "format": "uri", - "description": "The link to the next page of items" - } - }, - "required": [ - "value" - ] + "$ref": "#/definitions/PagedMember" }, "headers": { "x-ms-ccf-transaction-id": { @@ -1032,26 +994,7 @@ "200": { "description": "The request has succeeded.", "schema": { - "type": "object", - "description": "Paged collection of Node items", - "properties": { - "value": { - "type": "array", - "description": "The Node items on this page", - "items": { - "$ref": "#/definitions/ServiceState.Node" - }, - "x-ms-identifiers": [] - }, - "nextLink": { - "type": "string", - "format": "uri", - "description": "The link to the next page of items" - } - }, - "required": [ - "value" - ] + "$ref": "#/definitions/PagedNode" }, "headers": { "x-ms-ccf-transaction-id": { @@ -1292,6 +1235,72 @@ } } }, + "PagedMember": { + "type": "object", + "description": "Paged collection of Member items", + "properties": { + "value": { + "type": "array", + "description": "The Member items on this page", + "items": { + "$ref": "#/definitions/ServiceState.Member" + }, + "x-ms-identifiers": [] + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, + "PagedNode": { + "type": "object", + "description": "Paged collection of Node items", + "properties": { + "value": { + "type": "array", + "description": "The Node items on this page", + "items": { + "$ref": "#/definitions/ServiceState.Node" + }, + "x-ms-identifiers": [] + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, + "PagedProposal": { + "type": "object", + "description": "Paged collection of Proposal items", + "properties": { + "value": { + "type": "array", + "description": "The Proposal items on this page", + "items": { + "$ref": "#/definitions/Proposals.Proposal" + }, + "x-ms-identifiers": [] + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, "Proposals.Action": { "type": "object", "description": "A single step in a proposed change to the service.", 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 c6658714b8d3..aca1698b9abb 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 @@ -52,26 +52,7 @@ "200": { "description": "The request has succeeded.", "schema": { - "type": "object", - "description": "Paged collection of WidgetSuite items", - "properties": { - "value": { - "type": "array", - "description": "The WidgetSuite items on this page", - "items": { - "$ref": "#/definitions/WidgetSuite" - }, - "x-ms-identifiers": [] - }, - "nextLink": { - "type": "string", - "format": "uri", - "description": "The link to the next page of items" - } - }, - "required": [ - "value" - ] + "$ref": "#/definitions/PagedWidgetSuite" } }, "default": { @@ -210,7 +191,8 @@ "Widgets_CreateOrUpdateWidget": { "$ref": "./examples/Widgets_CreateOrUpdateWidgetSample.json" } - } + }, + "x-ms-long-running-operation": true }, "delete": { "operationId": "Widgets_DeleteWidget", @@ -277,7 +259,8 @@ "Delete widget by widget name using long-running operation.": { "$ref": "./examples/Widgets_DeleteWidgetSample.json" } - } + }, + "x-ms-long-running-operation": true } }, "/widgets/{widgetName}/operations/{operationId}": { @@ -486,6 +469,28 @@ } } }, + "PagedWidgetSuite": { + "type": "object", + "description": "Paged collection of WidgetSuite items", + "properties": { + "value": { + "type": "array", + "description": "The WidgetSuite items on this page", + "items": { + "$ref": "#/definitions/WidgetSuite" + }, + "x-ms-identifiers": [] + }, + "nextLink": { + "type": "string", + "format": "uri", + "description": "The link to the next page of items" + } + }, + "required": [ + "value" + ] + }, "Versions": { "type": "string", "description": "Versions info.", From 7f579469b3ddad1fa043f8f79b77310a579c1cb0 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 9 Aug 2023 01:21:18 +0000 Subject: [PATCH 06/10] Update packages to 0.47 and 0.33 --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 1b0571565e06..df8c4431a6a2 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.33.0", + "@azure-tools/typespec-azure-core": "0.33.0", + "@azure-tools/typespec-azure-resource-manager": "0.33.0", + "@azure-tools/typespec-client-generator-core": "0.33.0", + "@azure-tools/typespec-providerhub": "0.33.0", + "@typespec/compiler": "0.47.0", + "@typespec/http": "0.47.0", + "@typespec/lint": "0.47.0", + "@typespec/openapi": "0.47.0", + "@typespec/rest": "0.47.0", + "@typespec/versioning": "0.47.0", "@azure/avocado": "^0.8.4", "@types/prettier": "^2.7.2", "azure-rest-api-specs-eng-tools": "file:eng/tools", From 192c0f4720adc553f09ad7ff51356178b130a9e3 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 9 Aug 2023 01:24:57 +0000 Subject: [PATCH 07/10] npm install --force --- package-lock.json | 204 ++++++++++++++++++++++------------------------ 1 file changed, 98 insertions(+), 106 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75d7842574bd..79d6c3a7484d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,19 +6,19 @@ "": { "name": "azure-rest-api-specs", "devDependencies": { - "@azure-tools/typespec-apiview": "0.4.4", - "@azure-tools/typespec-autorest": "0.32.0", - "@azure-tools/typespec-azure-core": "0.32.0", - "@azure-tools/typespec-azure-resource-manager": "0.32.0", - "@azure-tools/typespec-client-generator-core": "0.32.0", - "@azure-tools/typespec-providerhub": "0.32.0", + "@azure-tools/typespec-autorest": "0.33.0", + "@azure-tools/typespec-azure-core": "0.33.0", + "@azure-tools/typespec-azure-resource-manager": "0.33.0", + "@azure-tools/typespec-client-generator-core": "0.33.0", + "@azure-tools/typespec-providerhub": "0.33.0", "@azure/avocado": "^0.8.4", "@types/prettier": "^2.7.2", - "@typespec/compiler": "0.46.0", - "@typespec/http": "0.46.0", - "@typespec/openapi": "0.46.0", - "@typespec/rest": "0.46.0", - "@typespec/versioning": "0.46.0", + "@typespec/compiler": "0.47.0", + "@typespec/http": "0.47.0", + "@typespec/lint": "0.47.0", + "@typespec/openapi": "0.47.0", + "@typespec/rest": "0.47.0", + "@typespec/versioning": "0.47.0", "azure-rest-api-specs-eng-tools": "file:eng/tools", "prettier": "^2.8.8", "typescript": "~5.0.4" @@ -55,109 +55,96 @@ "typescript": "~5.0.4" } }, - "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.32.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.32.0.tgz", - "integrity": "sha512-EjF1tZdoMwUgcMRA6u3ZqabnmpvXsfnkEVvC8v7iL8v80EeGpn6ZjHzeH7jp8p/is4i54DAA9b8OFmxMEOed7A==", + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.33.0.tgz", + "integrity": "sha512-xA29JJt6Dnb8402xYJrR1dAwzEuhen/gcYeUk4KZrfn/3FsLpfiGQCwTAfcCd6iyLDRx7yQ34ysJmLt5ebcOdw==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "~0.32.0", - "@typespec/compiler": "~0.46.0", - "@typespec/http": "~0.46.0", - "@typespec/openapi": "~0.46.0", - "@typespec/rest": "~0.46.0", - "@typespec/versioning": "~0.46.0" + "@azure-tools/typespec-azure-core": "~0.33.0", + "@typespec/compiler": "~0.47.0", + "@typespec/http": "~0.47.0", + "@typespec/openapi": "~0.47.0", + "@typespec/rest": "~0.47.0", + "@typespec/versioning": "~0.47.0" } }, "node_modules/@azure-tools/typespec-azure-core": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.32.0.tgz", - "integrity": "sha512-KnatCnncPVXQqUMHv5TYHrrcELtCCAbBIp3oMemqU8BLECs8KefOlLvxTqnkd9nSWdbcQTuJPnafmaH8A7gtrg==", + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.33.0.tgz", + "integrity": "sha512-DHa2WU21cuJ961OBXBjDYgFODsNwR77tAWxq7aRagLn/b1Y1xI+I455o99GU/N1T4k/jXGi382qvSkTF6xmsMQ==", "dev": true, "dependencies": { - "@typespec/lint": "~0.46.0" + "@typespec/lint": "~0.47.0" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.46.0", - "@typespec/http": "~0.46.0", - "@typespec/rest": "~0.46.0" + "@typespec/compiler": "~0.47.0", + "@typespec/http": "~0.47.0", + "@typespec/rest": "~0.47.0" } }, "node_modules/@azure-tools/typespec-azure-resource-manager": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.32.0.tgz", - "integrity": "sha512-yeDhg5qC73bqlWxyNDqD0bhvsdNPKyczx3FY6hYT4xGP1fynZbk3OXEduJuDIi65f4H1e762TBZDvGPv1/y7uw==", + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.33.0.tgz", + "integrity": "sha512-8jkOae2Yf5fsYVh7ZgdC+a06Ghlfnk6DvLIQPouwOIftsmnUXScJdDIPodqxjdHuR5AWr053+OiKtVrJDWYgjw==", "dev": true, "dependencies": { - "@typespec/lint": "~0.46.0" + "@typespec/lint": "~0.47.0" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": "~0.32.0", - "@azure-tools/typespec-azure-core": "~0.32.0", - "@typespec/compiler": "~0.46.0", - "@typespec/http": "~0.46.0", - "@typespec/openapi": "~0.46.0", - "@typespec/rest": "~0.46.0", - "@typespec/versioning": "~0.46.0" + "@azure-tools/typespec-autorest": "~0.33.0", + "@azure-tools/typespec-azure-core": "~0.33.0", + "@typespec/compiler": "~0.47.0", + "@typespec/http": "~0.47.0", + "@typespec/openapi": "~0.47.0", + "@typespec/rest": "~0.47.0", + "@typespec/versioning": "~0.47.0" } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.32.0.tgz", - "integrity": "sha512-jukmmipTgyhnVe+Bzo8b8qQNZOTyZGxHZLsBryMEJJSJQwGPIz4eZ5O/GNSRmmBSau9+Fg/TE9rB/4lelE/c0w==", + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.33.0.tgz", + "integrity": "sha512-Cm6hxL7oEUfK5pyPHM0gbtlLVPQSE3qJbSVQDiTqGJaU/660GSLEjp9i+NfZ1nl+cDUBCaCKaFqongin+sbKuw==", "dev": true, "dependencies": { - "@typespec/lint": "~0.46.0" + "@typespec/lint": "~0.47.0" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.46.0", - "@typespec/http": "~0.46.0", - "@typespec/rest": "~0.46.0", - "@typespec/versioning": "~0.46.0" + "@typespec/compiler": "~0.47.0", + "@typespec/http": "~0.47.0", + "@typespec/rest": "~0.47.0", + "@typespec/versioning": "~0.47.0" } }, "node_modules/@azure-tools/typespec-providerhub": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-providerhub/-/typespec-providerhub-0.32.0.tgz", - "integrity": "sha512-x6wrTxe8GdaY5RCiPLgLcKXNeIwbH7CNg+6M3DQ9DHWVEigr0tdSHUkyozLeqmaMbxUYUScinRzxoy/LR9Cklw==", + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-providerhub/-/typespec-providerhub-0.33.0.tgz", + "integrity": "sha512-18HRdQUwSrzcyDxP95REu4qIOL8SMjUhifZAJjGThwhkqczTxoeqPI3ek3ISFj9C7SsSvvlLAsL09kiy+GKYZA==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": "~0.32.0", - "@azure-tools/typespec-azure-core": "~0.32.0", - "@azure-tools/typespec-azure-resource-manager": "~0.32.0", - "@typespec/compiler": "~0.46.0", - "@typespec/http": "~0.46.0", - "@typespec/openapi": "~0.46.0", - "@typespec/rest": "~0.46.0", - "@typespec/versioning": "~0.46.0" + "@azure-tools/typespec-autorest": "~0.33.0", + "@azure-tools/typespec-azure-core": "~0.33.0", + "@azure-tools/typespec-azure-resource-manager": "~0.33.0", + "@typespec/compiler": "~0.47.0", + "@typespec/http": "~0.47.0", + "@typespec/openapi": "~0.47.0", + "@typespec/rest": "~0.47.0", + "@typespec/versioning": "~0.47.0" } }, "node_modules/@azure-tools/typespec-validation": { @@ -601,9 +588,9 @@ "dev": true }, "node_modules/@typespec/compiler": { - "version": "0.46.0", - "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.46.0.tgz", - "integrity": "sha512-CTt6WzGCUwXJ1w8Tto6/C3MtSa220Fo9pE2c4s+X620TxHV1kUb6ifOIkLonBbUHM++qSjXjG19kASoHXAQ08g==", + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.47.0.tgz", + "integrity": "sha512-4Y1WhTs4AScPkEsax14jW1QZMoqZl40OMgGiFB8MGDlTpcZV3zdWp1Wj13Q5rcAFYDc/Zl/wnDRgASRKQcqxoQ==", "dev": true, "dependencies": { "@babel/code-frame": "~7.22.5", @@ -612,9 +599,8 @@ "globby": "~13.1.1", "js-yaml": "~4.1.0", "mustache": "~4.2.0", - "node-watch": "~0.7.1", "picocolors": "~1.0.0", - "prettier": "~2.8.7", + "prettier": "~3.0.1", "prompts": "~2.4.1", "semver": "^7.3.8", "vscode-languageserver": "~8.1.0", @@ -722,6 +708,21 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/@typespec/compiler/node_modules/prettier": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", + "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/@typespec/compiler/node_modules/vscode-jsonrpc": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", @@ -813,65 +814,65 @@ } }, "node_modules/@typespec/http": { - "version": "0.46.0", - "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.46.0.tgz", - "integrity": "sha512-MGZxRvgqsbTlHUFd7ueWwoIXMf0ZPjWtg7K4GjfS0XR4EAmag3zz4Y85QK6vSNFj7q7SxvLMKCezlCoo8KB1SA==", + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.47.0.tgz", + "integrity": "sha512-HrVu5mGV+p3KGPtcNFHB5gXm9pU4rYRG3hJWZdLcN8fy+OuwbhmOgjOGN4AB7HLllnISmcFn6LtlqGnr0LpyfA==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.46.0" + "@typespec/compiler": "~0.47.0" } }, "node_modules/@typespec/lint": { - "version": "0.46.0", - "resolved": "https://registry.npmjs.org/@typespec/lint/-/lint-0.46.0.tgz", - "integrity": "sha512-aIW4rnBFhjMbfdLdPw0u5sx2Gn4uOWhqp4ttLv27hy8/itsDBEPzDd9ID+gy6AlsRqfJRwnK3xRiknLr+No6wA==", + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@typespec/lint/-/lint-0.47.0.tgz", + "integrity": "sha512-+CZ8OC8ABHU+HljjWvkVfLDZzyj2kc8VqEOHoXYdomt7PTo2GdVubyOXZMAYFiXWJr/k4YWHD2moPcvu+e2yTQ==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.46.0" + "@typespec/compiler": "~0.47.0" } }, "node_modules/@typespec/openapi": { - "version": "0.46.0", - "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.46.0.tgz", - "integrity": "sha512-br54z+FpLU7T08Q89KBnhrGM7U+LfI0KnTbqpb0c8M0NZ+nbJvKGAVAHO/NcCA6J8L3TTEkUC1GaWhiwrUF8RQ==", + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.47.0.tgz", + "integrity": "sha512-p10NA5MQ1/z/yltTmK9g/RHgRQa+UPJg7ntcix8I9DIwX6u3yJReYwWBrKLeRNExd8ylNHNqjXTwiHJfptmR3w==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.46.0", - "@typespec/http": "~0.46.0", - "@typespec/rest": "~0.46.0" + "@typespec/compiler": "~0.47.0", + "@typespec/http": "~0.47.0", + "@typespec/rest": "~0.47.0" } }, "node_modules/@typespec/rest": { - "version": "0.46.0", - "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.46.0.tgz", - "integrity": "sha512-WmSCI/J1QRy9W6Cq9595jqjyzCTYpOAWzzVDNMdyWH66BRVp3ckBdaXRynq1HfkUBaRd9qQCZGv1rA6qqhVTCA==", + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.47.0.tgz", + "integrity": "sha512-sjxCY2dQ6Wc51W7NYDLgcZdeTI35vFJR0aK+tuYHMTwjhZJK20ezwb/c+RZQ8xyGIyX+vUj9yhTc7lBZGw4n1A==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.46.0" + "@typespec/compiler": "~0.47.0" } }, "node_modules/@typespec/versioning": { - "version": "0.46.0", - "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.46.0.tgz", - "integrity": "sha512-f0/pxvV+CZAfFZjQYS/tVm3qY9BigijCtja1vPeHBqe92TxQW10+He82LLOv6udAdRzuy+Zd+B8kzLVXa3ShUQ==", + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.47.0.tgz", + "integrity": "sha512-j3NUBm61k40ZI5aljgqfVFvduoR+q7ijLpwt+lzXw/DecOgNWZX7R/GGzwCmUVyfJUZpMA/8zhuxmx4fB36P7g==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "~0.46.0" + "@typespec/compiler": "~0.47.0" } }, "node_modules/ansi-regex": { @@ -1730,15 +1731,6 @@ "node": ">=0.10.0" } }, - "node_modules/node-watch": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.3.tgz", - "integrity": "sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", From aa342ea56501d2f43ff3678582fc455208f2fa56 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 9 Aug 2023 01:35:11 +0000 Subject: [PATCH 08/10] Revert pipeline changes --- eng/pipelines/typespec-validation-all.yml | 15 ++------------- eng/pipelines/typespec-validation.yml | 15 ++------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/eng/pipelines/typespec-validation-all.yml b/eng/pipelines/typespec-validation-all.yml index ed52f5eb7ce6..8a5f34fb5e40 100644 --- a/eng/pipelines/typespec-validation-all.yml +++ b/eng/pipelines/typespec-validation-all.yml @@ -23,24 +23,13 @@ jobs: vmImage: $(OSVmImage) steps: - - script: git merge origin/main - displayName: git merge origin/main - - # Remove lockfile to update all packages to latest "next" version - - script: rm package-lock.json - displayName: rm package-lock.json - - - script: npm install - displayName: npm install + - script: npm ci + displayName: npm ci - script: npm ls -a displayName: npm ls -a condition: succeededOrFailed() - - script: git restore package-lock.json - displayName: Revert package-lock.json - condition: succeededOrFailed() - - pwsh: | $(Build.SourcesDirectory)/eng/scripts/Validate-TypeSpec.ps1 $(Build.SourcesDirectory) -GitClean displayName: Validate All Specs diff --git a/eng/pipelines/typespec-validation.yml b/eng/pipelines/typespec-validation.yml index e494ee2d68de..968d35df0a77 100644 --- a/eng/pipelines/typespec-validation.yml +++ b/eng/pipelines/typespec-validation.yml @@ -12,24 +12,13 @@ jobs: vmImage: ubuntu-22.04 steps: - - script: git merge origin/main - displayName: git merge origin/main - - # Remove lockfile to update all packages to latest "next" version - - script: rm package-lock.json - displayName: rm package-lock.json - - - script: npm install - displayName: npm install + - script: npm ci + displayName: npm ci - script: npm ls -a displayName: npm ls -a condition: succeededOrFailed() - - script: git restore package-lock.json - displayName: Revert package-lock.json - condition: succeededOrFailed() - - pwsh: | $(Build.SourcesDirectory)/eng/scripts/Validate-TypeSpec.ps1 ` $(Build.SourcesDirectory) ` From bba240f5dbf310bc0e3e6a8b011d59aef3a6c0ae Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 9 Aug 2023 01:39:26 +0000 Subject: [PATCH 09/10] Add back typespec-apiview --- package-lock.json | 14 ++++++++++++++ package.json | 1 + 2 files changed, 15 insertions(+) diff --git a/package-lock.json b/package-lock.json index 79d6c3a7484d..dd11d742a20f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,6 +6,7 @@ "": { "name": "azure-rest-api-specs", "devDependencies": { + "@azure-tools/typespec-apiview": "0.4.4", "@azure-tools/typespec-autorest": "0.33.0", "@azure-tools/typespec-azure-core": "0.33.0", "@azure-tools/typespec-azure-resource-manager": "0.33.0", @@ -55,6 +56,19 @@ "typescript": "~5.0.4" } }, + "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.33.0", "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.33.0.tgz", diff --git a/package.json b/package.json index df8c4431a6a2..c8a4922ee979 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "azure-rest-api-specs", "devDependencies": { + "@azure-tools/typespec-apiview": "0.4.4", "@azure-tools/typespec-autorest": "0.33.0", "@azure-tools/typespec-azure-core": "0.33.0", "@azure-tools/typespec-azure-resource-manager": "0.33.0", From 6b599f62f86f729e86fffe41fd1f0754113e5b67 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 9 Aug 2023 01:40:30 +0000 Subject: [PATCH 10/10] Remove @typespec/lint --- package-lock.json | 1 - package.json | 1 - 2 files changed, 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd11d742a20f..d40d7f94ff6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "@types/prettier": "^2.7.2", "@typespec/compiler": "0.47.0", "@typespec/http": "0.47.0", - "@typespec/lint": "0.47.0", "@typespec/openapi": "0.47.0", "@typespec/rest": "0.47.0", "@typespec/versioning": "0.47.0", diff --git a/package.json b/package.json index c8a4922ee979..df360fda9cf2 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "@azure-tools/typespec-providerhub": "0.33.0", "@typespec/compiler": "0.47.0", "@typespec/http": "0.47.0", - "@typespec/lint": "0.47.0", "@typespec/openapi": "0.47.0", "@typespec/rest": "0.47.0", "@typespec/versioning": "0.47.0",