Paths

Table of Contentst

-
services/backup/docker-server/contents/server/
-
backup/
-
docker-server/
-
contents/
-
server/
-
CMakeLists.txt
-
src/
-
AwsTools.cpp

[services] Dev mode - Set up Backup service
ClosedPublic
Actions

Authored by • karol on Apr 11 2022, 6:01 AM.

Details

Reviewers

tomek
• jim

Commits

rCOMM6773029cb66b: [services] Dev mode - Set up Backup service

Summary

Depends on D3694

Modify the code of the backup service so the dev mode that uses the local cloud can be properly launched

Test Plan

cd services
docker-compose down
yarn run-local-cloud
yarn test-backup-service-dev-mode

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• karol created this revision.Apr 11 2022, 6:01 AM

Herald added subscribers: • abosh, • benschac, atul and 3 others. · View Herald TranscriptApr 11 2022, 6:01 AM

Harbormaster completed remote builds in B8059: Diff 11278.Apr 11 2022, 6:06 AM

• karol requested review of this revision.Apr 11 2022, 6:06 AM

• karol edited the summary of this revision. (Show Details)Apr 11 2022, 6:37 AM

• karol edited the test plan for this revision. (Show Details)

• karol added reviewers: tomek, • jim.

• karol added a parent revision: D3694: [services] Dev mode - Add scripts for running local cloud.

update

• karol added a child revision: D3691: [services] Dev mode - Set up Blob service.Apr 11 2022, 6:38 AM

• karol added inline comments.Apr 11 2022, 6:47 AM

services/backup/docker-server/contents/server/src/AwsTools.cpp
10	@jimpo suggested avoiding using a compile-time flag https://phabricator.ashoat.com/D3498#98870 Using such a flag also occurs in `Constants.h` for both blob/backup - `COMM_TEST_SERVICES`. So if we want to stop using such variables, we should do this separately for both variables I think. @jimpo as you started this discussion: what do you think about reading env vars? For example with `getenv`?

• karol mentioned this in D3691: [services] Dev mode - Set up Blob service.Apr 11 2022, 6:48 AM

Harbormaster completed remote builds in B8071: Diff 11290.Apr 11 2022, 6:49 AM

@jimpo is on a lot of diffs and doesn't always have time for all of them, so to make sure he sees this one I'm setting him as blocking

• jim added inline comments.Apr 18 2022, 11:53 PM

services/backup/docker-server/contents/server/src/AwsTools.cpp
10	Reading an environment variable at runtime is a fine way to do it.

As noted, COMM_SERVICES_DEV_MODE should not be a compile-time flag, please fix

This revision now requires changes to proceed.Apr 26 2022, 9:41 AM

In D3690#107078, @jimpo wrote:

As noted, COMM_SERVICES_DEV_MODE should not be a compile-time flag, please fix

I don't it is a good idea to change this here. As I mentioned:

Using such a flag also occurs in Constants.h for both blob/backup - COMM_TEST_SERVICES. So if we want to stop using such variables, we should do this separately for both variables I think.

This is a typical situation when we need to do a follow-up because the change you're requesting applies in multiple places, not only this one. If we change it here, the codebase will be inconsistent. And if we change the rest of the occurrences here as well, the diff will be invalid as it will consist of unrelated changes.

I put up a diff with this follow-up D3872.

This revision is now accepted and ready to land.Apr 29 2022, 6:50 AM

Closed by commit rCOMM6773029cb66b: [services] Dev mode - Set up Backup service (authored by • karol). · Explain WhyMay 6 2022, 1:46 AM

This revision was automatically updated to reflect the committed changes.

• karol added a commit: rCOMM6773029cb66b: [services] Dev mode - Set up Backup service.

Revision Contents
Changeset List

Path

Size

services/

backup/

docker-server/

contents/

server/

CMakeLists.txt

14 lines

src/

AwsTools.cpp

4 lines

Diff 11290

View Options

