Skip to content

Commit 2dee9a0

Browse files
nelsonwellsredisnelsonwellsredis
committed
RI-5042: Add RI_ prefix to tls cert env vars, change API_PORT to RI_APP_PORT
1 parent cd578bd commit 2dee9a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+820
-496
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,8 +871,8 @@ jobs:
871871
fi
872872
873873
docker build --build-arg NODE_ENV=<< parameters.env >> \
874-
--build-arg SERVER_TLS_CERT="$SERVER_TLS_CERT" \
875-
--build-arg SERVER_TLS_KEY="$SERVER_TLS_KEY" \
874+
--build-arg RI_SERVER_TLS_CERT="$RI_SERVER_TLS_CERT" \
875+
--build-arg RI_SERVER_TLS_KEY="$RI_SERVER_TLS_KEY" \
876876
--build-arg SEGMENT_WRITE_KEY="$TELEMETRY" \
877877
-t riv2:latest .
878878

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ FROM node:18.18-alpine
4343

4444
# runtime args and environment variables
4545
ARG NODE_ENV=production
46-
ARG SERVER_TLS_CERT
47-
ARG SERVER_TLS_KEY
46+
ARG RI_SERVER_TLS_CERT
47+
ARG RI_SERVER_TLS_KEY
4848
ARG SEGMENT_WRITE_KEY
49-
ENV SERVER_TLS_CERT=${SERVER_TLS_CERT}
50-
ENV SERVER_TLS_KEY=${SERVER_TLS_KEY}
49+
ENV RI_SERVER_TLS_CERT=${RI_SERVER_TLS_CERT}
50+
ENV RI_SERVER_TLS_KEY=${RI_SERVER_TLS_KEY}
5151
ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
5252
ENV NODE_ENV=${NODE_ENV}
5353
ENV SERVER_STATIC_CONTENT=true

‎configs/webpack.config.main.prod.ts‎

