Merge remote-tracking branch 'upstream/main' into checkupdate

Azure · Oct 28, 2024 · 333bcc2 · 333bcc2
2 parents 8652016 + b359a78
commit 333bcc2
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/.changeset/poor-deers-happen.md b/.changeset/poor-deers-happen.md
diff --git a/packages/cadl-ranch-specs/CHANGELOG.md b/packages/cadl-ranch-specs/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @azure-tools/cadl-ranch-specs
 
+## 0.39.0
+
+### Minor Changes
+
+- caa2290: Remove handler code and commonapi file
+
+### Patch Changes
+
+- 43638ce: Fixed ARM singleton resource mock test.
+- Updated dependencies [caa2290]
+  - @azure-tools/cadl-ranch@0.16.0
+
 ## 0.38.0
 
 ### Minor Changes

diff --git a/packages/cadl-ranch-specs/cadl-ranch-summary.md b/packages/cadl-ranch-specs/cadl-ranch-summary.md
@@ -1172,7 +1172,6 @@ Expected request body:
 
 ```json
 {
-  "location": "eastus2",
   "properties": {
     "description": "valid2"
   }
@@ -1186,7 +1185,7 @@ Expected response body:
   "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default",
   "name": "default",
   "type": "Azure.ResourceManager.Resources/singletonTrackedResources",
-  "location": "eastus2",
+  "location": "eastus",
   "properties":{
     "description": "valid2",
     "provisioningState": "Succeeded"

diff --git a/packages/cadl-ranch-specs/http/azure/resource-manager/resources/mockapi.ts b/packages/cadl-ranch-specs/http/azure/resource-manager/resources/mockapi.ts
@@ -112,7 +112,6 @@ Scenarios.Azure_ResourceManager_Resources_Singleton_update = passOnSuccess({
       "api-version": "2023-12-01-preview",
     },
     body: {
-      location: "eastus2",
       properties: {
         description: "valid2",
       },
@@ -125,7 +124,6 @@ Scenarios.Azure_ResourceManager_Resources_Singleton_update = passOnSuccess({
     status: 200,
     body: json({
       ...validSingletonResource,
-      location: "eastus2",
       properties: {
         provisioningState: "Succeeded",
         description: "valid2",

diff --git a/packages/cadl-ranch-specs/http/azure/resource-manager/resources/singleton.tsp b/packages/cadl-ranch-specs/http/azure/resource-manager/resources/singleton.tsp
@@ -104,7 +104,6 @@ interface Singleton {
     Expected request body:
     ```json
     {
-      "location": "eastus2",
       "properties": {
         "description": "valid2"
       }
@@ -116,7 +115,7 @@ interface Singleton {
       "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default",
       "name": "default",
       "type": "Azure.ResourceManager.Resources/singletonTrackedResources",
-      "location": "eastus2",
+      "location": "eastus",
       "properties":{
         "description": "valid2",
         "provisioningState": "Succeeded"

diff --git a/packages/cadl-ranch-specs/package.json b/packages/cadl-ranch-specs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/cadl-ranch-specs",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "description": "Cadl scenarios and mock apis",
   "main": "dist/index.js",
   "type": "module",

diff --git a/packages/cadl-ranch/CHANGELOG.md b/packages/cadl-ranch/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @azure-tools/cadl-ranch
 
+## 0.16.0
+
+### Minor Changes
+
+- caa2290: Remove handler code and commonapi file
+
 ## 0.15.0
 
 ### Minor Changes

diff --git a/packages/cadl-ranch/package.json b/packages/cadl-ranch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/cadl-ranch",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Cadl Ranch Tool to validate, run mock api, collect coverage.",
   "main": "dist/index.js",
   "type": "module",