Page MenuHomePhabricator
Differential D4129

[services] Tunnelbroker - Change `ConfigManager.load()` to use config file path as a parameter
ClosedPublic
Actions

Authored by • max on May 25 2022, 1:11 PM.
Tags
None
Referenced Files
F5118600: D4129.id13130.diff
Thu, Apr 3, 1:18 AM
Unknown Object (File)
Mon, Mar 31, 7:57 AM
Unknown Object (File)
Mon, Mar 31, 4:15 AM
Unknown Object (File)
Sun, Mar 30, 10:56 PM
Unknown Object (File)
Sun, Mar 30, 2:38 PM
Unknown Object (File)
Sun, Mar 30, 10:28 AM
Unknown Object (File)
Feb 20 2025, 8:57 AM
Unknown Object (File)
Feb 17 2025, 12:36 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
• karol
tomek

Details

Reviewers
• karol
tomek
Commits
rCOMMbf09f40e34be: [services] Tunnelbroker - Change `ConfigManager.load()` to use config file path…
Summary

To change the config file path for dev-mode introducing changes to the ConfigManager.load() method to use config file path as a parameter instead of the config file path inside the method itself.

Linear task: ENG-1101

Test Plan

Run yarn run-tunnelbroker-service service successfuly built and load the default config file.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• max created this revision.May 25 2022, 1:11 PM
• max held this revision as a draft.
Herald added subscribers: • abosh, • karol, atul and 3 others. · View Herald TranscriptMay 25 2022, 1:11 PM
Harbormaster completed remote builds in B9476: Diff 13130.May 25 2022, 1:16 PM
• max added parent revisions: D4126: [services] Tunnelbroker - Add yarn scripts for dev-mode, D4127: [services] Tunnelbroker - Add config ini file for dev-mode.May 25 2022, 1:56 PM
• max published this revision for review.May 25 2022, 1:59 PM
• max edited the summary of this revision. (Show Details)
• max added reviewers: • karol, tomek.
• max removed a parent revision: D4126: [services] Tunnelbroker - Add yarn scripts for dev-mode.
• max added a child revision: D4130: [services] Tunnelbroker - Load dev-mode config file on start.
• max updated this revision to Diff 13135.May 26 2022, 1:16 AM

Stack postition update.

