From 0f907440a475e71b102df9cf62cf7d384fa8aaa5 Mon Sep 17 00:00:00 2001
From: devanbenz <devandbenz@gmail.com>
Date: Tue, 11 Aug 2026 15:46:15 -0500
Subject: [PATCH] Revert "feat: Update openapi contracts to include onConflict
 parameter for restore (#655)"

This reverts commit d90ba204f2e8ae3b2751fd9d9eba4618d38aa45f.

Bucket conflict handling for `influx restore --on-conflict` is now
implemented entirely client-side in the CLI (influxdata/influx-cli#583),
so the server never receives an onConflict parameter and the spec change
is no longer needed.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 contracts/oss-diff.yml                   |  9 ---------
 contracts/oss.json                       | 13 -------------
 contracts/oss.yml                        |  9 ---------
 contracts/ref/oss.yml                    |  9 ---------
 src/oss/paths/restore_bucketMetadata.yml |  9 ---------
 5 files changed, 49 deletions(-)

diff --git a/contracts/oss-diff.yml b/contracts/oss-diff.yml
index b66cd931..00da0ae4 100644
--- a/contracts/oss-diff.yml
+++ b/contracts/oss-diff.yml
@@ -2519,15 +2519,6 @@ paths:
       summary: Create a new bucket pre-seeded with shard info from a backup.
       parameters:
         - $ref: '#/paths/~1ready/get/parameters/0'
-        - in: query
-          name: onConflict
-          description: Behavior when a bucket with the same name already exists.
-          schema:
-            type: string
-            enum:
-              - error
-              - skip
-              - replace
       requestBody:
         description: Metadata manifest for a bucket.
         required: true
diff --git a/contracts/oss.json b/contracts/oss.json
index 7e0d3666..5c18a9b5 100644
--- a/contracts/oss.json
+++ b/contracts/oss.json
@@ -14708,19 +14708,6 @@
         "parameters": [
           {
             "$ref": "#/components/parameters/TraceSpan"
-          },
-          {
-            "in": "query",
-            "name": "onConflict",
-            "description": "Behavior when a bucket with the same name already exists.",
-            "schema": {
-              "type": "string",
-              "enum": [
-                "error",
-                "skip",
-                "replace"
-              ]
-            }
           }
         ],
         "requestBody": {
diff --git a/contracts/oss.yml b/contracts/oss.yml
index 7ed93cfc..c1b95e40 100644
--- a/contracts/oss.yml
+++ b/contracts/oss.yml
@@ -11907,15 +11907,6 @@ paths:
       summary: Create a new bucket pre-seeded with shard info from a backup.
       parameters:
         - $ref: '#/components/parameters/TraceSpan'
-        - in: query
-          name: onConflict
-          description: Behavior when a bucket with the same name already exists.
-          schema:
-            type: string
-            enum:
-              - error
-              - skip
-              - replace
       requestBody:
         description: Metadata manifest for a bucket.
         required: true
diff --git a/contracts/ref/oss.yml b/contracts/ref/oss.yml
index 269ee8c9..ee58f3b2 100644
--- a/contracts/ref/oss.yml
+++ b/contracts/ref/oss.yml
@@ -14995,15 +14995,6 @@ paths:
       operationId: PostRestoreBucketMetadata
       parameters:
       - $ref: '#/components/parameters/TraceSpan'
-      - description: Behavior when a bucket with the same name already exists.
-        in: query
-        name: onConflict
-        schema:
-          enum:
-          - error
-          - skip
-          - replace
-          type: string
       requestBody:
         content:
           application/json:
diff --git a/src/oss/paths/restore_bucketMetadata.yml b/src/oss/paths/restore_bucketMetadata.yml
index 8dc0572c..67dc47b0 100644
--- a/src/oss/paths/restore_bucketMetadata.yml
+++ b/src/oss/paths/restore_bucketMetadata.yml
@@ -5,15 +5,6 @@ post:
   summary: Create a new bucket pre-seeded with shard info from a backup.
   parameters:
     - $ref: "../../common/parameters/TraceSpan.yml"
-    - in: query
-      name: onConflict
-      description: Behavior when a bucket with the same name already exists.
-      schema:
-        type: string
-        enum:
-          - error
-          - skip
-          - replace
   requestBody:
     description: Metadata manifest for a bucket.
     required: true