diff --git a/pkg/build/build_test.go b/pkg/build/build_test.go index d9fb37ab9..c5466dcfb 100644 --- a/pkg/build/build_test.go +++ b/pkg/build/build_test.go @@ -37,7 +37,6 @@ var requireErrInvalidConfiguration require.ErrorAssertionFunc = func(t require.T // TestConfiguration_Load is the main set of tests for loading a configuration // file. When in doubt, add your test here. func TestConfiguration_Load(t *testing.T) { - gid1000 := uint32(1000) tests := []struct { name string skipConfigCleanStep bool @@ -209,8 +208,8 @@ func TestConfiguration_Load(t *testing.T) { "GOPATH": "/var/cache/melange/go", }, Accounts: apko_types.ImageAccounts{ - Users: []apko_types.User{{UserName: "build", UID: 1000, GID: apko_types.GID(&gid1000)}}, - Groups: []apko_types.Group{{GroupName: "build", GID: 1000, Members: []string{"build"}}}, + Users: []apko_types.User{{UserName: buildUser, UID: 1000, GID: apko_types.GID(&gid1000)}}, + Groups: []apko_types.Group{{GroupName: buildUser, GID: 1000, Members: []string{buildUser}}}, }, }, Subpackages: []config.Subpackage{}, @@ -285,14 +284,14 @@ package: } gid1000 := uint32(1000) expected.Environment.Accounts.Users = []apko_types.User{{ - UserName: "build", + UserName: buildUser, UID: 1000, GID: apko_types.GID(&gid1000), }} expected.Environment.Accounts.Groups = []apko_types.Group{{ - GroupName: "build", + GroupName: buildUser, GID: 1000, - Members: []string{"build"}, + Members: []string{buildUser}, }} expected.Environment.Environment = map[string]string{ "HOME": "/home/build", diff --git a/pkg/build/test_test.go b/pkg/build/test_test.go index ba1516401..864b424ac 100644 --- a/pkg/build/test_test.go +++ b/pkg/build/test_test.go @@ -39,14 +39,14 @@ const ( homeBuild = "/home/build" ) -var ( - gid1000 = uint32(1000) -) +const buildUser = "build" + +var gid1000 = uint32(1000) func defaultEnv(opts ...func(*apko_types.ImageConfiguration)) apko_types.ImageConfiguration { env := apko_types.ImageConfiguration{ Accounts: types.ImageAccounts{ - Groups: []types.Group{{GroupName: "build", GID: 1000, Members: []string{"build"}}}, + Groups: []types.Group{{GroupName: "build", GID: 1000, Members: []string{buildUser}}}, Users: []apko_types.User{{UserName: "build", UID: 1000, GID: apko_types.GID(&gid1000)}}, }, } diff --git a/pkg/config/config.go b/pkg/config/config.go index 143f97fe1..4277fb901 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -42,7 +42,10 @@ import ( "chainguard.dev/melange/pkg/util" ) -const purlTypeAPK = "apk" +const ( + buildUser = "build" + purlTypeAPK = "apk" +) type Trigger struct { // Optional: The script to run @@ -1361,12 +1364,12 @@ func ParseConfiguration(_ context.Context, configurationFilePath string, opts .. // TODO: validate that subpackage ranges have been consumed and applied usr := apko_types.User{ - UserName: "build", + UserName: buildUser, UID: 1000, } grp := apko_types.Group{ - GroupName: "build", + GroupName: buildUser, GID: 1000, Members: []string{usr.UserName}, }