• max edited parent revisions, added: D4131: [services] Tunnelbroker - Dev-mode environment variables in Docker; removed: D4127: [services] Tunnelbroker - Add config ini file for dev-mode.May 26 2022, 1:17 AM
Harbormaster completed remote builds in B9481: Diff 13135.May 26 2022, 1:24 AM
tomek accepted this revision.May 26 2022, 3:52 AM
tomek added 1 blocking reviewer(s): • karol.
• karol accepted this revision.May 26 2022, 5:58 AM
• karol added inline comments.
services/tunnelbroker/src/Tools/ConfigManager.cpp
2 ↗(On Diff #13135)

is this still needed?

This revision is now accepted and ready to land.May 26 2022, 5:58 AM
• max marked an inline comment as done.May 30 2022, 6:32 AM
• max added inline comments.
services/tunnelbroker/src/Tools/ConfigManager.cpp
2 ↗(On Diff #13135)

is this still needed?

Yes, we are heavily using the default values from Constants.h as a default value if no value in the config file was provided.
For example, we are using the value from the constant at line 56 (AMQP_FANOUT_EXCHANGE_NAME).

Closed by commit rCOMMbf09f40e34be: [services] Tunnelbroker - Change `ConfigManager.load()` to use config file path… (authored by • max). · Explain WhyMay 30 2022, 6:34 AM
This revision was automatically updated to reflect the committed changes.
• max marked an inline comment as done.
• max added a commit: rCOMMbf09f40e34be: [services] Tunnelbroker - Change `ConfigManager.load()` to use config file path….
• max mentioned this in D4638: [services] Tunnelbroker - Changing the `ConfigManager` load function to include the sandbox condition.Jul 26 2022, 4:10 AM

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
src/
Tools/
2 lines
6 lines
3 lines

Diff 13203

View Options

services/tunnelbroker/src/Tools/ConfigManager.h

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { Switch, Text, View } from 'react-native'; import { Alert, Switch, Text, View } from 'react-native';
import { ScrollView } from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { getMessageForException } from 'lib/utils/errors.js';
import { entries } from 'lib/utils/objects.js';
import { useClientBackup } from '../backup/use-client-backup.js';
import Button from '../components/button.react.js';
import { setLocalSettingsActionType } from '../redux/action-types.js'; import { setLocalSettingsActionType } from '../redux/action-types.js';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import { useStyles } from '../themes/colors.js'; import { useColors, useStyles } from '../themes/colors.js';
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
function BackupMenu(props: { ... }): React.Node { function BackupMenu(props: { ... }): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const dispatch = useDispatch(); const dispatch = useDispatch();
const colors = useColors();
const userStore = useSelector(state => state.userStore);
const isBackupEnabled = useSelector( const isBackupEnabled = useSelector(
state => state.localSettings.isBackupEnabled, state => state.localSettings.isBackupEnabled,
); );
const { restoreBackupProtocol } = useClientBackup();
const testRestore = React.useCallback(async () => {
let message;
try {
const result = await restoreBackupProtocol({ userStore });
message = entries(result)
.map(([key, value]) => `${key}: ${String(value)}`)
.join('\n');
} catch (e) {
console.error(`Backup uploading error: ${e}`);
message = `Backup restore error: ${String(getMessageForException(e))}`;
}
Alert.alert('Restore protocol result', message);
}, [restoreBackupProtocol, userStore]);
const onBackupToggled = React.useCallback( const onBackupToggled = React.useCallback(
value => { value => {
dispatch({ dispatch({
type: setLocalSettingsActionType, type: setLocalSettingsActionType,
payload: { isBackupEnabled: value }, payload: { isBackupEnabled: value },
}); });
}, },
[dispatch], [dispatch],
); );
return ( return (
<ScrollView <ScrollView
contentContainerStyle={styles.scrollViewContentContainer} contentContainerStyle={styles.scrollViewContentContainer}
style={styles.scrollView} style={styles.scrollView}
> >
<Text style={styles.header}>SETTINGS</Text> <Text style={styles.header}>SETTINGS</Text>
<View style={styles.section}> <View style={styles.section}>
<View style={styles.submenuButton}> <View style={styles.submenuButton}>
<Text style={styles.submenuText}>Toggle automatic backup</Text> <Text style={styles.submenuText}>Toggle automatic backup</Text>
<Switch value={isBackupEnabled} onValueChange={onBackupToggled} /> <Switch value={isBackupEnabled} onValueChange={onBackupToggled} />
</View> </View>
</View> </View>
<Text style={styles.header}>ACTIONS</Text>
<View style={styles.section}>
<Button
onPress={testRestore}
style={styles.row}
iosFormat="highlight"
iosHighlightUnderlayColor={colors.panelIosHighlightUnderlay}
iosActiveOpacity={0.85}
>
<Text style={styles.submenuText}>Test backup restore protocol</Text>
</Button>
</View>
</ScrollView> </ScrollView>
); );
} }
const unboundStyles = { const unboundStyles = {
scrollViewContentContainer: { scrollViewContentContainer: {
paddingTop: 24, paddingTop: 24,
}, },
Show All 21 Lines submenuButton: {
paddingVertical: 10, paddingVertical: 10,
alignItems: 'center', alignItems: 'center',
}, },
submenuText: { submenuText: {
color: 'panelForegroundLabel', color: 'panelForegroundLabel',
flex: 1, flex: 1,
fontSize: 16, fontSize: 16,
}, },
row: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingHorizontal: 24,
paddingVertical: 14,
},
}; };
export default BackupMenu; export default BackupMenu;
View Options