services/backup/docker-server/contents/server/CMakeLists.txt

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Lines	type Props = {
+accountPassword: string,		+accountPassword: string,
+setAccountPassword: SetState<string>,		+setAccountPassword: SetState<string>,
+currentTabType: TabType,		+currentTabType: TabType,
+setCurrentTabType: SetState<TabType>,		+setCurrentTabType: SetState<TabType>,
+queuedChanges: ThreadChanges,		+queuedChanges: ThreadChanges,
+setQueuedChanges: SetState<ThreadChanges>,		+setQueuedChanges: SetState<ThreadChanges>,
+namePlaceholder: string,		+namePlaceholder: string,
+changeQueued: boolean,		+changeQueued: boolean,
		+onChangeName: (event: SyntheticEvent<HTMLInputElement>) => void,
};		};
class ThreadSettingsModal extends React.PureComponent<Props> {		class ThreadSettingsModal extends React.PureComponent<Props> {
nameInput: ?HTMLInputElement;		nameInput: ?HTMLInputElement;
accountPasswordInput: ?HTMLInputElement;		accountPasswordInput: ?HTMLInputElement;

constructor(props: Props) {		constructor(props: Props) {
super(props);		super(props);
}		}
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Lines	const inputDisabled =
!this.hasPermissionForTab(threadInfo, this.props.currentTabType);		!this.hasPermissionForTab(threadInfo, this.props.currentTabType);

let mainContent = null;		let mainContent = null;
if (this.props.currentTabType === 'general') {		if (this.props.currentTabType === 'general') {
mainContent = (		mainContent = (
<ThreadSettingsGeneralTab		<ThreadSettingsGeneralTab
threadNameValue={firstLine(this.possiblyChangedValue('name'))}		threadNameValue={firstLine(this.possiblyChangedValue('name'))}
threadNamePlaceholder={this.props.namePlaceholder}		threadNamePlaceholder={this.props.namePlaceholder}
threadNameOnChange={this.onChangeName}		threadNameOnChange={this.props.onChangeName}
threadNameDisabled={inputDisabled}		threadNameDisabled={inputDisabled}
threadNameInputRef={this.nameInputRef}		threadNameInputRef={this.nameInputRef}
threadDescriptionValue={this.possiblyChangedValue('description')}		threadDescriptionValue={this.possiblyChangedValue('description')}
threadDescriptionOnChange={this.onChangeDescription}		threadDescriptionOnChange={this.onChangeDescription}
threadDescriptionDisabled={inputDisabled}		threadDescriptionDisabled={inputDisabled}
threadColorCurrentColor={this.possiblyChangedValue('color')}		threadColorCurrentColor={this.possiblyChangedValue('color')}
threadColorOnColorSelection={this.onChangeColor}		threadColorOnColorSelection={this.onChangeColor}
/>		/>
▲ Show 20 Lines • Show All 110 Lines • ▼ Show 20 Lines	class ThreadSettingsModal extends React.PureComponent<Props> {
nameInputRef = (nameInput: ?HTMLInputElement) => {		nameInputRef = (nameInput: ?HTMLInputElement) => {
this.nameInput = nameInput;		this.nameInput = nameInput;
};		};

accountPasswordInputRef = (accountPasswordInput: ?HTMLInputElement) => {		accountPasswordInputRef = (accountPasswordInput: ?HTMLInputElement) => {
this.accountPasswordInput = accountPasswordInput;		this.accountPasswordInput = accountPasswordInput;
};		};

onChangeName = (event: SyntheticEvent<HTMLInputElement>) => {
const target = event.currentTarget;
const newValue =
target.value !== this.props.threadInfo.name ? target.value : undefined;
this.props.setQueuedChanges(
Object.freeze({
...this.props.queuedChanges,
name: firstLine(newValue),
}),
);
};

onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {		onChangeDescription = (event: SyntheticEvent<HTMLTextAreaElement>) => {
const target = event.currentTarget;		const target = event.currentTarget;
const newValue =		const newValue =
target.value !== this.props.threadInfo.description		target.value !== this.props.threadInfo.description
? target.value		? target.value
: undefined;		: undefined;
this.props.setQueuedChanges(		this.props.setQueuedChanges(
Object.freeze({		Object.freeze({
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	function ConnectedThreadSettingsModal(props) {
}, [threadInfo, userInfos, viewerID]);		}, [threadInfo, userInfos, viewerID]);

const changeQueued: boolean = React.useMemo(		const changeQueued: boolean = React.useMemo(
() =>		() =>
Object.values(queuedChanges).some(v => v !== null && v !== undefined),		Object.values(queuedChanges).some(v => v !== null && v !== undefined),
[queuedChanges],		[queuedChanges],
);		);

		const onChangeName = React.useCallback(
		(event: SyntheticEvent<HTMLInputElement>) => {
		const target = event.currentTarget;
		setQueuedChanges(
		Object.freeze({
		...queuedChanges,
		name: firstLine(
		target.value !== threadInfo?.name ? target.value : undefined,
		),
		}),
		);
		},
		[queuedChanges, threadInfo],
		);

if (!threadInfo) {		if (!threadInfo) {
return (		return (
<Modal onClose={modalContext.clearModal} name="Invalid thread">		<Modal onClose={modalContext.clearModal} name="Invalid thread">
<div className={css.modal_body}>		<div className={css.modal_body}>
<p>You no longer have permission to view this thread</p>		<p>You no longer have permission to view this thread</p>
</div>		</div>
</Modal>		</Modal>
);		);
Show All 15 Lines	return (
accountPassword={accountPassword}		accountPassword={accountPassword}
setAccountPassword={setAccountPassword}		setAccountPassword={setAccountPassword}
currentTabType={currentTabType}		currentTabType={currentTabType}
setCurrentTabType={setCurrentTabType}		setCurrentTabType={setCurrentTabType}
queuedChanges={queuedChanges}		queuedChanges={queuedChanges}
setQueuedChanges={setQueuedChanges}		setQueuedChanges={setQueuedChanges}
namePlaceholder={namePlaceholder}		namePlaceholder={namePlaceholder}
changeQueued={changeQueued}		changeQueued={changeQueued}
		onChangeName={onChangeName}
/>		/>
);		);
},		},
);		);

export default ConnectedThreadSettingsModal;		export default ConnectedThreadSettingsModal;