Skip to content

Commit

Permalink
Merge branch 'main' into custom-roles-api-spec-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
n1v0lg authored Apr 9, 2024
2 parents 1536fd0 + 17b7bcb commit 514c24f
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16
FROM node:20

WORKDIR /usr/src/app

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 20.x

- name: Install
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compiler.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 20.x

- name: Install deps
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
token: ${{ secrets.PAT }}
persist-credentials: true

- name: Setup Node 16.x
- name: Setup Node 20.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x
cache: npm
cache-dependency-path: '**/package-lock.json'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 20.x

- name: Install
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 20.x

- name: Install
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-rest-api-json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
with:
ref: ${{ matrix.branch }}

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 20.x

- name: Install deps
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
token: ${{ secrets.PAT }}
ref: main

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 20.x

- name: Install deps 1/2
working-directory: ./clients-flight-recorder
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
20
10 changes: 8 additions & 2 deletions specification/_spec_utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@ import { Stringified } from '@spec_utils/Stringified'
* to a missing value. It is used for exemple in settings, where using the `NullValue` for a setting will reset
* it to its default value.
*/
type NullValue = null
export type NullValue = null

/**
* `WithNullValue<T>` allows for explicit null assignments in contexts where `null` should be interpreted as an
* actual value.
*/
export type WithNullValue<T> = T | NullValue

/**
* Settings in Elasticsearch are values that can be reset to their default by setting them to the `null` value.
*
* @es_quirk Because of how they are implemented internally, settings are always returned as strings, even
* if their value has been set using a primitive type.
*/
type Setting<T> = Stringified<T> | NullValue
export type Setting<T> = WithNullValue<Stringified<T>>

0 comments on commit 514c24f

Please sign in to comment.