CLOUDP-304938: Merge conflict

Author: lovisaberggren

.github/scripts/branded_preview.sh

@@ -16,13 +16,16 @@ while IFS= read -r version; do
     versions+=("$version")
 done < <(jq -r '.[]' versions.json)
 
-all_urls=(
-   "https://raw.githubusercontent.com/mongodb/openapi/${branch_name:?}/openapi/v2.json"
-   "https://raw.githubusercontent.com/mongodb/openapi/${branch_name:?}/openapi/v2.yaml"
-)
+all_urls=()
 
 # Fetch and append file URLs from each version
 for version in "${versions[@]}"; do
+    if [[ "${version}" == *"private"* ]]; then
+        all_urls+=("https://raw.githubusercontent.com/mongodb/openapi/${branch_name:?}/openapi/v2/private/openapi-${version}.json")
+        all_urls+=("https://raw.githubusercontent.com/mongodb/openapi/${branch_name:?}/openapi/v2/private/openapi-${version}.yaml")
+        continue
+    fi
+
     all_urls+=("https://raw.githubusercontent.com/mongodb/openapi/${branch_name:?}/openapi/v2/openapi-${version}.json")
     all_urls+=("https://raw.githubusercontent.com/mongodb/openapi/${branch_name:?}/openapi/v2/openapi-${version}.yaml")
 done

.github/scripts/split_spec.sh

@@ -13,6 +13,7 @@ foascli split -s openapi-foas.json --env "${target_env:?}" -o ./openapi/v2/opena
 foascli filter -s openapi-foas.json --env "${target_env:?}" -o ./openapi/v2.json --format all
 
 # Moves the unfiltered OAS to the raw folder
+mkdir -p ./openapi/.raw
 mv -f "openapi-foas.json" "./openapi/.raw/v2.json"
 mv -f "openapi-foas.yaml" "./openapi/.raw/v2.yaml"
 

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

@@ -16,7 +16,7 @@ on:
         default: 'dev'
         required: false
   schedule:
-   - cron: '0 * * * 1-5' # Run every hour from Monday to Friday
+    - cron: '0 */2 * * 1-5' # Run every 2 hours from Monday to Friday
 permissions:
   contents: write
   pull-requests: write

.github/workflows/spectral-lint.yml

@@ -6,16 +6,14 @@ on:
     paths: 
       - 'tools/spectral/**'
       - 'openapi/**.yaml'
-      - '.spectral.yaml'
-      - 'ipa-spectral.yaml'
+      - 'package.json'
   push:
     branches:
       - main
     paths: 
       - 'tools/spectral/**'
       - 'openapi/**.yaml'
-      - '.spectral.yaml'
-      - 'ipa-spectral.yaml'
+      - 'package.json'
 
 jobs:
   spectral-lint:

changelog/changelog.json

@@ -1,7 +1,7 @@
 {
-  "runDate": "2025-03-11",
-  "specRevision": "9c739cc8a51f69b2bf5ffc8178fd1d28b63bae65",
-  "specRevisionShort": "9c739cc8a51",
+  "runDate": "2025-03-13",
+  "specRevision": "ea31b246dee192e28f29a05b89b2138479429cfa",
+  "specRevisionShort": "ea31b246dee",
   "versions": [
     "2023-01-01",
     "2023-02-01",
@@ -11,6 +11,7 @@
     "2024-08-05",
     "2024-10-23",
     "2024-11-13",
-    "2025-02-19"
+    "2025-02-19",
+    "2025-03-12"
   ]
 }

changelog/changelog.yaml

@@ -18,6 +18,11 @@
     "operationId": "listClusters",
     "tag": "Clusters",
     "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      },
       {
         "change": "the 'backupEnabled' response's property default value 'false' was added",
         "changeCode": "response-property-default-value-added",
@@ -52,6 +57,11 @@
     "operationId": "createCluster",
     "tag": "Clusters",
     "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      },
       {
         "change": "the 'replicationSpecs/items/numShards' request property's min was set to '1.00'",
         "changeCode": "request-property-min-set",
@@ -121,6 +131,11 @@
     "operationId": "getCluster",
     "tag": "Clusters",
     "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      },
       {
         "change": "the 'backupEnabled' response's property default value 'false' was added",
         "changeCode": "response-property-default-value-added",
@@ -155,6 +170,11 @@
     "operationId": "updateCluster",
     "tag": "Clusters",
     "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      },
       {
         "change": "the 'replicationSpecs/items/numShards' request property's min was set to '1.00'",
         "changeCode": "request-property-min-set",
@@ -218,6 +238,71 @@
       }
     ]
   },
+  {
+    "path": "/api/atlas/v2/groups/{groupId}/clusters/{clusterName}/globalWrites",
+    "httpMethod": "GET",
+    "operationId": "getManagedNamespace",
+    "tag": "Global Clusters",
+    "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      }
+    ]
+  },
+  {
+    "path": "/api/atlas/v2/groups/{groupId}/clusters/{clusterName}/globalWrites/customZoneMapping",
+    "httpMethod": "DELETE",
+    "operationId": "deleteAllCustomZoneMappings",
+    "tag": "Global Clusters",
+    "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      }
+    ]
+  },
+  {
+    "path": "/api/atlas/v2/groups/{groupId}/clusters/{clusterName}/globalWrites/customZoneMapping",
+    "httpMethod": "POST",
+    "operationId": "createCustomZoneMapping",
+    "tag": "Global Clusters",
+    "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      }
+    ]
+  },
+  {
+    "path": "/api/atlas/v2/groups/{groupId}/clusters/{clusterName}/globalWrites/managedNamespaces",
+    "httpMethod": "DELETE",
+    "operationId": "deleteManagedNamespace",
+    "tag": "Global Clusters",
+    "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      }
+    ]
+  },
+  {
+    "path": "/api/atlas/v2/groups/{groupId}/clusters/{clusterName}/globalWrites/managedNamespaces",
+    "httpMethod": "POST",
+    "operationId": "createManagedNamespace",
+    "tag": "Global Clusters",
+    "changes": [
+      {
+        "change": "api sunset date changed to an earlier date, from '2026-11-30' to '2026-03-01', new sunset date must be not earlier than '2026-11-30' and at least '365' days from now",
+        "changeCode": "api-sunset-date-changed-too-small",
+        "backwardCompatible": false
+      }
+    ]
+  },
   {
     "path": "/api/atlas/v2/groups/{groupId}/streams",
     "httpMethod": "GET",