Chore/config consolidation (#6647)

treeverse · Oct 1, 2023 · 2cbbc4a · 2cbbc4a
1 parent 3a16e7c
commit 2cbbc4a
Show file tree

Hide file tree

Showing 30 changed files with 1,684 additions and 574 deletions.
diff --git a/api/swagger.yml b/api/swagger.yml
@@ -1001,7 +1001,13 @@ components:
           type: boolean
         import_validity_regex:
           type: string
-
+    Config:
+      type: object
+      properties:
+        version_config:
+          $ref: "#/components/schemas/VersionConfig"
+        storage_config:
+          $ref: "#/components/schemas/StorageConfig"
     VersionConfig:
       type: object
       properties:
@@ -4271,12 +4277,28 @@ paths:
       responses:
         204:
           description: NoContent
-  /config/version:
+  /config:
     get:
       tags:
         - config
+      operationId: getConfig
+      description: retrieve lakeFS configuration
+      responses:
+        200:
+          description: lakeFS configuration
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Config"
+        401:
+          $ref: "#/components/responses/Unauthorized"
+  /config/version:
+    get:
+      tags:
+        - internal
       operationId: getLakeFSVersion
       description: get version of lakeFS server
+      deprecated: true
       responses:
         200:
           description: lakeFS version
@@ -4289,9 +4311,10 @@ paths:
   /config/storage:
     get:
       tags:
-        - config
+        - internal
       operationId: getStorageConfig
       description: retrieve lakeFS storage configuration
+      deprecated: true
       responses:
         200:
           description: lakeFS storage configuration

diff --git a/clients/java/README.md b/clients/java/README.md
diff --git a/clients/java/api/openapi.yaml b/clients/java/api/openapi.yaml
diff --git a/clients/java/docs/Config.md b/clients/java/docs/Config.md
diff --git a/clients/java/docs/ConfigApi.md b/clients/java/docs/ConfigApi.md