fix lint and validate ci

Signed-off-by: Tokesh <[email protected]>
Tokesh · Jul 31, 2024 · 7acf0b6 · 7acf0b6
1 parent 0bea608
commit 7acf0b6
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 42 deletions.
diff --git a/spec/namespaces/sql.yaml b/spec/namespaces/sql.yaml
@@ -6,19 +6,19 @@ info:
 paths:
   /_plugins/_query/settings:
     put:
-        operationId: sql.settings.0
-        x-operation-group: sql.settings
-        x-version-added: '1.0'
-        description: Adds SQL settings to the standard OpenSearch cluster settings.
-        externalDocs:
-          url: https://opensearch.org/docs/latest/search-plugins/sql/settings/
-        parameters:
-          - $ref: '#/components/parameters/sql.settings::query.format'
-        requestBody:
-          $ref: '#/components/requestBodies/sql.settings'
-        responses:
-          '200':
-            $ref: '#/components/responses/sql.settings@200'
+      operationId: sql.settings.0
+      x-operation-group: sql.settings
+      x-version-added: '1.0'
+      description: Adds SQL settings to the standard OpenSearch cluster settings.
+      externalDocs:
+        url: https://opensearch.org/docs/latest/search-plugins/sql/settings/
+      parameters:
+        - $ref: '#/components/parameters/sql.settings::query.format'
+      requestBody:
+        $ref: '#/components/requestBodies/sql.settings'
+      responses:
+        '200':
+          $ref: '#/components/responses/sql.settings@200'
   /_plugins/_sql:
     post:
       operationId: sql.query.0

diff --git a/spec/schemas/sql._common.yaml b/spec/schemas/sql._common.yaml
@@ -104,29 +104,40 @@ components:
       type: object
       properties:
         plugins:
-          type: object
-          properties:
-            ppl:
-              type: object
-              properties:
-                enabled:
-                  type: string
-            query:
-              type: object
-              properties:
-                memory_limit:
-                  type: string
-                size_limit:
-                  type: string
-            sql:
-              type: object
-              properties:
-                enabled:
-                  type: string
-                slowlog:
-                  type: string
-                cursor:
-                  type: object
-                  properties:
-                    keep_alive:
-                      type: string
+          $ref: '#/components/schemas/Plugins'
+    Plugins:
+      type: object
+      properties:
+        ppl:
+          $ref: '#/components/schemas/Ppl'
+        query:
+          $ref: '#/components/schemas/Query'
+        sql:
+          $ref: '#/components/schemas/Sql'
+    Ppl:
+      type: object
+      properties:
+        enabled:
+          type: string
+    Query:
+      type: object
+      properties:
+        memory_limit:
+          type: string
+        size_limit:
+          type: string
+
+    Sql:
+      type: object
+      properties:
+        enabled:
+          type: string
+        slowlog:
+          type: string
+        cursor:
+          $ref: '#/components/schemas/Cursor'
+    Cursor:
+      type: object
+      properties:
+        keep_alive:
+          type: string
diff --git a/tests/sql/settings.yaml b/tests/sql/settings.yaml
@@ -14,11 +14,11 @@ chapters:
               enabled: 'true'
               slowlog: '2'
               cursor:
-                keep_alive: "1m"
+                keep_alive: 1m
             ppl:
               enabled: 'true'
             query:
-              memory_limit: "80%"
-              size_limit: "200"
+              memory_limit: '80%'
+              size_limit: '200'
     response:
       status: 200