Merge branch 'main' into fix-multipart-diagnostics

Azure · Sep 13, 2024 · 865e7f0 · 865e7f0
2 parents 44cf17b + 95386b0
commit 865e7f0
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/.chronus/changes/allow-reserved-2024-8-11-16-40-29.md b/.chronus/changes/allow-reserved-2024-8-11-16-40-29.md
@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-azure-resource-manager"
+---
+
+`x-ms-skip-url-encoding` should be replaced with `allowReserved`
diff --git a/core b/core
diff --git a/eng/feeds/arm-canonical/tspconfig.yaml b/eng/feeds/arm-canonical/tspconfig.yaml
@@ -7,7 +7,6 @@ options:
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
-    examples-directory: "{project-root}/examples"
   "@azure-tools/typespec-autorest-canonical":
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"

diff --git a/eng/feeds/arm/tspconfig.yaml b/eng/feeds/arm/tspconfig.yaml
@@ -6,7 +6,6 @@ options:
     emitter-output-dir: "{project-root}/.."
     azure-resource-provider-folder: "resource-manager"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
-    examples-directory: "{project-root}/examples"
 linter:
   extends:
     - "@azure-tools/typespec-azure-rulesets/resource-manager"
diff --git a/eng/feeds/arm/tspconfig_stand_alone.yaml b/eng/feeds/arm/tspconfig_stand_alone.yaml
@@ -7,7 +7,6 @@ options:
     use-read-only-status-schema: true
     azure-resource-provider-folder: "resource-manager"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
-    examples-directory: "{project-root}/examples"
 linter:
   extends:
     - "@azure-tools/typespec-azure-rulesets/resource-manager"
diff --git a/eng/feeds/data-plane/tspconfig.yaml b/eng/feeds/data-plane/tspconfig.yaml
@@ -10,7 +10,6 @@ options:
   "@azure-tools/typespec-autorest":
     azure-resource-provider-folder: "data-plane"
     emitter-output-dir: "{project-root}/.."
-    examples-directory: "{project-root}/examples"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
   "@azure-tools/typespec-python":    
     package-dir: "{{#normalizePackageName}}{{parameters.ServiceNamespace}}{{/normalizePackageName}}"

diff --git a/eng/feeds/data-plane/tspconfig_stand_alone.yaml b/eng/feeds/data-plane/tspconfig_stand_alone.yaml
@@ -10,7 +10,6 @@ options:
   "@azure-tools/typespec-autorest":
     azure-resource-provider-folder: "data-plane"
     ## emitter-output-dir: "{project-root}/.."
-    examples-directory: "{project-root}/examples"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
   "@azure-tools/typespec-python":    
     package-dir: "{{#normalizePackageName}}{{parameters.ServiceNamespace}}{{/normalizePackageName}}"

diff --git a/packages/e2e-tests/cadl-ranch-specs/package.json b/packages/e2e-tests/cadl-ranch-specs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azure-tools/typespec-e2e-cadl-ranch-specs",
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.37.1"
+    "@azure-tools/cadl-ranch-specs": "0.37.2"
   },
   "type": "module",
   "private": true

diff --git a/packages/typespec-azure-resource-manager/lib/common-types/types.tsp b/packages/typespec-azure-resource-manager/lib/common-types/types.tsp
@@ -537,10 +537,9 @@ model ManagementGroupNameParameter {
 @added(Versions.v4)
 model ScopeParameter {
   /** The scope at which the operation is performed. */
-  @path
+  @path(#{ allowReserved: true })
   @segment("scope")
   @minLength(1)
-  @extension("x-ms-skip-url-encoding", true)
   scope: string;
 }
 

diff --git a/packages/typespec-azure-resource-manager/lib/parameters.tsp b/packages/typespec-azure-resource-manager/lib/parameters.tsp
@@ -83,9 +83,8 @@ model ArmLocationResource<BaseType extends
  */
 @doc("The default resourceUri parameter type.")
 model ResourceUriParameter {
-  @path
+  @path(#{ allowReserved: true })
   @doc("The fully qualified Azure Resource manager identifier of the resource.")
-  @extension("x-ms-skip-url-encoding", true)
   @resourceParameterBaseFor([ResourceHome.Extension])
   resourceUri: string;
 }