Checkout latest protobuf version for report

Author: lucy66hw

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

@@ -102,20 +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
+      - name: Convert protobuf
         run: |
-          cd cloned-repo
-          ./mvnw clean package
+          java -jar tools/bin/openapi-generator-cli.jar generate -c tools/proto-convert/src/config/protobuf-generator-config.yaml
 
-      - name: Convert protobuf
+      - name: Check for auto-pr-branch and use its protos if exists
         run: |
-          java -jar cloned-repo/modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -c tools/proto-convert/src/config/protobuf-generator-config.yaml
+          # Check if auto-pr-branch exists
+          if git ls-remote --exit-code --heads origin auto-pr-branch > /dev/null 2>&1; then
+            echo "Found auto-pr-branch, using its proto files for comparison"
+            git fetch origin auto-pr-branch
+            git checkout origin/auto-pr-branch -- protos/schemas/
+          else
+            echo "auto-pr-branch not found, using main branch proto files"
+          fi
 
       - 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
@@ -104,20 +104,9 @@ 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 cloned-repo/modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -c tools/proto-convert/src/config/protobuf-generator-config.yaml
+          java -jar tools/bin/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,10 +588,6 @@ 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);
-                        }
                     }
                 }
             }