From 5f6956886cca58a87396bbf2946f6ba13966abeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Mon, 6 Dec 2021 12:48:28 +0100
Subject: [PATCH 1/8] chore(ci): use composite action

---
 .github/setup/action.yml                | 34 +++++++++++++++++++++++++
 .github/workflows/client_javascript.yml | 15 ++---------
 .github/workflows/cts.yml               |  9 +------
 .github/workflows/specs.yml             | 13 ++--------
 4 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 .github/setup/action.yml

diff --git a/.github/setup/action.yml b/.github/setup/action.yml
new file mode 100644
index 00000000000..64bc9808a88
--- /dev/null
+++ b/.github/setup/action.yml
@@ -0,0 +1,34 @@
+name: Setup
+
+description: Setup GitHub Actions environment
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Update ubuntu packages
+      shell: bash
+      run: apt update
+
+    - uses: actions/setup-java@v2
+      with:
+        distribution: 'zulu'
+        java-version: '11'
+
+    - uses: actions/setup-node@v2
+      with:
+        node-version-file: '.nvmrc'
+        cache: 'yarn'
+        cache-dependency-path: 'yarn.lock'
+
+    - uses: actions/cache@v2
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+
+    - name: Install Dependencies
+      shell: bash
+      run: yarn install
+
+    - name: Install spec linter
+      shell: bash
+      run: apt-get -y install yamllint
diff --git a/.github/workflows/client_javascript.yml b/.github/workflows/client_javascript.yml
index d10b13ff9da..732778b4174 100644
--- a/.github/workflows/client_javascript.yml
+++ b/.github/workflows/client_javascript.yml
@@ -8,19 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-          cache-dependency-path: 'yarn.lock'
-
-      - name: Install Dependencies
-        run: yarn install
+      - uses: './.github/setup/action.yml'
 
       - name: Generate search client
         run: yarn generate:js:search
@@ -39,5 +27,6 @@ jobs:
 
       - name: Build personalization client
         run: yarn client:build-js:personalization
+
       - name: Lint
         run: yarn lint
diff --git a/.github/workflows/cts.yml b/.github/workflows/cts.yml
index ce512506f28..7532542f967 100644
--- a/.github/workflows/cts.yml
+++ b/.github/workflows/cts.yml
@@ -8,14 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v2
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-          cache-dependency-path: 'yarn.lock'
-
-      - name: Install Dependencies
-        run: yarn install
+      - uses: './.github/setup/action.yml'
 
       - name: Generate client
         run: yarn generate:js
diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml
index 88840a75ec6..3fc97ca7ffa 100644
--- a/.github/workflows/specs.yml
+++ b/.github/workflows/specs.yml
@@ -8,16 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-          cache-dependency-path: 'yarn.lock'
+      - uses: './.github/setup/action.yml'
 
       - name: Install Dependencies
         run: yarn install
@@ -29,4 +20,4 @@ jobs:
         run: yarn validate
 
       - name: Lint
-        run: yarn prettier --check specs
+        run: yamllint specs

From 30f92e4dc4068e956cecb9bd58e45ea22a5f1859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Mon, 6 Dec 2021 12:54:32 +0100
Subject: [PATCH 2/8] fix: folders

---
 .github/{ => actions}/setup/action.yml  | 4 ++--
 .github/workflows/client_javascript.yml | 3 ++-
 .github/workflows/cts.yml               | 3 ++-
 .github/workflows/specs.yml             | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename .github/{ => actions}/setup/action.yml (90%)

diff --git a/.github/setup/action.yml b/.github/actions/setup/action.yml
similarity index 90%
rename from .github/setup/action.yml
rename to .github/actions/setup/action.yml
index 64bc9808a88..c91443334be 100644
--- a/.github/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -7,7 +7,7 @@ runs:
   steps:
     - name: Update ubuntu packages
       shell: bash
-      run: apt update
+      run: sudo apt update
 
     - uses: actions/setup-java@v2
       with:
@@ -31,4 +31,4 @@ runs:
 
     - name: Install spec linter
       shell: bash
-      run: apt-get -y install yamllint
+      run: sudo apt-get -y install yamllint
diff --git a/.github/workflows/client_javascript.yml b/.github/workflows/client_javascript.yml
index 732778b4174..9039e66b335 100644
--- a/.github/workflows/client_javascript.yml
+++ b/.github/workflows/client_javascript.yml
@@ -8,7 +8,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: './.github/setup/action.yml'
+      - name: Setup
+        uses: ./.github/actions/setup
 
       - name: Generate search client
         run: yarn generate:js:search
