revert change back

Author: lucy66hw

.github/workflows/backward-compatible-report.yml

@@ -102,9 +102,20 @@ jobs:
           OPENSEARCH_VERSION: ${{ steps.get_opensearch_version.outputs.version }}
         run: npm ci && npm run preprocessing -- --opensearch-version "$OPENSEARCH_VERSION"
 
+      - name: Clone Protobuf Generator Repository
+        run: |
+          git clone https://github.com/OpenAPITools/openapi-generator cloned-repo
+          cd cloned-repo
+          git checkout 6699ecd9d2f4e0868f23bb36566ea03cd1230e6a
+
+      - name: Build Protobuf Generator Tool
+        run: |
+          cd cloned-repo
+          ./mvnw clean package
+
       - name: Convert protobuf
         run: |
-          java -jar tools/bin/openapi-generator-cli.jar generate -c tools/proto-convert/src/config/protobuf-generator-config.yaml
+          java -jar cloned-repo/modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -c tools/proto-convert/src/config/protobuf-generator-config.yaml
 
       - name: Check for auto-pr-branch and use its protos if exists
         run: |

.github/workflows/convert-proto.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   auto-proto-convert:
     runs-on: ubuntu-latest
-    #if: github.repository == 'opensearch-project/opensearch-protobufs'
+    if: github.repository == 'opensearch-project/opensearch-protobufs'
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -32,11 +32,11 @@ jobs:
       - 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
+          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
@@ -104,9 +104,20 @@ jobs:
           OPENSEARCH_VERSION: ${{ steps.get_opensearch_version.outputs.version }}
         run: npm ci && npm run preprocessing -- --opensearch-version "$OPENSEARCH_VERSION"
 
+      - name: Clone Protobuf Generator Repository
+        run: |
+          git clone https://github.com/OpenAPITools/openapi-generator cloned-repo
+          cd cloned-repo
+          git checkout 6699ecd9d2f4e0868f23bb36566ea03cd1230e6a
+
+      - name: Build Protobuf Generator Tool
+        run: |
+          cd cloned-repo
+          ./mvnw clean package
+
       - name: Convert protobuf
         run: |
-          java -jar tools/bin/openapi-generator-cli.jar generate -c tools/proto-convert/src/config/protobuf-generator-config.yaml
+          java -jar cloned-repo/modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -c tools/proto-convert/src/config/protobuf-generator-config.yaml
 
       - name: Post Process Protobuf
         id: merge_report

tools/proto-convert/src/SchemaModifier.ts

@@ -588,6 +588,10 @@ export class SchemaModifier {
                     const prop = schema.properties[propName] as any;
                     if (prop && typeof prop === 'object') {
                         prop['x-oneof-property'] = true;
+
+                        if ('$ref' in prop) {
+                            this.markReferencedSchemaAsOneof(prop.$ref);
+                        }
                     }
                 }
             }