Paths

Table of Contentst

-
services/terraform/self-host/
-
terraform/
-
self-host/
-
aws-deploy.sh

[terraform] include keyserver logs on keyserver init for qr code for self-host aws-deploy script
ClosedPublic
Actions

Authored by will on Aug 15 2024, 9:09 PM.

Details

Reviewers

varun
bartek

Commits

rCOMM5578307107f7: [terraform] include keyserver logs on keyserver init for qr code for self-host…

Summary

This prints the logs for the primary keyserver so user can access the QR code

Depends on D13095

Test Plan

ran a fresh keyserver deploy and was able to print the qr code

The output:

Diff Detail

Repository

rCOMM Comm

Branch

script_changes

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

will created this revision.Aug 15 2024, 9:09 PM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptAug 15 2024, 9:09 PM

will retitled this revision from [terraform] include keyserver logs on keyserver init for qr code to [terraform] include keyserver logs on keyserver init for qr code for self-host aws-deploy script.Aug 15 2024, 9:09 PM

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

Harbormaster completed remote builds in B31120: Diff 43417.Aug 15 2024, 9:26 PM

will requested review of this revision.Aug 15 2024, 9:26 PM

how'd you decide on --since 1d?

This revision is now accepted and ready to land.Aug 15 2024, 10:50 PM

In D13096#369718, @varun wrote:

how'd you decide on --since 1d?

I can make this shorter if needed, however I just over estimated just to be safe. Given that the the keyserver was only just initialized, I don't think there's a danger that the user would receive a huge influx in logs. It should only just be the logs when one first runs the keyserver.

@varun do you think we can keep it as is or make it something like 1 hr

I think it's fine, was just curious

Closed by commit rCOMM5578307107f7: [terraform] include keyserver logs on keyserver init for qr code for self-host… (authored by will). · Explain WhyAug 16 2024, 1:15 PM

This revision was automatically updated to reflect the committed changes.

will added a commit: rCOMM5578307107f7: [terraform] include keyserver logs on keyserver init for qr code for self-host….

Revision Contents
Changeset List

Path

Size

services/

terraform/

self-host/

aws-deploy.sh

3 lines

Diff 43417

View Options