services/tunnelbroker/src/Tools/ConfigManager.cpp

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { Switch, Text, View } from 'react-native'; import { Alert, Switch, Text, View } from 'react-native';
import { ScrollView } from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { getMessageForException } from 'lib/utils/errors.js';
import { entries } from 'lib/utils/objects.js';
import { useClientBackup } from '../backup/use-client-backup.js';
import Button from '../components/button.react.js';
import { setLocalSettingsActionType } from '../redux/action-types.js'; import { setLocalSettingsActionType } from '../redux/action-types.js';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import { useStyles } from '../themes/colors.js'; import { useColors, useStyles } from '../themes/colors.js';
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
function BackupMenu(props: { ... }): React.Node { function BackupMenu(props: { ... }): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const dispatch = useDispatch(); const dispatch = useDispatch();
const colors = useColors();
const userStore = useSelector(state => state.userStore);
const isBackupEnabled = useSelector( const isBackupEnabled = useSelector(
state => state.localSettings.isBackupEnabled, state => state.localSettings.isBackupEnabled,
); );
const { restoreBackupProtocol } = useClientBackup();
const testRestore = React.useCallback(async () => {
let message;
try {
const result = await restoreBackupProtocol({ userStore });
message = entries(result)
.map(([key, value]) => `${key}: ${String(value)}`)
.join('\n');
} catch (e) {
console.error(`Backup uploading error: ${e}`);
message = `Backup restore error: ${String(getMessageForException(e))}`;
}
Alert.alert('Restore protocol result', message);
}, [restoreBackupProtocol, userStore]);
const onBackupToggled = React.useCallback( const onBackupToggled = React.useCallback(
value => { value => {
dispatch({ dispatch({
type: setLocalSettingsActionType, type: setLocalSettingsActionType,
payload: { isBackupEnabled: value }, payload: { isBackupEnabled: value },
}); });
}, },
[dispatch], [dispatch],
); );
return ( return (
<ScrollView <ScrollView
contentContainerStyle={styles.scrollViewContentContainer} contentContainerStyle={styles.scrollViewContentContainer}
style={styles.scrollView} style={styles.scrollView}
> >
<Text style={styles.header}>SETTINGS</Text> <Text style={styles.header}>SETTINGS</Text>
<View style={styles.section}> <View style={styles.section}>
<View style={styles.submenuButton}> <View style={styles.submenuButton}>
<Text style={styles.submenuText}>Toggle automatic backup</Text> <Text style={styles.submenuText}>Toggle automatic backup</Text>
<Switch value={isBackupEnabled} onValueChange={onBackupToggled} /> <Switch value={isBackupEnabled} onValueChange={onBackupToggled} />
</View> </View>
</View> </View>
<Text style={styles.header}>ACTIONS</Text>
<View style={styles.section}>
<Button
onPress={testRestore}
style={styles.row}
iosFormat="highlight"
iosHighlightUnderlayColor={colors.panelIosHighlightUnderlay}
iosActiveOpacity={0.85}
>
<Text style={styles.submenuText}>Test backup restore protocol</Text>
</Button>
</View>
</ScrollView> </ScrollView>
); );
} }
const unboundStyles = { const unboundStyles = {
scrollViewContentContainer: { scrollViewContentContainer: {
paddingTop: 24, paddingTop: 24,
}, },
Show All 21 Lines submenuButton: {
paddingVertical: 10, paddingVertical: 10,
alignItems: 'center', alignItems: 'center',
}, },
submenuText: { submenuText: {
color: 'panelForegroundLabel', color: 'panelForegroundLabel',
flex: 1, flex: 1,
fontSize: 16, fontSize: 16,
}, },
row: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingHorizontal: 24,
paddingVertical: 14,
},
}; };
export default BackupMenu; export default BackupMenu;
View Options

