Page MenuHomePhabricator
Differential D11231

[identity] Replace elastic crate in identity
ClosedPublic
Actions

Authored by will on Mar 3 2024, 10:44 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 3:54 PM
Unknown Object (File)
Feb 28 2025, 8:22 PM
Unknown Object (File)
Feb 28 2025, 8:22 PM
Unknown Object (File)
Feb 28 2025, 4:08 PM
Unknown Object (File)
Feb 5 2025, 4:57 PM
Unknown Object (File)
Feb 3 2025, 3:05 PM
Unknown Object (File)
Feb 3 2025, 1:27 PM
Unknown Object (File)
Jan 30 2025, 1:55 PM
View All 64 Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
bartek
Commits
rCOMMe5c6972837ba: [identity] Replace elastic crate in identity
Summary

This replaces the elastic crate by implementing the opensearch response struct in the file opensearch.rs. Attempted looking into using the opensearch rust crate but it doesn't implement a deserializable struct. Instead, opensearch.rs examples showed accessing the hits as a serde_json::Value. Opted to implementing our own struct instead with anything extraneous removed

Context: https://linear.app/comm/issue/ENG-7046/remove-elastic-package-from-identity-service

Test Plan

Tested on local websocket server. Successfully deserializing opensearch response into hit results

Diff Detail

Repository
rCOMM Comm
Branch
remove-elastic
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

will created this revision.Mar 3 2024, 10:44 PM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptMar 3 2024, 10:44 PM
will retitled this revision from [identity] Replace elastic crate to [identity] Replace elastic crate in identity.Mar 3 2024, 10:45 PM
will added a reviewer: bartek.
will edited the summary of this revision. (Show Details)
will edited the summary of this revision. (Show Details)
will added inline comments.Mar 3 2024, 10:47 PM
services/identity/src/websockets/mod.rs
175

Using filter_map to grab only the Ok values. Not sure if there's a cleaner way

services/identity/src/websockets/opensearch.rs
4

Follows format of https://github.com/elastic-rs/elastic/blob/312eeb22b6ad60072a80680fbec27f466cdcb9b3/src/elastic/src/client/responses/search.rs#L91

Harbormaster completed remote builds in B27287: Diff 37764.Mar 3 2024, 10:59 PM
will requested review of this revision.Mar 3 2024, 10:59 PM
will edited the summary of this revision. (Show Details)Mar 4 2024, 7:17 AM
will edited the summary of this revision. (Show Details)Mar 4 2024, 8:27 AM
will edited the summary of this revision. (Show Details)
bartek accepted this revision.Mar 4 2024, 9:57 PM
This revision is now accepted and ready to land.Mar 4 2024, 9:57 PM
Closed by commit rCOMMe5c6972837ba: [identity] Replace elastic crate in identity (authored by will). · Explain WhyMar 5 2024, 9:09 PM
This revision was automatically updated to reflect the committed changes.
will added a commit: rCOMMe5c6972837ba: [identity] Replace elastic crate in identity.

Revision Contents
Changeset List

PathSize
services/
identity/
1 line
src/
websockets/
13 lines
18 lines

Diff 37764

View Options

services/identity/Cargo.lock

  • This file was added.
