Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging develop to master #5

Merged
merged 76 commits into from
May 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
eb9d532
Pass refreshRequestTimestamp to Pinboard so it can fetch new data whe…
adrianmroz Jun 19, 2020
7f7a0d5
For duplicates, search in series list without initial series. (#642)
adrianmroz Jun 20, 2020
8ff078e
Adjust visualization after changing DataCube in Essence. (#643)
adrianmroz Jun 20, 2020
00dfcbd
Improved bar chart (#628)
adrianmroz Jun 22, 2020
05b244c
Release 1.26.0-beta.0
allegrogroup Jun 22, 2020
c579305
Handle time shift on bar-chart (#646)
adrianmroz Jun 24, 2020
6d707ea
Release 1.26.0-beta.1
allegrogroup Jun 25, 2020
f320671
give dropdown max-height, scroll on overflow (#648)
alexmorten Jul 27, 2020
0f9b342
Release 1.26.0
allegrogroup Jul 28, 2020
f592ef6
Bump @hapi/hoek from 8.5.0 to 8.5.1 (#655)
dependabot[bot] Sep 15, 2020
3352081
Bump node-sass from 4.12.0 to 4.13.1 (#654)
dependabot[bot] Sep 15, 2020
0c5d010
Bump elliptic from 6.5.2 to 6.5.3 (#650)
dependabot[bot] Sep 15, 2020
8acd35d
Pass client IP address to url shortener function (#657)
milimetric Sep 22, 2020
c15582c
Helper for ColorEntry creation. When datum for hovered range is not a…
adrianmroz Oct 7, 2020
c6239fc
Feature/stacked bar chart (#658)
adrianmroz Oct 7, 2020
4d37a8f
Release 1.27.0-beta.0
allegrogroup Oct 7, 2020
5b8a2a3
Feature/e2e bar chart smoke tests (#663)
adrianmroz Oct 8, 2020
ce411d4
Release 1.27.0
allegrogroup Oct 16, 2020
a1d98a6
DynamicSubsetFormula (#667)
adrianmroz Oct 20, 2020
ebbc81a
Release 1.28.0-beta.0
allegrogroup Oct 20, 2020
474937a
Use true when setting 'trust proxy' on express (#668)
milimetric Oct 21, 2020
a4cc91e
If dynamicSubsetFormula returns Expression.TRUE, we can bypass applyi…
adrianmroz Oct 23, 2020
2bec8b3
Release 1.28.1-beta.0
allegrogroup Oct 23, 2020
f4365e2
Update security.md (#662)
akhilsuri02 Nov 9, 2020
de8212f
Modules foundations (#669)
adrianmroz Nov 10, 2020
0b0a2d2
Release 1.28.1-beta.1
allegrogroup Nov 10, 2020
06a4815
Real modules (#675)
adrianmroz Nov 16, 2020
f8e2944
Release 1.28.1-beta.2
allegrogroup Nov 16, 2020
9c98a3b
Release 1.28.1
allegrogroup Nov 26, 2020
682a0f5
Feature/bump node (#681)
adrianmroz Nov 26, 2020
cd4a0a7
update Druid links (#684)
druid-matt Dec 1, 2020
3fd7d74
RequestDecorator modernisation (#683)
adrianmroz Dec 1, 2020
693c682
Plugin loader which understands module names and file paths. (#685)
adrianmroz Dec 2, 2020
a19fff8
query decorator (#686)
adrianmroz Dec 9, 2020
60329fe
Release 1.29.0-beta.0
allegrogroup Dec 9, 2020
dbfdfc3
One timeTag per DataSource (#691)
adrianmroz Jan 7, 2021
146e114
Release 1.29.0-beta.1
allegrogroup Jan 7, 2021
6cbdda7
Use module-loader when loading DruidRequestDecorator. (#692)
adrianmroz Jan 11, 2021
57a4e55
Release 1.29.0-beta.2
allegrogroup Jan 11, 2021
e6ab082
GitHub actions (#694)
mkuthan Jan 25, 2021
b319cff
Bump axios from 0.19.0 to 0.21.1 (#690)
dependabot[bot] Jan 25, 2021
a3d35e9
Automated example Turnilo instance deployment on GCP (#695)
mkuthan Jan 25, 2021
9f74187
Bump ini from 1.3.5 to 1.3.8 (#689)
dependabot[bot] Jan 25, 2021
8e3d6e7
Release 1.29.0
allegrogroup Jan 27, 2021
5d6a844
Retry Options (#699)
adrianmroz-allegro Feb 2, 2021
12beafc
Timeouts (#698)
adrianmroz Feb 2, 2021
0f94dd4
Release 1.30.0-beta.0
allegrogroup Feb 2, 2021
56c583f
Covid19 example dataset (#700)
mkuthan Feb 3, 2021
beaf9d7
Memory increased for demo instance to 1GB to handle Covid19 dataset
mkuthan Feb 3, 2021
5dec8bd
Covid19 dataset optimalization (#703)
mkuthan Feb 3, 2021
11cb499
Increase timeout for loading examples from default 800ms to 2000ms to…
mkuthan Feb 3, 2021
9af37a0
"Try it" section in Readme added - there is a demo public instance tu…
mkuthan Feb 4, 2021
9eb7d93
fix: consider user selected timezone while exporting the reports (#707)
metapraveen Feb 24, 2021
821defe
Release 1.30.0
allegrogroup Feb 24, 2021
cc5cb92
Github action for release management (#711)
mkuthan Mar 2, 2021
8a42f1d
Debug Release action
adrianmroz-allegro Mar 3, 2021
35e5fa3
Debug Release action part 2
adrianmroz-allegro Mar 3, 2021
bc69e71
Debug Release action part 3
adrianmroz-allegro Mar 3, 2021
6ce2bf2
Debug Release action part 4
adrianmroz-allegro Mar 3, 2021
12b4bc5
Debug Release action part 5
adrianmroz-allegro Mar 3, 2021
fa3dc82
Gird (#712)
adrianmroz-allegro Mar 3, 2021
a120797
Release 1.31.0-beta.0
allegrogroup Mar 3, 2021
e5dc8f7
GH action for release management - attempt 5
Honkafritz Mar 4, 2021
a5de685
GH action for release management - attempt 6
Honkafritz Mar 4, 2021
81136e6
GH action for release management - attempt 7
Honkafritz Mar 4, 2021
cdc9828
Release 1.31.0-beta.1
mkuthan Mar 4, 2021
7b244b9
GH action for release management - attempt 8
Honkafritz Mar 4, 2021
91cb7f2
GH action for release management - attempt 9
Honkafritz Mar 4, 2021
fe12050
GH action for release management - attempt 10
Honkafritz Mar 4, 2021
c1fe4ee
squashed commits
bgalek Mar 11, 2021
181814c
Security issue for release management fixed. (#719)
mkuthan Mar 11, 2021
617739b
Release 1.31.0-beta.5
mkuthan Mar 11, 2021
acf04fb
Documentation on GH pages (#720)
mkuthan Mar 15, 2021
bbfec83
Update external links (#726)
l2dy Apr 7, 2021
44c528f
Release 1.31.0
adrianmroz-allegro Apr 12, 2021
b7034e6
Merge pull request #4 from skimhub/merge-upstream-1-31
rathko Apr 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/.git/
/.github/
/.idea/
/build/
/docs/
/node_modules/
/resources/
.dockerignore
.gitignore
.npmignore
LICENSE
NOTICE
README.md
49 changes: 49 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Build

on:
push:
branches:
- master
pull_request:

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [ 12.x, 14.x ]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-

- name: Install dependencies
run: npm ci

- name: Lint
run: npm run lint

- name: Build
run: npm run build

- name: Unit Test
run: npm run test

- name: E2E Test
run: npm run e2e
51 changes: 51 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Deploy

on:
push:
branches:
- master

jobs:
deploy:

runs-on: ubuntu-latest

env:
IMAGE_NAME: eu.gcr.io/${{ secrets.GCP_PROJECT_ID }}/turnilo

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Authenticate on GCP
uses: google-github-actions/setup-gcloud@master
with:
project_id: ${{ secrets.GCP_PROJECT_ID }}
service_account_key: ${{ secrets.GCP_SA_KEY }}
export_default_credentials: true

- name: Configure Docker
run: gcloud auth configure-docker --quiet

- name: Build Docker image
run: docker build . -t $IMAGE_NAME:latest

- name: Push Docker image
run: docker push $IMAGE_NAME:latest

- name: Deploy on GCP
run: |
gcloud run deploy turnilo \
--image $IMAGE_NAME:latest \
--region europe-west1 \
--platform managed \
--allow-unauthenticated \
--quiet \
--port 9090 \
--cpu 1 --memory 1G --max-instances 1 --concurrency 80 \
--args="--examples"

- name: Delete previous Docker image
run: |
gcloud container images list-tags $IMAGE_NAME --filter='-tags:*' --format='get(digest)' --limit=unlimited | \
xargs -I {digest} gcloud container images delete "$IMAGE_NAME@{digest}" --quiet
66 changes: 66 additions & 0 deletions .github/workflows/release-beta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Release Beta

on:
workflow_dispatch:
inputs:
increment:
description: 'Defines which part of a SemVer should be increased during the release process, e.g "major", "minor", "patch" or empty for consecutive release'

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
with:
# changelog is generated from git log
fetch-depth: 0
# release must bypass branch protection rules, built-in GITHUB_TOKEN doesn't work
token: ${{ secrets.RELEASE_GH_TOKEN }}

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

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-

- name: Install dependencies
run: npm ci

- name: Lint
run: npm run lint

- name: Build
run: npm run build

- name: Unit Test
run: npm run test

- name: E2E Test
run: npm run e2e

- name: Configure GIT
run: |
git config user.name "${GITHUB_ACTOR}"
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"

- name: Install release-it
run: npm install -g release-it@13.7.1

- name: Beta Release
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_CONFIG_USERCONFIG: .npmrc-publish
run: |
release-it ${{ github.event.inputs.increment }} --preRelease=beta --ci
72 changes: 72 additions & 0 deletions .github/workflows/release-final.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Release Final

on:
workflow_dispatch:
inputs:
increment:
description: 'Defines which part of a SemVer should be increased during the release process, e.g "major", "minor" or "patch"'
default: 'minor'
required: true

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
with:
# changelog is generated from git log
fetch-depth: 0
# release must bypass branch protection rules, built-in GITHUB_TOKEN doesn't work
token: ${{ secrets.RELEASE_GH_TOKEN }}

- name: Check if branch is not master
if: github.ref != 'refs/heads/master'
run: exit 1

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

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-

- name: Install dependencies
run: npm ci

- name: Lint
run: npm run lint

- name: Build
run: npm run build

- name: Unit Test
run: npm run test

- name: E2E Test
run: npm run e2e

- name: Configure GIT
run: |
git config user.name "${GITHUB_ACTOR}"
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"

- name: Install release-it
run: npm install -g release-it@13.7.1

- name: Final Release
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_CONFIG_USERCONFIG: .npmrc-publish
run: |
release-it ${{ github.event.inputs.increment }} --ci
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/.idea/
/node_modules/
/build/
/.idea/*
/node_modules/*
/build/*
/docs/_site/*
*.iml
*.tgz
config.yml
Expand Down
5 changes: 4 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/.git/
/.github/
/.idea/
/config/
/docs/
Expand All @@ -12,8 +14,9 @@
*.ts
*.tgz
*.iml
.dockerignore
.release-it.json
.sass-lint.yml
.travis.yml
Dockerfile
tsconfig*.json
tslint.json
2 changes: 2 additions & 0 deletions .npmrc-publish
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//registry.npmjs.org/:_authToken=${NPM_TOKEN}

13 changes: 9 additions & 4 deletions .release-it.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{
"pkgFiles": [
"package.json",
"package-lock.json"
]
"git": {
"requireCleanWorkingDir": false
},
"github": {
"release": true
},
"npm": {
"skipChecks": true
}
}
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

46 changes: 46 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#
# BUILD stage
#
FROM node:14.15.4 AS build

WORKDIR /usr/src/app

# Install and cache dependencies
COPY package.json package-lock.json ./
RUN npm ci

# Copy sources (see .dockerignore)
COPY . ./

# Build and test
RUN npm run build

# Prune dev dependencies from node_modules
RUN npm prune --production

#
# RUNTIME stage
#
FROM gcr.io/distroless/nodejs:14 as runtime

WORKDIR /app

# Example configuration and packages.json
COPY --from=build /usr/src/app/config-examples.yaml /usr/src/app/package.json /usr/src/app/package-lock.json ./

# Wikiticker dataset
COPY --from=build /usr/src/app/assets ./assets

# Main JS
COPY --from=build /usr/src/app/bin ./bin

# Build results
COPY --from=build /usr/src/app/build ./build

# Dependencies
COPY --from=build /usr/src/app/node_modules ./node_modules

# Expose default port
EXPOSE 9090

ENTRYPOINT [ "/nodejs/bin/node", "bin/turnilo" ]
Loading