Read AllowReserved value (#4294)

Fix Azure/autorest.csharp#4966 --------- Co-authored-by: Pan Shao <pashao@microsoft.com>
microsoft · Sep 3, 2024 · 11a01ce · 11a01ce
1 parent c2b80f7
commit 11a01ce
Show file tree

Hide file tree

Showing 27 changed files with 1,202 additions and 596 deletions.
diff --git a/packages/http-client-csharp/emitter/src/lib/operation-converter.ts b/packages/http-client-csharp/emitter/src/lib/operation-converter.ts
@@ -42,6 +42,7 @@ import { getExternalDocs, getOperationId } from "./decorators.js";
 import { fromSdkHttpExamples } from "./example-converter.js";
 import { Logger } from "./logger.js";
 import { getInputType } from "./model.js";
+import { isSdkPathParameter } from "./utils.js";
 
 export function fromSdkServiceMethod(
   method: SdkServiceMethod<SdkHttpOperation>,
@@ -207,6 +208,7 @@ function fromSdkHttpOperationParameter(
     Kind: getParameterKind(p, parameterType, rootApiVersions.length > 0),
     DefaultValue: getParameterDefaultValue(p.clientDefaultValue, parameterType),
     Decorators: p.decorators,
+    SkipUrlEncoding: isSdkPathParameter(p) ? p.allowReserved : false,
   } as InputParameter;
 }
 

diff --git a/packages/http-client-csharp/emitter/src/lib/utils.ts b/packages/http-client-csharp/emitter/src/lib/utils.ts
@@ -1,5 +1,7 @@
 import {
   SdkContext,
+  SdkModelPropertyTypeBase,
+  SdkPathParameter,
   getLibraryName,
   getSdkModel,
 } from "@azure-tools/typespec-client-generator-core";
@@ -72,3 +74,9 @@ export function createContentTypeOrAcceptParameter(
         : undefined,
   };
 }
+
+export function isSdkPathParameter(
+  parameter: SdkModelPropertyTypeBase
+): parameter is SdkPathParameter {
+  return (parameter as SdkPathParameter).kind === "path";
+}
diff --git a/...ent-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/tspCodeModel.json b/...ent-csharp/generator/TestProjects/CadlRanch/http/authentication/api-key/tspCodeModel.json
@@ -130,7 +130,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [

diff --git a/...csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json b/...csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json
@@ -130,7 +130,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [

diff --git a/...ient-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json b/...ient-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json
@@ -130,7 +130,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [

diff --git a/.../http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/tspCodeModel.json b/.../http-client-csharp/generator/TestProjects/CadlRanch/http/client/naming/tspCodeModel.json
@@ -281,7 +281,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [
@@ -339,7 +340,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       },
       {
        "$id": "39",
@@ -355,7 +357,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [
@@ -416,7 +419,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       },
       {
        "$id": "45",
@@ -432,7 +436,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [
@@ -493,7 +498,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       },
       {
        "$id": "51",
@@ -509,7 +515,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [
@@ -563,7 +570,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [
@@ -707,7 +715,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       },
       {
        "$id": "71",
@@ -723,7 +732,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [
@@ -784,7 +794,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       },
       {
        "$id": "77",
@@ -800,7 +811,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [
@@ -904,7 +916,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       },
       {
        "$id": "89",
@@ -920,7 +933,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [
@@ -981,7 +995,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Constant",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       },
       {
        "$id": "95",
@@ -997,7 +1012,8 @@
        "Explode": false,
        "IsRequired": true,
        "Kind": "Method",
-       "Decorators": []
+       "Decorators": [],
+       "SkipUrlEncoding": false
       }
      ],
      "Responses": [