// @flow
import type {
StackNavigationEventMap,
StackNavigationState,
StackOptions,
} from '@react-navigation/core';
import * as React from 'react';
import { Text } from 'react-native';
import { type QRAuthNavigationProp } from './qr-auth-navigator.react.js';
import RegistrationButtonContainer from '../../account/registration/registration-button-container.react.js';
import RegistrationContainer from '../../account/registration/registration-container.react.js';
import RegistrationContentContainer from '../../account/registration/registration-content-container.react.js';
import PrimaryButton from '../../components/primary-button.react.js';
import type { RootNavigationProp } from '../../navigation/root-navigator.react.js';
import {
type NavigationRoute,
type ScreenParamList,
} from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js';
type Props = {
+navigation: QRAuthNavigationProp<'QRAuthNotPrimaryDevice'>,
+route: NavigationRoute<'QRAuthNotPrimaryDevice'>,
};
function QRAuthNotPrimaryDevice(prop: Props): React.Node {
const { navigation } = prop;
const styles = useStyles(unboundStyles);
const onPressGoBack = React.useCallback(() => {
navigation
.getParent<
ScreenParamList,
'LinkedDevicesBottomSheet',
StackNavigationState,
StackOptions,
StackNavigationEventMap,
RootNavigationProp<'LinkedDevicesBottomSheet'>,
>()
?.goBack();
}, [navigation]);
return (
<RegistrationContainer>
<RegistrationContentContainer>
<Text style={styles.header}>Device not primary</Text>
<Text style={styles.body}>
This mobile device is not your primary device, and cannot be used to
authorize new devices. Please try your other mobile device(s).
</Text>
</RegistrationContentContainer>
<RegistrationButtonContainer>
<PrimaryButton
onPress={onPressGoBack}
label="Go back"
variant="enabled"
/>
</RegistrationButtonContainer>
</RegistrationContainer>
);
}
const unboundStyles = {
header: {
fontSize: 24,
color: 'panelForegroundLabel',
paddingBottom: 16,
},
body: {
fontFamily: 'Arial',
fontSize: 15,
lineHeight: 20,
color: 'panelForegroundSecondaryLabel',
paddingBottom: 16,
},
};
export default QRAuthNotPrimaryDevice;
View Options

services/identity/Cargo.toml

  • This file was added.
// @flow
import type {
StackNavigationEventMap,
StackNavigationState,
StackOptions,
} from '@react-navigation/core';
import * as React from 'react';
import { Text } from 'react-native';
import { type QRAuthNavigationProp } from './qr-auth-navigator.react.js';
import RegistrationButtonContainer from '../../account/registration/registration-button-container.react.js';
import RegistrationContainer from '../../account/registration/registration-container.react.js';
import RegistrationContentContainer from '../../account/registration/registration-content-container.react.js';
import PrimaryButton from '../../components/primary-button.react.js';
import type { RootNavigationProp } from '../../navigation/root-navigator.react.js';
import {
type NavigationRoute,
type ScreenParamList,
} from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js';
type Props = {
+navigation: QRAuthNavigationProp<'QRAuthNotPrimaryDevice'>,
+route: NavigationRoute<'QRAuthNotPrimaryDevice'>,
};
function QRAuthNotPrimaryDevice(prop: Props): React.Node {
const { navigation } = prop;
const styles = useStyles(unboundStyles);
const onPressGoBack = React.useCallback(() => {
navigation
.getParent<
ScreenParamList,
'LinkedDevicesBottomSheet',
StackNavigationState,
StackOptions,
StackNavigationEventMap,
RootNavigationProp<'LinkedDevicesBottomSheet'>,
>()
?.goBack();
}, [navigation]);
return (
<RegistrationContainer>
<RegistrationContentContainer>
<Text style={styles.header}>Device not primary</Text>
<Text style={styles.body}>
This mobile device is not your primary device, and cannot be used to
authorize new devices. Please try your other mobile device(s).
</Text>
</RegistrationContentContainer>
<RegistrationButtonContainer>
<PrimaryButton
onPress={onPressGoBack}
label="Go back"
variant="enabled"
/>
</RegistrationButtonContainer>
</RegistrationContainer>
);
}
const unboundStyles = {
header: {
fontSize: 24,
color: 'panelForegroundLabel',
paddingBottom: 16,
},
body: {
fontFamily: 'Arial',
fontSize: 15,
lineHeight: 20,
color: 'panelForegroundSecondaryLabel',
paddingBottom: 16,
},
};
export default QRAuthNotPrimaryDevice;
View Options

services/identity/src/websockets/mod.rs

  • This file was added.