services/terraform/self-host/aws-deploy.sh

	Show All 23 Lines

	function reduceIntegrityStore(			function reduceIntegrityStore(
	state: IntegrityStore,			state: IntegrityStore,
	action: BaseAction,			action: BaseAction,
	threadInfos: {			threadInfos: {
	+[string]: RawThreadInfo,			+[string]: RawThreadInfo,
	},			},
	threadStoreOperations: $ReadOnlyArray<ThreadStoreOperation>,			threadStoreOperations: $ReadOnlyArray<ThreadStoreOperation>,
	): IntegrityStore {			): {
				+integrityStore: IntegrityStore,
				+integrityStoreOperations: $ReadOnlyArray<IntegrityStoreOperation>,
				} {
	if (action.type === fullStateSyncActionType) {			if (action.type === fullStateSyncActionType) {
	const removeAllOperation = { type: 'remove_all_integrity_thread_hashes' };			const removeAllOperation = { type: 'remove_all_integrity_thread_hashes' };
	const threadHashesArray = Object.entries(state.threadHashes).filter(			const threadHashesArray = Object.entries(state.threadHashes).filter(
	([key]) => extractKeyserverIDFromID(key) !== action.payload.keyserverID,			([key]) => extractKeyserverIDFromID(key) !== action.payload.keyserverID,
	);			);
	const threadHashes = Object.fromEntries(threadHashesArray);
	const replaceOperation = {			const replaceOperation = {
	type: 'replace_integrity_thread_hashes',			type: 'replace_integrity_thread_hashes',
	payload: { threadHashes },			payload: { threadHashes: Object.fromEntries(threadHashesArray) },
	};			};
	return {			return {
				integrityStore: {
	threadHashes: processStoreOps(state, [			threadHashes: processStoreOps(state, [
	removeAllOperation,			removeAllOperation,
	replaceOperation,			replaceOperation,
	]).threadHashes,			]).threadHashes,
	threadHashingStatus: 'starting',			threadHashingStatus: 'starting',
				},
				integrityStoreOperations: [removeAllOperation, replaceOperation],
	};			};
	} else if (			} else if (
	action.type === logInActionTypes.success \|\|			action.type === logInActionTypes.success \|\|
	action.type === siweAuthActionTypes.success \|\|			action.type === siweAuthActionTypes.success \|\|
	action.type === keyserverRegisterActionTypes.success \|\|			action.type === keyserverRegisterActionTypes.success \|\|
	(action.type === setClientDBStoreActionType &&			(action.type === setClientDBStoreActionType &&
	!!action.payload.threadStore &&			!!action.payload.threadStore &&
	state.threadHashingStatus !== 'completed')			state.threadHashingStatus !== 'completed')
	) {			) {
	const removeAllOperation = { type: 'remove_all_integrity_thread_hashes' };			const removeAllOperation = { type: 'remove_all_integrity_thread_hashes' };
	return {			return {
				integrityStore: {
	threadHashes: processStoreOps(state, [removeAllOperation]).threadHashes,			threadHashes: processStoreOps(state, [removeAllOperation]).threadHashes,
	threadHashingStatus: 'starting',			threadHashingStatus: 'starting',
				},
				integrityStoreOperations: [removeAllOperation],
	};			};
	} else if (action.type === keyserverAuthActionTypes.success) {			} else if (action.type === keyserverAuthActionTypes.success) {
	return {			return {
				integrityStore: {
	threadHashes: processStoreOps(state, []).threadHashes,			threadHashes: processStoreOps(state, []).threadHashes,
	threadHashingStatus: 'starting',			threadHashingStatus: 'starting',
				},
				integrityStoreOperations: [],
	};			};
	}			}
	let newState = state;			let newState = state;
				const integrityOperations: IntegrityStoreOperation[] = [];
	if (action.type === updateIntegrityStoreActionType) {			if (action.type === updateIntegrityStoreActionType) {
	if (action.payload.threadIDsToHash) {			if (action.payload.threadIDsToHash) {
	const newThreadHashes = Object.fromEntries(			const newThreadHashes = Object.fromEntries(
	action.payload.threadIDsToHash			action.payload.threadIDsToHash
	.map(id => [id, threadInfos[id]])			.map(id => [id, threadInfos[id]])
	.filter(([, info]) => !!info)			.filter(([, info]) => !!info)
	.map(([id, info]) => [id, hash(info)]),			.map(([id, info]) => [id, hash(info)]),
	);			);
	const replaceOperation = {			const replaceOperation = {
	type: 'replace_integrity_thread_hashes',			type: 'replace_integrity_thread_hashes',
	payload: { threadHashes: newThreadHashes },			payload: { threadHashes: newThreadHashes },
	};			};

	newState = processStoreOps(state, [replaceOperation]);			newState = processStoreOps(state, [replaceOperation]);
				integrityOperations.push(replaceOperation);
	}			}
	if (action.payload.threadHashingStatus) {			if (action.payload.threadHashingStatus) {
	newState = {			newState = {
	...newState,			...newState,
	threadHashingStatus: action.payload.threadHashingStatus,			threadHashingStatus: action.payload.threadHashingStatus,
	};			};
	}			}
	}			}
	if (threadStoreOperations.length === 0) {			if (threadStoreOperations.length === 0) {
	return newState;			return {
				integrityStore: newState,
				integrityStoreOperations: integrityOperations,
				};
	}			}
	const integrityOperations: IntegrityStoreOperation[] = [];
	let threadHashingStatus = newState.threadHashingStatus;			let threadHashingStatus = newState.threadHashingStatus;
	for (const operation of threadStoreOperations) {			for (const operation of threadStoreOperations) {
	if (operation.type === 'replace') {			if (operation.type === 'replace') {
	const newIntegrityThreadHash = hash(operation.payload.threadInfo);			const newIntegrityThreadHash = hash(operation.payload.threadInfo);
	integrityOperations.push({			integrityOperations.push({
	type: 'replace_integrity_thread_hashes',			type: 'replace_integrity_thread_hashes',
	payload: {			payload: {
	threadHashes: { [operation.payload.id]: newIntegrityThreadHash },			threadHashes: { [operation.payload.id]: newIntegrityThreadHash },
	},			},
	});			});
	} else if (operation.type === 'remove') {			} else if (operation.type === 'remove') {
	for (const id of operation.payload.ids) {			for (const id of operation.payload.ids) {
	integrityOperations.push({			integrityOperations.push({
	type: 'remove_integrity_thread_hashes',			type: 'remove_integrity_thread_hashes',
	payload: { ids: [id] },			payload: { ids: [id] },
	});			});
	}			}
	} else if (operation.type === 'remove_all') {			} else if (operation.type === 'remove_all') {
	integrityOperations.push({ type: 'remove_all_integrity_thread_hashes' });			integrityOperations.push({ type: 'remove_all_integrity_thread_hashes' });
	threadHashingStatus = 'completed';			threadHashingStatus = 'completed';
	}			}
	}			}
	return {			return {
	...newState,			integrityStore: {
	threadHashes: processStoreOps(newState, integrityOperations).threadHashes,			threadHashes: processStoreOps(newState, integrityOperations).threadHashes,
	threadHashingStatus,			threadHashingStatus,
				},
				integrityStoreOperations: integrityOperations,
	};			};
	}			}

	export { reduceIntegrityStore };			export { reduceIntegrityStore };

[terraform] include keyserver logs on keyserver init for qr code for self-host aws-deploy scriptClosedPublicActions