services/tunnelbroker/src/server.cpp

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { Switch, Text, View } from 'react-native'; import { Alert, Switch, Text, View } from 'react-native';
import { ScrollView } from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { getMessageForException } from 'lib/utils/errors.js';
import { entries } from 'lib/utils/objects.js';
import { useClientBackup } from '../backup/use-client-backup.js';
import Button from '../components/button.react.js';
import { setLocalSettingsActionType } from '../redux/action-types.js'; import { setLocalSettingsActionType } from '../redux/action-types.js';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import { useStyles } from '../themes/colors.js'; import { useColors, useStyles } from '../themes/colors.js';
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
function BackupMenu(props: { ... }): React.Node { function BackupMenu(props: { ... }): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const dispatch = useDispatch(); const dispatch = useDispatch();
const colors = useColors();
const userStore = useSelector(state => state.userStore);
const isBackupEnabled = useSelector( const isBackupEnabled = useSelector(
state => state.localSettings.isBackupEnabled, state => state.localSettings.isBackupEnabled,
); );
const { restoreBackupProtocol } = useClientBackup();
const testRestore = React.useCallback(async () => {
let message;
try {
const result = await restoreBackupProtocol({ userStore });
message = entries(result)
.map(([key, value]) => `${key}: ${String(value)}`)
.join('\n');
} catch (e) {
console.error(`Backup uploading error: ${e}`);
message = `Backup restore error: ${String(getMessageForException(e))}`;
}
Alert.alert('Restore protocol result', message);
}, [restoreBackupProtocol, userStore]);
const onBackupToggled = React.useCallback( const onBackupToggled = React.useCallback(
value => { value => {
dispatch({ dispatch({
type: setLocalSettingsActionType, type: setLocalSettingsActionType,
payload: { isBackupEnabled: value }, payload: { isBackupEnabled: value },
}); });
}, },
[dispatch], [dispatch],
); );
return ( return (
<ScrollView <ScrollView
contentContainerStyle={styles.scrollViewContentContainer} contentContainerStyle={styles.scrollViewContentContainer}
style={styles.scrollView} style={styles.scrollView}
> >
<Text style={styles.header}>SETTINGS</Text> <Text style={styles.header}>SETTINGS</Text>
<View style={styles.section}> <View style={styles.section}>
<View style={styles.submenuButton}> <View style={styles.submenuButton}>
<Text style={styles.submenuText}>Toggle automatic backup</Text> <Text style={styles.submenuText}>Toggle automatic backup</Text>
<Switch value={isBackupEnabled} onValueChange={onBackupToggled} /> <Switch value={isBackupEnabled} onValueChange={onBackupToggled} />
</View> </View>
</View> </View>
<Text style={styles.header}>ACTIONS</Text>
<View style={styles.section}>
<Button
onPress={testRestore}
style={styles.row}
iosFormat="highlight"
iosHighlightUnderlayColor={colors.panelIosHighlightUnderlay}
iosActiveOpacity={0.85}
>
<Text style={styles.submenuText}>Test backup restore protocol</Text>
</Button>
</View>
</ScrollView> </ScrollView>
); );
} }
const unboundStyles = { const unboundStyles = {
scrollViewContentContainer: { scrollViewContentContainer: {
paddingTop: 24, paddingTop: 24,
}, },
Show All 21 Lines submenuButton: {
paddingVertical: 10, paddingVertical: 10,
alignItems: 'center', alignItems: 'center',
}, },
submenuText: { submenuText: {
color: 'panelForegroundLabel', color: 'panelForegroundLabel',
flex: 1, flex: 1,
fontSize: 16, fontSize: 16,
}, },
row: {
flexDirection: 'row',
justifyContent: 'space-between',
paddingHorizontal: 24,
paddingVertical: 14,
},
}; };
export default BackupMenu; export default BackupMenu;