pkg/blueprint: add ExpireDate to users

osbuild · Mar 21, 2024 · a5beebe · a5beebe
1 parent a8d116c
commit a5beebe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/pkg/blueprint/customizations.go b/pkg/blueprint/customizations.go
@@ -72,6 +72,7 @@ type UserCustomization struct {
 	Groups      []string `json:"groups,omitempty" toml:"groups,omitempty"`
 	UID         *int     `json:"uid,omitempty" toml:"uid,omitempty"`
 	GID         *int     `json:"gid,omitempty" toml:"gid,omitempty"`
+	ExpireDate  *int     `json:"expiredate,omitempty" toml:"expiredate,omitempty"`
 }
 
 type GroupCustomization struct {

diff --git a/pkg/blueprint/customizations_test.go b/pkg/blueprint/customizations_test.go
@@ -103,6 +103,7 @@ func TestGetUsers(t *testing.T) {
 	}
 	UID := 123
 	GID := 321
+	ExpireDate := 12345
 
 	expectedUsers := []UserCustomization{
 		{
@@ -115,6 +116,7 @@ func TestGetUsers(t *testing.T) {
 			Groups:      Groups,
 			UID:         &UID,
 			GID:         &GID,
+			ExpireDate:  &ExpireDate,
 		},
 	}
 

diff --git a/pkg/customizations/users/users.go b/pkg/customizations/users/users.go
@@ -12,6 +12,7 @@ type User struct {
 	Groups      []string
 	UID         *int
 	GID         *int
+	ExpireDate  *int
 }
 
 type Group struct {

diff --git a/pkg/osbuild/users_stage.go b/pkg/osbuild/users_stage.go
@@ -20,6 +20,7 @@ type UsersStageOptionsUser struct {
 	Shell       *string  `json:"shell,omitempty"`
 	Password    *string  `json:"password,omitempty"`
 	Key         *string  `json:"key,omitempty"`
+	ExpireDate  *int     `json:"expiredate,omitempty"`
 }
 
 func NewUsersStage(options *UsersStageOptions) *Stage {
@@ -60,6 +61,7 @@ func NewUsersStageOptions(userCustomizations []users.User, omitKey bool) (*Users
 			Shell:       uc.Shell,
 			Password:    uc.Password,
 			Key:         nil,
+			ExpireDate:  uc.ExpireDate,
 		}
 		if !omitKey {
 			user.Key = uc.Key