Skip to content

Commit 0912568

Browse files
nelsonwellsredisnelsonwellsredis
committed
RI-5042: Revert formatting changes, remove RI_SERVER_TLS
1 parent 873becd commit 0912568

36 files changed

+431
-763
lines changed

‎DOCKER_README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ Redis Insight supports several configuration values that can be supplied via con
2121
| ---------|---------|-----------------|---------|
2222
| RI_APP_PORT | The port the app listens on | 5000 | See [Express Documentation](https://expressjs.com/en/api.html#app.listen) |
2323
| RI_APP_HOST | The host the app listens on | 0.0.0.0 | See [Express Documentation](https://expressjs.com/en/api.html#app.listen) |
24-
| RI_SERVER_TLS | Enable HTTPS | false | If `true`, requires RI_SERVER_TLS_KEY and RI_SERVER_TLS_CERT as well. |
2524
| RI_SERVER_TLS_KEY | Private key for HTTPS | | Private key in [PEM format](https://www.ssl.com/guide/pem-der-crt-and-cer-x-509-encodings-and-conversions/#ftoc-heading-3). May be a path to a file or a string in PEM format. |
2625
| RI_SERVER_TLS_CERT | Certificate for supplied private key | | Public certificate in [PEM format](https://www.ssl.com/guide/pem-der-crt-and-cer-x-509-encodings-and-conversions/#ftoc-heading-3) |

‎Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@ FROM node:18.18-alpine
4545
ARG NODE_ENV=production
4646
ARG RI_APP_HOST
4747
ARG RI_APP_PORT=5000
48-
ARG RI_SERVER_TLS
4948
ARG RI_SERVER_TLS_CERT
5049
ARG RI_SERVER_TLS_KEY
5150
ARG SEGMENT_WRITE_KEY
5251
ENV RI_APP_HOST=${RI_APP_HOST}
5352
ENV RI_APP_PORT=${RI_APP_PORT}
54-
ENV RI_SERVER_TLS=${RI_SERVER_TLS}
5553
ENV RI_SERVER_TLS_CERT=${RI_SERVER_TLS_CERT}
5654
ENV RI_SERVER_TLS_KEY=${RI_SERVER_TLS_KEY}
5755
ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}

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

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

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

@@ -57,61 +56,29 @@ export default merge(baseConfig, {
5756
DEBUG_PROD: false,
5857
START_MINIMIZED: false,
5958
APP_ENV: 'electron',
60-
RI_SERVER_TLS: true,
6159
RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
6260
RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
6361
APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
6462
UPGRADES_LINK: process.env.UPGRADES_LINK || '',
6563
RI_APP_HOST: '127.0.0.1',
6664
BUILD_TYPE: 'ELECTRON',
6765
APP_VERSION: version,
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
66+
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
67+
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
68+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
69+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
70+
: toString(30 * 1000), // 30 sec
7871
// cloud auth
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-
: '',
72+
RI_CLOUD_IDP_AUTHORIZE_URL: 'RI_CLOUD_IDP_AUTHORIZE_URL' in process.env ? process.env.RI_CLOUD_IDP_AUTHORIZE_URL: '',
73+
RI_CLOUD_IDP_TOKEN_URL: 'RI_CLOUD_IDP_TOKEN_URL' in process.env ? process.env.RI_CLOUD_IDP_TOKEN_URL: '',
74+
RI_CLOUD_IDP_ISSUER: 'RI_CLOUD_IDP_ISSUER' in process.env ? process.env.RI_CLOUD_IDP_ISSUER: '',
75+
RI_CLOUD_IDP_CLIENT_ID: 'RI_CLOUD_IDP_CLIENT_ID' in process.env ? process.env.RI_CLOUD_IDP_CLIENT_ID: '',
76+
RI_CLOUD_IDP_REDIRECT_URI: 'RI_CLOUD_IDP_REDIRECT_URI' in process.env ? process.env.RI_CLOUD_IDP_REDIRECT_URI: '',
77+
RI_CLOUD_IDP_GOOGLE_ID: 'RI_CLOUD_IDP_GOOGLE_ID' in process.env ? process.env.RI_CLOUD_IDP_GOOGLE_ID: '',
78+
RI_CLOUD_IDP_GH_ID: 'RI_CLOUD_IDP_GH_ID' in process.env ? process.env.RI_CLOUD_IDP_GH_ID: '',
79+
RI_CLOUD_API_URL: 'RI_CLOUD_API_URL' in process.env ? process.env.RI_CLOUD_API_URL: '',
80+
RI_CLOUD_CAPI_URL: 'RI_CLOUD_CAPI_URL' in process.env ? process.env.RI_CLOUD_CAPI_URL: '',
81+
RI_CLOUD_API_TOKEN: 'RI_CLOUD_API_TOKEN' in process.env ? process.env.RI_CLOUD_API_TOKEN: '',
11582
}),
11683

11784
new webpack.DefinePlugin({

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,18 @@ export default merge(mainProdConfig, {
2121
DEBUG_PROD: false,
2222
START_MINIMIZED: false,
2323
APP_ENV: 'electron',
24-
RI_SERVER_TLS: true,
2524
RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
2625
RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
2726
APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
2827
UPGRADES_LINK: process.env.UPGRADES_LINK || '',
2928
RI_APP_HOST: '127.0.0.1',
3029
BUILD_TYPE: 'ELECTRON',
3130
APP_VERSION: version,
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
31+
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
32+
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
33+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
34+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
35+
: toString(30 * 1000), // 30 sec
4236
}),
4337
],
4438
});

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

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

1212
DeleteSourceMaps();
1313

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';
14+
const htmlPagesNames = ['splash.ejs', 'index.ejs']
15+
const apiUrl = process.env.RI_SERVER_TLS_CERT && process.env.RI_SERVER_TLS_KEY
16+
? 'https://localhost'
17+
: 'http://localhost'
1918

2019
const devtoolsConfig =
2120
process.env.DEBUG_PROD === 'true'
@@ -181,10 +180,7 @@ const configuration: webpack.Configuration = {
181180
},
182181

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

189185
new webpack.EnvironmentPlugin({
190186
NODE_ENV: 'production',
@@ -194,15 +190,14 @@ const configuration: webpack.Configuration = {
194190
filename: 'style.css',
195191
}),
196192

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-
),
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+
)),
206201

