Removed one of the duplicate '/_nodes/{metric}' and '/_nodes/{node_id…

…}' paths.

Signed-off-by: dblock <[email protected]>

spec/namespaces/nodes.yaml

@@ -253,24 +253,9 @@ paths:
       responses:
         '200':
           $ref: '#/components/responses/nodes.usage@200'
-  /_nodes/{metric}:
-    get:
-      operationId: nodes.info.1
-      x-operation-group: nodes.info
-      x-version-added: '1.0'
-      description: Returns information about nodes in the cluster.
-      externalDocs:
-        url: https://opensearch.org/docs/latest/api-reference/nodes-apis/nodes-info/
-      parameters:
-        - $ref: '#/components/parameters/nodes.info::path.metric'
-        - $ref: '#/components/parameters/nodes.info::query.flat_settings'
-        - $ref: '#/components/parameters/nodes.info::query.timeout'
-      responses:
-        '200':
-          $ref: '#/components/responses/nodes.info@200'
   /_nodes/{node_id}:
     get:
-      operationId: nodes.info.2
+      operationId: nodes.info.1
       x-operation-group: nodes.info
       x-version-added: '1.0'
       description: Returns information about nodes in the cluster.

tools/src/linter/components/NamespacesFolder.ts

@@ -10,6 +10,7 @@
 import NamespaceFile from './NamespaceFile'
 import { type ValidationError } from 'types'
 import FolderValidator from './base/FolderValidator'
+import _ from 'lodash'
 
 export default class NamespacesFolder extends FolderValidator<NamespaceFile> {
   constructor (folder_path: string) {
@@ -21,16 +22,28 @@ export default class NamespacesFolder extends FolderValidator<NamespaceFile> {
   }
 
   validate_duplicate_paths (): ValidationError[] {
-    const paths: Record<string, string[]> = {}
+    const paths: Record<string, [{ path: string, namespace: string }]> = {}
     for (const file of this.files) {
       if (file.spec().paths == null) continue
       Object.keys(file.spec().paths).sort().forEach((path) => {
-        if (paths[path] == null) paths[path] = [file.namespace]
-        else paths[path].push(file.namespace)
+        const normalized_path = path.replaceAll(/\{[^}]+}/g, '{}')
+        const path_entry = {
+          path: path,
+          namespace: file.namespace
+        }
+        if (paths[normalized_path] == null) {
+          paths[normalized_path] = [path_entry]
+        } else {
+          paths[normalized_path].push(path_entry)
+        }
       })
     }
-    return Object.entries(paths).map(([path, namespaces]) => {
-      if (namespaces.length > 1) { return this.error(`Duplicate path '${path}' found in namespaces: ${namespaces.sort().join(', ')}.`) }
+    return Object.entries(paths).map(([_normalized_path, namespaces]) => {
+      if (namespaces.length > 1) {
+        const dup_paths = _.uniq(_.map(namespaces, (entry) => { return `'${entry.path}'` }))
+        const dup_namespaces = _.uniq(_.map(namespaces, (entry) => entry.namespace ))
+        return this.error(`Duplicate path${dup_paths.length > 1 ? 's' : ''} ${_.join(dup_paths, ', ')} found in namespace${dup_namespaces.length > 1 ? 's' : ''}: ${_.join(dup_namespaces, ', ')}.`) 
+      }
     }).filter((e) => e) as ValidationError[]
   }
 }

tools/tests/linter/NamespacesFolder.test.ts

@@ -56,6 +56,11 @@ describe('validate()', () => {
         file: 'invalid_folder/',
         location: 'Folder',
         message: "Duplicate path '/{index}/_rollover' found in namespaces: dup_path_a, dup_path_b, dup_path_c."
+      },
+      {
+        file: 'invalid_folder/',
+        location: 'Folder',
+        message: "Duplicate paths '/nodes/{metric}', '/nodes/{node_id}' found in namespace: dup_path_d."
       }
     ])
   })

tools/tests/linter/fixtures/folder_validators/namespaces/invalid_folder/dup_path_d.yaml

@@ -0,0 +1,3 @@
+paths:
+  '/nodes/{metric}': {}
+  '/nodes/{node_id}': {}