Java client issues fixes backport

.gitattributes

@@ -0,0 +1,4 @@
+output/dangling-types/dangling.csv linguist-generated=true
+output/schema/schema.json linguist-generated=true
+output/schema/validation-errors.json linguist-generated=true
+output/typescript/types.ts linguist-generated=true

.github/download-artifacts/index.js

@@ -40,22 +40,23 @@ const downloadedSpec = join(esFolder, 'rest-api-spec', 'api')
 const specFolder = join(__dirname, '..', '..', 'specification', '_json_spec')
 
 async function downloadArtifacts (opts) {
-  if (typeof opts.version !== 'string') {
-    throw new Error('Missing version')
+  if (typeof opts.version !== 'string' && typeof opts.branch !== 'string') {
+    throw new Error('Missing version or branch')
   }
 
   core.info('Checking out spec and test')
 
-  core.info('Resolving versions')
+  core.info('Resolving version')
   let resolved
   try {
-    resolved = await resolve(opts.version, opts.hash)
+    resolved = await resolve(opts.version || fromBranch(opts.branch), opts.hash)
   } catch (err) {
     core.error(err.message)
     process.exit(1)
   }
 
   opts.version = resolved.version
+  core.info(`Resolved version ${opts.version}`)
 
   core.info('Cleanup')
   await rm(esFolder)
@@ -88,6 +89,16 @@ async function downloadArtifacts (opts) {
 }
 
 async function resolve (version, hash) {
+  if (version === 'latest') {
+    const response = await fetch('https://artifacts-api.elastic.co/v1/versions')
+    if (!response.ok) {
+      throw new Error(`unexpected response ${response.statusText}`)
+    }
+    const { versions } = await response.json()
+    version = versions.pop()
+  }
+
+  core.info(`Resolving version ${version}`)
   const response = await fetch(`https://artifacts-api.elastic.co/v1/versions/${version}`)
   if (!response.ok) {
     throw new Error(`unexpected response ${response.statusText}`)
@@ -136,12 +147,24 @@ async function resolve (version, hash) {
   }
 }
 
+function fromBranch (branch) {
+  if (branch === 'main') {
+    return 'latest'
+  } else if (branch === '7.x') {
+    return '7.x-SNAPSHOT'
+  } else if ((branch.startsWith('7.') || branch.startsWith('8.')) && !isNaN(Number(branch.split('.')[1]))) {
+    return `${branch}-SNAPSHOT`
+  } else {
+    throw new Error(`Cannot derive version from branch '${branch}'`)
+  }
+}
+
 async function main (options) {
   await downloadArtifacts(options)
 }
 
 const options = minimist(process.argv.slice(2), {
-  string: ['id', 'version', 'hash']
+  string: ['id', 'version', 'hash', 'branch']
 })
 main(options).catch(t => {
   core.error(t)

.github/download-artifacts/package.json

@@ -10,10 +10,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@actions/core": "^1.2.7",
+    "@actions/core": "^1.6.0",
     "cross-zip": "^4.0.0",
     "minimist": "^1.2.5",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "^2.6.7",
     "rimraf": "^3.0.2"
   }
 }

.github/labeler.yml

@@ -9,9 +9,3 @@ generator:typescript:
 
 compiler:
   - 'compiler/**/*'
-
-backport-7.x:
-  # Add 'backport-7.x` label to any change to compiler/ts-generator files
-  # as long as the 'specification' hasn't changed
-  - any: ['compiler/**/*', 'typescript-generator/**/*']
-    all: ['!specification/**/*']

.github/workflows/backport.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   backport:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     name: Backport
     steps:
       - name: Backport

.github/workflows/code-format.yml

@@ -10,10 +10,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Use Node.js 14.x
+    - name: Use Node.js 16.x
       uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: 16.x
 
     - name: Install
       run: |

.github/workflows/generate.yml

@@ -0,0 +1,92 @@
+name: Generate Output
+
+on:
+  push:
+    branches:
+      - 'main'
+      - '7.17'
+      - '8.[0-9]+'
+
+  # For debugging purposes:
+  # pull_request:
+  #   types: [opened, synchronize, reopened]
+  #   branches:
+  #     - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'elastic' && github.actor != 'elasticmachine'
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.PAT }}
+        persist-credentials: true
+
+    - name: Setup Node 16.x
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16.x
+        cache: npm
+        cache-dependency-path: '**/package-lock.json'
+
+    - name: Setup Dependencies
+      run: |
+        make setup
+
+    - name: Generate Output
+      run: |
+        make spec-compile
+        make spec-generate
+
+    - name: Check for Changed Files
+      id: changes
+      run: |
+        if [ -n "$(git status --porcelain)" ]; then
+          echo "has-changes=1" >> $GITHUB_OUTPUT
+        fi
+
+    - name: Set Git Identity
+      if: steps.changes.outputs.has-changes == '1'
+      run: |-
+        git config --global user.email "elasticmachine@users.noreply.github.com"
+        git config --global user.name "Elastic Machine"
+
+    - name: Push Output
+      if: steps.changes.outputs.has-changes == '1'
+      run: |
+        cd ./output
+
+        git add -A
+        git commit -m "Update specification output"
+
+        git status
+
+        git push
+
+    # For debugging purposes:
+    # - name: Push Output
+    #   if: steps.changes.outputs.has-changes == '1'
+    #   env:
+    #     BRANCH_NAME: output_${{ github.run_id }}_${{ github.run_attempt }}
+    #   run: |
+    #     cd ./output
+
+    #     git fetch
+    #     git switch main
+
+    #     git add -A
+    #     git commit -m "Update specification output"
+
+    #     git status
+
+    #     git push origin HEAD:refs/heads/${{ env.BRANCH_NAME }}

.github/workflows/linter.yml

@@ -10,10 +10,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Use Node.js 14.x
+    - name: Use Node.js 16.x
       uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: 16.x
 
     - name: Install
       run: |

.github/workflows/update-rest-api-json.yml

@@ -9,37 +9,51 @@ jobs:
   update-rest-api:
     name: Update rest-api-spec
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        branch: ['main', '8.1', '8.0', '7.17']
+
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branch }}
 
