Merge tag 'main' of github.com:opensearch-project/opensearch-api-spec…

…ification into transforms

.github/CODEOWNERS

@@ -1 +1 @@
-*   @abhivka7 @dblock @harshavamsi @pgtgrly @sachetalva @nhtruong @Xtansia @VachaShah
+*   @dblock @harshavamsi @sachetalva @nhtruong @Xtansia @VachaShah @Tokesh @aabeshov

.github/workflows/build.yml

@@ -21,13 +21,10 @@ jobs:
           node-version: '20'
 
       - name: Build
-        working-directory: ./tools
         run: |-
-          mkdir -p ../build
+          mkdir -p ./build
           npm install
-          export ROOT_PATH=../spec
-          export OUTPUT_PATH=../build/opensearch-openapi.yaml
-          npm run merge -- $ROOT_PATH $OUTPUT_PATH
+          npm run merge -- --source ./spec --output ./build/opensearch-openapi.yaml
 
       - name: Extract Branch Name
         id: branch

.github/workflows/coverage-gather.yml

@@ -15,13 +15,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Build Spec
-        working-directory: ./tools
         run: |-
-          mkdir -p ../build
+          mkdir -p ./build
           npm install
-          export ROOT_PATH=../spec
-          export OUTPUT_PATH=../build/opensearch-openapi.yaml
-          npm run merge -- $ROOT_PATH $OUTPUT_PATH
+          npm run merge -- --source ./spec --output ./build/opensearch-openapi.yaml
       - name: Build and Run Docker Container
         run: |
           docker build coverage --tag opensearch-with-api-plugin

.github/workflows/links.yml

@@ -14,4 +14,4 @@ jobs:
         uses: lycheeverse/lychee-action@v1
         with:
           fail: true
-          args: --base . --verbose --no-progress './**/*.yaml' './**/*.yml' './**/*.md' './**/*.json'  './**/*.ts' --exclude-path ./tools/package-lock.json
+          args: --base . --verbose --no-progress './**/*.yaml' './**/*.yml' './**/*.md' './**/*.json'  './**/*.ts' --exclude-path ./package-lock.json

.github/workflows/lint.yml

@@ -5,24 +5,21 @@ on:
     branches: ['**']
     paths:
       - 'spec/**'
-      - 'tools/linter/**'
+      - 'tools/src/linter/**'
   pull_request:
     branches: ['**']
     paths:
       - 'spec/**'
-      - 'tools/linter/**'
+      - 'tools/src/linter/**'
 
 jobs:
   lint-spec:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: tools
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 20.10.0
       - run: npm install
       - run: |
-          npm run lint:spec -- ../spec
+          npm run lint:spec -- --source ./spec

.github/workflows/tools.yml

@@ -13,9 +13,6 @@ on:
 jobs:
   tools-tests:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: tools
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

DEVELOPER_GUIDE.md

@@ -118,7 +118,7 @@ This repository includes several OpenAPI Specification Extensions to fill in any
 
 ## Tools
 
-We authored a number of tools to merge and lint specs that live in [tools](tools). All tools have tests (run with `npm run test`) and a linter (run with `npm run lint`).
+We authored a number of tools to merge and lint specs that live in [tools](./tools/src/). All tools have tests (run with `npm run test`) and a linter (run with `npm run lint`).
 
 ### Merger
 

MAINTAINERS.md

@@ -8,12 +8,20 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 ## Current Maintainers
 
 | Maintainer           | GitHub ID                                     | Affiliation |