207202
new webpack.DefinePlugin({
208203
'process.type': '"renderer"',
@@ -216,14 +211,12 @@ const configuration: webpack.Configuration = {
216211
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
217212
'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
218213
'process.env.APP_VERSION': JSON.stringify(version),
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'),
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'),
227220
}),
228221
],
229222
};

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

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

88
DeleteSourceMaps();
99

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

1514
export default merge(baseConfig, {
1615
...rendererProdConfig,
@@ -32,14 +31,12 @@ export default merge(baseConfig, {
3231
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
3332
'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
3433
'process.env.APP_VERSION': JSON.stringify(version),
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'),
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'),
4340
}),
4441
],
4542
});

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

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

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

2118
module: {
2219
rules: [
@@ -73,10 +70,7 @@ export default {
7370

7471
new HtmlWebpackPlugin({ template: 'index.html.ejs' }),
7572

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

8175
new webpack.IgnorePlugin({
8276
checkResource(resource) {

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

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -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
},
@@ -80,25 +80,19 @@ const configuration: webpack.Configuration = {
8080
API_PREFIX: '',
8181
BASE_API_URL: 'api/',
8282
RESOURCES_BASE_URL:
83-
process.env.RI_SERVER_TLS_CERT && process.env.RI_SERVER_TLS_KEY
84-
? 'https://localhost'
85-
: 'http://localhost',
83+
process.env.RI_SERVER_TLS_CERT && process.env.RI_SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
8684
SCAN_COUNT_DEFAULT: '500',
8785
SCAN_TREE_COUNT_DEFAULT: '10000',
8886
PIPELINE_COUNT_DEFAULT: '5',
8987
SEGMENT_WRITE_KEY:
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
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
9792
}),
9893

9994
new BundleAnalyzerPlugin({
100-
analyzerMode:
101-
process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
95+
analyzerMode: process.env.OPEN_ANALYZER === 'true' ? 'server' : 'disabled',
10296
openAnalyzer: process.env.OPEN_ANALYZER === 'true',
10397
}),
10498
],

0 commit comments

Comments
 (0)