Skip to content

Commit 8c7b354

Browse files
AschenAschen
authored
Merge pull request #652 from kuzzleio/7.7.2-proposal
# [7.7.2](https://github.com/kuzzleio/sdk-javascript/releases/tag/7.7.2) (2021-07-21) #### Bug fixes - [ [#651](#651) ] Hotfix heartbeat race condition ([Shiranuit](https://github.com/Shiranuit)) - [ [#648](#648) ] Fix the Jwt.expired getter wrong comparison of micro timestamp and timestamp ([robingrandval](https://github.com/robingrandval)) - [ [#646](#646) ] Fix usage of SearchResult.next with HTTP ([Aschen](https://github.com/Aschen)) - [ [#644](#644) ] Correctly reject aborted queued requests ([scottinet](https://github.com/scottinet)) #### Enhancements - [ [#650](#650) ] Add authenticator function used at reconnection ([Aschen](https://github.com/Aschen)) ---
2 parents 68a346e + 0a9df3f commit 8c7b354

File tree

29 files changed

+628
-346
lines changed

29 files changed

+628
-346
lines changed

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ src/**/*.js.map
44

55
src/Kuzzle.js
66
src/KuzzleError.js
7+
src/RequestTimeoutError.js
78
src/controllers/Auth.js
89
src/controllers/Bulk.js
910
src/controllers/Document.js
@@ -16,6 +17,7 @@ src/core/security/Profile.js
1617
src/core/security/Role.js
1718
src/protocols/abstract/Base.js
1819
src/protocols/abstract/Realtime.js
20+
src/protocols/DisconnectionOrigin.js
1921
src/protocols/Http.js
2022
src/protocols/WebSocket.js
2123
src/protocols/index.js

‎.github/actions/dead-links/action.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/actions/doc-deploy/action.yml‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎.github/actions/tests-ac/action.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ runs:
2323
cp -f ./cypress.json /tmp/admin-console/cypress.json
2424
cd /tmp/admin-console
2525
yarn
26-
yarn add kuzzle-sdk-v${{ inputs.sdk-version }}@"$SDK_DIR"
26+
yarn add kuzzle-sdk-v7.6.1@"$SDK_DIR"
27+
yarn build
2728
shell: bash
2829
- name: Run e2e tests
2930
run: |

‎.github/workflows/pull_request.workflow.yml‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -72,51 +72,53 @@ jobs:
7272
with:
7373
CYPRESS_RECORD_KEY_DOC: ${{ secrets.CYPRESS_RECORD_KEY_DOC }}
7474

75-
# admin-console-tests:
76-
# name: Admin Console Tests
77-
# runs-on: ubuntu-18.04
78-
# needs: [unit-tests]
79-
# steps:
80-
# - uses: actions/checkout@v2
81-
# - name: Cache node modules
82-
# uses: actions/cache@v2
83-
# env:
84-
# cache-name: cache-node-modules
85-
# with:
86-
# path: ~/.npm
87-
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
88-
# restore-keys: |
89-
# ${{ runner.os }}-build-${{ env.cache-name }}-
90-
# ${{ runner.os }}-build-
91-
# ${{ runner.os }}-
92-
# - uses: actions/setup-node@v1
93-
# with:
94-
# node-version: "12"
95-
# - uses: ./.github/actions/tests-ac
96-
# with:
97-
# sdk-version: 7
98-
# cypress-key: ${{ secrets.CYPRESS_RECORD_KEY }}
75+
admin-console-tests:
76+
name: Admin Console Tests
77+
runs-on: ubuntu-18.04
78+
needs: [unit-tests]
79+
steps:
80+
- uses: actions/checkout@v2
81+
- name: Cache node modules
82+
uses: actions/cache@v2
83+
env:
84+
cache-name: cache-node-modules
85+
with:
86+
path: ~/.npm
87+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
88+
restore-keys: |
89+
${{ runner.os }}-build-${{ env.cache-name }}-
90+
${{ runner.os }}-build-
91+
${{ runner.os }}-
92+
- uses: actions/setup-node@v1
93+
with:
94+
node-version: "12"
95+
- uses: ./.github/actions/tests-ac
96+
with:
97+
sdk-version: 7
98+
cypress-key: ${{ secrets.CYPRESS_RECORD_KEY }}
9999

100-
# documentation-dead-links:
101-
# name: Dead links
102-
# runs-on: ubuntu-18.04
103-
# steps:
104-
# - uses: actions/checkout@v2
105-
# - name: Cache node modules
106-
# uses: actions/cache@v2
107-
# env:
108-
# cache-name: cache-node-modules
109-
# with:
110-
# path: ~/.npm
111-
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
112-
# restore-keys: |
113-
# ${{ runner.os }}-build-${{ env.cache-name }}-
114-
# ${{ runner.os }}-build-
115-
# ${{ runner.os }}-
116-
# - uses: actions/setup-node@v1.4.4
117-
# with:
118-
# node-version: "12"
119-
# - uses: ./.github/actions/dead-links
100+
doc-dead-links:
101+
name: Check dead-links
102+
runs-on: ubuntu-latest
103+
steps:
104+
- uses: actions/checkout@v2
105+
with:
106+
fetch-depth: 0
107+
- name: Extract references from context
108+
shell: bash
109+
id: extract-refs
110+
run: |
111+
echo "::set-output name=version::$(git describe --abbrev=0 --tags | cut -d. -f 1)"
112+
echo "::set-output name=repo::$(echo $GITHUB_REPOSITORY | cut -d/ -f 2)"
113+
echo "::set-output name=fw-branch::$(if [ $BASE_BRANCH == master ]; then echo master; else echo develop; fi)"
114+
- uses: convictional/trigger-workflow-and-wait@v1.3.0
115+
with:
116+
owner: kuzzleio
117+
repo: documentation
118+
github_token: ${{ secrets.ACCESS_TOKEN_CI }}
119+
workflow_file_name: dead_links.workflow.yml
120+
ref: ${{ steps.extract-refs.outputs.fw-branch }}
121+
inputs: '{"repo_name": "${{ steps.extract-refs.outputs.repo }}", "branch": "${{ github.head_ref }}", "version": "${{ steps.extract-refs.outputs.version }}"}'
120122

