public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

fixup! fixup! run: user LookupId 

Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
This commit is contained in:
Yoan Blanc 2020-03-05 17:00:14 +01:00
parent 67fbdef360
commit bd77f131fd
No known key found for this signature in database
GPG Key ID: 6058CF4574298812
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/run.go
View File

@ -41,7 +41,7 @@ type RunCommand struct {
// for testing // for testing
var ( var (
userLookup = user.Lookup userLookup = user.Lookup
userLookupId = user.LookupId userLookupID = user.LookupId
) )
func (r *RunCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile.BuildArgs) error { func (r *RunCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile.BuildArgs) error {
@ -131,7 +131,7 @@ func addDefaultHOME(u string, envs []string) ([]string, error) {
// Otherwise the user is set to uid and HOME is / // Otherwise the user is set to uid and HOME is /
userObj, err := userLookup(u) userObj, err := userLookup(u)
if err != nil { if err != nil {
if uo, e := userLookupId(u); e == nil { if uo, e := userLookupID(u); e == nil {
userObj = uo userObj = uo
} else { } else {
return nil, err return nil, err

4
pkg/commands/run_test.go
View File

@ -114,10 +114,10 @@ func Test_addDefaultHOME(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
userLookup = func(username string) (*user.User, error) { return test.mockUser, test.lookupError } userLookup = func(username string) (*user.User, error) { return test.mockUser, test.lookupError }
userLookupId = func(username string) (*user.User, error) { return test.mockUserId, nil } userLookupID = func(username string) (*user.User, error) { return test.mockUserId, nil }
defer func() { defer func() {
userLookup = user.Lookup userLookup = user.Lookup
userLookupId = user.LookupId userLookupID = user.LookupId
}() }()
actual, err := addDefaultHOME(test.user, test.initial) actual, err := addDefaultHOME(test.user, test.initial)
testutil.CheckErrorAndDeepEqual(t, false, err, test.expected, actual) testutil.CheckErrorAndDeepEqual(t, false, err, test.expected, actual)