Skip to content

Commit 5fa044c

Browse files
authored
Stop saving badges in the database (#5074)
1 parent bd4c620 commit 5fa044c

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

src/controllers/krate/publish.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use swirl::Job;
1111

1212
use crate::controllers::cargo_prelude::*;
1313
use crate::models::{
14-
insert_version_owner_action, Badge, Category, Crate, DependencyKind, Keyword, NewCrate,
15-
NewVersion, Rights, VersionAction,
14+
insert_version_owner_action, Category, Crate, DependencyKind, Keyword, NewCrate, NewVersion,
15+
Rights, VersionAction,
1616
};
1717
use crate::worker;
1818

@@ -186,9 +186,6 @@ pub fn publish(req: &mut dyn RequestExt) -> EndpointResult {
186186
// in order to be able to warn about them
187187
let ignored_invalid_categories = Category::update_crate(&conn, &krate, &categories)?;
188188

189-
// Update all badges for this crate, collecting any invalid badges in
190-
// order to be able to warn about them
191-
let ignored_invalid_badges = Badge::update_crate(&conn, &krate, new_crate.badges.as_ref())?;
192189
let top_versions = krate.top_versions(&conn)?;
193190

194191
// Read tarball from request
@@ -248,7 +245,7 @@ pub fn publish(req: &mut dyn RequestExt) -> EndpointResult {
248245
// warnings at this time, but if we need to, the field is available.
249246
let warnings = PublishWarnings {
250247
invalid_categories: ignored_invalid_categories,
251-
invalid_badges: ignored_invalid_badges,
248+
invalid_badges: vec![],
252249
other: vec![],
253250
};
254251

src/tests/krate/publish.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -813,15 +813,7 @@ fn ignored_badges() {
813813
let json = token.publish_crate(crate_to_publish).good();
814814
assert_eq!(json.krate.name, "foo_ignored_badge");
815815
assert_eq!(json.krate.max_version, "1.0.0");
816-
assert_eq!(json.warnings.invalid_badges.len(), 2);
817-
assert!(json
818-
.warnings
819-
.invalid_badges
820-
.contains(&"travis-ci".to_string(),));
821-
assert!(json
822-
.warnings
823-
.invalid_badges
824-
.contains(&"not-a-badge".to_string(),));
816+
assert_eq!(json.warnings.invalid_badges.len(), 0);
825817

826818
let json = anon.show_crate("foo_ignored_badge");
827819
let badges = json.krate.badges.unwrap();

0 commit comments

Comments
 (0)