Lines changed: 51 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ export default merge(baseConfig, {
4747

4848
plugins: [
4949
new BundleAnalyzerPlugin({
50-
analyzerMode: process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
50+
analyzerMode:
51+
process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
5152
openAnalyzer: process.env.OPEN_ANALYZER === 'true',
5253
}),
5354

@@ -56,30 +57,61 @@ export default merge(baseConfig, {
5657
DEBUG_PROD: false,
5758
START_MINIMIZED: false,
5859
APP_ENV: 'electron',
59-
SERVER_TLS: true,
60-
SERVER_TLS_CERT: process.env.SERVER_TLS_CERT || '',
61-
SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
60+
RI_SERVER_TLS: true,
61+
RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
62+
RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
6263
APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
6364
UPGRADES_LINK: process.env.UPGRADES_LINK || '',
6465
RI_HOSTNAME: '127.0.0.1',
6566
BUILD_TYPE: 'ELECTRON',
6667
APP_VERSION: version,
67-
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
68-
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
69-
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
70-
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
71-
: toString(30 * 1000), // 30 sec
68+
AWS_BUCKET_NAME:
69+
'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
70+
SEGMENT_WRITE_KEY:
71+
'SEGMENT_WRITE_KEY' in process.env
72+
? process.env.SEGMENT_WRITE_KEY
73+
: 'SOURCE_WRITE_KEY',
74+
CONNECTIONS_TIMEOUT_DEFAULT:
75+
'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
76+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
77+
: toString(30 * 1000), // 30 sec
7278
// cloud auth
73-
RI_CLOUD_IDP_AUTHORIZE_URL: 'RI_CLOUD_IDP_AUTHORIZE_URL' in process.env ? process.env.RI_CLOUD_IDP_AUTHORIZE_URL: '',
74-
RI_CLOUD_IDP_TOKEN_URL: 'RI_CLOUD_IDP_TOKEN_URL' in process.env ? process.env.RI_CLOUD_IDP_TOKEN_URL: '',
75-
RI_CLOUD_IDP_ISSUER: 'RI_CLOUD_IDP_ISSUER' in process.env ? process.env.RI_CLOUD_IDP_ISSUER: '',
76-
RI_CLOUD_IDP_CLIENT_ID: 'RI_CLOUD_IDP_CLIENT_ID' in process.env ? process.env.RI_CLOUD_IDP_CLIENT_ID: '',
77-
RI_CLOUD_IDP_REDIRECT_URI: 'RI_CLOUD_IDP_REDIRECT_URI' in process.env ? process.env.RI_CLOUD_IDP_REDIRECT_URI: '',
78-
RI_CLOUD_IDP_GOOGLE_ID: 'RI_CLOUD_IDP_GOOGLE_ID' in process.env ? process.env.RI_CLOUD_IDP_GOOGLE_ID: '',
79-
RI_CLOUD_IDP_GH_ID: 'RI_CLOUD_IDP_GH_ID' in process.env ? process.env.RI_CLOUD_IDP_GH_ID: '',
80-
RI_CLOUD_API_URL: 'RI_CLOUD_API_URL' in process.env ? process.env.RI_CLOUD_API_URL: '',
81-
RI_CLOUD_CAPI_URL: 'RI_CLOUD_CAPI_URL' in process.env ? process.env.RI_CLOUD_CAPI_URL: '',
82-
RI_CLOUD_API_TOKEN: 'RI_CLOUD_API_TOKEN' in process.env ? process.env.RI_CLOUD_API_TOKEN: '',
79+
RI_CLOUD_IDP_AUTHORIZE_URL:
80+
'RI_CLOUD_IDP_AUTHORIZE_URL' in process.env
81+
? process.env.RI_CLOUD_IDP_AUTHORIZE_URL
82+
: '',
83+
RI_CLOUD_IDP_TOKEN_URL:
84+
'RI_CLOUD_IDP_TOKEN_URL' in process.env
85+
? process.env.RI_CLOUD_IDP_TOKEN_URL
86+
: '',
87+
RI_CLOUD_IDP_ISSUER:
88+
'RI_CLOUD_IDP_ISSUER' in process.env
89+
? process.env.RI_CLOUD_IDP_ISSUER
90+
: '',
91+
RI_CLOUD_IDP_CLIENT_ID:
92+
'RI_CLOUD_IDP_CLIENT_ID' in process.env
93+
? process.env.RI_CLOUD_IDP_CLIENT_ID
94+
: '',
95+
RI_CLOUD_IDP_REDIRECT_URI:
96+
'RI_CLOUD_IDP_REDIRECT_URI' in process.env
97+
? process.env.RI_CLOUD_IDP_REDIRECT_URI
98+
: '',
99+
RI_CLOUD_IDP_GOOGLE_ID:
100+
'RI_CLOUD_IDP_GOOGLE_ID' in process.env
101+
? process.env.RI_CLOUD_IDP_GOOGLE_ID
102+
: '',
103+
RI_CLOUD_IDP_GH_ID:
104+
'RI_CLOUD_IDP_GH_ID' in process.env
105+
? process.env.RI_CLOUD_IDP_GH_ID
106+
: '',
107+
RI_CLOUD_API_URL:
108+
'RI_CLOUD_API_URL' in process.env ? process.env.RI_CLOUD_API_URL : '',
109+
RI_CLOUD_CAPI_URL:
110+
'RI_CLOUD_CAPI_URL' in process.env ? process.env.RI_CLOUD_CAPI_URL : '',
111+
RI_CLOUD_API_TOKEN:
112+
'RI_CLOUD_API_TOKEN' in process.env
113+
? process.env.RI_CLOUD_API_TOKEN
114+
: '',
83115
}),
84116

85117
new webpack.DefinePlugin({

‎configs/webpack.config.main.stage.ts‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,24 @@ export default merge(mainProdConfig, {
2121
DEBUG_PROD: false,
2222
START_MINIMIZED: false,
2323
APP_ENV: 'electron',
24-
SERVER_TLS: true,
25-
SERVER_TLS_CERT: process.env.SERVER_TLS_CERT || '',
26-
SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
24+
RI_SERVER_TLS: true,
25+
RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
26+
RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
2727
APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
2828
UPGRADES_LINK: process.env.UPGRADES_LINK || '',
2929
RI_HOSTNAME: '127.0.0.1',
3030
BUILD_TYPE: 'ELECTRON',
3131
APP_VERSION: version,
32-
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
33-
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
34-
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
35-
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
36-
: toString(30 * 1000), // 30 sec
32+
AWS_BUCKET_NAME:
33+
'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
34+
SEGMENT_WRITE_KEY:
35+
'SEGMENT_WRITE_KEY' in process.env
36+
? process.env.SEGMENT_WRITE_KEY
37+
: 'SOURCE_WRITE_KEY',
38+
CONNECTIONS_TIMEOUT_DEFAULT:
39+
'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
40+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
41+
: toString(30 * 1000), // 30 sec
3742
}),
3843
],
3944
});

‎configs/webpack.config.renderer.prod.ts‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import { version } from '../redisinsight/package.json';
1111

1212
DeleteSourceMaps();
1313

14-
const htmlPagesNames = ['splash.ejs', 'index.ejs']
15-
const apiUrl = process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY
16-
? 'https://localhost'
17-
: 'http://localhost'
14+
const htmlPagesNames = ['splash.ejs', 'index.ejs'];
15+
const apiUrl =
16+
process.env.RI_SERVER_TLS_CERT && process.env.RI_SERVER_TLS_KEY
17+
? 'https://localhost'
18+
: 'http://localhost';
1819

1920
const devtoolsConfig =
2021
process.env.DEBUG_PROD === 'true'
@@ -180,7 +181,10 @@ const configuration: webpack.Configuration = {
180181
},
181182

182183
plugins: [
183-
new MonacoWebpackPlugin({ languages: ['json', 'javascript', 'typescript'], features: ['!rename'] }),
184+
new MonacoWebpackPlugin({
185+
languages: ['json', 'javascript', 'typescript'],
186+
features: ['!rename'],
187+
}),
184188

185189
new webpack.EnvironmentPlugin({
186190
NODE_ENV: 'production',
@@ -190,14 +194,15 @@ const configuration: webpack.Configuration = {
190194
filename: 'style.css',
191195
}),
192196

193-
...htmlPagesNames.map((htmlPageName) => (
194-
new HtmlWebpackPlugin({
195-
filename: path.join(`${htmlPageName.split('.')?.[0]}.html`),
196-
template: path.join(webpackPaths.desktopPath, htmlPageName),
197-
isBrowser: false,
198-
isDevelopment: false,
199-
})
200-
)),
197+
...htmlPagesNames.map(
198+
(htmlPageName) =>
199+
new HtmlWebpackPlugin({
200+
filename: path.join(`${htmlPageName.split('.')?.[0]}.html`),
201+
template: path.join(webpackPaths.desktopPath, htmlPageName),
202+
isBrowser: false,
203+
isDevelopment: false,
204+
})
205+
),
201206

202207
new webpack.DefinePlugin({
203208
'process.type': '"renderer"',
@@ -211,12 +216,14 @@ const configuration: webpack.Configuration = {
211216
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
212217
'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
213218
'process.env.APP_VERSION': JSON.stringify(version),
214-
'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
215-
? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
216-
: JSON.stringify(30 * 1000),
217-
'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
218-
? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
219-
: JSON.stringify('SOURCE_WRITE_KEY'),
219+
'process.env.CONNECTIONS_TIMEOUT_DEFAULT':
220+
'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
221+
? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
222+
: JSON.stringify(30 * 1000),
223+
'process.env.SEGMENT_WRITE_KEY':
224+
'SEGMENT_WRITE_KEY' in process.env
225+
? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
226+
: JSON.stringify('SOURCE_WRITE_KEY'),
220227
}),
221228
],
222229
};

‎configs/webpack.config.renderer.stage.ts‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import { version } from '../redisinsight/package.json';
77

88
DeleteSourceMaps();
99

10-
const apiUrl = process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY
11-
? 'https://localhost'
12-
: 'http://localhost'
10+
const apiUrl =
11+
process.env.RI_SERVER_TLS_CERT && process.env.RI_SERVER_TLS_KEY
12+
? 'https://localhost'
13+
: 'http://localhost';
1314

1415
export default merge(baseConfig, {
1516
...rendererProdConfig,
@@ -31,12 +32,14 @@ export default merge(baseConfig, {
3132
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
3233
'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
3334
'process.env.APP_VERSION': JSON.stringify(version),
34-
'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
35-
? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
36-
: JSON.stringify(30 * 1000),
37-
'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
38-
? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
39-
: JSON.stringify('SOURCE_WRITE_KEY'),
35+
'process.env.CONNECTIONS_TIMEOUT_DEFAULT':
36+
'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
37+
? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
38+
: JSON.stringify(30 * 1000),
39+
'process.env.SEGMENT_WRITE_KEY':
40+
'SEGMENT_WRITE_KEY' in process.env
41+
? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
42+
: JSON.stringify('SOURCE_WRITE_KEY'),
4043
}),
4144
],
4245
});

‎configs/webpack.config.web.common.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import { dependencies as externalsApi } from '../redisinsight/api/package.json';
1313
export default {
1414
target: 'web',
1515

16-
externals: [...Object.keys(externals || {}), ...Object.keys(externalsApi || {})],
16+
externals: [
17+
...Object.keys(externals || {}),
18+
...Object.keys(externalsApi || {}),
19+
],
1720

1821
module: {
1922
rules: [
@@ -70,7 +73,10 @@ export default {
7073

7174
new HtmlWebpackPlugin({ template: 'index.html.ejs' }),
7275

73-
new MonacoWebpackPlugin({ languages: ['json', 'javascript', 'typescript'], features: ['!rename'] }),
76+
new MonacoWebpackPlugin({
77+
languages: ['json', 'javascript', 'typescript'],
78+
features: ['!rename'],
79+
}),
7480

7581
new webpack.IgnorePlugin({
7682
checkResource(resource) {

‎configs/webpack.config.web.prod.ts‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { merge } from 'webpack-merge';
22
import { resolve } from 'path';
33
import webpack from 'webpack';
4-
import { toString } from 'lodash'
4+
import { toString } from 'lodash';
55
import TerserPlugin from 'terser-webpack-plugin';
66
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
77
import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
@@ -28,7 +28,7 @@ const configuration: webpack.Configuration = {
2828
filename: 'js/bundle.[name].min.js',
2929
path: resolve(__dirname, '../redisinsight/ui/dist'),
3030
publicPath: '/',
31-
chunkFilename: '[id].[chunkhash].js'
31+
chunkFilename: '[id].[chunkhash].js',
3232
},
3333
optimization: {
3434
minimize: true,
@@ -46,23 +46,23 @@ const configuration: webpack.Configuration = {
4646
cacheGroups: {
4747
reactVendor: {
4848
test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
49-
name: "reactVendor"
49+
name: 'reactVendor',
5050
},
5151
elasticVendor: {
5252
test: /[\\/]node_modules[\\/](@elastic)[\\/]/,
53-
name: "elasticVendor"
53+
name: 'elasticVendor',
5454
},
5555
monacoVendor: {
5656
test: /[\\/]node_modules[\\/](monaco-editor)[\\/]/,
57-
name: "monacoVendor"
57+
name: 'monacoVendor',
5858
},
5959
utilityVendor: {
6060
test: /[\\/]node_modules[\\/](lodash)[\\/]/,
61-
name: "utilityVendor"
61+
name: 'utilityVendor',
6262
},
6363
vendor: {
6464
test: /[\\/]node_modules[\\/](!@elastic)(!monaco-editor)(!lodash)[\\/]/,
65-
name: "vendor"
65+
name: 'vendor',
6666
},
6767
},
6868
},
@@ -76,23 +76,29 @@ const configuration: webpack.Configuration = {
7676
new webpack.EnvironmentPlugin({
7777
NODE_ENV: 'production',
7878
APP_ENV: 'web',
79-
API_PORT: '5000',
79+
RI_APP_PORT: '5000',
8080
API_PREFIX: '',
8181
BASE_API_URL: 'api/',
8282
RESOURCES_BASE_URL:
83-
process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
83+
process.env.RI_SERVER_TLS_CERT && process.env.RI_SERVER_TLS_KEY
84+
? 'https://localhost'
85+
: 'http://localhost',
8486
SCAN_COUNT_DEFAULT: '500',
8587
SCAN_TREE_COUNT_DEFAULT: '10000',
8688
PIPELINE_COUNT_DEFAULT: '5',
8789
SEGMENT_WRITE_KEY:
88-
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
89-
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
90-
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
91-
: toString(30 * 1000), // 30 sec
90+
'SEGMENT_WRITE_KEY' in process.env
91+
? process.env.SEGMENT_WRITE_KEY
92+
: 'SOURCE_WRITE_KEY',
93+
CONNECTIONS_TIMEOUT_DEFAULT:
94+
'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
95+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
96+
: toString(30 * 1000), // 30 sec
9297
}),
9398

9499
new BundleAnalyzerPlugin({
95-
analyzerMode: process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
100+
analyzerMode:
101+
process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
96102
openAnalyzer: process.env.OPEN_ANALYZER === 'true',
97103
}),
98104
],

0 commit comments

Comments
 (0)