lix-project/lix-installer
16
4
Fork 4
Code Issues 23 Code Review (Gerrit) Projects Activity

Rename daemon-user-count and make an alias (#159)

Browse source 
* Update actions too

* Fix nix_user_count to nix_build_user_count
This commit is contained in:
Ana Hobden 2023-01-09 10:31:37 -08:00 committed by GitHub
parent eebb77900f
commit 6f50f8ad65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
action.yml
View file

@ -18,7 +18,7 @@ inputs:
modify-profile: modify-profile:
description: Modify the user profile to automatically load nix description: Modify the user profile to automatically load nix
required: false required: false
daemon-user-count: nix-build-user-count:
description: Number of build users to create description: Number of build users to create
required: false required: false
nix-build-group-name: nix-build-group-name:
@ -86,8 +86,8 @@ runs:
fi fi
if [ -n "${{ inputs.daemon-user-count }}" ]; then if [ -n "${{ inputs.daemon-user-count }}" ]; then
export NIX_INSTALLER_DAEMON_USER_COUNT=${{ inputs.daemon-user-count }} export NIX_INSTALLER_NIX_BUILD_USER_COUNT=${{ inputs.nix-build-user-count }}
echo "Set NIX_INSTALLER_DAEMON_USER_COUNT=$NIX_INSTALLER_DAEMON_USER_COUNT" echo "Set NIX_INSTALLER_NIX_BUILD_USER_COUNT=$NIX_INSTALLER_NIX_BUILD_USER_COUNT"
fi fi
if [ -n "${{ inputs.nix-build-group-name }}" ]; then if [ -n "${{ inputs.nix-build-group-name }}" ]; then

18
src/action/common/create_users_and_groups.rs
View file

@ -10,7 +10,7 @@ use tracing::{span, Instrument, Span};
#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)] #[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
pub struct CreateUsersAndGroups { pub struct CreateUsersAndGroups {
daemon_user_count: usize, nix_build_user_count: usize,
nix_build_group_name: String, nix_build_group_name: String,
nix_build_group_id: usize, nix_build_group_id: usize,
nix_build_user_prefix: String, nix_build_user_prefix: String,
@ -28,7 +28,7 @@ impl CreateUsersAndGroups {
settings.nix_build_group_id, settings.nix_build_group_id,
); );
// TODO(@hoverbear): CHeck if they exist, error if so // TODO(@hoverbear): CHeck if they exist, error if so
let create_users = (0..settings.daemon_user_count) let create_users = (0..settings.nix_build_user_count)
.map(|count| { .map(|count| {
CreateUser::plan( CreateUser::plan(
format!("{}{count}", settings.nix_build_user_prefix), format!("{}{count}", settings.nix_build_user_prefix),
@ -39,7 +39,7 @@ impl CreateUsersAndGroups {
}) })
.collect(); .collect();
Ok(Self { Ok(Self {
daemon_user_count: settings.daemon_user_count, nix_build_user_count: settings.nix_build_user_count,
nix_build_group_name: settings.nix_build_group_name, nix_build_group_name: settings.nix_build_group_name,
nix_build_group_id: settings.nix_build_group_id, nix_build_group_id: settings.nix_build_group_id,
nix_build_user_prefix: settings.nix_build_user_prefix, nix_build_user_prefix: settings.nix_build_user_prefix,
@ -58,7 +58,7 @@ impl Action for CreateUsersAndGroups {
format!( format!(
"Create build users (UID {}-{}) and group (GID {})", "Create build users (UID {}-{}) and group (GID {})",
self.nix_build_user_id_base, self.nix_build_user_id_base,
self.nix_build_user_id_base + self.daemon_user_count, self.nix_build_user_id_base + self.nix_build_user_count,
self.nix_build_group_id self.nix_build_group_id
) )
} }
@ -67,7 +67,7 @@ impl Action for CreateUsersAndGroups {
span!( span!(
tracing::Level::DEBUG, tracing::Level::DEBUG,
"create_users_and_group", "create_users_and_group",
daemon_user_count = self.daemon_user_count, nix_build_user_count = self.nix_build_user_count,
nix_build_group_name = self.nix_build_group_name, nix_build_group_name = self.nix_build_group_name,
nix_build_group_id = self.nix_build_group_id, nix_build_group_id = self.nix_build_group_id,
nix_build_user_prefix = self.nix_build_user_prefix, nix_build_user_prefix = self.nix_build_user_prefix,
@ -77,7 +77,7 @@ impl Action for CreateUsersAndGroups {
fn execute_description(&self) -> Vec<ActionDescription> { fn execute_description(&self) -> Vec<ActionDescription> {
let Self { let Self {
daemon_user_count: _, nix_build_user_count: _,
nix_build_group_name: _, nix_build_group_name: _,
nix_build_group_id: _, nix_build_group_id: _,
nix_build_user_prefix: _, nix_build_user_prefix: _,
@ -109,7 +109,7 @@ impl Action for CreateUsersAndGroups {
let Self { let Self {
create_users, create_users,
create_group, create_group,
daemon_user_count: _, nix_build_user_count: _,
nix_build_group_name: _, nix_build_group_name: _,
nix_build_group_id: _, nix_build_group_id: _,
nix_build_user_prefix: _, nix_build_user_prefix: _,
@ -167,7 +167,7 @@ impl Action for CreateUsersAndGroups {
fn revert_description(&self) -> Vec<ActionDescription> { fn revert_description(&self) -> Vec<ActionDescription> {
let Self { let Self {
daemon_user_count: _, nix_build_user_count: _,
nix_build_group_name: _, nix_build_group_name: _,
nix_build_group_id: _, nix_build_group_id: _,
nix_build_user_prefix: _, nix_build_user_prefix: _,
@ -201,7 +201,7 @@ impl Action for CreateUsersAndGroups {
let Self { let Self {
create_users, create_users,
create_group, create_group,
daemon_user_count: _, nix_build_user_count: _,
nix_build_group_name: _, nix_build_group_name: _,
nix_build_group_id: _, nix_build_group_id: _,
nix_build_user_prefix: _, nix_build_user_prefix: _,

17
src/settings.rs
View file

@ -64,11 +64,12 @@ pub struct CommonSettings {
clap( clap(
long, long,
default_value = "32", default_value = "32",
env = "NIX_INSTALLER_DAEMON_USER_COUNT", alias = "daemon-user-count",
env = "NIX_INSTALLER_NIX_BUILD_USER_COUNT",
global = true global = true
) )
)] )]
pub(crate) daemon_user_count: usize, pub(crate) nix_build_user_count: usize,
/// The Nix build group name /// The Nix build group name
#[cfg_attr( #[cfg_attr(
@ -209,7 +210,7 @@ impl CommonSettings {
}; };
Ok(Self { Ok(Self {
daemon_user_count: 32, nix_build_user_count: 32,
channels: vec![ChannelValue( channels: vec![ChannelValue(
"nixpkgs".into(), "nixpkgs".into(),
reqwest::Url::parse("https://nixos.org/channels/nixpkgs-unstable") reqwest::Url::parse("https://nixos.org/channels/nixpkgs-unstable")
@ -231,7 +232,7 @@ impl CommonSettings {
let Self { let Self {
channels, channels,
modify_profile, modify_profile,
daemon_user_count, nix_build_user_count,
nix_build_group_name, nix_build_group_name,
nix_build_group_id, nix_build_group_id,
nix_build_user_prefix, nix_build_user_prefix,
@ -256,8 +257,8 @@ impl CommonSettings {
serde_json::to_value(modify_profile)?, serde_json::to_value(modify_profile)?,
); );
map.insert( map.insert(
"daemon_user_count".into(), "nix_build_user_count".into(),
serde_json::to_value(daemon_user_count)?, serde_json::to_value(nix_build_user_count)?,
); );
map.insert( map.insert(
"nix_build_group_name".into(), "nix_build_group_name".into(),
@ -289,8 +290,8 @@ impl CommonSettings {
// Builder Pattern // Builder Pattern
impl CommonSettings { impl CommonSettings {
/// Number of build users to create /// Number of build users to create
pub fn daemon_user_count(&mut self, count: usize) -> &mut Self { pub fn nix_build_user_count(&mut self, count: usize) -> &mut Self {
self.daemon_user_count = count; self.nix_build_user_count = count;
self self
} }

4
tests/fixtures/darwin/darwin-multi.json vendored
View file

@ -94,7 +94,7 @@
}, },
"create_users_and_group": { "create_users_and_group": {
"action": { "action": {
"daemon_user_count": 32, "nix_build_user_count": 32,
"nix_build_group_name": "nixbld", "nix_build_group_name": "nixbld",
"nix_build_group_id": 3000, "nix_build_group_id": 3000,
"nix_build_user_prefix": "_nixbld", "nix_build_user_prefix": "_nixbld",
@ -670,7 +670,7 @@
] ]
], ],
"modify_profile": true, "modify_profile": true,
"daemon_user_count": 32, "nix_build_user_count": 32,
"nix_build_group_name": "nixbld", "nix_build_group_name": "nixbld",
"nix_build_group_id": 3000, "nix_build_group_id": 3000,
"nix_build_user_prefix": "_nixbld", "nix_build_user_prefix": "_nixbld",

4
tests/fixtures/linux/linux-multi.json vendored
View file

@ -24,7 +24,7 @@
}, },
"create_users_and_group": { "create_users_and_group": {
"action": { "action": {
"daemon_user_count": 32, "nix_build_user_count": 32,
"nix_build_group_name": "nixbld", "nix_build_group_name": "nixbld",
"nix_build_group_id": 3000, "nix_build_group_id": 3000,
"nix_build_user_prefix": "nixbld", "nix_build_user_prefix": "nixbld",
@ -604,7 +604,7 @@
] ]
], ],
"modify_profile": true, "modify_profile": true,
"daemon_user_count": 32, "nix_build_user_count": 32,
"nix_build_group_name": "nixbld", "nix_build_group_name": "nixbld",
"nix_build_group_id": 3000, "nix_build_group_id": 3000,
"nix_build_user_prefix": "nixbld", "nix_build_user_prefix": "nixbld",

4
tests/fixtures/linux/steam-deck.json vendored
View file

@ -67,7 +67,7 @@
}, },
"create_users_and_group": { "create_users_and_group": {
"action": { "action": {
"daemon_user_count": 32, "nix_build_user_count": 32,
"nix_build_group_name": "nixbld", "nix_build_group_name": "nixbld",
"nix_build_group_id": 3000, "nix_build_group_id": 3000,
"nix_build_user_prefix": "nixbld", "nix_build_user_prefix": "nixbld",
@ -648,7 +648,7 @@
] ]
], ],
"modify_profile": true, "modify_profile": true,
"daemon_user_count": 32, "nix_build_user_count": 32,
"nix_build_group_name": "nixbld", "nix_build_group_name": "nixbld",
"nix_build_group_id": 3000, "nix_build_group_id": 3000,
"nix_build_user_prefix": "nixbld", "nix_build_user_prefix": "nixbld",