-| -------------------- | --------------------------------------------- | ----------- |
-| Abhi Kalra           | [abhivka7](https://github.com/abhivka7)       | Amazon      |
+|----------------------|-----------------------------------------------|-------------|
+| Alen Abeshov         | [aabeshov](https://github.com/aabeshov)       |             |
 | Daniel Doubrovkine   | [dblock](https://github.com/dblock)           | Amazon      |
 | Harsha Vamsi Kalluri | [harshavamsi](https://github.com/harshavamsi) | Amazon      |
-| Pranav Garg          | [pgtgrly](https://github.com/pgtgrly)         | Amazon      |
 | Sachet Alva          | [sachetalva](https://github.com/sachetalva)   | Amazon      |
 | Theo Truong          | [nhtruong](https://github.com/nhtruong)       | Amazon      |
 | Thomas Farr          | [Xtansia](https://github.com/Xtansia)         | Amazon      |
+| Torekeldi Niyazbek   | [Tokesh](https://github.com/Tokesh)           |             |
 | Vacha Shah           | [VachaShah](https://github.com/VachaShah)     | Amazon      |
+
+
+## Emeritus
+
+| Maintainer  | GitHub ID                               | Affiliation |
+|-------------|-----------------------------------------|-------------|
+| Abhi Kalra  | [abhivka7](https://github.com/abhivka7) | Amazon      |
+| Pranav Garg | [pgtgrly](https://github.com/pgtgrly)   | Amazon      |

README.md

@@ -52,7 +52,7 @@ Click [here](https://github.com/opensearch-project/opensearch-api-specification/
 
 ## Security
 
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to aws-security@amazon.com. Please do **not** create a public GitHub issue.
+If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do **not** create a public GitHub issue.
 
 ## License
 

SECURITY.md

@@ -1,3 +1,3 @@
 ## Reporting a Vulnerability
 
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to aws-security@amazon.com. Please do **not** create a public GitHub issue.
+If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do **not** create a public GitHub issue.

_plugins/openapi.rb

@@ -2,10 +2,8 @@ module OpenAPI
   def self.generate(_site, _payload)
     return if @generated
 
-    Dir.chdir('tools') do
-      system 'npm install'
-      system 'npm run merge -- ../spec ../_site/opensearch-openapi.yaml'
-    end
+    system 'npm install'
+    system 'npm run merge -- --source ./spec --output ./_site/opensearch-openapi.yaml'
 
     @generated = true
   end

tools/jest.config.js → jest.config.js

@@ -1,5 +1,6 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
   preset: 'ts-jest',
-  testEnvironment: 'node'
+  testEnvironment: 'node',
+  moduleDirectories: ['node_modules', './tools/src']
 }

tools/package.json → package.json

@@ -5,17 +5,19 @@
   "author": "opensearch-project",
   "license": "Apache-2.0",
   "scripts": {
-    "merge": "ts-node merger/merge.ts",
-    "lint:spec": "ts-node linter/lint.ts",
+    "merge": "ts-node tools/src/merger/merge.ts",
+    "lint:spec": "ts-node tools/src/linter/lint.ts",
     "lint": "eslint .",
     "test": "jest"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
+    "@commander-js/extra-typings": "^12.0.1",
     "@types/lodash": "^4.14.202",
     "@types/node": "^20.10.3",
     "ajv": "^8.13.0",
     "ajv-formats": "^3.0.1",
+    "commander": "^12.0.0",
     "lodash": "^4.17.21",
     "ts-node": "^10.9.1",
     "typescript": "^5.4.5",

spec/_info.yaml

@@ -1,4 +1,4 @@
-$schema: ../json_schemas/_info.schema.yaml
+$schema: ./json_schemas/_info.schema.yaml
 
 title: OpenSearch API Specification
 version: 1.0.0

spec/_superseded_operations.yaml

@@ -1,4 +1,4 @@
-$schema: ../json_schemas/_superseded_operations.schema.yaml
+$schema: ./json_schemas/_superseded_operations.schema.yaml
 
 /_opendistro/_alerting/destinations:
   superseded_by: /_plugins/_alerting/destinations
@@ -368,6 +368,14 @@ $schema: ../json_schemas/_superseded_operations.schema.yaml
   superseded_by: /_plugins/_rollup/jobs/{rollupID}/_stop
   operations:
     - POST
+/_opendistro/_security/api/_upgrade_check/:
+  superseded_by: /_plugins/_security/api/_upgrade_check/
+  operations:
+    - GET
+/_opendistro/_security/api/_upgrade_perform/:
+  superseded_by: /_plugins/_security/api/_upgrade_perform/
+  operations:
+    - POST
 /_opendistro/_security/api/account:
   superseded_by: /_plugins/_security/api/account
   operations:
@@ -393,8 +401,8 @@ $schema: ../json_schemas/_superseded_operations.schema.yaml
   operations:
     - GET
     - PUT
-    - DELETE
     - PATCH
+    - DELETE
 /_opendistro/_security/api/audit/:
   superseded_by: /_plugins/_security/api/audit/
   operations:
@@ -476,17 +484,33 @@ $schema: ../json_schemas/_superseded_operations.schema.yaml
   superseded_by: /_plugins/_security/api/ssl/certs
   operations:
     - GET
-/_opendistro/_security/api/ssl/{certType}/reloadcerts/:
-  superseded_by: /_plugins/_security/api/ssl/{certType}/reloadcerts/
+/_opendistro/_security/api/ssl/transport/reloadcerts:
+  superseded_by: /_plugins/_security/api/ssl/transport/reloadcerts
+  operations:
+    - PUT
+/_opendistro/_security/api/ssl/http/reloadcerts:
+  superseded_by: /_plugins/_security/api/ssl/http/reloadcerts
+  operations:
+    - PUT
+/_opendistro/_security/api/nodesdn:
+  superseded_by: /_plugins/_security/api/nodesdn/
+  operations:
+    - GET
+    - PATCH
+/_opendistro/_security/api/nodesdn/{cluster_name}:
+  superseded_by: /_plugins/_security/api/nodesdn/{cluster_name}
   operations:
+    - GET
     - PUT
+    - PATCH
+    - DELETE
 /_opendistro/_security/api/tenancy/config:
   superseded_by: /_plugins/_security/api/tenancy/config
   operations:
     - GET
     - PUT
-/_opendistro/_security/api/tenants/:
-  superseded_by: /_plugins/_security/api/tenants/
+/_opendistro/_security/api/tenants:
+  superseded_by: /_plugins/_security/api/tenants
   operations:
     - GET
     - PATCH
@@ -497,8 +521,8 @@ $schema: ../json_schemas/_superseded_operations.schema.yaml
     - PUT
     - DELETE
     - PATCH
-/_opendistro/_security/api/user/:
-  superseded_by: /_plugins/_security/api/user/
+/_opendistro/_security/api/user:
+  superseded_by: /_plugins/_security/api/user
   operations:
     - GET
 /_opendistro/_security/api/user/{name}:
@@ -521,6 +545,12 @@ $schema: ../json_schemas/_superseded_operations.schema.yaml
     - GET
     - PUT
     - PATCH
+/_opendistro/_security/api/allowlist:
+  superseded_by: /_plugins/_security/api/allowlist
+  operations:
+    - GET
+    - PUT
+    - PATCH
 /_opendistro/_security/authinfo:
   superseded_by: /_plugins/_security/authinfo
   operations:
@@ -532,14 +562,10 @@ $schema: ../json_schemas/_superseded_operations.schema.yaml
     - GET
     - POST
 /_opendistro/_security/kibanainfo:
-  superseded_by: /_plugins/_security/kibanainfo
+  superseded_by: /_plugins/_security/dashboardsinfo
   operations:
     - GET
     - POST
-/_opendistro/_security/sslinfo:
-  superseded_by: /_plugins/_security/sslinfo
-  operations:
-    - GET
 /_opendistro/_security/tenantinfo:
   superseded_by: /_plugins/_security/tenantinfo
   operations: