test

Author: lucy66hw

.github/workflows/convert-proto.yml

@@ -31,14 +31,14 @@ jobs:
           npm install -g @bufbuild/buf
           buf --version
 
-      - name: Download Release Assets
-        uses: robinraju/release-downloader@v1
-        with:
-          repository: 'opensearch-project/opensearch-api-specification'
-          latest: true
-          fileName: 'opensearch-openapi.yaml'
-          tag: 'main-latest'
-          preRelease: true
+#      - name: Download Release Assets
+#        uses: robinraju/release-downloader@v1
+#        with:
+#          repository: 'opensearch-project/opensearch-api-specification'
+#          latest: true
+#          fileName: 'opensearch-openapi.yaml'
+#          tag: 'main-latest'
+#          preRelease: true
 
       - name: Get Latest Commit ID
         id: get_commit
@@ -124,9 +124,9 @@ jobs:
       #      - name: Post Process Protobuf
       #        run: npm run postprocessing
 
-      # - name: Reformat proto files
-      #   run: |
-      #     buf format -w protos/generated
+      - name: Reformat proto files
+        run: |
+         buf format -w protos/generated
 
       - name: Configure Git User
         run: |

.gitignore

@@ -70,4 +70,4 @@ Thumbs.db
 protos/generated/.openapi-generator/
 protos/generated/.openapi-generator-ignore
 /cloned-repo
-opensearch-openapi.yaml
+#opensearch-openapi.yaml

tools/proto-convert/src/SchemaModifier.ts

@@ -43,10 +43,11 @@ export class SchemaModifier {
                 this.handleAdditionalPropertiesUndefined(schema)
 
             },
-            onSchema: (schema) => {
+            onSchema: (schema, schemaName) => {
                 if (!schema || isReferenceObject(schema)) return;
                 this.simplifySingleMapSchema(schema, visit)
                 this.handleAdditionalPropertiesUndefined(schema)
+                this.markOneOfExtensions(schema, schemaName);
             },
         });
         return this.root
@@ -479,7 +480,8 @@ export class SchemaModifier {
     /**
      * Marks schemas and properties with oneOf extensions.
      * Adds x-oneof to properties when schema has minProperties=1 and maxProperties=1.
-     * Adds x-oneof-constraint to top-level schemas that contain such patterns.
+     * Adds x-oneof-constraint to schemas that have the min/max pattern AND to parent schemas
+     * that contain nested schemas with the pattern.
      **/
     markOneOfExtensions(schema: OpenAPIV3.SchemaObject, schemaName?: string): void {
         // Check if this schema or nested items have the oneOf pattern
@@ -490,21 +492,24 @@ export class SchemaModifier {
             return;
         }
 
-        // Add x-oneof to properties of this schema if it has the pattern
-        if (hasDirectPattern && schema.properties) {
-            for (const propName in schema.properties) {
-                const prop = schema.properties[propName] as any;
-                if (prop && typeof prop === 'object') {
-                    prop['x-oneof'] = true;
+        // Only mark with x-oneof-constraint if the schema directly has the pattern
+        // OR if it has nested patterns (parent schemas that contain oneOf)
+        if (hasDirectPattern) {
+            // Add x-oneof to properties of this schema if it has the direct pattern
+            if (schema.properties) {
+                for (const propName in schema.properties) {
+                    const prop = schema.properties[propName] as any;
+                    if (prop && typeof prop === 'object') {
+                        prop['x-oneof'] = true;
+                    }
                 }
             }
-            this.logger.info(`Added x-oneof to properties with minProperties=1 and maxProperties=1`);
-        }
-
-        // Add x-oneof-constraint to top-level schemas (not nested in allOf/anyOf/oneOf)
-        if (schemaName && !['allOf', 'anyOf', 'oneOf'].includes(schemaName)) {
             (schema as any)['x-oneof-constraint'] = true;
-            this.logger.info(`Marked schema with x-oneof-constraint`);
+            this.logger.info(`Added x-oneof to properties and marked schema with x-oneof-constraint`);
+        } else if (hasNestedPattern) {
+            // Mark parent schemas that contain nested oneOf patterns
+            (schema as any)['x-oneof-constraint'] = true;
+            this.logger.info(`Marked parent schema with x-oneof-constraint (contains nested oneOf pattern)`);
         }
     }