Skip to content

Commit 0e7ac76

Browse files
sypharsyphar
committed
fixes
1 parent 3677870 commit 0e7ac76

28 files changed

+296
-419
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ exclude = [
1717
]
1818

1919
[dependencies]
20+
arc-swap = "1.7.1"
2021
sentry = { version = "0.42.0", features = ["panic", "tracing", "tower-http", "anyhow", "backtrace"] }
2122
log = "0.4"
2223
tracing = "0.1.37"

‎src/bin/cratesfyi.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,8 +656,8 @@ impl DatabaseSubcommand {
656656
let mut conn = ctx.pool.get_async().await?;
657657
db::delete_version(
658658
&mut conn,
659-
&*ctx.async_storage,
660-
&*ctx.config,
659+
&ctx.async_storage,
660+
&ctx.config,
661661
&name,
662662
&version,
663663
)
@@ -670,7 +670,7 @@ impl DatabaseSubcommand {
670670
.runtime
671671
.block_on(async move {
672672
let mut conn = ctx.pool.get_async().await?;
673-
db::delete_crate(&mut conn, &*ctx.async_storage, &*ctx.config, &name).await
673+
db::delete_crate(&mut conn, &ctx.async_storage, &ctx.config, &name).await
674674
})
675675
.context("failed to delete the crate")?,
676676
Self::Blacklist { command } => command.handle_args(ctx)?,

‎src/build_queue.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -754,10 +754,10 @@ mod tests {
754754
.create()
755755
.await?;
756756

757-
let build_queue = env.async_build_queue().await;
757+
let build_queue = env.async_build_queue();
758758
assert!(build_queue.queued_crates().await?.is_empty());
759759

760-
let mut conn = env.async_db().await.async_conn().await;
760+
let mut conn = env.async_db().async_conn().await;
761761
queue_rebuilds(&mut conn, &env.config(), &build_queue).await?;
762762

763763
let queue = build_queue.queued_crates().await?;
@@ -777,15 +777,15 @@ mod tests {
777777
config.max_queued_rebuilds = Some(1);
778778
});
779779

780-
let build_queue = env.async_build_queue().await;
780+
let build_queue = env.async_build_queue();
781781
build_queue
782782
.add_crate("foo1", "0.1.0", REBUILD_PRIORITY, None)
783783
.await?;
784784
build_queue
785785
.add_crate("foo2", "0.1.0", REBUILD_PRIORITY, None)
786786
.await?;
787787

788-
let mut conn = env.async_db().await.async_conn().await;
788+
let mut conn = env.async_db().async_conn().await;
789789
sqlx::query!("UPDATE queue SET attempt = 99")
790790
.execute(&mut *conn)
791791
.await?;
@@ -803,7 +803,7 @@ mod tests {
803803
.create()
804804
.await?;
805805

806-
let build_queue = env.async_build_queue().await;
806+
let build_queue = env.async_build_queue();
807807
queue_rebuilds(&mut conn, &env.config(), &build_queue).await?;
808808

809809
assert_eq!(build_queue.queued_crates().await?.len(), 1);
@@ -819,7 +819,7 @@ mod tests {
819819
config.max_queued_rebuilds = Some(1);
820820
});
821821

822-
let build_queue = env.async_build_queue().await;
822+
let build_queue = env.async_build_queue();
823823
build_queue
824824
.add_crate("foo1", "0.1.0", REBUILD_PRIORITY, None)
825825
.await?;
@@ -838,10 +838,10 @@ mod tests {
838838
.create()
839839
.await?;
840840

841-
let build_queue = env.async_build_queue().await;
841+
let build_queue = env.async_build_queue();
842842
assert_eq!(build_queue.queued_crates().await?.len(), 2);
843843

844-
let mut conn = env.async_db().await.async_conn().await;
844+
let mut conn = env.async_db().async_conn().await;
845845
queue_rebuilds(&mut conn, &env.config(), &build_queue).await?;
846846

847847
assert_eq!(build_queue.queued_crates().await?.len(), 2);
@@ -853,7 +853,7 @@ mod tests {
853853
#[test]
854854
fn test_add_duplicate_doesnt_fail_last_priority_wins() {
855855
crate::test::async_wrapper(|env| async move {
856-
let queue = env.async_build_queue().await;
856+
let queue = env.async_build_queue();
857857

858858
queue.add_crate("some_crate", "0.1.1", 0, None).await?;
859859
queue.add_crate("some_crate", "0.1.1", 9, None).await?;
@@ -873,9 +873,9 @@ mod tests {
873873
config.build_attempts = 5;
874874
});
875875

876-
let queue = env.async_build_queue().await;
876+
let queue = env.async_build_queue();
877877

878-
let mut conn = env.async_db().await.async_conn().await;
878+
let mut conn = env.async_db().async_conn().await;
879879
sqlx::query!(
880880
"
881881
INSERT INTO queue (name, version, priority, attempt, last_attempt )
@@ -910,11 +910,11 @@ mod tests {
910910
#[test]
911911
fn test_has_build_queued() {
912912
crate::test::async_wrapper(|env| async move {
913-
let queue = env.async_build_queue().await;
913+
let queue = env.async_build_queue();
914914

915915
queue.add_crate("dummy", "0.1.1", 0, None).await?;
916916

917-
let mut conn = env.async_db().await.async_conn().await;
917+
let mut conn = env.async_db().async_conn().await;
918918
assert!(queue.has_build_queued("dummy", "0.1.1").await.unwrap());
919919

920920
sqlx::query!("UPDATE queue SET attempt = 6")
@@ -955,7 +955,7 @@ mod tests {
955955

956956
runtime.block_on(async {
957957
// fake the build-attempt timestamp so it's older
958-
let mut conn = env.async_db().await.async_conn().await;
958+
let mut conn = env.async_db().async_conn().await;
959959
sqlx::query!(
960960
"UPDATE queue SET last_attempt = $1",
961961
Utc::now() - chrono::Duration::try_seconds(60).unwrap()
@@ -1060,7 +1060,7 @@ mod tests {
10601060
env.runtime()
10611061
.block_on(async {
10621062
cdn::queued_or_active_crate_invalidations(
1063-
&mut *env.async_db().await.async_conn().await,
1063+
&mut *env.async_db().async_conn().await,
10641064
)
10651065
.await
10661066
})?
@@ -1087,7 +1087,7 @@ mod tests {
10871087
let fetch_invalidations = || {
10881088
env.runtime()
10891089
.block_on(async {
1090-
let mut conn = env.async_db().await.async_conn().await;
1090+
let mut conn = env.async_db().async_conn().await;
10911091
cdn::queued_or_active_crate_invalidations(&mut conn).await
10921092
})
10931093
.unwrap()
@@ -1323,7 +1323,7 @@ mod tests {
13231323
fn test_broken_db_reference_breaks() {
13241324
crate::test::wrapper(|env| {
13251325
env.runtime().block_on(async {
1326-
let mut conn = env.async_db().await.async_conn().await;
1326+
let mut conn = env.async_db().async_conn().await;
13271327
set_config(&mut conn, ConfigName::LastSeenIndexReference, "invalid")
13281328
.await
13291329
.unwrap();

‎src/cdn.rs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ mod tests {
699699
config.cdn_backend = CdnKind::CloudFront;
700700
});
701701

702-
assert!(matches!(*env.cdn().await, CdnBackend::CloudFront { .. }));
702+
assert!(matches!(*env.cdn(), CdnBackend::CloudFront { .. }));
703703
assert!(matches!(
704704
CdnBackend::new(&env.config()).await,
705705
CdnBackend::CloudFront { .. }
@@ -712,7 +712,7 @@ mod tests {
712712
#[test]
713713
fn create_dummy() {
714714
async_wrapper(|env| async move {
715-
assert!(matches!(*env.cdn().await, CdnBackend::Dummy { .. }));
715+
assert!(matches!(*env.cdn(), CdnBackend::Dummy { .. }));
716716
assert!(matches!(
717717
CdnBackend::new(&env.config()).await,
718718
CdnBackend::Dummy { .. }
@@ -731,7 +731,7 @@ mod tests {
731731
});
732732

733733
let config = env.config();
734-
let mut conn = env.async_db().await.async_conn().await;
734+
let mut conn = env.async_db().async_conn().await;
735735
assert!(
736736
queued_or_active_crate_invalidations(&mut conn)
737737
.await?
@@ -757,9 +757,9 @@ mod tests {
757757
config.cdn_max_queued_age = Duration::from_secs(0);
758758
});
759759

760-
let cdn = env.cdn().await;
760+
let cdn = env.cdn();
761761
let config = env.config();
762-
let mut conn = env.async_db().await.async_conn().await;
762+
let mut conn = env.async_db().async_conn().await;
763763
assert!(
764764
queued_or_active_crate_invalidations(&mut conn)
765765
.await?
@@ -813,7 +813,7 @@ mod tests {
813813
assert!(active_invalidations(&cdn, "distribution_id_web").is_empty());
814814
assert!(active_invalidations(&cdn, "distribution_id_static").is_empty());
815815

816-
let cdn = env.cdn().await;
816+
let cdn = env.cdn();
817817
let config = env.config();
818818

819819
// now handle the queued invalidations
@@ -865,9 +865,9 @@ mod tests {
865865
config.cloudfront_distribution_id_static = Some("distribution_id_static".into());
866866
});
867867

868-
let cdn = env.cdn().await;
868+
let cdn = env.cdn();
869869
let config = env.config();
870-
let mut conn = env.async_db().await.async_conn().await;
870+
let mut conn = env.async_db().async_conn().await;
871871
assert!(
872872
queued_or_active_crate_invalidations(&mut conn)
873873
.await?
@@ -921,7 +921,7 @@ mod tests {
921921
assert!(active_invalidations(&cdn, "distribution_id_web").is_empty());
922922
assert!(active_invalidations(&cdn, "distribution_id_static").is_empty());
923923

924-
let cdn = env.cdn().await;
924+
let cdn = env.cdn();
925925
let config = env.config();
926926

927927
// now handle the queued invalidations
@@ -1001,7 +1001,7 @@ mod tests {
10011001
config.cloudfront_distribution_id_web = Some("distribution_id_web".into());
10021002
});
10031003

1004-
let cdn = env.cdn().await;
1004+
let cdn = env.cdn();
10051005

10061006
// create an invalidation with 15 paths, so we're over the limit
10071007
let already_running_invalidation = cdn
@@ -1013,7 +1013,7 @@ mod tests {
10131013
)
10141014
.await?;
10151015

1016-
let mut conn = env.async_db().await.async_conn().await;
1016+
let mut conn = env.async_db().async_conn().await;
10171017
assert!(
10181018
queued_or_active_crate_invalidations(&mut conn)
10191019
.await?
@@ -1049,7 +1049,7 @@ mod tests {
10491049
// handle the queued invalidations
10501050
handle_queued_invalidation_requests(
10511051
&env.config(),
1052-
&*env.cdn().await,
1052+
&*env.cdn(),
10531053
&env.instance_metrics(),
10541054
&mut conn,
10551055
"distribution_id_web",
@@ -1083,7 +1083,7 @@ mod tests {
10831083
config.cloudfront_distribution_id_web = Some("distribution_id_web".into());
10841084
});
10851085

1086-
let cdn = env.cdn().await;
1086+
let cdn = env.cdn();
10871087

10881088
// create an invalidation with 15 paths, so we're over the limit
10891089
let already_running_invalidation = cdn
@@ -1093,7 +1093,7 @@ mod tests {
10931093
)
10941094
.await?;
10951095

1096-
let mut conn = env.async_db().await.async_conn().await;
1096+
let mut conn = env.async_db().async_conn().await;
10971097
assert!(
10981098
queued_or_active_crate_invalidations(&mut conn)
10991099
.await?
@@ -1112,7 +1112,7 @@ mod tests {
11121112
// handle the queued invalidations
11131113
handle_queued_invalidation_requests(
11141114
&env.config(),
1115-
&*env.cdn().await,
1115+
&*env.cdn(),
11161116
&env.instance_metrics(),
11171117
&mut conn,
11181118
"distribution_id_web",
@@ -1143,7 +1143,7 @@ mod tests {
11431143
// now handle again
11441144
handle_queued_invalidation_requests(
11451145
&env.config(),
1146-
&*env.cdn().await,
1146+
&*env.cdn(),
11471147
&env.instance_metrics(),
11481148
&mut conn,
11491149
"distribution_id_web",
@@ -1174,9 +1174,9 @@ mod tests {
11741174
config.cloudfront_distribution_id_web = Some("distribution_id_web".into());
11751175
});
11761176

1177-
let cdn = env.cdn().await;
1177+
let cdn = env.cdn();
11781178

1179-
let mut conn = env.async_db().await.async_conn().await;
1179+
let mut conn = env.async_db().async_conn().await;
11801180
// no invalidation is queued
11811181
assert!(
11821182
queued_or_active_crate_invalidations(&mut conn)
@@ -1187,7 +1187,7 @@ mod tests {
11871187
// run the handler
11881188
handle_queued_invalidation_requests(
11891189
&env.config(),
1190-
&*env.cdn().await,
1190+
&*env.cdn(),
11911191
&env.instance_metrics(),
11921192
&mut conn,
11931193
"distribution_id_web",

0 commit comments

Comments
 (0)