CLOUDP-292068: Merge conflict

Author: lovisaberggren

.github/workflows/changelog-report.yml

@@ -61,7 +61,7 @@ jobs:
           changelog_entries=$(jq --arg start_date "${START_DATE}" --arg end_date "${END_DATE}" ' map(select(.date >= $start_date and .date <= $end_date))' changelog/internal/changelog-all.json)
           echo "${changelog_entries}" > entries.json
       - name: Upload entries for debugging
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
         with:
           name: changelog_entries_in_range
           retention-days: 1

.github/workflows/generate-openapi.yml

@@ -74,7 +74,7 @@ jobs:
       - name: Generate Federated Spec
         run: .github/scripts/generate_federated_spec.sh
       - name: Upload artifact
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
         with:
           name: openapi-foas-${{ inputs.env }}
           path: |

.github/workflows/release-changelog.yml

@@ -102,7 +102,7 @@ jobs:
             S3_BUCKET: ${{ inputs.aws_s3_bucket }}
           run: ./release-scripts/generate_changelog.sh
         - name: Upload revision and base folders for debugging
-          uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
+          uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
           with:
             name: base-revision-${{ inputs.env }}
             retention-days: 1

.github/workflows/release-spec-runner.yml

@@ -38,7 +38,7 @@ jobs:
       # We upload the scripts in .github/scripts/* (defined only in main) so that they can be downloaded and reused 
       # when releasing in all the branches.
       - name: Upload release scripts 
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
         with:
           name: release-scripts
           retention-days: 1

.github/workflows/release-spec-v1.yml

@@ -57,7 +57,7 @@ jobs:
           sudo snap install yq
           yq -P '.' v1.json > v1.yaml
       - name: Upload artifact
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
         with:
           name: openapi-v1-${{ inputs.env }}
           path: |

.github/workflows/release-spec.yml

@@ -97,7 +97,7 @@ jobs:
             ref: ${{ inputs.branch }}
             token: ${{secrets.api_bot_pat}}
         - name: Upload current Specs and Changelog files
-          uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
+          uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
           with:
             name: base-${{ inputs.env }}
             retention-days: 1

.gitignore

@@ -20,3 +20,4 @@
 *.vscode
 
 *.out
+**/*ipa-collector-results-combined.log

changelog/internal/metadata.json

@@ -1,7 +1,7 @@
 {
-  "runDate": "2025-01-14",
-  "specRevision": "c779787120545e331d2f675991d16e888ebe050f",
-  "specRevisionShort": "c7797871205",
+  "runDate": "2025-01-15",
+  "specRevision": "8c55e9157bca5fd7d1eccca4ba6159aa6d4f9aa5",
+  "specRevisionShort": "8c55e9157bc",
   "versions": [
     "2023-01-01",
     "2023-02-01",

openapi/v2.json

@@ -252,7 +252,7 @@
     "termsOfService": "https://www.mongodb.com/mongodb-management-service-terms-and-conditions",
     "title": "MongoDB Atlas Administration API",
     "version": "2.0",
-    "x-xgen-sha": "c779787120545e331d2f675991d16e888ebe050f"
+    "x-xgen-sha": "8c55e9157bca5fd7d1eccca4ba6159aa6d4f9aa5"
   },
   "paths": {
     "/api/atlas/v2": {

openapi/v2.yaml

@@ -34614,7 +34614,7 @@ info:
     termsOfService: https://www.mongodb.com/mongodb-management-service-terms-and-conditions
     title: MongoDB Atlas Administration API
     version: "2.0"
-    x-xgen-sha: c779787120545e331d2f675991d16e888ebe050f
+    x-xgen-sha: 8c55e9157bca5fd7d1eccca4ba6159aa6d4f9aa5
 openapi: 3.0.1
 paths:
     /api/atlas/v2: