Page MenuHomePhabricator
Differential D10788

[services] [1/n] Reorganize lambda function structs into query.rs and payload.rs
ClosedPublic
Actions

Authored by will on Jan 22 2024, 10:06 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 17, 2:52 PM
Unknown Object (File)
Thu, Apr 17, 1:15 PM
Unknown Object (File)
Thu, Apr 17, 11:41 AM
Unknown Object (File)
Thu, Apr 17, 2:11 AM
Unknown Object (File)
Thu, Apr 17, 1:59 AM
Unknown Object (File)
Thu, Apr 17, 12:21 AM
Unknown Object (File)
Wed, Apr 16, 6:52 AM
Unknown Object (File)
Tue, Apr 15, 4:47 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
bartek
Commits
rCOMM0c7251ece86c: [services] [1/n] Reorganize lambda function structs into query.rs and payload.rs
Summary

This moves the structs from main.rs to their own separate files for code cleanliness.

I've created two new files: query.rs and payload.rs.

query.rs contains structs we use for constructing JSON for queries to our opensearch instance. payload.rs contains structs for dynamodb stream records.

Test Plan

Successfully compiled with cargo lambda

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

will created this revision.Jan 22 2024, 10:06 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJan 22 2024, 10:06 AM
will updated this revision to Diff 35968.Jan 22 2024, 10:09 AM

Rebase

will retitled this revision from [services] Reorganize lambda function structs into query.rs and payload.rs to [services] [1/n] Reorganize lambda function structs into query.rs and payload.rs.Jan 22 2024, 10:10 AM
will edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B26031: Diff 35967.Jan 22 2024, 10:26 AM
Harbormaster completed remote builds in B26032: Diff 35968.Jan 22 2024, 10:29 AM
will requested review of this revision.Jan 22 2024, 10:29 AM
will planned changes to this revision.Jan 22 2024, 10:30 AM
will updated this revision to Diff 35971.Jan 22 2024, 10:52 AM
will edited the summary of this revision. (Show Details)

Remove error handling

will edited the summary of this revision. (Show Details)Jan 22 2024, 11:11 AM
Harbormaster completed remote builds in B26035: Diff 35971.Jan 22 2024, 11:12 AM
will added a child revision: D10736: [services] [2/n] Replace panic with custom errors on search index lambda.Jan 22 2024, 11:12 AM
varun accepted this revision.Jan 22 2024, 6:08 PM

thanks for splitting this up into multiple diffs! just a couple suggestions inline

services/search-index-lambda/src/payload.rs
44 ↗(On Diff #35971)

how about rename_all = camelCase?

50 ↗(On Diff #35971)

how about rename_all = PascalCase here?

This revision is now accepted and ready to land.Jan 22 2024, 6:08 PM
will updated this revision to Diff 36038.Jan 23 2024, 10:15 AM
will edited the summary of this revision. (Show Details)

Address review feedback. Use rename_all camelCase and PascalCase

Harbormaster completed remote builds in B26081: Diff 36038.Jan 23 2024, 10:35 AM
Closed by commit rCOMM0c7251ece86c: [services] [1/n] Reorganize lambda function structs into query.rs and payload.rs (authored by will). · Explain WhyJan 23 2024, 10:41 AM
This revision was automatically updated to reflect the committed changes.
will marked 2 inline comments as done.
will added a commit: rCOMM0c7251ece86c: [services] [1/n] Reorganize lambda function structs into query.rs and payload.rs.

Revision Contents
Changeset List

PathSize
services/
search-index-lambda/
src/
101 lines
54 lines
36 lines

Diff 36039

View Options

services/search-index-lambda/Cargo.lock

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useBroadcastDeviceListUpdates } from '../hooks/peer-list-hooks.js'; import {
useBroadcastDeviceListUpdates,
useBroadcastAccountDeletion,
} from '../hooks/peer-list-hooks.js';
import type { import type {
CallSingleKeyserverEndpoint, CallSingleKeyserverEndpoint,
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
} from '../keyserver-conn/call-single-keyserver-endpoint.js'; } from '../keyserver-conn/call-single-keyserver-endpoint.js';
import { import {
extractKeyserverIDFromID, extractKeyserverIDFromID,
sortThreadIDsPerKeyserver, sortThreadIDsPerKeyserver,
sortCalendarQueryPerKeyserver, sortCalendarQueryPerKeyserver,
▲ Show 20 Lines • Show All 486 Lines • ▼ Show 20 Lines
} }
const deleteAccountActionTypes = Object.freeze({ const deleteAccountActionTypes = Object.freeze({
started: 'DELETE_ACCOUNT_STARTED', started: 'DELETE_ACCOUNT_STARTED',
success: 'DELETE_ACCOUNT_SUCCESS', success: 'DELETE_ACCOUNT_SUCCESS',
failed: 'DELETE_ACCOUNT_FAILED', failed: 'DELETE_ACCOUNT_FAILED',
}); });
const accountDeletionBroadcastOptions = Object.freeze({
broadcastToOwnDevices: true,
});
function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> { function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const broadcastAccountDeletion = useBroadcastAccountDeletion(
accountDeletionBroadcastOptions,
);
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount); const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
return React.useCallback( return React.useCallback(
async password => { async password => {
if (usingCommServicesAccessToken) { if (usingCommServicesAccessToken) {
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
if ( const { deleteWalletUser, deletePasswordUser } = identityClient;
!identityClient.deleteWalletUser || if (!deleteWalletUser || !deletePasswordUser) {
bartekAuthorUnsubmitted
Done
Inline Actions

This is because of Flow not being able to infer these as non-null after await broadcastAccountDeletion(); was called

bartek: This is because of Flow not being able to infer these as non-null after `await…
!identityClient.deletePasswordUser
) {
throw new Error('Delete user method unimplemented'); throw new Error('Delete user method unimplemented');
} }
await broadcastAccountDeletion();
if (password) { if (password) {
await identityClient.deletePasswordUser(password); await deletePasswordUser(password);
} else { } else {
await identityClient.deleteWalletUser(); await deleteWalletUser();
} }
} }
try { try {
const keyserverResult = await callKeyserverDeleteAccount({ const keyserverResult = await callKeyserverDeleteAccount({
preRequestUserState, preRequestUserState,
}); });
const { keyserverIDs: _, ...result } = keyserverResult; const { keyserverIDs: _, ...result } = keyserverResult;
return { return {
Show All 16 Lines async password => {
currentUserInfo: null, currentUserInfo: null,
preRequestUserState: { preRequestUserState: {
...preRequestUserState, ...preRequestUserState,
commServicesAccessToken, commServicesAccessToken,
}, },
}; };
}, },
[ [
broadcastAccountDeletion,
callKeyserverDeleteAccount, callKeyserverDeleteAccount,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
preRequestUserState, preRequestUserState,
], ],
); );
} }
▲ Show 20 Lines • Show All 887 Lines • Show Last 20 Lines
View Options

services/search-index-lambda/src/main.rs

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useBroadcastDeviceListUpdates } from '../hooks/peer-list-hooks.js'; import {
useBroadcastDeviceListUpdates,
useBroadcastAccountDeletion,
} from '../hooks/peer-list-hooks.js';
import type { import type {
CallSingleKeyserverEndpoint, CallSingleKeyserverEndpoint,
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
} from '../keyserver-conn/call-single-keyserver-endpoint.js'; } from '../keyserver-conn/call-single-keyserver-endpoint.js';
import { import {
extractKeyserverIDFromID, extractKeyserverIDFromID,
sortThreadIDsPerKeyserver, sortThreadIDsPerKeyserver,
sortCalendarQueryPerKeyserver, sortCalendarQueryPerKeyserver,
▲ Show 20 Lines • Show All 486 Lines • ▼ Show 20 Lines
} }
const deleteAccountActionTypes = Object.freeze({ const deleteAccountActionTypes = Object.freeze({
started: 'DELETE_ACCOUNT_STARTED', started: 'DELETE_ACCOUNT_STARTED',
success: 'DELETE_ACCOUNT_SUCCESS', success: 'DELETE_ACCOUNT_SUCCESS',
failed: 'DELETE_ACCOUNT_FAILED', failed: 'DELETE_ACCOUNT_FAILED',
}); });
const accountDeletionBroadcastOptions = Object.freeze({
broadcastToOwnDevices: true,
});
function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> { function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const broadcastAccountDeletion = useBroadcastAccountDeletion(
accountDeletionBroadcastOptions,
);
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount); const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
return React.useCallback( return React.useCallback(
async password => { async password => {
if (usingCommServicesAccessToken) { if (usingCommServicesAccessToken) {
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
if ( const { deleteWalletUser, deletePasswordUser } = identityClient;
!identityClient.deleteWalletUser || if (!deleteWalletUser || !deletePasswordUser) {
bartekAuthorUnsubmitted
Done
Inline Actions

This is because of Flow not being able to infer these as non-null after await broadcastAccountDeletion(); was called

bartek: This is because of Flow not being able to infer these as non-null after `await…
!identityClient.deletePasswordUser
) {
throw new Error('Delete user method unimplemented'); throw new Error('Delete user method unimplemented');
} }
await broadcastAccountDeletion();
if (password) { if (password) {
await identityClient.deletePasswordUser(password); await deletePasswordUser(password);
} else { } else {
await identityClient.deleteWalletUser(); await deleteWalletUser();
} }
} }
try { try {
const keyserverResult = await callKeyserverDeleteAccount({ const keyserverResult = await callKeyserverDeleteAccount({
preRequestUserState, preRequestUserState,
}); });
const { keyserverIDs: _, ...result } = keyserverResult; const { keyserverIDs: _, ...result } = keyserverResult;
return { return {
Show All 16 Lines async password => {
currentUserInfo: null, currentUserInfo: null,
preRequestUserState: { preRequestUserState: {
...preRequestUserState, ...preRequestUserState,
commServicesAccessToken, commServicesAccessToken,
}, },
}; };
}, },
[ [
broadcastAccountDeletion,
callKeyserverDeleteAccount, callKeyserverDeleteAccount,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
preRequestUserState, preRequestUserState,
], ],
); );
} }
▲ Show 20 Lines • Show All 887 Lines • Show Last 20 Lines
View Options

services/search-index-lambda/src/payload.rs

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useBroadcastDeviceListUpdates } from '../hooks/peer-list-hooks.js'; import {
useBroadcastDeviceListUpdates,
useBroadcastAccountDeletion,
} from '../hooks/peer-list-hooks.js';
import type { import type {
CallSingleKeyserverEndpoint, CallSingleKeyserverEndpoint,
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
} from '../keyserver-conn/call-single-keyserver-endpoint.js'; } from '../keyserver-conn/call-single-keyserver-endpoint.js';
import { import {
extractKeyserverIDFromID, extractKeyserverIDFromID,
sortThreadIDsPerKeyserver, sortThreadIDsPerKeyserver,
sortCalendarQueryPerKeyserver, sortCalendarQueryPerKeyserver,
▲ Show 20 Lines • Show All 486 Lines • ▼ Show 20 Lines
} }
const deleteAccountActionTypes = Object.freeze({ const deleteAccountActionTypes = Object.freeze({
started: 'DELETE_ACCOUNT_STARTED', started: 'DELETE_ACCOUNT_STARTED',
success: 'DELETE_ACCOUNT_SUCCESS', success: 'DELETE_ACCOUNT_SUCCESS',
failed: 'DELETE_ACCOUNT_FAILED', failed: 'DELETE_ACCOUNT_FAILED',
}); });
const accountDeletionBroadcastOptions = Object.freeze({
broadcastToOwnDevices: true,
});
function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> { function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const broadcastAccountDeletion = useBroadcastAccountDeletion(
accountDeletionBroadcastOptions,
);
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount); const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
return React.useCallback( return React.useCallback(
async password => { async password => {
if (usingCommServicesAccessToken) { if (usingCommServicesAccessToken) {
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
if ( const { deleteWalletUser, deletePasswordUser } = identityClient;
!identityClient.deleteWalletUser || if (!deleteWalletUser || !deletePasswordUser) {
bartekAuthorUnsubmitted
Done
Inline Actions

This is because of Flow not being able to infer these as non-null after await broadcastAccountDeletion(); was called

bartek: This is because of Flow not being able to infer these as non-null after `await…
!identityClient.deletePasswordUser
) {
throw new Error('Delete user method unimplemented'); throw new Error('Delete user method unimplemented');
} }
await broadcastAccountDeletion();
if (password) { if (password) {
await identityClient.deletePasswordUser(password); await deletePasswordUser(password);
} else { } else {
await identityClient.deleteWalletUser(); await deleteWalletUser();
} }
} }
try { try {
const keyserverResult = await callKeyserverDeleteAccount({ const keyserverResult = await callKeyserverDeleteAccount({
preRequestUserState, preRequestUserState,
}); });
const { keyserverIDs: _, ...result } = keyserverResult; const { keyserverIDs: _, ...result } = keyserverResult;
return { return {
Show All 16 Lines async password => {
currentUserInfo: null, currentUserInfo: null,
preRequestUserState: { preRequestUserState: {
...preRequestUserState, ...preRequestUserState,
commServicesAccessToken, commServicesAccessToken,
}, },
}; };
}, },
[ [
broadcastAccountDeletion,
callKeyserverDeleteAccount, callKeyserverDeleteAccount,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
preRequestUserState, preRequestUserState,
], ],
); );
} }
▲ Show 20 Lines • Show All 887 Lines • Show Last 20 Lines
View Options

services/search-index-lambda/src/query.rs

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useBroadcastDeviceListUpdates } from '../hooks/peer-list-hooks.js'; import {
useBroadcastDeviceListUpdates,
useBroadcastAccountDeletion,
} from '../hooks/peer-list-hooks.js';
import type { import type {
CallSingleKeyserverEndpoint, CallSingleKeyserverEndpoint,
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
} from '../keyserver-conn/call-single-keyserver-endpoint.js'; } from '../keyserver-conn/call-single-keyserver-endpoint.js';
import { import {
extractKeyserverIDFromID, extractKeyserverIDFromID,
sortThreadIDsPerKeyserver, sortThreadIDsPerKeyserver,
sortCalendarQueryPerKeyserver, sortCalendarQueryPerKeyserver,
▲ Show 20 Lines • Show All 486 Lines • ▼ Show 20 Lines
} }
const deleteAccountActionTypes = Object.freeze({ const deleteAccountActionTypes = Object.freeze({
started: 'DELETE_ACCOUNT_STARTED', started: 'DELETE_ACCOUNT_STARTED',
success: 'DELETE_ACCOUNT_SUCCESS', success: 'DELETE_ACCOUNT_SUCCESS',
failed: 'DELETE_ACCOUNT_FAILED', failed: 'DELETE_ACCOUNT_FAILED',
}); });
const accountDeletionBroadcastOptions = Object.freeze({
broadcastToOwnDevices: true,
});
function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> { function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const broadcastAccountDeletion = useBroadcastAccountDeletion(
accountDeletionBroadcastOptions,
);
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount); const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
return React.useCallback( return React.useCallback(
async password => { async password => {
if (usingCommServicesAccessToken) { if (usingCommServicesAccessToken) {
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
if ( const { deleteWalletUser, deletePasswordUser } = identityClient;
!identityClient.deleteWalletUser || if (!deleteWalletUser || !deletePasswordUser) {
bartekAuthorUnsubmitted
Done
Inline Actions

This is because of Flow not being able to infer these as non-null after await broadcastAccountDeletion(); was called

bartek: This is because of Flow not being able to infer these as non-null after `await…
!identityClient.deletePasswordUser
) {
throw new Error('Delete user method unimplemented'); throw new Error('Delete user method unimplemented');
} }
await broadcastAccountDeletion();
if (password) { if (password) {
await identityClient.deletePasswordUser(password); await deletePasswordUser(password);
} else { } else {
await identityClient.deleteWalletUser(); await deleteWalletUser();
} }
} }
try { try {
const keyserverResult = await callKeyserverDeleteAccount({ const keyserverResult = await callKeyserverDeleteAccount({
preRequestUserState, preRequestUserState,
}); });
const { keyserverIDs: _, ...result } = keyserverResult; const { keyserverIDs: _, ...result } = keyserverResult;
return { return {
Show All 16 Lines async password => {
currentUserInfo: null, currentUserInfo: null,
preRequestUserState: { preRequestUserState: {
...preRequestUserState, ...preRequestUserState,
commServicesAccessToken, commServicesAccessToken,
}, },
}; };
}, },
[ [
broadcastAccountDeletion,
callKeyserverDeleteAccount, callKeyserverDeleteAccount,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
preRequestUserState, preRequestUserState,
], ],
); );
} }
▲ Show 20 Lines • Show All 887 Lines • Show Last 20 Lines