Page MenuHomePhabricator
Differential D7256

[identity] bump aws-config and aws-sdk-dynamodb crate versions
ClosedPublic
Actions

Authored by varun on Mar 30 2023, 12:27 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 26 2025, 2:22 PM
Unknown Object (File)
Feb 25 2025, 7:15 AM
Unknown Object (File)
Feb 25 2025, 7:14 AM
Unknown Object (File)
Feb 24 2025, 12:27 AM
Unknown Object (File)
Feb 16 2025, 8:55 AM
Unknown Object (File)
Feb 16 2025, 8:55 AM
Unknown Object (File)
Feb 16 2025, 8:54 AM
Unknown Object (File)
Feb 16 2025, 8:51 AM
View All Files
Subscribers
ashoat
atul
tomek

Details

Reviewers
• jon
bartek
Commits
rCOMMf30a02df6cdd: [identity] bump aws-config and aws-sdk-dynamodb crate versions
Summary

these were pretty outdated. tested a couple client calls to DDB to make sure nothing broke

Test Plan

called the generate nonce and get user ID RPCs and the DDB client was able to read from/write to test tables

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

varun created this revision.Mar 30 2023, 12:27 PM
Herald added subscribers: atul, tomek, ashoat. · View Herald TranscriptMar 30 2023, 12:27 PM
varun added a child revision: D7258: [identity] config for LocalStack.Mar 30 2023, 12:33 PM
Harbormaster completed remote builds in B17841: Diff 24437.Mar 30 2023, 12:48 PM
varun requested review of this revision.Mar 30 2023, 12:48 PM
ashoat added inline comments.Mar 30 2023, 1:50 PM
services/identity/Cargo.toml
17 ↗(On Diff #24437)

Other services use 0.51.0... wondering if we care to keep them synced?

varun added inline comments.Mar 30 2023, 1:56 PM
services/identity/Cargo.toml
17 ↗(On Diff #24437)

i'd like to use the latest here, and i don't really want to upgrade the other services...

it would be great to keep them in sync, though. I'll link this issue in ENG-2311

varun added inline comments.Mar 30 2023, 2:00 PM
services/identity/Cargo.toml
17 ↗(On Diff #24437)

linked on 3102 instead

varun added a reviewer: bartek.Mar 30 2023, 3:23 PM
bartek accepted this revision.Mar 31 2023, 4:14 AM
bartek added inline comments.
services/identity/Cargo.toml
17 ↗(On Diff #24437)

Agree, let's use the latest here and bump others later in ENG-3102

This revision is now accepted and ready to land.Mar 31 2023, 4:14 AM
Closed by commit rCOMMf30a02df6cdd: [identity] bump aws-config and aws-sdk-dynamodb crate versions (authored by varun). · Explain WhyMar 31 2023, 12:21 PM
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMMf30a02df6cdd: [identity] bump aws-config and aws-sdk-dynamodb crate versions.

Revision Contents
Changeset List

PathSize
services/
identity/
5 lines
src/
2 lines

Diff 24522

View Options

services/identity/Cargo.lock

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

services/identity/Cargo.toml

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

services/identity/src/database.rs

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines