Set build directory ownership in virtual_build_directory.go

Author: mortenmj

cmd/bb_worker/main.go

@@ -372,7 +372,9 @@ func main() {
 								suspendableClock),
 							symlinkFactory,
 							characterDeviceFactory,
-							handleAllocator)
+							handleAllocator,
+							runnerConfiguration.BuildDirectoryOwnerUserId,
+							runnerConfiguration.BuildDirectoryOwnerGroupId)
 					} else {
 						executionTimeoutClock = clock.SystemClock
 						buildDirectory = builder.NewNaiveBuildDirectory(

pkg/builder/virtual_build_directory.go

@@ -20,11 +20,13 @@ import (
 )
 
 type virtualBuildDirectoryOptions struct {
-	directoryFetcher          cas.DirectoryFetcher
-	contentAddressableStorage blobstore.BlobAccess
-	symlinkFactory            virtual.SymlinkFactory
-	characterDeviceFactory    virtual.CharacterDeviceFactory
-	handleAllocator           virtual.StatefulHandleAllocator
+	directoryFetcher           cas.DirectoryFetcher
+	contentAddressableStorage  blobstore.BlobAccess
+	symlinkFactory             virtual.SymlinkFactory
+	characterDeviceFactory     virtual.CharacterDeviceFactory
+	handleAllocator            virtual.StatefulHandleAllocator
+	buildDirectoryOwnerUserID  uint32
+	buildDirectoryOwnerGroupID uint32
 }
 
 type virtualBuildDirectory struct {
@@ -37,15 +39,17 @@ type virtualBuildDirectory struct {
 // input root explicitly, it calls PrepopulatedDirectory.CreateChildren
 // to add special file and directory nodes whose contents are read on
 // demand.
-func NewVirtualBuildDirectory(directory virtual.PrepopulatedDirectory, directoryFetcher cas.DirectoryFetcher, contentAddressableStorage blobstore.BlobAccess, symlinkFactory virtual.SymlinkFactory, characterDeviceFactory virtual.CharacterDeviceFactory, handleAllocator virtual.StatefulHandleAllocator) BuildDirectory {
+func NewVirtualBuildDirectory(directory virtual.PrepopulatedDirectory, directoryFetcher cas.DirectoryFetcher, contentAddressableStorage blobstore.BlobAccess, symlinkFactory virtual.SymlinkFactory, characterDeviceFactory virtual.CharacterDeviceFactory, handleAllocator virtual.StatefulHandleAllocator, buildDirectoryOwnerUserID, buildDirectoryOwnerGroupID uint32) BuildDirectory {
 	return &virtualBuildDirectory{
 		PrepopulatedDirectory: directory,
 		options: &virtualBuildDirectoryOptions{
-			directoryFetcher:          directoryFetcher,
-			contentAddressableStorage: contentAddressableStorage,
-			symlinkFactory:            symlinkFactory,
-			characterDeviceFactory:    characterDeviceFactory,
-			handleAllocator:           handleAllocator,
+			directoryFetcher:           directoryFetcher,
+			contentAddressableStorage:  contentAddressableStorage,
+			symlinkFactory:             symlinkFactory,
+			characterDeviceFactory:     characterDeviceFactory,
+			handleAllocator:            handleAllocator,
+			buildDirectoryOwnerUserID:  buildDirectoryOwnerUserID,
+			buildDirectoryOwnerGroupID: buildDirectoryOwnerGroupID,
 		},
 	}
 }
@@ -85,9 +89,8 @@ func (d *virtualBuildDirectory) InstallHooks(filePool pool.FilePool, errorLogger
 			d.options.handleAllocator),
 		errorLogger,
 		/* defaultAttributesSetter = */ func(requested virtual.AttributesMask, attributes *virtual.Attributes) {
-			// TODO: Do we want to provide the ability to
-			// let build directories be owned by the user
-			// running the build actions?
+			attributes.SetOwnerUserID(d.options.buildDirectoryOwnerUserID)
+			attributes.SetOwnerGroupID(d.options.buildDirectoryOwnerGroupID)
 		},
 	)
 }