feat(http-client-csharp): add InputOperation.OperationId

- add `InputOperation.OperationId` - invoke `resolveOperationId()` to initialize it part of Azure/autorest.csharp#5117
microsoft · Jan 3, 2025 · de848fc · de848fc
1 parent 254aba7
commit de848fc
Show file tree

Hide file tree

Showing 68 changed files with 723 additions and 0 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
@@ -19,6 +19,7 @@ import {
 } from "@azure-tools/typespec-client-generator-core";
 import { getDeprecated, isErrorModel } from "@typespec/compiler";
 import { HttpStatusCodeRange } from "@typespec/http";
+import { resolveOperationId } from "@typespec/openapi";
 import { getResourceOperation } from "@typespec/rest";
 import { NetEmitterOptions } from "../options.js";
 import { BodyMediaType } from "../type/body-media-type.js";
@@ -74,6 +75,7 @@ export function fromSdkServiceMethod(
       getResourceOperation(sdkContext.program, method.operation.__raw.operation)?.resourceType
         .name ??
       getOperationGroupName(sdkContext, method.operation, sdkContext.sdkPackage.rootNamespace),
+    OperationId: resolveOperationId(sdkContext.program, method.operation.__raw.operation),
     Deprecated: getDeprecated(sdkContext.program, method.__raw!),
     Summary: method.summary,
     Doc: method.doc,

diff --git a/packages/http-client-csharp/emitter/src/type/input-operation.ts b/packages/http-client-csharp/emitter/src/type/input-operation.ts
@@ -19,6 +19,7 @@ export interface Paging {
 export interface InputOperation {
   Name: string;
   ResourceName?: string;
+  OperationId: string;
   Summary?: string;
   Deprecated?: string;
   Doc?: string;

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
@@ -44,6 +44,7 @@
      "$id": "6",
      "Name": "valid",
      "ResourceName": "ApiKey",
+     "OperationId": "valid",
      "Doc": "Check whether client is authenticated",
      "Accessibility": "public",
      "Parameters": [],
@@ -72,6 +73,7 @@
      "$id": "8",
      "Name": "invalid",
      "ResourceName": "ApiKey",
+     "OperationId": "invalid",
      "Doc": "Check whether client is authenticated.",
      "Accessibility": "public",
      "Parameters": [

diff --git a/...csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json b/...csharp/generator/TestProjects/CadlRanch/http/authentication/http/custom/tspCodeModel.json
@@ -44,6 +44,7 @@
      "$id": "6",
      "Name": "valid",
      "ResourceName": "Custom",
+     "OperationId": "valid",
      "Doc": "Check whether client is authenticated",
      "Accessibility": "public",
      "Parameters": [],
@@ -72,6 +73,7 @@
      "$id": "8",
      "Name": "invalid",
      "ResourceName": "Custom",
+     "OperationId": "invalid",
      "Doc": "Check whether client is authenticated.",
      "Accessibility": "public",
      "Parameters": [

diff --git a/...ient-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json b/...ient-csharp/generator/TestProjects/CadlRanch/http/authentication/oauth2/tspCodeModel.json
@@ -44,6 +44,7 @@
      "$id": "6",
      "Name": "valid",
      "ResourceName": "OAuth2",
+     "OperationId": "valid",
      "Doc": "Check whether client is authenticated",
      "Accessibility": "public",
      "Parameters": [],
@@ -72,6 +73,7 @@
      "$id": "8",
      "Name": "invalid",
      "ResourceName": "OAuth2",
+     "OperationId": "invalid",
      "Doc": "Check whether client is authenticated. Will return an invalid bearer error.",
      "Accessibility": "public",
      "Parameters": [

diff --git a/...lient-csharp/generator/TestProjects/CadlRanch/http/authentication/union/tspCodeModel.json b/...lient-csharp/generator/TestProjects/CadlRanch/http/authentication/union/tspCodeModel.json
@@ -14,6 +14,7 @@
      "$id": "3",
      "Name": "validKey",
      "ResourceName": "Union",
+     "OperationId": "validKey",
      "Doc": "Check whether client is authenticated",
      "Accessibility": "public",
      "Parameters": [],
@@ -42,6 +43,7 @@
      "$id": "5",
      "Name": "validToken",
      "ResourceName": "Union",
+     "OperationId": "validToken",
      "Doc": "Check whether client is authenticated",
      "Accessibility": "public",
      "Parameters": [],

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
@@ -255,6 +255,7 @@
      "$id": "28",
      "Name": "clientName",
      "ResourceName": "Naming",
+     "OperationId": "operation",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -282,6 +283,7 @@
      "$id": "30",
      "Name": "parameter",
      "ResourceName": "Naming",
+     "OperationId": "parameter",
      "Accessibility": "public",
      "Parameters": [
       {
@@ -331,6 +333,7 @@
      "$id": "34",
      "Name": "client",
      "ResourceName": "Property",
+     "OperationId": "Property_client",
      "Accessibility": "public",
      "Parameters": [
       {
@@ -407,6 +410,7 @@
      "$id": "40",
      "Name": "language",
      "ResourceName": "Property",
+     "OperationId": "Property_language",
      "Accessibility": "public",
      "Parameters": [
       {
@@ -483,6 +487,7 @@
      "$id": "46",
      "Name": "compatibleWithEncodedName",
      "ResourceName": "Property",
+     "OperationId": "Property_compatibleWithEncodedName",
      "Accessibility": "public",
      "Parameters": [
       {
@@ -559,6 +564,7 @@
      "$id": "52",
      "Name": "request",
      "ResourceName": "Header",
+     "OperationId": "Header_request",
      "Accessibility": "public",
      "Parameters": [
       {
@@ -608,6 +614,7 @@
      "$id": "56",
      "Name": "response",
      "ResourceName": "Header",
+     "OperationId": "Header_response",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -691,6 +698,7 @@
      "$id": "66",
      "Name": "client",
      "ResourceName": "Model",
+     "OperationId": "Model_client",
      "Accessibility": "public",
      "Parameters": [
       {
@@ -767,6 +775,7 @@
      "$id": "72",
      "Name": "language",
      "ResourceName": "Model",
+     "OperationId": "Model_language",
      "Accessibility": "public",
      "Parameters": [
       {
@@ -887,6 +896,7 @@
      "$id": "84",
      "Name": "unionEnumName",
      "ResourceName": "UnionEnum",
+     "OperationId": "UnionEnum_unionEnumName",
      "Accessibility": "public",
      "Parameters": [
       {
@@ -963,6 +973,7 @@
      "$id": "90",
      "Name": "unionEnumMemberName",
      "ResourceName": "UnionEnum",
+     "OperationId": "UnionEnum_unionEnumMemberName",
      "Accessibility": "public",
      "Parameters": [
       {

diff --git a/...tor/TestProjects/CadlRanch/http/client/structure/client-operation-group/tspCodeModel.json b/...tor/TestProjects/CadlRanch/http/client/structure/client-operation-group/tspCodeModel.json
@@ -118,6 +118,7 @@
      "$id": "15",
      "Name": "one",
      "ResourceName": "ClientOperationGroup",
+     "OperationId": "ClientOperationGroup_one",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -196,6 +197,7 @@
      "$id": "22",
      "Name": "two",
      "ResourceName": "Group3",
+     "OperationId": "Group3_two",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -223,6 +225,7 @@
      "$id": "24",
      "Name": "three",
      "ResourceName": "Group3",
+     "OperationId": "Group3_three",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -302,6 +305,7 @@
      "$id": "31",
      "Name": "four",
      "ResourceName": "Group4",
+     "OperationId": "Group4_four",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -381,6 +385,7 @@
      "$id": "38",
      "Name": "five",
      "ResourceName": "AnotherClientOperationGroup",
+     "OperationId": "AnotherClientOperationGroup_five",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -459,6 +464,7 @@
      "$id": "45",
      "Name": "six",
      "ResourceName": "Group5",
+     "OperationId": "Group5_six",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [

diff --git a/...t-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspCodeModel.json b/...t-csharp/generator/TestProjects/CadlRanch/http/client/structure/default/tspCodeModel.json
@@ -119,6 +119,7 @@
      "$id": "15",
      "Name": "one",
      "ResourceName": "Service",
+     "OperationId": "one",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -146,6 +147,7 @@
      "$id": "17",
      "Name": "two",
      "ResourceName": "Service",
+     "OperationId": "two",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -275,6 +277,7 @@
      "$id": "29",
      "Name": "seven",
      "ResourceName": "Foo",
+     "OperationId": "Foo_seven",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -354,6 +357,7 @@
      "$id": "36",
      "Name": "eight",
      "ResourceName": "Qux",
+     "OperationId": "Qux_eight",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -433,6 +437,7 @@
      "$id": "43",
      "Name": "nine",
      "ResourceName": "Bar",
+     "OperationId": "Bar_nine",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -512,6 +517,7 @@
      "$id": "50",
      "Name": "three",
      "ResourceName": "Foo",
+     "OperationId": "Foo_three",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -539,6 +545,7 @@
      "$id": "52",
      "Name": "four",
      "ResourceName": "Foo",
+     "OperationId": "Foo_four",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -618,6 +625,7 @@
      "$id": "59",
      "Name": "five",
      "ResourceName": "Bar",
+     "OperationId": "Bar_five",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -645,6 +653,7 @@
      "$id": "61",
      "Name": "six",
      "ResourceName": "Bar",
+     "OperationId": "Bar_six",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [

diff --git a/...arp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspCodeModel.json b/...arp/generator/TestProjects/CadlRanch/http/client/structure/multi-client/tspCodeModel.json
@@ -118,6 +118,7 @@
      "$id": "15",
      "Name": "renamedOne",
      "ResourceName": "ClientA",
+     "OperationId": "ClientA_renamedOne",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -145,6 +146,7 @@
      "$id": "17",
      "Name": "renamedThree",
      "ResourceName": "ClientA",
+     "OperationId": "ClientA_renamedThree",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -172,6 +174,7 @@
      "$id": "19",
      "Name": "renamedFive",
      "ResourceName": "ClientA",
+     "OperationId": "ClientA_renamedFive",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -250,6 +253,7 @@
      "$id": "26",
      "Name": "renamedTwo",
      "ResourceName": "ClientB",
+     "OperationId": "ClientB_renamedTwo",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -277,6 +281,7 @@
      "$id": "28",
      "Name": "renamedFour",
      "ResourceName": "ClientB",
+     "OperationId": "ClientB_renamedFour",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -304,6 +309,7 @@
      "$id": "30",
      "Name": "renamedSix",
      "ResourceName": "ClientB",
+     "OperationId": "ClientB_renamedSix",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [

diff --git a/...enerator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspCodeModel.json b/...enerator/TestProjects/CadlRanch/http/client/structure/renamed-operation/tspCodeModel.json
@@ -118,6 +118,7 @@
      "$id": "15",
      "Name": "renamedOne",
      "ResourceName": "RenamedOperation",
+     "OperationId": "RenamedOperation_renamedOne",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -145,6 +146,7 @@
      "$id": "17",
      "Name": "renamedThree",
      "ResourceName": "RenamedOperation",
+     "OperationId": "RenamedOperation_renamedThree",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -172,6 +174,7 @@
      "$id": "19",
      "Name": "renamedFive",
      "ResourceName": "RenamedOperation",
+     "OperationId": "RenamedOperation_renamedFive",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -250,6 +253,7 @@
      "$id": "26",
      "Name": "renamedTwo",
      "ResourceName": "Group",
+     "OperationId": "Group_renamedTwo",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -277,6 +281,7 @@
      "$id": "28",
      "Name": "renamedFour",
      "ResourceName": "Group",
+     "OperationId": "Group_renamedFour",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [
@@ -304,6 +309,7 @@
      "$id": "30",
      "Name": "renamedSix",
      "ResourceName": "Group",
+     "OperationId": "Group_renamedSix",
      "Accessibility": "public",
      "Parameters": [],
      "Responses": [