BUG/MINOR: add force-reload parameter to storage map replace (PUT)

Also remove force-reload parameter from map create (POST), tweak HTTP
return codes.

Fix querystring parameters to use underscores and clarify descriptions.

Author: aiharos

build/haproxy_spec.yaml

@@ -10039,7 +10039,7 @@ paths:
         - default: false
           description: If true, also show unmanaged map files loaded in haproxy
           in: query
-          name: includeUnmanaged
+          name: include_unmanaged
           required: false
           type: boolean
         responses:
@@ -10109,7 +10109,7 @@ paths:
         description: Returns an array of all entries in a given runtime map file.
         operationId: showRuntimeMap
         parameters:
-        - description: Map storage_name
+        - description: Mapfile attribute storage_name
           in: query
           name: map
           required: true
@@ -10130,7 +10130,7 @@ paths:
         description: Adds an entry into the map file.
         operationId: addMapEntry
         parameters:
-        - description: Map storage_name
+        - description: Mapfile attribute storage_name
           in: query
           name: map
           required: true
@@ -10169,7 +10169,7 @@ paths:
           name: id
           required: true
           type: string
-        - description: Map storage_name
+        - description: Mapfile attribute storage_name
           in: query
           name: map
           required: true
@@ -10198,7 +10198,7 @@ paths:
           name: id
           required: true
           type: string
-        - description: Map storage_name
+        - description: Mapfile attribute storage_name
           in: query
           name: map
           required: true
@@ -10224,7 +10224,7 @@ paths:
           name: id
           required: true
           type: string
-        - description: Map storage_name
+        - description: Mapfile attribute storage_name
           in: query
           name: map
           required: true
@@ -10301,22 +10301,14 @@ paths:
         parameters:
         - description: The map file contents
           in: formData
-          name: fileUpload
+          name: file_upload
           type: file
           x-mimetype: text/plain
         responses:
           "201":
             description: Map file created with its entries
             schema:
               $ref: '#/definitions/map'
-          "202":
-            description: Configuration change accepted and reload requested
-            headers:
-              Reload-ID:
-                description: ID of the requested reload
-                type: string
-            schema:
-              $ref: '#/definitions/map'
           "400":
             $ref: '#/responses/BadRequest'
           "409":
@@ -10389,7 +10381,13 @@ paths:
         produces:
         - application/json
         responses:
-          "200":
+          "202":
+            description: Configuration change accepted and reload requested
+            headers:
+              Reload-ID:
+                description: ID of the requested reload
+                type: string
+          "204":
             description: Map file replaced
           "400":
             $ref: '#/responses/BadRequest'

paths/runtime.yaml

@@ -190,7 +190,7 @@ maps:
     tags:
       - Maps
     parameters:
-      - name: includeUnmanaged
+      - name: include_unmanaged
         in: query
         description: If true, also show unmanaged map files loaded in haproxy
         required: false
@@ -265,7 +265,7 @@ maps_entries:
     parameters:
       - name: map
         in: query
-        description: Map storage_name
+        description: Mapfile attribute storage_name
         required: true
         type: string
     responses:
@@ -284,7 +284,7 @@ maps_entries:
     parameters:
       - name: map
         in: query
-        description: Map storage_name
+        description: Mapfile attribute storage_name
         required: true
         type: string
       - name: forceSync
@@ -325,7 +325,7 @@ maps_entries_one:
         type: string
       - name: map
         in: query
-        description: Map storage_name
+        description: Mapfile attribute storage_name
         required: true
         type: string
     responses:
@@ -351,7 +351,7 @@ maps_entries_one:
         type: string
       - name: map
         in: query
-        description: Map storage_name
+        description: Mapfile attribute storage_name
         required: true
         type: string
       - name: forceSync
@@ -395,7 +395,7 @@ maps_entries_one:
         type: string
       - name: map
         in: query
-        description: Map storage_name
+        description: Mapfile attribute storage_name
         required: true
         type: string
       - name: forceSync

paths/storage.yaml

@@ -23,7 +23,7 @@ maps:
       - multipart/form-data
     parameters:
       - in: formData
-        name: fileUpload
+        name: file_upload
         type: file
         description: The map file contents
         x-mimetype: text/plain
@@ -34,14 +34,6 @@ maps:
         description: Map file created with its entries
         schema:
           $ref: "#/definitions/map"
-      '202':
-        description: Configuration change accepted and reload requested
-        headers:
-          Reload-ID:
-            description: ID of the requested reload
-            type: string
-        schema:
-          $ref: '#/definitions/map'
       '409':
         $ref: '#/responses/AlreadyExists'
       '400':
@@ -114,7 +106,13 @@ maps_one:
           type: string
       - $ref: "#/parameters/force_reload"
     responses:
-      '200':
+      "202":
+        description: Configuration change accepted and reload requested
+        headers:
+          Reload-ID:
+            description: ID of the requested reload
+            type: string
+      '204':
         description: Map file replaced
       '400':
         $ref: '#/responses/BadRequest'