diff --git a/.github/workflows/cts.yml b/.github/workflows/cts.yml
index 7532542f967..c1021c85662 100644
--- a/.github/workflows/cts.yml
+++ b/.github/workflows/cts.yml
@@ -8,7 +8,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: './.github/setup/action.yml'
+      - name: Setup
+        uses: ./.github/actions/setup
 
       - name: Generate client
         run: yarn generate:js
diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml
index 3fc97ca7ffa..3a5ffae31f9 100644
--- a/.github/workflows/specs.yml
+++ b/.github/workflows/specs.yml
@@ -8,7 +8,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: './.github/setup/action.yml'
+      - name: Setup
+        uses: ./.github/actions/setup
 
       - name: Install Dependencies
         run: yarn install

From 414d31f0241ce6e51cd354d47b05294b346ff5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Mon, 6 Dec 2021 16:37:01 +0100
Subject: [PATCH 3/8] fix: unify workflows, use more cache

---
 .github/actions/cache/action.yml        | 32 +++++++++
 .github/actions/setup/action.yml        | 22 +++----
 .github/workflows/check.yml             | 87 +++++++++++++++++++++++++
 .github/workflows/client_javascript.yml | 33 ----------
 .github/workflows/cts.yml               | 24 -------
 .github/workflows/specs.yml             | 24 -------
 6 files changed, 129 insertions(+), 93 deletions(-)
 create mode 100644 .github/actions/cache/action.yml
 create mode 100644 .github/workflows/check.yml
 delete mode 100644 .github/workflows/client_javascript.yml
 delete mode 100644 .github/workflows/cts.yml
 delete mode 100644 .github/workflows/specs.yml

diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
new file mode 100644
index 00000000000..75c564bb844
--- /dev/null
+++ b/.github/actions/cache/action.yml
@@ -0,0 +1,32 @@
+name: Cache
+
+description: Restore cached dependencies.
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Get yarn cache directory path
+      shell: bash
+      id: yarn-cache-dir-path
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+
+    - name: Restore yarn cache
+      uses: actions/cache@v2
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn-
+
+    - name: Restore node_modules
+      uses: actions/cache@v2
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+
+    - name: Restore JavaScript client
+      uses: actions/cache@v2
+      with:
+        path: 'clients/algoliasearch-client-javascript'
+        key: build-${{ hashFiles('**/yarn.lock') }}
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index c91443334be..c86afebbf7d 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -1,31 +1,29 @@
 name: Setup
 
-description: Setup GitHub Actions environment
+description: Setup CI environment.
 
 runs:
   using: 'composite'
   steps:
-    - name: Update ubuntu packages
+    - name: Restore cache
+      uses: ./.github/actions/cache
+
+    - name: Update apt packages
       shell: bash
       run: sudo apt update
 
-    - uses: actions/setup-java@v2
+    - name: Install Java
+      uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
         java-version: '11'
 
-    - uses: actions/setup-node@v2
+    - name: Install Node
+      uses: actions/setup-node@v2
       with:
         node-version-file: '.nvmrc'