// @flow
import type {
StackNavigationEventMap,
StackNavigationState,
StackOptions,
} from '@react-navigation/core';
import * as React from 'react';
import { Text } from 'react-native';
import { type QRAuthNavigationProp } from './qr-auth-navigator.react.js';
import RegistrationButtonContainer from '../../account/registration/registration-button-container.react.js';
import RegistrationContainer from '../../account/registration/registration-container.react.js';
import RegistrationContentContainer from '../../account/registration/registration-content-container.react.js';
import PrimaryButton from '../../components/primary-button.react.js';
import type { RootNavigationProp } from '../../navigation/root-navigator.react.js';
import {
type NavigationRoute,
type ScreenParamList,
} from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js';
type Props = {
+navigation: QRAuthNavigationProp<'QRAuthNotPrimaryDevice'>,
+route: NavigationRoute<'QRAuthNotPrimaryDevice'>,
};
function QRAuthNotPrimaryDevice(prop: Props): React.Node {
const { navigation } = prop;
const styles = useStyles(unboundStyles);
const onPressGoBack = React.useCallback(() => {
navigation
.getParent<
ScreenParamList,
'LinkedDevicesBottomSheet',
StackNavigationState,
StackOptions,
StackNavigationEventMap,
RootNavigationProp<'LinkedDevicesBottomSheet'>,
>()
?.goBack();
}, [navigation]);
return (
<RegistrationContainer>
<RegistrationContentContainer>
<Text style={styles.header}>Device not primary</Text>
<Text style={styles.body}>
This mobile device is not your primary device, and cannot be used to
authorize new devices. Please try your other mobile device(s).
</Text>
</RegistrationContentContainer>
<RegistrationButtonContainer>
<PrimaryButton
onPress={onPressGoBack}
label="Go back"
variant="enabled"
/>
</RegistrationButtonContainer>
</RegistrationContainer>
);
}
const unboundStyles = {
header: {
fontSize: 24,
color: 'panelForegroundLabel',
paddingBottom: 16,
},
body: {
fontFamily: 'Arial',
fontSize: 15,
lineHeight: 20,
color: 'panelForegroundSecondaryLabel',
paddingBottom: 16,
},
};
export default QRAuthNotPrimaryDevice;
View Options

services/identity/src/websockets/opensearch.rs

  • This file was added.
// @flow
import type {
StackNavigationEventMap,
StackNavigationState,
StackOptions,
} from '@react-navigation/core';
import * as React from 'react';
import { Text } from 'react-native';
import { type QRAuthNavigationProp } from './qr-auth-navigator.react.js';
import RegistrationButtonContainer from '../../account/registration/registration-button-container.react.js';
import RegistrationContainer from '../../account/registration/registration-container.react.js';
import RegistrationContentContainer from '../../account/registration/registration-content-container.react.js';
import PrimaryButton from '../../components/primary-button.react.js';
import type { RootNavigationProp } from '../../navigation/root-navigator.react.js';
import {
type NavigationRoute,
type ScreenParamList,
} from '../../navigation/route-names.js';
import { useStyles } from '../../themes/colors.js';
type Props = {
+navigation: QRAuthNavigationProp<'QRAuthNotPrimaryDevice'>,
+route: NavigationRoute<'QRAuthNotPrimaryDevice'>,
};
function QRAuthNotPrimaryDevice(prop: Props): React.Node {
const { navigation } = prop;
const styles = useStyles(unboundStyles);
const onPressGoBack = React.useCallback(() => {
navigation
.getParent<
ScreenParamList,
'LinkedDevicesBottomSheet',
StackNavigationState,
StackOptions,
StackNavigationEventMap,
RootNavigationProp<'LinkedDevicesBottomSheet'>,
>()
?.goBack();
}, [navigation]);
return (
<RegistrationContainer>
<RegistrationContentContainer>
<Text style={styles.header}>Device not primary</Text>
<Text style={styles.body}>
This mobile device is not your primary device, and cannot be used to
authorize new devices. Please try your other mobile device(s).
</Text>
</RegistrationContentContainer>
<RegistrationButtonContainer>
<PrimaryButton
onPress={onPressGoBack}
label="Go back"
variant="enabled"
/>
</RegistrationButtonContainer>
</RegistrationContainer>
);
}
const unboundStyles = {
header: {
fontSize: 24,
color: 'panelForegroundLabel',
paddingBottom: 16,
},
body: {
fontFamily: 'Arial',
fontSize: 15,
lineHeight: 20,
color: 'panelForegroundSecondaryLabel',
paddingBottom: 16,
},
};
export default QRAuthNotPrimaryDevice;