Change vendorExtension protobuf type handling to use protobuf type instead of openApi type (opensearch-project#413)

* Change vendorExtension protobuf type handling to use protobuf type instead of openApi type

Signed-off-by: xil <fridalu66@gmail.com>

* use x-protobuf-type

Signed-off-by: xil <fridalu66@gmail.com>

* codecov setup

Signed-off-by: xil <fridalu66@gmail.com>

---------

Signed-off-by: xil <fridalu66@gmail.com>

Author: lucy66hw

CHANGELOG.md

@@ -7,6 +7,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Changed
  - Fix simplifySingleMapSchema to generate named wrapper schemas. ([#406](https://github.com/opensearch-project/opensearch-protobufs/pull/406))
+ - Change vendorExtension protobuf type handling to use protobuf type instead of openApi type ([#409](https://github.com/opensearch-project/opensearch-protobufs/pull/409))
 
 ### Removed
 

codecov.yml

@@ -0,0 +1,19 @@
+codecov:
+  require_ci_to_pass: yes
+
+coverage:
+  status:
+    project:
+      default:
+        target: 85%  # Require 85% overall coverage
+        threshold: 1%  # Allow 1% decrease
+    patch:
+      default:
+        target: 85%  # Require 85% coverage on new code
+        threshold: 1%  # Allow 1% decrease on patches
+
+comment:
+  layout: "header, diff, flags, files"
+  behavior: default
+  require_changes: false
+  require_base: false

tools/proto-convert/src/VendorExtensionProcessor.ts

@@ -13,15 +13,6 @@ export class VendorExtensionProcessor {
     private static readonly PROTOBUF_TYPE_EXTENSION = 'x-protobuf-type';
     private static readonly PROTOBUF_NAME_EXTENSION = 'x-protobuf-name';
 
-    private static readonly PROTOBUF_TYPE_MAPPING: Record<string, { type: string; format?: string }> = {
-        'int32': { type: 'integer', format: 'int32' },
-        'int64': { type: 'integer', format: 'int64' },
-        'float': { type: 'number', format: 'float' },
-        'double': { type: 'number', format: 'double' },
-        'bool': { type: 'boolean' },
-        'string': { type: 'string' },
-    };
-
     private root: OpenAPIV3.Document;
 
     constructor(root: OpenAPIV3.Document) {
@@ -30,7 +21,7 @@ export class VendorExtensionProcessor {
 
     /**
      * Process the spec by pruning anything marked with x-protobuf-excluded
-     * and applying vendor extensions (x-protobuf-name, x-protobuf-type)
+     * and applying vendor extensions (x-protobuf-name, x-protobuf-data-type)
      */
     public process(): OpenAPIV3.Document {
         deleteMatchingKeys(this.root, (item: any) => this.hasProtobufExcluded(item));
@@ -139,46 +130,25 @@ export class VendorExtensionProcessor {
     }
 
     /**
-     * Apply type override to a schema if it has x-protobuf-type
+     * Apply type override to simplify complex schemas to a single protobuf type.
      */
     private applyTypeOverride(schema: any): void {
         if (!schema) return;
 
         if (VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION in schema) {
             const protoType = schema[VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION];
 
-            // Clear structural properties that might conflict
-            if ('$ref' in schema) {
-                delete schema.$ref;
-            }
-            if ('properties' in schema) {
-                delete schema.properties;
-            }
-            if ('additionalProperties' in schema) {
-                delete schema.additionalProperties;
-            }
-            if ('oneOf' in schema) {
-                delete schema.oneOf;
-            }
-            if ('anyOf' in schema) {
-                delete schema.anyOf;
-            }
-            if ('allOf' in schema) {
-                delete schema.allOf;
-            }
-
-            const typeMapping = VendorExtensionProcessor.PROTOBUF_TYPE_MAPPING[protoType];
-            if (typeMapping) {
-                schema.type = typeMapping.type;
-                if (typeMapping.format) {
-                    schema.format = typeMapping.format;
-                }
-            } else {
-                schema.type = protoType;
-            }
-
-            delete schema[VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION];
-            logger.info(`Applied ${VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION}: ${protoType} -> type: ${schema.type}${schema.format ? `, format: ${schema.format}` : ''}`);
+            // Clear structural properties that conflict with simple type
+            delete schema.$ref;
+            delete schema.properties;
+            delete schema.additionalProperties;
+            delete schema.oneOf;
+            delete schema.anyOf;
+            delete schema.allOf;
+
+            // Set type to x-protobuf-type value (preserves x-protobuf-type for template)
+            schema.type = protoType;
+            logger.info(`Applied ${VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION}: ${protoType} -> simplified to type: ${schema.type}`);
         }
     }
 

tools/proto-convert/src/config/protobuf-generator-config.yaml

@@ -17,7 +17,5 @@ typeMappings:
   object: "ObjectMap"
   AnyType: "ObjectMap"
   number: "GeneralNumber"
-  bytes: "bytes"
-  NullValue: "NullValue"
 openapiGeneratorIgnoreList:
   - "README.md"