-        cache: 'yarn'
-        cache-dependency-path: 'yarn.lock'
-
-    - uses: actions/cache@v2
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
-    - name: Install Dependencies
+    - name: Install JavaScript Dependencies
       shell: bash
       run: yarn install
 
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
new file mode 100644
index 00000000000..465b3ef4ab1
--- /dev/null
+++ b/.github/workflows/check.yml
@@ -0,0 +1,87 @@
+name: specs
+
+on: [push]
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup
+        uses: ./.github/actions/setup
+
+  specs:
+    runs-on: ubuntu-latest
+    needs: setup
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Restore cache
+        uses: ./.github/actions/cache
+
+      - name: Build
+        run: yarn build:spec
+
+      - name: Validate
+        run: yarn validate
+
+      - name: Lint
+        run: yamllint specs
+
+  client_javascript:
+    runs-on: ubuntu-latest
+    needs: [setup, specs]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Restore cache
+        uses: ./.github/actions/cache
+
+      - name: Generate search client
+        run: yarn generate:js:search
+
+      - name: Build search client
+        run: yarn client:build-js:search
+
+      - name: Generate recommend client
+        run: yarn generate:js:recommend
+
+      - name: Build recommend client
+        run: yarn client:build-js:recommend
+
+      - name: Generate personalization client
+        run: yarn generate:js:personalization
+
+      - name: Build personalization client
+        run: yarn client:build-js:personalization
+
+      - name: Lint
+        run: yarn lint
+
+      - name: Cache JavaScript client
+        uses: actions/cache@v2
+        with:
+          path: 'clients/algoliasearch-client-javascript'
+          key: build-${{ hashFiles('**/yarn.lock') }}
+
+  cts:
+    runs-on: ubuntu-latest
+    needs: [setup, specs, client_javascript]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Restore cache
+        uses: ./.github/actions/cache
+
+      - name: Generate client
+        run: yarn generate:js
+
+      - name: Build client
+        run: yarn client:build
+
+      - name: Generate CTS
+        run: yarn cts:generate
+
+      - name: Run CTS
+        run: yarn cts:test
diff --git a/.github/workflows/client_javascript.yml b/.github/workflows/client_javascript.yml
deleted file mode 100644
index 9039e66b335..00000000000
--- a/.github/workflows/client_javascript.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: client_javascript
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup
-        uses: ./.github/actions/setup
-
-      - name: Generate search client
-        run: yarn generate:js:search
-
-      - name: Build search client
-        run: yarn client:build-js:search
-
-      - name: Generate recommend client
-        run: yarn generate:js:recommend
-
-      - name: Build recommend client
-        run: yarn client:build-js:recommend
-
-      - name: Generate personalization client
-        run: yarn generate:js:personalization
-
-      - name: Build personalization client
-        run: yarn client:build-js:personalization
-
-      - name: Lint
-        run: yarn lint
diff --git a/.github/workflows/cts.yml b/.github/workflows/cts.yml
deleted file mode 100644
index c1021c85662..00000000000
--- a/.github/workflows/cts.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: cts
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup
-        uses: ./.github/actions/setup
-
-      - name: Generate client
-        run: yarn generate:js
-
-      - name: Build client
-        run: yarn client:build
-
-      - name: Generate CTS
-        run: yarn cts:generate
-
-      - name: Run CTS
-        run: yarn cts:test
diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml
deleted file mode 100644
index 3a5ffae31f9..00000000000
--- a/.github/workflows/specs.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: specs
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup
-        uses: ./.github/actions/setup
-
-      - name: Install Dependencies
-        run: yarn install
-
-      - name: Build
-        run: yarn build:spec
-
-      - name: Validate
-        run: yarn validate
-
-      - name: Lint
-        run: yamllint specs

From b2c2de8e01c459e50eba68d98a1b436ad5ef18b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Mon, 6 Dec 2021 16:43:19 +0100
Subject: [PATCH 4/8] add yamllint config

---
 .yamllint | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .yamllint

diff --git a/.yamllint b/.yamllint
new file mode 100644
index 00000000000..9a6cb94e594
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,31 @@
+---
+yaml-files:
+  - '*.yml'
+
+rules:
+  line-length:
+    level: warning
+  braces: enable
+  brackets: enable
+  colons: enable
+  commas: enable
+  comments:
+    level: warning
+  comments-indentation:
+    level: warning
+  document-end: disable
+  document-start:
+    level: warning
+  empty-lines: enable
+  empty-values: disable
+  hyphens: enable
+  indentation: enable
+  key-duplicates: enable
+  key-ordering: disable
+  new-line-at-end-of-file: enable
+  new-lines: enable
+  octal-values: disable
+  quoted-strings: disable
+  trailing-spaces: enable
+  truthy:
+    level: warning

From c8299878fda04f7dd04738d9b743734379c95770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Mon, 6 Dec 2021 17:02:14 +0100
Subject: [PATCH 5/8] fix: yamllint options, GA cache keys

---
 .github/actions/cache/action.yml | 6 ++----
 .github/workflows/check.yml      | 4 ++--
 .yamllint                        | 6 ++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
index 75c564bb844..e123beb534c 100644
--- a/.github/actions/cache/action.yml
+++ b/.github/actions/cache/action.yml
@@ -16,17 +16,15 @@ runs:
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
 
     - name: Restore node_modules
       uses: actions/cache@v2
       with:
         path: '**/node_modules'
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
     - name: Restore JavaScript client
       uses: actions/cache@v2
       with:
         path: 'clients/algoliasearch-client-javascript'