121123
documentation-snippet-tests:
122124
name: Documentation Snippet Tests

‎.github/workflows/push_dev.workflow.yml‎

Lines changed: 23 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -75,34 +75,10 @@ jobs:
7575
with:
7676
CYPRESS_RECORD_KEY_DOC: ${{ secrets.CYPRESS_RECORD_KEY_DOC }}
7777

78-
# admin-console-tests:
79-
# name: Admin Console Tests
80-
# runs-on: ubuntu-18.04
81-
# needs: [unit-tests]
82-
# steps:
83-
# - uses: actions/checkout@v2
84-
# - name: Cache node modules
85-
# uses: actions/cache@v2
86-
# env:
87-
# cache-name: cache-node-modules
88-
# with:
89-
# path: ~/.npm
90-
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
91-
# restore-keys: |
92-
# ${{ runner.os }}-build-${{ env.cache-name }}-
93-
# ${{ runner.os }}-build-
94-
# ${{ runner.os }}-
95-
# - uses: actions/setup-node@v1
96-
# with:
97-
# node-version: "12"
98-
# - uses: ./.github/actions/tests-ac
99-
# with:
100-
# sdk-version: 7
101-
# cypress-key: ${{ secrets.CYPRESS_RECORD_KEY }}
102-
103-
documentation-dead-links:
104-
name: Dead links
78+
admin-console-tests:
79+
name: Admin Console Tests
10580
runs-on: ubuntu-18.04
81+
needs: [unit-tests]
10682
steps:
10783
- uses: actions/checkout@v2
10884
- name: Cache node modules
@@ -116,10 +92,13 @@ jobs:
11692
${{ runner.os }}-build-${{ env.cache-name }}-
11793
${{ runner.os }}-build-
11894
${{ runner.os }}-
119-
- uses: actions/setup-node@v1.4.4
95+
- uses: actions/setup-node@v1
12096
with:
12197
node-version: "12"
122-
- uses: ./.github/actions/dead-links
98+
- uses: ./.github/actions/tests-ac
99+
with:
100+
sdk-version: 7
101+
cypress-key: ${{ secrets.CYPRESS_RECORD_KEY }}
123102

124103
documentation-snippet-tests:
125104
name: Documentation Snippet Tests
@@ -148,28 +127,22 @@ jobs:
148127
documentation-staging:
149128
name: Deployment Documentation to staging
150129
runs-on: ubuntu-18.04
151-
needs: [functional-tests, admin-console-tests, documentation-snippet-tests, documentation-dead-links]
130+
needs: [functional-tests, admin-console-tests, documentation-snippet-tests]
152131
steps:
153132
- uses: actions/checkout@v2
154-
- name: Cache node modules
155-
uses: actions/cache@v2
156-
env:
157-
cache-name: cache-node-modules
158133
with:
159-
path: ~/.npm
160-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
161-
restore-keys: |
162-
${{ runner.os }}-build-${{ env.cache-name }}-
163-
${{ runner.os }}-build-
164-
${{ runner.os }}-
165-
- uses: actions/setup-node@v1
166-
with:
167-
node-version: "12"
168-
- uses: ./.github/actions/doc-deploy
134+
fetch-depth: 0
135+
- name: Extract references from context
136+
shell: bash
137+
id: extract-refs
138+
run: |
139+
echo "::set-output name=version::$(git describe --abbrev=0 --tags | cut -d. -f 1)"
140+
echo "::set-output name=repo::$(echo $GITHUB_REPOSITORY | cut -d/ -f 2)"
141+
- uses: convictional/trigger-workflow-and-wait@v1.3.0
169142
with:
170-
REGION: us-west-2
171-
S3_BUCKET: docs-next.kuzzle.io
172-
CLOUDFRONT_ID: E2ZCCEK9GRB49U
173-
FRAMEWORK_BRANCH: develop
174-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
175-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
143+
owner: kuzzleio
144+
repo: documentation
145+
github_token: ${{ secrets.ACCESS_TOKEN_CI }}
146+
workflow_file_name: child_repo.workflow.yml
147+
ref: develop
148+
inputs: '{"repo_name": "${{ steps.extract-refs.outputs.repo }}", "branch": "${{ github.head_ref }}", "version": "${{ steps.extract-refs.outputs.version }}"}'

0 commit comments

Comments
 (0)