Skip to content

Commit

Permalink
Sort and format bolt generated workspace members (#317)
Browse files Browse the repository at this point in the history 
<!-- Please make sure there is an issue that this PR is correlated to. -->

## Changes

I tried changing this out for a few reasons:

- People contributing will still look at this file, even if it's generated. Having it in one long line is harder to get an understanding of the scope of `svc/`.
- Having the crates in a list with newlines makes for easier-to-understand crate changes in PRs, since it's not just part of one long line that is changing.
- Making the list sorted will make it more consistant. I've had a few times where just starting Bolt will cause a large change in this file that shows up in my diffs. After looking at how it's generated, I'm not sure how this is the case, but this should be prevented by having a sorted list.
  • Loading branch information
@AngelOnFira
AngelOnFira committed Jan 5, 2024
1 parent dd9ef43 commit 1b09cb4
Show file tree
Hide file tree
Showing 2 changed files with 253 additions and 3 deletions.
9 changes: 7 additions & 2 deletions lib/bolt/core/src/tasks/gen.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,18 @@ async fn generate_root(path: &Path) {
}
}

// Sort the workspace_members
workspace_members.sort();

// Generate a project manifest for all of the services. This will let us use a shared lockfile.
let cargo_project_manifest = indoc::formatdoc!(
r#"
# This is generated by Bolt. Do not modify.
[workspace]
members = [{}]
members = [
{}
]
# Speed up compilation
[profile.dev]
Expand All @@ -163,7 +168,7 @@ async fn generate_root(path: &Path) {
[profile.dev.build-override]
opt-level = 3
"#,
workspace_members.join(", "),
workspace_members.join(",\n\t"),
);
write_if_different(&cargo_toml_path, &cargo_project_manifest).await;

Expand Down
247 changes: 246 additions & 1 deletion svc/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,252 @@
# This is generated by Bolt. Do not modify.

[workspace]
members = ["api/cloud", "api/group", "api/route", "api/portal", "api/job", "api/cf-verification", "api/module", "api/identity", "api/admin", "api/matchmaker", "api/status", "api/kv", "api/monolith", "api/auth", "pkg/push-notification/worker", "pkg/cdn/worker", "pkg/cdn/ops/ns-enable-domain-public-auth-set", "pkg/cdn/ops/namespace-get", "pkg/cdn/ops/version-get", "pkg/cdn/ops/namespace-create", "pkg/cdn/ops/namespace-domain-remove", "pkg/cdn/ops/namespace-auth-user-update", "pkg/cdn/ops/site-get", "pkg/cdn/ops/namespace-resolve-domain", "pkg/cdn/ops/version-publish", "pkg/cdn/ops/namespace-auth-user-remove", "pkg/cdn/ops/namespace-domain-create", "pkg/cdn/ops/site-list-for-game", "pkg/cdn/ops/version-prepare", "pkg/cdn/ops/site-create", "pkg/cdn/ops/ns-auth-type-set", "pkg/captcha/ops/turnstile-verify", "pkg/captcha/ops/hcaptcha-verify", "pkg/captcha/ops/turnstile-config-get", "pkg/captcha/ops/verify", "pkg/captcha/ops/request", "pkg/captcha/ops/hcaptcha-config-get", "pkg/email-verification/ops/complete", "pkg/email-verification/ops/create", "pkg/team/worker", "pkg/team/standalone/billing-collect", "pkg/team/ops/member-get", "pkg/team/ops/member-relationship-get", "pkg/team/ops/resolve-display-name", "pkg/team/ops/profile-validate", "pkg/team/ops/user-ban-get", "pkg/team/ops/get", "pkg/team/ops/join-request-list", "pkg/team/ops/recommend", "pkg/team/ops/user-ban-list", "pkg/team/ops/search", "pkg/team/ops/avatar-upload-complete", "pkg/team/ops/validate", "pkg/team/ops/billing-aggregate", "pkg/team/ops/member-count", "pkg/team/ops/member-list", "pkg/cloud/worker", "pkg/cloud/ops/namespace-token-development-create", "pkg/cloud/ops/game-config-get", "pkg/cloud/ops/namespace-get", "pkg/cloud/ops/version-get", "pkg/cloud/ops/namespace-create", "pkg/cloud/ops/namespace-token-public-create", "pkg/cloud/ops/version-publish", "pkg/cloud/ops/game-config-create", "pkg/cloud/ops/game-token-create", "pkg/cloud/ops/device-link-create", "pkg/external/worker", "pkg/external/ops/request-validate", "pkg/faker/ops/mm-player", "pkg/faker/ops/job-template", "pkg/faker/ops/team", "pkg/faker/ops/region", "pkg/faker/ops/game-version", "pkg/faker/ops/build", "pkg/faker/ops/cdn-site", "pkg/faker/ops/user", "pkg/faker/ops/mm-lobby", "pkg/faker/ops/game", "pkg/faker/ops/job-run", "pkg/faker/ops/game-namespace", "pkg/faker/ops/mm-lobby-row", "pkg/token/ops/get", "pkg/token/ops/exchange", "pkg/token/ops/create", "pkg/token/ops/revoke", "pkg/user-follow/worker", "pkg/user-follow/ops/relationship-get", "pkg/user-follow/ops/request-list", "pkg/user-follow/ops/get", "pkg/user-follow/ops/toggle", "pkg/user-follow/ops/count", "pkg/user-follow/ops/list", "pkg/user-notification-auth/ops/register", "pkg/user-notification-auth/ops/unregister", "pkg/region/ops/get", "pkg/region/ops/recommend", "pkg/region/ops/config-get", "pkg/region/ops/list", "pkg/region/ops/resolve", "pkg/load-test/standalone/sqlx", "pkg/load-test/standalone/api-cloud", "pkg/load-test/standalone/mm", "pkg/user-dev/worker", "pkg/job-log/worker", "pkg/job-log/ops/read", "pkg/custom-user-avatar/ops/upload-complete", "pkg/custom-user-avatar/ops/list-for-game", "pkg/kv-config/ops/namespace-get", "pkg/kv-config/ops/version-get", "pkg/kv-config/ops/namespace-create", "pkg/kv-config/ops/version-publish", "pkg/kv-config/ops/version-prepare", "pkg/telemetry/standalone/beacon", "pkg/nsfw/ops/image-score", "pkg/build/standalone/default-create", "pkg/build/ops/get", "pkg/build/ops/list-for-game", "pkg/build/ops/create", "pkg/job/standalone/gc", "pkg/analytics/worker", "pkg/team-invite/worker", "pkg/team-invite/ops/get", "pkg/email/ops/send", "pkg/profanity/ops/check", "pkg/user-identity/ops/delete", "pkg/user-identity/ops/get", "pkg/user-identity/ops/create", "pkg/user/worker", "pkg/user/standalone/delete-pending", "pkg/user/standalone/search-user-gc", "pkg/user/ops/pending-delete-toggle", "pkg/user/ops/profile-validate", "pkg/user/ops/get", "pkg/user/ops/mutual-friend-list", "pkg/user/ops/search", "pkg/user/ops/resolve-email", "pkg/user/ops/token-create", "pkg/user/ops/avatar-upload-complete", "pkg/user/ops/resolve-access-token", "pkg/user/ops/team-list", "pkg/module/worker", "pkg/module/ops/game-version-get", "pkg/module/ops/version-get", "pkg/module/ops/game-version-publish", "pkg/module/ops/get", "pkg/module/ops/ns-instance-get", "pkg/module/ops/instance-call", "pkg/module/ops/instance-get", "pkg/module/ops/game-version-prepare", "pkg/team-dev/worker", "pkg/team-dev/standalone/halt-collect", "pkg/team-dev/ops/get", "pkg/team-dev/ops/halt", "pkg/team-dev/ops/game-list", "pkg/user-presence/worker", "pkg/user-presence/standalone/gc", "pkg/user-presence/ops/touch", "pkg/user-presence/ops/get", "pkg/mm/worker", "pkg/mm/standalone/gc", "pkg/mm/ops/lobby-state-get", "pkg/mm/ops/lobby-player-count", "pkg/mm/ops/lobby-idle-update", "pkg/mm/ops/player-count-for-namespace", "pkg/mm/ops/lobby-find-try-complete", "pkg/mm/ops/lobby-find-fail", "pkg/mm/ops/lobby-get", "pkg/mm/ops/player-get", "pkg/mm/ops/lobby-list-for-namespace", "pkg/mm/ops/lobby-find-lobby-query-list", "pkg/mm/ops/lobby-history", "pkg/mm/ops/lobby-runtime-aggregate", "pkg/mm/ops/dev-player-token-create", "pkg/mm/ops/lobby-list-for-user-id", "pkg/ip/ops/info", "pkg/mm-config/ops/namespace-get", "pkg/mm-config/ops/version-get", "pkg/mm-config/ops/namespace-create", "pkg/mm-config/ops/lobby-group-resolve-version", "pkg/mm-config/ops/version-publish", "pkg/mm-config/ops/lobby-group-get", "pkg/mm-config/ops/version-prepare", "pkg/mm-config/ops/lobby-group-resolve-name-id", "pkg/mm-config/ops/namespace-config-set", "pkg/mm-config/ops/namespace-config-validate", "pkg/user-report/worker", "pkg/game/ops/namespace-resolve-name-id", "pkg/game/ops/namespace-get", "pkg/game/ops/version-get", "pkg/game/ops/namespace-resolve-url", "pkg/game/ops/namespace-create", "pkg/game/ops/version-create", "pkg/game/ops/namespace-version-history-list", "pkg/game/ops/resolve-name-id", "pkg/game/ops/get", "pkg/game/ops/token-development-validate", "pkg/game/ops/version-validate", "pkg/game/ops/recommend", "pkg/game/ops/namespace-validate", "pkg/game/ops/banner-upload-complete", "pkg/game/ops/resolve-namespace-id", "pkg/game/ops/namespace-version-set", "pkg/game/ops/list-all", "pkg/game/ops/validate", "pkg/game/ops/namespace-list", "pkg/game/ops/create", "pkg/game/ops/logo-upload-complete", "pkg/game/ops/version-list", "pkg/identity-config/ops/namespace-get", "pkg/identity-config/ops/version-get", "pkg/identity-config/ops/namespace-create", "pkg/identity-config/ops/version-publish", "pkg/identity-config/ops/version-prepare", "pkg/job-run/worker", "pkg/job-run/standalone/nomad-monitor", "pkg/job-run/ops/get", "pkg/job-run/ops/metrics-log", "pkg/game-user/worker", "pkg/game-user/ops/recent-session-list", "pkg/game-user/ops/get", "pkg/game-user/ops/recommend", "pkg/game-user/ops/link-create", "pkg/game-user/ops/link-get", "pkg/game-user/ops/list-for-user", "pkg/game-user/ops/create", "pkg/debug/ops/email-res", "pkg/cf-custom-hostname/worker", "pkg/cf-custom-hostname/ops/resolve-hostname", "pkg/cf-custom-hostname/ops/get", "pkg/cf-custom-hostname/ops/list-for-namespace-id", "pkg/upload/worker", "pkg/upload/standalone/provider-fill", "pkg/upload/ops/complete", "pkg/upload/ops/file-list", "pkg/upload/ops/get", "pkg/upload/ops/prepare", "pkg/upload/ops/list-for-user", "pkg/kv/worker", "pkg/kv/ops/get", "pkg/kv/ops/list", "pkg/tier/ops/list", "pkg/monolith/standalone/worker", "pkg/perf/ops/log-get"]
members = [
"api/admin",
"api/auth",
"api/cf-verification",
"api/cloud",
"api/group",
"api/identity",
"api/job",
"api/kv",
"api/matchmaker",
"api/module",
"api/monolith",
"api/portal",
"api/route",
"api/status",
"pkg/analytics/worker",
"pkg/build/ops/create",
"pkg/build/ops/get",
"pkg/build/ops/list-for-game",
"pkg/build/standalone/default-create",
"pkg/captcha/ops/hcaptcha-config-get",
"pkg/captcha/ops/hcaptcha-verify",
"pkg/captcha/ops/request",
"pkg/captcha/ops/turnstile-config-get",
"pkg/captcha/ops/turnstile-verify",
"pkg/captcha/ops/verify",
"pkg/cdn/ops/namespace-auth-user-remove",
"pkg/cdn/ops/namespace-auth-user-update",
"pkg/cdn/ops/namespace-create",
"pkg/cdn/ops/namespace-domain-create",
"pkg/cdn/ops/namespace-domain-remove",
"pkg/cdn/ops/namespace-get",
"pkg/cdn/ops/namespace-resolve-domain",
"pkg/cdn/ops/ns-auth-type-set",
"pkg/cdn/ops/ns-enable-domain-public-auth-set",
"pkg/cdn/ops/site-create",
"pkg/cdn/ops/site-get",
"pkg/cdn/ops/site-list-for-game",
"pkg/cdn/ops/version-get",
"pkg/cdn/ops/version-prepare",
"pkg/cdn/ops/version-publish",
"pkg/cdn/worker",
"pkg/cf-custom-hostname/ops/get",
"pkg/cf-custom-hostname/ops/list-for-namespace-id",
"pkg/cf-custom-hostname/ops/resolve-hostname",
"pkg/cf-custom-hostname/worker",
"pkg/cloud/ops/device-link-create",
"pkg/cloud/ops/game-config-create",
"pkg/cloud/ops/game-config-get",
"pkg/cloud/ops/game-token-create",
"pkg/cloud/ops/namespace-create",
"pkg/cloud/ops/namespace-get",
"pkg/cloud/ops/namespace-token-development-create",
"pkg/cloud/ops/namespace-token-public-create",
"pkg/cloud/ops/version-get",
"pkg/cloud/ops/version-publish",
"pkg/cloud/worker",
"pkg/custom-user-avatar/ops/list-for-game",
"pkg/custom-user-avatar/ops/upload-complete",
"pkg/debug/ops/email-res",
"pkg/email-verification/ops/complete",
"pkg/email-verification/ops/create",
"pkg/email/ops/send",
"pkg/external/ops/request-validate",
"pkg/external/worker",
"pkg/faker/ops/build",
"pkg/faker/ops/cdn-site",
"pkg/faker/ops/game",
"pkg/faker/ops/game-namespace",
"pkg/faker/ops/game-version",
"pkg/faker/ops/job-run",
"pkg/faker/ops/job-template",
"pkg/faker/ops/mm-lobby",
"pkg/faker/ops/mm-lobby-row",
"pkg/faker/ops/mm-player",
"pkg/faker/ops/region",
"pkg/faker/ops/team",
"pkg/faker/ops/user",
"pkg/game-user/ops/create",
"pkg/game-user/ops/get",
"pkg/game-user/ops/link-create",
"pkg/game-user/ops/link-get",
"pkg/game-user/ops/list-for-user",
"pkg/game-user/ops/recent-session-list",
"pkg/game-user/ops/recommend",
"pkg/game-user/worker",
"pkg/game/ops/banner-upload-complete",
"pkg/game/ops/create",
"pkg/game/ops/get",
"pkg/game/ops/list-all",
"pkg/game/ops/logo-upload-complete",
"pkg/game/ops/namespace-create",
"pkg/game/ops/namespace-get",
"pkg/game/ops/namespace-list",
"pkg/game/ops/namespace-resolve-name-id",
"pkg/game/ops/namespace-resolve-url",
"pkg/game/ops/namespace-validate",
"pkg/game/ops/namespace-version-history-list",
"pkg/game/ops/namespace-version-set",
"pkg/game/ops/recommend",
"pkg/game/ops/resolve-name-id",
"pkg/game/ops/resolve-namespace-id",
"pkg/game/ops/token-development-validate",
"pkg/game/ops/validate",
"pkg/game/ops/version-create",
"pkg/game/ops/version-get",
"pkg/game/ops/version-list",
"pkg/game/ops/version-validate",
"pkg/identity-config/ops/namespace-create",
"pkg/identity-config/ops/namespace-get",
"pkg/identity-config/ops/version-get",
"pkg/identity-config/ops/version-prepare",
"pkg/identity-config/ops/version-publish",
"pkg/ip/ops/info",
"pkg/job-log/ops/read",
"pkg/job-log/worker",
"pkg/job-run/ops/get",
"pkg/job-run/ops/metrics-log",
"pkg/job-run/standalone/nomad-monitor",
"pkg/job-run/worker",
"pkg/job/standalone/gc",
"pkg/kv-config/ops/namespace-create",
"pkg/kv-config/ops/namespace-get",
"pkg/kv-config/ops/version-get",
"pkg/kv-config/ops/version-prepare",
"pkg/kv-config/ops/version-publish",
"pkg/kv/ops/get",
"pkg/kv/ops/list",
"pkg/kv/worker",
"pkg/load-test/standalone/api-cloud",
"pkg/load-test/standalone/mm",
"pkg/load-test/standalone/sqlx",
"pkg/mm-config/ops/lobby-group-get",
"pkg/mm-config/ops/lobby-group-resolve-name-id",
"pkg/mm-config/ops/lobby-group-resolve-version",
"pkg/mm-config/ops/namespace-config-set",
"pkg/mm-config/ops/namespace-config-validate",
"pkg/mm-config/ops/namespace-create",
"pkg/mm-config/ops/namespace-get",
"pkg/mm-config/ops/version-get",
"pkg/mm-config/ops/version-prepare",
"pkg/mm-config/ops/version-publish",
"pkg/mm/ops/dev-player-token-create",
"pkg/mm/ops/lobby-find-fail",
"pkg/mm/ops/lobby-find-lobby-query-list",
"pkg/mm/ops/lobby-find-try-complete",
"pkg/mm/ops/lobby-get",
"pkg/mm/ops/lobby-history",
"pkg/mm/ops/lobby-idle-update",
"pkg/mm/ops/lobby-list-for-namespace",
"pkg/mm/ops/lobby-list-for-user-id",
"pkg/mm/ops/lobby-player-count",
"pkg/mm/ops/lobby-runtime-aggregate",
"pkg/mm/ops/lobby-state-get",
"pkg/mm/ops/player-count-for-namespace",
"pkg/mm/ops/player-get",
"pkg/mm/standalone/gc",
"pkg/mm/worker",
"pkg/module/ops/game-version-get",
"pkg/module/ops/game-version-prepare",
"pkg/module/ops/game-version-publish",
"pkg/module/ops/get",
"pkg/module/ops/instance-call",
"pkg/module/ops/instance-get",
"pkg/module/ops/ns-instance-get",
"pkg/module/ops/version-get",
"pkg/module/worker",
"pkg/monolith/standalone/worker",
"pkg/nsfw/ops/image-score",
"pkg/perf/ops/log-get",
"pkg/profanity/ops/check",
"pkg/push-notification/worker",
"pkg/region/ops/config-get",
"pkg/region/ops/get",
"pkg/region/ops/list",
"pkg/region/ops/recommend",
"pkg/region/ops/resolve",
"pkg/team-dev/ops/game-list",
"pkg/team-dev/ops/get",
"pkg/team-dev/ops/halt",
"pkg/team-dev/standalone/halt-collect",
"pkg/team-dev/worker",
"pkg/team-invite/ops/get",
"pkg/team-invite/worker",
"pkg/team/ops/avatar-upload-complete",
"pkg/team/ops/billing-aggregate",
"pkg/team/ops/get",
"pkg/team/ops/join-request-list",
"pkg/team/ops/member-count",
"pkg/team/ops/member-get",
"pkg/team/ops/member-list",
"pkg/team/ops/member-relationship-get",
"pkg/team/ops/profile-validate",
"pkg/team/ops/recommend",
"pkg/team/ops/resolve-display-name",
"pkg/team/ops/search",
"pkg/team/ops/user-ban-get",
"pkg/team/ops/user-ban-list",
"pkg/team/ops/validate",
"pkg/team/standalone/billing-collect",
"pkg/team/worker",
"pkg/telemetry/standalone/beacon",
"pkg/tier/ops/list",
"pkg/token/ops/create",
"pkg/token/ops/exchange",
"pkg/token/ops/get",
"pkg/token/ops/revoke",
"pkg/upload/ops/complete",
"pkg/upload/ops/file-list",
"pkg/upload/ops/get",
"pkg/upload/ops/list-for-user",
"pkg/upload/ops/prepare",
"pkg/upload/standalone/provider-fill",
"pkg/upload/worker",
"pkg/user-dev/worker",
"pkg/user-follow/ops/count",
"pkg/user-follow/ops/get",
"pkg/user-follow/ops/list",
"pkg/user-follow/ops/relationship-get",
"pkg/user-follow/ops/request-list",
"pkg/user-follow/ops/toggle",
"pkg/user-follow/worker",
"pkg/user-identity/ops/create",
"pkg/user-identity/ops/delete",
"pkg/user-identity/ops/get",
"pkg/user-notification-auth/ops/register",
"pkg/user-notification-auth/ops/unregister",
"pkg/user-presence/ops/get",
"pkg/user-presence/ops/touch",
"pkg/user-presence/standalone/gc",
"pkg/user-presence/worker",
"pkg/user-report/worker",
"pkg/user/ops/avatar-upload-complete",
"pkg/user/ops/get",
"pkg/user/ops/mutual-friend-list",
"pkg/user/ops/pending-delete-toggle",
"pkg/user/ops/profile-validate",
"pkg/user/ops/resolve-access-token",
"pkg/user/ops/resolve-email",
"pkg/user/ops/search",
"pkg/user/ops/team-list",
"pkg/user/ops/token-create",
"pkg/user/standalone/delete-pending",
"pkg/user/standalone/search-user-gc",
"pkg/user/worker"
]

# Speed up compilation
[profile.dev]
Expand Down

0 comments on commit 1b09cb4

Please sign in to comment.