-        key: build-${{ hashFiles('**/yarn.lock') }}
+        key: ${{ runner.os }}-clients--${{ hashFiles('**/yarn.lock') }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 465b3ef4ab1..776f3e44995 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,4 +1,4 @@
-name: specs
+name: Checks
 
 on: [push]
 
@@ -63,7 +63,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: 'clients/algoliasearch-client-javascript'
-          key: build-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-clients-${{ hashFiles('**/yarn.lock') }}
 
   cts:
     runs-on: ubuntu-latest
diff --git a/.yamllint b/.yamllint
index 9a6cb94e594..936003eef68 100644
--- a/.yamllint
+++ b/.yamllint
@@ -3,8 +3,7 @@ yaml-files:
   - '*.yml'
 
 rules:
-  line-length:
-    level: warning
+  line-length: disable
   braces: enable
   brackets: enable
   colons: enable
@@ -14,8 +13,7 @@ rules:
   comments-indentation:
     level: warning
   document-end: disable
-  document-start:
-    level: warning
+  document-start: { present: false }
   empty-lines: enable
   empty-values: disable
   hyphens: enable

From c891c2e5e0aa4ccf7534d47526c3dc21f6ee2ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Tue, 7 Dec 2021 15:01:00 +0100
Subject: [PATCH 6/8] apply changes from suggestion

---
 .github/actions/cache/action.yml | 10 ++--------
 .github/actions/setup/action.yml |  2 +-
 .github/workflows/check.yml      | 18 ++++++------------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
index e123beb534c..39edb3ad1f2 100644
--- a/.github/actions/cache/action.yml
+++ b/.github/actions/cache/action.yml
@@ -15,16 +15,10 @@ runs:
       id: yarn-cache
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
 
     - name: Restore node_modules
       uses: actions/cache@v2
       with:
         path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-
-    - name: Restore JavaScript client
-      uses: actions/cache@v2
-      with:
-        path: 'clients/algoliasearch-client-javascript'
-        key: ${{ runner.os }}-clients--${{ hashFiles('**/yarn.lock') }}
+        key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index c86afebbf7d..bf84501fa9f 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -16,7 +16,7 @@ runs:
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: '11'
+        java-version: '11.52.13'
 
     - name: Install Node
       uses: actions/setup-node@v2
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 776f3e44995..da5f08bb0b8 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
 
@@ -12,7 +12,7 @@ jobs:
         uses: ./.github/actions/setup
 
   specs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: setup
     steps:
       - uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
         run: yamllint specs
 
   client_javascript:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [setup, specs]
     steps:
       - uses: actions/checkout@v2
@@ -59,14 +59,8 @@ jobs:
       - name: Lint
         run: yarn lint
 
-      - name: Cache JavaScript client
-        uses: actions/cache@v2
-        with:
-          path: 'clients/algoliasearch-client-javascript'
-          key: ${{ runner.os }}-clients-${{ hashFiles('**/yarn.lock') }}
-
   cts:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [setup, specs, client_javascript]
     steps:
       - uses: actions/checkout@v2
@@ -74,8 +68,8 @@ jobs:
       - name: Restore cache
         uses: ./.github/actions/cache
 
-      - name: Generate client
-        run: yarn generate:js
+      - name: Generate clients
+        run: yarn generate
 
       - name: Build client
         run: yarn client:build

From 8910bd0970cbc1dabba6caa560d8912c329dbf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Tue, 7 Dec 2021 15:03:24 +0100
Subject: [PATCH 7/8] fix: java version

---
 .github/actions/setup/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index bf84501fa9f..01c7e786ce3 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -16,7 +16,7 @@ runs:
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: '11.52.13'
+        java-version: '11.0.4'
 
     - name: Install Node
       uses: actions/setup-node@v2

From 22246e6ada23322c8ecde46be881b1da43bb83cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vannicatte?= <vannicattec@gmail.com>
Date: Tue, 7 Dec 2021 15:25:19 +0100
Subject: [PATCH 8/8] lint specs

---
 .../paths/search/getTopFilterAttributes.yml   |  2 +-
 specs/analytics/spec.yml                      | 14 +++----
 specs/search/spec.yml                         | 38 +++++++++----------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/specs/analytics/paths/search/getTopFilterAttributes.yml b/specs/analytics/paths/search/getTopFilterAttributes.yml
index e012e7acb56..516f9e4a9c5 100644
--- a/specs/analytics/paths/search/getTopFilterAttributes.yml
+++ b/specs/analytics/paths/search/getTopFilterAttributes.yml
@@ -1,2 +1,2 @@
+# handle /2/filters?search= as well
 get:
-# handle /2/filters?search= as well
diff --git a/specs/analytics/spec.yml b/specs/analytics/spec.yml
index 871895b8233..fb71e428c57 100644
--- a/specs/analytics/spec.yml
+++ b/specs/analytics/spec.yml
@@ -13,12 +13,6 @@ security:
   - appId: []
     apiKey: []
 paths:
-  # ########################
-  # ### Status Endpoints ###
-  # ########################
-  /2/status:
-    $ref: './paths/status/getStatus.yml'
-  #
   # ##################################
   # ### Search Analytics Endpoints ###
   # ##################################
@@ -48,7 +42,7 @@ paths:
   #   $ref: './paths/search/getAttributeTopFilters.yml'
   # /2/countries:
   #   $ref: './paths/search/getTopCountries.yml'
-  #
+
   # #################################
   # ### Click Analytics Endpoints ###
   # #################################
@@ -60,3 +54,9 @@ paths:
   #   $ref: './paths/click/getClickThroughRate.yml'
   # /2/conversions/conversionRate:
   #   $ref: './paths/click/getConversionRate.yml'
+
+  # ########################
+  # ### Status Endpoints ###
+  # ########################
+  /2/status:
+    $ref: './paths/status/getStatus.yml'
diff --git a/specs/search/spec.yml b/specs/search/spec.yml
index 9ca319447a6..e75bddb1848 100644
--- a/specs/search/spec.yml
+++ b/specs/search/spec.yml
@@ -20,11 +20,11 @@ paths:
     $ref: './paths/search/search.yml'
   /1/indexes/*/queries:
     $ref: './paths/search/multipleQueries.yml'
-  #/1/indexes/{indexName}/facets/{facetName}/query:
+  # /1/indexes/{indexName}/facets/{facetName}/query:
   #  $ref: './paths/search/searchForFacetValues.yml'
-  #/1/indexes/{indexName}/browse:
+  # /1/indexes/{indexName}/browse:
   #  $ref: './paths/search/browse.yml'
-  #
+
   # #########################
   # ### Objects Endpoints ###
   # #########################
@@ -46,21 +46,13 @@ paths:
   #   $ref: './paths/objects/multipleGetObjects.yml'
   # /1/indexes/{indexName}/{objectID}:
   #   $ref: './paths/objects/getObject.yml'
-  #
+
   # ##########################
   # ### Settings Endpoints ###
   # ##########################
   /1/indexes/{indexName}/settings:
     $ref: './paths/settings/settings.yml'
-  #
-  # ################################
-  # ### Manage Indices Endpoints ###
-  # ################################
-  /1/indexes/{indexName}/operation:
-    $ref: './paths/manage_indices/operationIndex.yml'
-  /1/indexes:
-    $ref: './paths/manage_indices/listIndices.yml'
-  #
+
   # ##########################
   # ### Synonyms Endpoints ###
   # ##########################
@@ -72,7 +64,7 @@ paths:
   #   $ref: './paths/synonyms/clearAllSynonyms.yml'
   # /1/indexes/{indexName}/synonyms/search:
   #   $ref: './paths/synonyms/searchSynonyms.yml'
-  #
+
   # ######################
   # ### Keys Endpoints ###
   # ######################
@@ -82,7 +74,7 @@ paths:
   #   $ref: './paths/keys/key.yml'
   # /1/keys/{key}/restore:
   #   $ref: './paths/keys/restoreApiKey.yml'
-  #
+
   # #######################
   # ### Rules Endpoints ###
   # #######################
@@ -94,7 +86,7 @@ paths:
   #   $ref: './paths/rules/clearRules.yml'
   # /1/indexes/{indexName}/rules/search:
   #   $ref: './paths/rules/searchRules.yml'
-  #
+
   # ##############################
   # ### Dictionaries Endpoints ###
   # ##############################
@@ -106,7 +98,7 @@ paths:
   #   $ref: './paths/dictionaries/dictionarySettings.yml'
   # /1/dictionaries/*/languages:
   #   $ref: './paths/dictionaries/getDictionaryLanguages.yml'
-  #
+
   # ###############################
   # ### MultiClusters Endpoints ###
   # ###############################
@@ -124,7 +116,7 @@ paths:
   #   $ref: './paths/multiclusters/searchUserIds.yml'
   # /1/clusters/mapping/pending:
   #   $ref: './paths/multiclusters/hasPendingMappings.yml'
-  #
+
   # #######################
   # ### Vault Endpoints ###
   # #######################
@@ -134,7 +126,7 @@ paths:
   #   $ref: './paths/vault/appendSource.yml'
   # /1/security/sources/{source}:
   #   $ref: './paths/vault/deleteSource.yml'
-  #
+
   # ##########################
   # ### Advanced Endpoints ###
   # ##########################
@@ -144,3 +136,11 @@ paths:
   #   $ref: './paths/advanced/getTask.yml'
   # /1/isalive:
   #   $ref: './paths/advanced/isAlive.yml'
+
+  # ################################
+  # ### Manage Indices Endpoints ###
+  # ################################
+  /1/indexes/{indexName}/operation:
+    $ref: './paths/manage_indices/operationIndex.yml'
+  /1/indexes:
+    $ref: './paths/manage_indices/listIndices.yml'