-      - name: Use Node.js 14.x
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install deps
         run: |
           npm install --prefix .github/download-artifacts
           npm install --prefix compiler
           npm install --prefix typescript-generator
-
       - name: Download artifacts
         run: |
-          node .github/download-artifacts/index.js --version 7.x-SNAPSHOT
-
+          node .github/download-artifacts/index.js --branch ${{ matrix.branch }}
       - name: Generate output
         run: |
           SKIP_VERSION_UPDATE=true make contrib
-
       - name: Debug git status
         run: |
           git status --porcelain
-
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          title: 'Update rest-api-spec'
+          title: Update rest-api-spec ${{ matrix.branch }}
           body: 'As titled.'
           commit-message: 'Update rest-api-spec'
+          labels: specification
           delete-branch: true
           team-reviewers: elastic/clients-team
+          branch: automated/rest-api-spec-update-${{ matrix.branch }}
+
+      - name: Open an issue if the action fails
+        if: ${{ failure() }}
+        uses: nashmaniac/create-issue-action@v1.1
+        with:
+          title: rest-api-spec update failed
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: bug
+          body: The rest-api-spec action is currently failing, see [here](https://github.com/elastic/elasticsearch-specification/actions/workflows/update-rest-api-json.yml).

.gitignore

@@ -42,10 +42,22 @@ dist/
 flight-recorder-generator/output
 *.d.ts
 java-generator/*.js
-package-lock.json
 specification/**/*.js
 specification/lib
 
 .DS_Store
 
 artifacts
+.github/download-artifacts/package-lock.json
+
+.validation.json
+compiler/lib
+typescript-generator/lib
+
+report
+output/schema/import-*
+output/schema/schema-no-generics.json
+.github/**/package-lock.json
+
+# Editor lockfiles
+.*.swp

.nvmrc

@@ -0,0 +1 @@
+16