filter model generation by labeling

Azure · Oct 23, 2023 · 0287500 · 0287500
1 parent 1a7e93f
commit 0287500
Show file tree

Hide file tree

Showing 7 changed files with 141 additions and 92 deletions.
diff --git a/packages/extensions/openapi-to-cadl/src/generate/generate-arm-resource.ts b/packages/extensions/openapi-to-cadl/src/generate/generate-arm-resource.ts
@@ -3,6 +3,7 @@ import { plural } from "pluralize";
 import { generateDecorators } from "../utils/decorators";
 import { generateDocs } from "../utils/docs";
 import { getModelPropertiesDeclarations } from "../utils/model-generation";
+import { generateOperation } from "./generate-operations";
 
 export function generateArmResource(resource: TspArmResource): string {
   let definitions: string[] = [];
@@ -38,13 +39,16 @@ function generateArmResourceOperation(resource: TspArmResource): string {
   const definitions: string[] = [];
   definitions.push("@armResourceOperations");
   definitions.push(`interface ${plural(resource.name)} {`);
-  for (const operation of resource.operations) {
+  for (const operation of resource.resourceOperations) {
     for (const fixme of operation.fixMe ?? []) {
       definitions.push(fixme);
     }
     definitions.push(generateDocs(operation));
     definitions.push(`${operation.name} is ${operation.kind}<${operation.templateParameters.join()}>`);
   }
+  for (const operation of resource.normalOperations) {
+    definitions.push(generateOperation(operation));
+  }
   definitions.push("}");
 
   return definitions.join("\n");

diff --git a/packages/extensions/openapi-to-cadl/src/generate/generate-operations.ts b/packages/extensions/openapi-to-cadl/src/generate/generate-operations.ts
@@ -2,7 +2,7 @@ import { CadlOperation, CadlOperationGroup, CadlParameter } from "../interfaces"
 import { generateDocs, generateSummary } from "../utils/docs";
 import { generateParameter } from "./generate-parameter";
 
-export function generateOperation(operation: CadlOperation, operationGroup: CadlOperationGroup) {
+export function generateOperation(operation: CadlOperation, operationGroup?: CadlOperationGroup) {
   const doc = generateDocs(operation);
   const summary = generateSummary(operation);
   const { verb, name, route, responses, parameters } = operation;
@@ -36,7 +36,7 @@ export function generateOperation(operation: CadlOperation, operationGroup: Cadl
     );
     const parametersString = !resourceParameters ? "" : `, { parameters: ${resourceParameters}}`;
     statements.push(
-      `${operationGroup.name ? "" : "op "}`,
+      `${operationGroup?.name ? "" : "op "}`,
       `${name} is Azure.Core.${resource.kind}<${resource.response.name} ${parametersString}>;\n\n\n`,
     );
   }

diff --git a/packages/extensions/openapi-to-cadl/src/interfaces.ts b/packages/extensions/openapi-to-cadl/src/interfaces.ts
@@ -189,14 +189,14 @@ export interface TspArmResourceNonListOperation extends TspArmResourceOperationB
 
 export interface TspArmResourceListOperation extends TspArmResourceOperationBase {
   kind: "ArmResourceListByParent" | "ArmListBySubscription" | "ArmResourceListAtScope";
-  resultSchemaName?: string;
 }
 
 export type MSIType = "ManagedServiceIdentity" | "ManagedSystemAssignedIdentity";
 export interface TspArmResource extends CadlObject {
   resourceKind: ArmResourceKind;
   propertiesModelName: string;
   resourceParent?: TspArmResource;
-  operations: TspArmResourceOperation[];
+  resourceOperations: TspArmResourceOperation[];
+  normalOperations: CadlOperation[];
   msiType?: MSIType;
 }
diff --git a/packages/extensions/openapi-to-cadl/src/model.ts b/packages/extensions/openapi-to-cadl/src/model.ts
@@ -11,7 +11,6 @@ import {
   ArmResourceSchema,
   filterResourceRelatedObjects,
   isResourceSchema,
-  isResourceUpdateSchema,
 } from "./utils/resource-discovery";
 import { isChoiceSchema } from "./utils/schemas";
 
@@ -52,14 +51,13 @@ function transformModel(codeModel: CodeModel): CadlProgram {
 
   const { isArm } = getOptions();
 
-  const armResources =
+  // objects need to be converted first because they are used in operation convertion
+  const cadlObjects = (codeModel.schemas.objects ?? []).map((o) => transformObject(o, codeModel));
+
+  const armResources = isArm ?
     codeModel.schemas.objects
       ?.filter((o) => isResourceSchema(o))
-      .map((o) => transformTspArmResource(codeModel, o as ArmResourceSchema)) ?? [];
-
-  const cadlObjects = (
-    (isArm ? filterResourceRelatedObjects(codeModel.schemas.objects, armResources) : codeModel.schemas.objects) ?? []
-  ).map((o) => transformObject(o, codeModel));
+      .map((o) => transformTspArmResource(codeModel, o as ArmResourceSchema)) ?? [] : [];
 
   const serviceInformation = transformServiceInformation(codeModel);
 
@@ -76,7 +74,7 @@ function transformModel(codeModel: CodeModel): CadlProgram {
     serviceInformation,
     models: {
       enums: caldEnums,
-      objects: cadlObjects,
+      objects: isArm ? filterResourceRelatedObjects(cadlObjects) : cadlObjects,
       armResources,
     },
     operationGroups: cadlOperationGroups,